At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1866
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Mon 2008-09-08 20:06:58 +0200
message:
Fix finding lhs parent when there are hidden revisions.
modified:
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-09-08 17:21:59 +0000
+++ b/revmeta.py 2008-09-08 18:06:58 +0000
@@ -157,17 +157,17 @@
assert (mapping.is_branch(self.branch_path) or
mapping.is_tag(self.branch_path)), "%s not valid in %r" %
(self.branch_path, mapping)
def get_next_parent(rm):
- if self.metabranch is not None and self.metabranch.mapping ==
mapping:
+ if rm.metabranch is not None and rm.metabranch.mapping == mapping:
# Perhaps the metabranch already has the parent?
- parentrevmeta = self.metabranch.get_lhs_parent(rm)
+ parentrevmeta = rm.metabranch.get_lhs_parent(rm)
if parentrevmeta is not None:
return parentrevmeta
# FIXME: Don't use self.repository.branch_prev_location,
# since it browses history
- return self.repository._revmeta_provider.branch_prev_location(rm,
mapping)
+ return rm.repository._revmeta_provider.branch_prev_location(rm,
mapping)
nm = get_next_parent(self)
while nm is not None and nm.is_hidden(mapping):
- nm = get_next_parent(self)
+ nm = get_next_parent(nm)
return nm
def get_lhs_parent(self, mapping):
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
