Rev 109: Handle the case when stop is None. in http://bzr.arbash-meinel.com/branches/bzr/history_db/tip_numbering
John Arbash Meinel
john at arbash-meinel.com
Mon Apr 19 17:33:55 BST 2010
At http://bzr.arbash-meinel.com/branches/bzr/history_db/tip_numbering
------------------------------------------------------------
revno: 109
revision-id: john at arbash-meinel.com-20100419163345-041qvgr90zkaebjo
parent: john at arbash-meinel.com-20100416212316-niq43zadt5mziuwo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tip_numbering
timestamp: Mon 2010-04-19 11:33:45 -0500
message:
Handle the case when stop is None.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py 2010-04-15 17:11:43 +0000
+++ b/__init__.py 2010-04-19 16:33:45 +0000
@@ -401,8 +401,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)
More information about the bazaar-commits
mailing list