At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2231
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: mappings
timestamp: Mon 2008-12-08 03:15:01 +0100
message:
Make sure when looking for revids we use actual revnums for revmeta.
modified:
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'revids.py'
--- a/revids.py 2008-12-08 01:38:06 +0000
+++ b/revids.py 2008-12-08 02:15:01 +0000
@@ -84,7 +84,7 @@
# Look at their bzr:revision-id-vX
revids = set()
try:
- revmeta = self.repos._revmeta_provider.lookup_revision(branch,
revno)
+ revmeta = self.repos._revmeta_provider.lookup_revision(branch,
self.repos._log.find_latest_change(branch, revno))
if revmeta.consider_bzr_fileprops():
for revid, bzr_revno, mapping_name in
revmeta.get_roundtrip_ancestor_revids():
revids.add(((bzr_revno, revid), mapping_name))
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-12-08 01:06:18 +0000
+++ b/revmeta.py 2008-12-08 02:15:01 +0000
@@ -650,8 +650,10 @@
return self._consider_bzr_revprops
def _get_revprop_redirect_revnum(self):
- if getattr(self, "_revprop_redirect_revnum", None) is not None:
+ try:
return self._revprop_redirect_revnum
+ except AttributeError:
+ pass
if self.knows_fileprops() or not self.children:
if SVN_PROP_BZR_REVPROP_REDIRECT in self.get_fileprops():
self._revprop_redirect_revnum =
int(self.get_fileprops()[SVN_PROP_BZR_REVPROP_REDIRECT])
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
