Rev 1664: Deal with moved tag parent directories. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Tue Aug 26 05:09:42 BST 2008


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

------------------------------------------------------------
revno: 1664
revision-id: jelmer at samba.org-20080826040939-burapuad97m3eyv4
parent: jelmer at samba.org-20080826040423-yo4zpfzodinmpkta
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-08-26 06:09:39 +0200
message:
  Deal with moved tag parent directories.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'repository.py'
--- a/repository.py	2008-08-26 04:04:23 +0000
+++ b/repository.py	2008-08-26 04:09:39 +0000
@@ -837,7 +837,18 @@
                 for p in sorted(paths):
                     (action, cf, cr) = paths[p]
                     if layout.is_tag_parent(p, project) and cf is not None:
-                        pass # FIXME
+                        parents = [p]
+                        while parents:
+                            p = parents.pop()
+                            try:
+                                for c in self.transport.get_dir(p, revnum)[0].keys():
+                                    n = p+"/"+c
+                                    if layout.is_tag(n, project):
+                                        tags[n] = self.generate_revision_id(revnum, n, mapping, revprops=revprops)
+                                    elif layout.is_tag_parent(n, project):
+                                        parents.append(n)
+                            except SubversionException, (_, errors.ERR_FS_NOT_DIRECTORY):
+                                pass
                     else:
                         try:
                             (pt, proj, bp, rp) = layout.parse(p)




More information about the bazaar-commits mailing list