Fix the behaviour when there is no user information configured

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index f5e2f328ff1942447a3526b8cc4a513a48baae29..46ba5c8614e892e44ede8816f8d19fb76fe6baef 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -23,6 +23,7 @@ import sys, os, popen2, re, gitmergeonefile
 from stgit import basedir
 from stgit.utils import *
 from stgit.config import config
 from stgit import basedir
 from stgit.utils import *
 from stgit.config import config

+from sets import Set

 
 # git exception class
 class GitException(Exception):
 
 # git exception class
 class GitException(Exception):


@@ -33,6 +34,39 @@ class GitException(Exception):
 #
 # Classes
 #
 #
 # Classes
 #

+
+class Person:
+    """An author, committer, etc."""
+    def __init__(self, name = None, email = None, date = '',
+                 desc = None):
+        self.name = self.email = self.date = None
+        if name or email or date:
+            assert not desc
+            self.name = name
+            self.email = email
+            self.date = date
+        elif desc:
+            assert not (name or email or date)
+            def parse_desc(s):
+                m = re.match(r'^(.+)<(.+)>(.*)$', s)
+                assert m
+                return [x.strip() or None for x in m.groups()]
+            self.name, self.email, self.date = parse_desc(desc)
+    def set_name(self, val):
+        if val:
+            self.name = val
+    def set_email(self, val):
+        if val:
+            self.email = val
+    def set_date(self, val):
+        if val:
+            self.date = val
+    def __str__(self):
+        if self.name and self.email:
+            return '%s <%s>' % (self.name, self.email)
+        else:
+            raise GitException, 'not enough identity data'
+

 class Commit:
     """Handle the commit objects
     """
 class Commit:
     """Handle the commit objects
     """


@@ -182,9 +216,13 @@ def __run(cmd, args=None):
     return 0
 
 def __tree_status(files = None, tree_id = 'HEAD', unknown = False,
     return 0
 
 def __tree_status(files = None, tree_id = 'HEAD', unknown = False,

-                  noexclude = True):
+                  noexclude = True, verbose = False):

     """Returns a list of pairs - [status, filename]
     """
     """Returns a list of pairs - [status, filename]
     """

+    if verbose and sys.stdout.isatty():
+        print 'Checking for changes in the working directory...',
+        sys.stdout.flush()
+

     refresh_index()
 
     if not files:
     refresh_index()
 
     if not files:


