Rev 2065: Use get_appropriate_mapping() everywhere. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2065
revision-id: jelmer at samba.org-20081124184019-zpwlxasnspt7bome
parent: jelmer at samba.org-20081124171902-xfp6892cr9g1rnxv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-11-24 19:40:19 +0100
message:
  Use get_appropriate_mapping() everywhere.
modified:
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'TODO'
--- a/TODO	2008-11-21 11:40:07 +0000
+++ b/TODO	2008-11-24 18:40:19 +0000
@@ -1,7 +1,6 @@
 mappingv4:
 - fix update_after_commit test
-- find tags during iter_all_changes() during fetch
-- iter_all_changes() doesn't follow non-layout (but mapping-approved) branch paths from older revisions that are part of the ancestors of a valid branch path revision properly
+- handle upgrades from v3 properly
 
 more tests:
 - Run all tests against repository with revprop changing allowed and without

=== modified file 'convert.py'
--- a/convert.py	2008-11-21 12:08:59 +0000
+++ b/convert.py	2008-11-24 18:40:19 +0000
@@ -213,7 +213,7 @@
                 try:
                     if revmeta.is_hidden(mapping):
                         continue
-                    # FIXME: Call revmeta.get_appropriate_mapping(mapping)
+                    mapping = revmeta.get_appropriate_mapping(mapping)
                     if target_repos is not None and (target_repos_is_empty or not target_repos.has_revision(revmeta.get_revision_id(mapping))):
                         revmetas.append((revmeta, mapping))
                     if not revmeta.branch_path in existing_branches and layout.is_branch(revmeta.branch_path, project=project):

=== modified file 'fetch.py'
--- a/fetch.py	2008-11-21 16:13:14 +0000
+++ b/fetch.py	2008-11-24 18:40:19 +0000
@@ -680,7 +680,7 @@
         needed = []
         from_revnum = self.source.get_latest_revnum()
         for revmeta in self.source._revmeta_provider.iter_all_changes(self.source.get_layout(), mapping=mapping, from_revnum=from_revnum, pb=pb):
-            # FIXME: Call revmeta.get_appropriate_mapping(mapping)
+            mapping = revmeta.get_appropriate_mapping(mapping)
             if pb:
                 pb.update("determining revisions to fetch", 
                           from_revnum-revmeta.revnum, from_revnum)

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-11-24 17:16:35 +0000
+++ b/revmeta.py	2008-11-24 18:40:19 +0000
@@ -748,7 +748,6 @@
                 for u in unusual:
                     if p.startswith("%s/" % u):
                         bps[u] = get_metabranch(u)
-
             
             # Apply renames and the like for the next round
             for new_name, old_name, old_rev in changes.apply_reverse_changes(metabranches.keys(), paths):