Changeset 1164 in tailor for vcpx/bzr.py

Timestamp:

06/13/06 02:31:31 (7 years ago)

Author:

lele@…

Hash name:

20060613003131-97f81-749a246c8e1e55900c2d3f3bdd0a89dd7cf82168

Message:

Use normalized path for comparing with paths from bzrlib
This is the patch attached to ticket #59, thank you luks.

File:

• vcpx/bzr.py (modified) (3 diffs)

vcpx/bzr.py

@@ -18 +18 @@
 from source import UpdatableSourceWorkingDir, ChangesetApplicationFailure
 from target import SynchronizableTargetWorkingDir
+from bzrlib.osutils import normpath
 from bzrlib.bzrdir import BzrDir
 from bzrlib.delta import compare_trees
@@ -164 +165 @@
 
             for fn in names:
+                normfn = normpath(fn)
                 if (not inv.has_filename(fn)
-                    and not fn in added
-                    and not parent_was_copied(fn)):
+                    and not normfn in added
+                    and not parent_was_copied(normfn)):
                     fnames.append(fn)
                 else:
@@ -206 +208 @@
         email = ''.join(email.split())
 
+        # Normalize file names
+        if entries:
+            entries = [normpath(entry) for entry in entries]
+        
         revision_id = "%s-%s-%s" % (email, compact_date(timestamp),
                                     hexlify(rand_bytes(8)))