Rev 2157: Handle unusual cases when iterating over prefix. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

Jelmer Vernooij jelmer at samba.org
Thu Dec 4 20:06:12 GMT 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2157
revision-id: jelmer at samba.org-20081204200609-fomeo3ti1msiad5o
parent: jelmer at samba.org-20081204200511-m4vfq80fr15z6hve
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Thu 2008-12-04 21:06:09 +0100
message:
  Handle unusual cases when iterating over prefix.
modified:
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-04 16:06:59 +0000
+++ b/revmeta.py	2008-12-04 20:06:09 +0000
@@ -734,6 +734,9 @@
             except StopIteration:
                 if self.to_revnum > 0:
                     raise MetaHistoryIncomplete()
+                if not any([x for x in self.prefixes if revmeta.branch_path.startswith(x+"/") or x == revmeta.branch_path or x == ""]):
+                    import pdb;pdb.set_trace()
+                    raise MetaHistoryIncomplete()
                 raise AssertionError("Unable to find direct lhs parent for %r" % revmeta)
         return revmeta._direct_lhs_parent_revmeta
 
@@ -985,7 +988,7 @@
         return filter_revisions(self.iter_all_changes(layout, check_unusual_path, from_revnum, to_revnum, project, pb))
 
     def iter_all_changes(self, layout, check_unusual_path, from_revnum, 
-                         to_revnum=0, project=None, prefix=None, pb=None):
+                         to_revnum=0, project=None, pb=None, prefix=None):
         """Iterate over all RevisionMetadata objects and branch removals 
         in a repository.
 




More information about the bazaar-commits mailing list