Rev 64: Only include mainline when generating revision history. in http://people.samba.org/bzr/jelmer/bzr-git/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-git/trunk

------------------------------------------------------------
revno: 64
revision-id: jelmer at samba.org-20080726153041-h1xj8ufk0n0gz8jl
parent: jelmer at samba.org-20080726153020-4wvnoho0tdyd9tbc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-07-26 17:30:41 +0200
message:
  Only include mainline when generating revision history.
modified:
  git_branch.py                  git_branch.py-20071108230535-su8dxk529f4uk9fx-2
=== modified file 'git_branch.py'
--- a/git_branch.py	2008-07-26 13:16:06 +0000
+++ b/git_branch.py	2008-07-26 15:30:41 +0000
@@ -74,10 +74,17 @@
         cms = None
         ret = []
         max_count = 1000
+        nextid = self.head
         while cms != []:
             cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
             skip += max_count
-            ret += [ids.convert_revision_id_git_to_bzr(cm.id) for cm in cms]
+            for cm in cms:
+                if cm.id == nextid:
+                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
+                    if cm.parents == []:
+                        nextid = None
+                    else:
+                        nextid = cm.parents[0].id
         ret.reverse()
         return ret