X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/011cbd1b417a29bbcb189f86833bac773ba4a6f7..537ddf3fcbb207659094a19acd83ac7b83d4deb1:/stgit/git.py

diff --git a/stgit/git.py b/stgit/git.py
index 40bcd78..ae5506b 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -45,6 +45,7 @@ class Commit:
         self.__id_hash = id_hash
 
         lines = _output_lines('git-cat-file commit %s' % id_hash)
+        self.__parents = []
         for i in range(len(lines)):
             line = lines[i]
             if line == '\n':
@@ -53,10 +54,10 @@ class Commit:
             if field[0] == 'tree':
                 self.__tree = field[1]
             elif field[0] == 'parent':
-                self.__parent = field[1]
+                self.__parents.append(field[1])
             if field[0] == 'author':
                 self.__author = field[1]
-            if field[0] == 'comitter':
+            if field[0] == 'committer':
                 self.__committer = field[1]
         self.__log = ''.join(lines[i:])
 
@@ -67,7 +68,10 @@ class Commit:
         return self.__tree
 
     def get_parent(self):
-        return self.__parent
+        return self.__parents[0]
+
+    def get_parents(self):
+        return self.__parents
 
     def get_author(self):
         return self.__author
@@ -75,6 +79,9 @@ class Commit:
     def get_committer(self):
         return self.__committer
 
+    def get_log(self):
+        return self.__log
+
 # dictionary of Commit objects, used to avoid multiple calls to git
 __commits = dict()
 
@@ -155,7 +162,8 @@ def __run(cmd, args=None):
 def __check_base_dir():
     return os.path.isdir(base_dir)
 
-def __tree_status(files = [], tree_id = 'HEAD', unknown = False, noexclude = True):
+def __tree_status(files = [], tree_id = 'HEAD', unknown = False,
+                  noexclude = True):
     """Returns a list of pairs - [status, filename]
     """
     os.system('git-update-cache --refresh > /dev/null')
@@ -164,16 +172,19 @@ def __tree_status(files = [], tree_id = 'HEAD', unknown = False, noexclude = Tru
 
     # unknown files
     if unknown:
-        exclude_file = os.path.join(base_dir, 'exclude')
-        base_exclude = [ '--exclude=*.[ao]', '--exclude=.*' '--exclude=TAGS',
-                        '--exclude=tags', '--exclude=*~', '--exclude=#*',
-                        '--exclude-per-directory=.gitignore' ]
-        extra_exclude = []
+        exclude_file = os.path.join(base_dir, 'info', 'exclude')
+        base_exclude = ['--exclude=%s' % s for s in
+                        ['*.[ao]', '*.pyc', '.*', '*~', '#*', 'TAGS', 'tags']]
+        base_exclude.append('--exclude-per-directory=.gitignore')
+
         if os.path.exists(exclude_file):
-            extra_exclude.append('--exclude-from=%s' % exclude_file)
+            extra_exclude = '--exclude-from=%s' % exclude_file
+        else:
+            extra_exclude = []
         if noexclude:
             extra_exclude = base_exclude = []
-        lines = _output_lines(['git-ls-files', '--others' ] + base_exclude
+
+        lines = _output_lines(['git-ls-files', '--others'] + base_exclude
                         + extra_exclude)
         cache_files += [('?', line.strip()) for line in lines]
 
@@ -342,7 +353,7 @@ def merge(base, head1, head2):
         raise GitException, 'git-read-tree failed (local changes maybe?)'
 
     # this can fail if there are conflicts
-    if os.system('git-merge-cache -o gitmergeonefile.py -a') != 0:
+    if os.system('git-merge-cache -o -q gitmergeonefile.py -a') != 0:
         raise GitException, 'git-merge-cache failed (possible conflicts)'
 
 def status(files = [], modified = False, new = False, deleted = False,
@@ -376,11 +387,11 @@ def status(files = [], modified = False, new = False, deleted = False,
 def diff(files = [], rev1 = 'HEAD', rev2 = None, out_fd = None):
     """Show the diff between rev1 and rev2
     """
-    os.system('git-update-cache --refresh > /dev/null')
 
     if rev2:
         diff_str = _output(['git-diff-tree', '-p', rev1, rev2] + files)
     else:
+        os.system('git-update-cache --refresh > /dev/null')
         diff_str = _output(['git-diff-cache', '-p', rev1] + files)
 
     if out_fd:
@@ -392,7 +403,6 @@ def diffstat(files = [], rev1 = 'HEAD', rev2 = None):
     """Return the diffstat between rev1 and rev2
     """
 
-    os.system('git-update-cache --refresh > /dev/null')
     p=popen2.Popen3('git-apply --stat')
     diff(files, rev1, rev2, p.tochild)
     p.tochild.close()
@@ -404,7 +414,6 @@ def diffstat(files = [], rev1 = 'HEAD', rev2 = None):
 def files(rev1, rev2):
     """Return the files modified between rev1 and rev2
     """
-    os.system('git-update-cache --refresh > /dev/null')
 
     str = ''
     for line in _output_lines('git-diff-tree -r %s %s' % (rev1, rev2)):
@@ -453,18 +462,16 @@ def reset(tree_id = None):
     # checkout doesn't remove files
     map(os.remove, rm_files)
 
-def pull(location, head = None, tag = None):
-    """Fetch changes from the remote repository. At the moment, just
-    use the 'git fetch' scripts
+def pull(repository = 'origin', refspec = None):
+    """Pull changes from the remote repository. At the moment, just
+    use the 'git pull' command
     """
-    args = [location]
-    if head:
-        args += [head]
-    elif tag:
-        args += ['tag', tag]
+    args = [repository]
+    if refspec:
+        args.append(refspec)
 
     if __run('git pull', args) != 0:
-        raise GitException, 'Failed "git fetch %s"' % location
+        raise GitException, 'Failed "git pull %s"' % repository
 
 def apply_patch(filename = None):
     """Apply a patch onto the current index. There must not be any