Use a more clear message when pop or push can't apply a patch

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index cc0ae79..56374bc 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -59,7 +59,7 @@ class Commit:
                 self.__author = field[1]
             if field[0] == 'committer':
                 self.__committer = field[1]
-        self.__log = ''.join(lines[i:])
+        self.__log = ''.join(lines[i+1:])
 
     def get_id_hash(self):
         return self.__id_hash
@@ -236,7 +236,7 @@ def __set_head(val):
 def rev_parse(git_id):
     """Parse the string and return an SHA1 id
     """
-    _output(['git-rev-parse', git_id])
+    return _output(['git-rev-parse', git_id]).strip()
 
 def add(names):
     """Add the files or recursively add the directory contents
@@ -355,6 +355,15 @@ def commit(message, files = [], parents = [], allowempty = False,
 
     return commit_id
 
+def apply_diff(rev1, rev2):
+    """Apply the diff between rev1 and rev2 onto the current
+    index. This function doesn't need to raise an exception since it
+    is only used for fast-pushing a patch. If this operation fails,
+    the pushing would fall back to the three-way merge.
+    """
+    return os.system('git-diff-tree -p %s %s | git-apply --index 2> /dev/null'
+                     % (rev1, rev2)) == 0
+
 def merge(base, head1, head2):
     """Perform a 3-way merge between base, head1 and head2 into the
     local tree