Rev 3377: Track down another bogus location. Only triggered with --long in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/dont_log_view_none_211661

John Arbash Meinel john at arbash-meinel.com
Fri May 9 17:19:33 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/dont_log_view_none_211661

------------------------------------------------------------
revno: 3377
revision-id: john at arbash-meinel.com-20080509161919-j2s1ymi8cm1me5ay
parent: john at arbash-meinel.com-20080503033307-eod32g60463mhx17
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dont_log_view_none_211661
timestamp: Fri 2008-05-09 11:19:19 -0500
message:
  Track down another bogus location. Only triggered with --long
modified:
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2008-05-03 03:33:07 +0000
+++ b/bzrlib/log.py	2008-05-09 16:19:19 +0000
@@ -522,8 +522,10 @@
     # This asks for all mainline revisions, which means we only have to spider
     # sideways, rather than depth history. That said, its still size-of-history
     # and should be addressed.
+    # mainline_revisions always includes an extra revision at the beginning, so
+    # don't request it.
     parent_map = dict(((key, value) for key, value in
-        graph.iter_ancestry(mainline_revs) if value is not None))
+        graph.iter_ancestry(mainline_revs[1:]) if value is not None))
     # filter out ghosts; merge_sort errors on ghosts.
     rev_graph = _strip_NULL_ghosts(parent_map)
     merge_sorted_revisions = merge_sort(



More information about the bazaar-commits mailing list