Rev 108: cherry-pick one of the bug-fixes from the re-numbering branch. in http://bzr.arbash-meinel.com/branches/bzr/history_db/trunk

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/history_db/trunk

------------------------------------------------------------
revno: 108
revision-id: john at arbash-meinel.com-20100422190816-snun7a1j5p74aszr
parent: john at arbash-meinel.com-20100421222400-nof19rzbwt2e7ql0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Thu 2010-04-22 14:08:16 -0500
message:
  cherry-pick one of the bug-fixes from the re-numbering branch.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2010-04-21 22:24:00 +0000
+++ b/__init__.py	2010-04-22 19:08:16 +0000
@@ -417,8 +417,11 @@
         # left-hand parent as the real stop revision
         # TODO: Handle a ghost or a first-revision that doesn't have a lh
         #       parent
-        real_stop_revision_id = self.repository.get_parent_map(
-            [stop_revision_id])[stop_revision_id][0]
+        if stop_revision_id is None:
+            real_stop_revision_id = stop_revision_id
+        else:
+            real_stop_revision_id = self.repository.get_parent_map(
+                [stop_revision_id])[stop_revision_id][0]
     merge_sorted = query.iter_merge_sorted_revisions(
                     start_revision_id=start_revision_id,
                     stop_revision_id=real_stop_revision_id)