@@ -221,12 +259,15 @@ def __tree_status(files = None, tree_id = 'HEAD', unknown = False,
         if fs[1] not in conflicts:
             cache_files.append(fs)
 
         if fs[1] not in conflicts:
             cache_files.append(fs)
 

+    if verbose and sys.stdout.isatty():
+        print 'done'
+

     return cache_files
 
     return cache_files
 

-def local_changes():
+def local_changes(verbose = True):

     """Return true if there are local changes in the tree
     """
     """Return true if there are local changes in the tree
     """

-    return len(__tree_status()) != 0
+    return len(__tree_status(verbose = verbose)) != 0

 
 # HEAD value cached
 __head = None
 
 # HEAD value cached
 __head = None


@@ -358,6 +399,11 @@ def rename_branch(from_name, to_name):
     rename(os.path.join(basedir.get(), 'refs', 'heads'),
            from_name, to_name)
 
     rename(os.path.join(basedir.get(), 'refs', 'heads'),
            from_name, to_name)
 

+    reflog_dir = os.path.join(basedir.get(), 'logs', 'refs', 'heads')
+    if os.path.exists(reflog_dir) \
+           and os.path.exists(os.path.join(reflog_dir, from_name)):
+        rename(reflog_dir, from_name, to_name)
+

 def add(names):
     """Add the files or recursively add the directory contents
     """
 def add(names):
     """Add the files or recursively add the directory contents
     """


@@ -395,13 +441,64 @@ def rm(files, force = False):
         if files:
             __run('git-update-index --force-remove --', files)
 
         if files:
             __run('git-update-index --force-remove --', files)
 

+# Persons caching
+__user = None
+__author = None
+__committer = None
+
+def user():
+    """Return the user information.
+    """
+    global __user
+    if not __user:
+        name=config.get('user.name')
+        email=config.get('user.email')
+        __user = Person(name, email)
+    return __user;
+
+def author():
+    """Return the author information.
+    """
+    global __author
+    if not __author:
+        try:
+            # the environment variables take priority over config
+            try:
+                date = os.environ['GIT_AUTHOR_DATE']
+            except KeyError:
+                date = ''
+            __author = Person(os.environ['GIT_AUTHOR_NAME'],
+                              os.environ['GIT_AUTHOR_EMAIL'],
+                              date)
+        except KeyError:
+            __author = user()
+    return __author
+
+def committer():
+    """Return the author information.
+    """
+    global __committer
+    if not __committer:
+        try:
+            # the environment variables take priority over config
+            try:
+                date = os.environ['GIT_COMMITTER_DATE']
+            except KeyError:
+                date = ''
+            __committer = Person(os.environ['GIT_COMMITTER_NAME'],
+                                 os.environ['GIT_COMMITTER_EMAIL'],
+                                 date)
+        except KeyError:
+            __committer = user()
+    return __committer
+

 def update_cache(files = None, force = False):
     """Update the cache information for the given files
     """
     if not files:
         files = []
 
 def update_cache(files = None, force = False):
     """Update the cache information for the given files
     """
     if not files:
         files = []
 

-    cache_files = __tree_status(files)
+    cache_files = __tree_status(files, verbose = False)

 
     # everything is up-to-date
     if len(cache_files) == 0:
 
     # everything is up-to-date
     if len(cache_files) == 0:


@@ -503,13 +600,27 @@ def apply_diff(rev1, rev2, check_index = True, files = None):
 
     return True
 
 
     return True
 

-def merge(base, head1, head2):
+def merge(base, head1, head2, recursive = False):

     """Perform a 3-way merge between base, head1 and head2 into the
     local tree
     """
     refresh_index()
     """Perform a 3-way merge between base, head1 and head2 into the
     local tree
     """
     refresh_index()

-    if __run('git-read-tree -u -m --aggressive', [base, head1, head2]) != 0:
-        raise GitException, 'git-read-tree failed (local changes maybe?)'
+
+    if recursive:
+        # this operation tracks renames but it is slower (used in
+        # general when pushing or picking patches)
+        try:
+            # use _output() to mask the verbose prints of the tool
+            _output('git-merge-recursive %s -- %s %s' % (base, head1, head2))
+        except GitException:
+            pass
+    else:
+        # the fast case where we don't track renames (used when the
+        # distance between base and heads is small, i.e. folding or
+        # synchronising patches)
+        if __run('git-read-tree -u -m --aggressive',
+                 [base, head1, head2]) != 0:
+            raise GitException, 'git-read-tree failed (local changes maybe?)'

 
     # check the index for unmerged entries
     files = {}
 
     # check the index for unmerged entries
     files = {}


@@ -532,6 +643,15 @@ def merge(base, head1, head2):
     # merge the unmerged files
     errors = False
     for path in files:
     # merge the unmerged files
     errors = False
     for path in files:

+        # remove additional files that might be generated for some
+        # newer versions of GIT
+        for suffix in [base, head1, head2]:
+            if not suffix:
+                continue
+            fname = path + '~' + suffix
+            if os.path.exists(fname):
+                os.remove(fname)
+

         stages = files[path]
         if gitmergeonefile.merge(stages['1'][1], stages['2'][1],
                                  stages['3'][1], path, stages['1'][0],
         stages = files[path]
         if gitmergeonefile.merge(stages['1'][1], stages['2'][1],
                                  stages['3'][1], path, stages['1'][0],


@@ -567,6 +687,8 @@ def status(files = None, modified = False, new = False, deleted = False,
         cache_files = [x for x in cache_files if x[0] in filestat]
 
     for fs in cache_files:
         cache_files = [x for x in cache_files if x[0] in filestat]
 
     for fs in cache_files:

+        if files and not fs[1] in files:
+            continue

         if all:
             print '%s %s' % (fs[0], fs[1])
         else:
         if all:
             print '%s %s' % (fs[0], fs[1])
         else:


@@ -684,31 +806,31 @@ def reset(files = None, tree_id = None, check_out = True):
     if not files:
         __set_head(tree_id)
 
     if not files:
         __set_head(tree_id)
 

-def pull(repository = 'origin', refspec = None):
-    """Pull changes from the remote repository. At the moment, just
-    use the 'git-pull' command
+def fetch(repository = 'origin', refspec = None):
+    """Fetches changes from the remote repository, using 'git-fetch'
+    by default.

     """
     """

-    # 'git-pull' updates the HEAD
+    # we update the HEAD

     __clear_head_cache()
 
     args = [repository]
     if refspec:
         args.append(refspec)
 
     __clear_head_cache()
 
     args = [repository]
     if refspec:
         args.append(refspec)
 

-    if __run(config.get('stgit', 'pullcmd'), args) != 0:
-        raise GitException, 'Failed "git-pull %s"' % repository
+    command = config.get('stgit.pullcmd')
+    if __run(command, args) != 0:
+        raise GitException, 'Failed "%s %s"' % (command, repository)
+
+def repack():
+    """Repack all objects into a single pack
+    """
+    __run('git-repack -a -d -f')

 
 def apply_patch(filename = None, diff = None, base = None,
                 fail_dump = True):
     """Apply a patch onto the current or given index. There must not
     be any local changes in the tree, otherwise the command fails
     """
 
 def apply_patch(filename = None, diff = None, base = None,
                 fail_dump = True):
     """Apply a patch onto the current or given index. There must not
     be any local changes in the tree, otherwise the command fails
     """

-    if base:
-        orig_head = get_head()
-        switch(base)
-    else:
-        refresh_index()
-

     if diff is None:
         if filename:
             f = file(filename)
     if diff is None:
         if filename:
             f = file(filename)


@@ -718,6 +840,12 @@ def apply_patch(filename = None, diff = None, base = None,
         if filename:
             f.close()
 
         if filename:
             f.close()
 

+    if base:
+        orig_head = get_head()
+        switch(base)
+    else:
+        refresh_index()
+

     try:
         _input_str('git-apply --index', diff)
     except GitException:
     try:
         _input_str('git-apply --index', diff)
     except GitException:


@@ -728,6 +856,7 @@ def apply_patch(filename = None, diff = None, base = None,
             f = file('.stgit-failed.patch', 'w+')
             f.write(diff)
             f.close()
             f = file('.stgit-failed.patch', 'w+')
             f.write(diff)
             f.close()

+            print >> sys.stderr, 'Diff written to the .stgit-failed.patch file'

 
         raise
 
 
         raise
 


@@ -752,3 +881,93 @@ def modifying_revs(files, base_rev):
     revs = [line.strip() for line in _output_lines(cmd + files)]
 
     return revs
     revs = [line.strip() for line in _output_lines(cmd + files)]
 
     return revs

+
+
+def refspec_localpart(refspec):
+    m = re.match('^[^:]*:([^:]*)$', refspec)
+    if m:
+        return m.group(1)
+    else:
+        raise GitException, 'Cannot parse refspec "%s"' % line
+
+def refspec_remotepart(refspec):
+    m = re.match('^([^:]*):[^:]*$', refspec)
+    if m:
+        return m.group(1)
+    else:
+        raise GitException, 'Cannot parse refspec "%s"' % line
+    
+
+def __remotes_from_config():
+    return config.sections_matching(r'remote\.(.*)\.url')
+
+def __remotes_from_dir(dir):
+    d = os.path.join(basedir.get(), dir)
+    if os.path.exists(d):
+        return os.listdir(d)
+    else:
+        return None
+
+def remotes_list():
+    """Return the list of remotes in the repository
+    """
+
+    return Set(__remotes_from_config()) | \
+           Set(__remotes_from_dir('remotes')) | \
+           Set(__remotes_from_dir('branches'))
+
+def remotes_local_branches(remote):
+    """Returns the list of local branches fetched from given remote
+    """
+
+    branches = []
+    if remote in __remotes_from_config():
+        for line in config.getall('remote.%s.fetch' % remote):
+            branches.append(refspec_localpart(line))
+    elif remote in __remotes_from_dir('remotes'):
+        stream = open(os.path.join(basedir.get(), 'remotes', remote), 'r')
+        for line in stream:
+            # Only consider Pull lines
+            m = re.match('^Pull: (.*)\n$', line)
+            if m:
+                branches.append(refspec_localpart(m.group(1)))
+        stream.close()
+    elif remote in __remotes_from_dir('branches'):
+        # old-style branches only declare one branch
+        branches.append('refs/heads/'+remote);
+    else:
+        raise GitException, 'Unknown remote "%s"' % remote
+
+    return branches
+
+def identify_remote(branchname):
+    """Return the name for the remote to pull the given branchname
+    from, or None if we believe it is a local branch.
+    """
+
+    for remote in remotes_list():
+        if branchname in remotes_local_branches(remote):
+            return remote
+
+    # if we get here we've found nothing, the branch is a local one
+    return None
+
+def fetch_head():
+    """Return the git id for the tip of the parent branch as left by
+    'git fetch'.
+    """
+
+    fetch_head=None
+    stream = open(os.path.join(basedir.get(), 'FETCH_HEAD'), "r")
+    for line in stream:
+        # Only consider lines not tagged not-for-merge
+        m = re.match('^([^\t]*)\t\t', line)
+        if m:
+            if fetch_head:
+                raise GitException, "StGit does not support multiple FETCH_HEAD"
+            else:
+                fetch_head=m.group(1)
+    stream.close()
+
+    # here we are sure to have a single fetch_head
+    return fetch_head