commit: handle --bisect-all output in Commit.list_from_string

davvid · davvid · commit c231551328fa · 2008-09-02T22:05:44.000-07:00
Rui Abreu Ferrerira pointed out that "git rev-list --bisect-all" returns a slightly different format which we can easily accomodate by changing the way we parse rev-list output. http://groups.google.com/group/git-python/browse_thread/thread/aed1d5c4b31d5027 This resolves the issue mentioned in that thread. Signed-off-by: David Aguilar <davvid@gmail.com>
diff --git a/lib/git/commit.py b/lib/git/commit.py
@@ -139,17 +139,17 @@ def list_from_string(cls, repo, text):
         commits = []
 
         while lines:
-            id = lines.pop(0).split()[-1]
-            tree = lines.pop(0).split()[-1]
+            id = lines.pop(0).split()[1]
+            tree = lines.pop(0).split()[1]
 
             parents = []
-            while lines and re.search(r'^parent', lines[0]):
+            while lines and lines[0].startswith('parent'):
                 parents.append(lines.pop(0).split()[-1])
             author, authored_date = cls.actor(lines.pop(0))
             committer, committed_date = cls.actor(lines.pop(0))
 
             messages = []
-            while lines and re.search(r'^ {4}', lines[0]):
+            while lines and lines[0].startswith('    '):
                 messages.append(lines.pop(0).strip())
 
             message = messages and messages[0] or ''
