Changeset 1653 in tailor

Timestamp:

07/17/08 23:30:40 (5 years ago)

Author:

jhs@…

Hash name:

20080717213040-487bc-499d85d180748957b5a79653d774271ff9617e02

Message:

Clear git target renaming error messages

File:

• vcpx/repository/git/target.py (modified) (1 diff)

vcpx/repository/git/target.py

@@ -267 +267 @@
                 # out of the way, and the superclass expects us to rename the
                 # the file or directory via git.
-                if exists(newpath) or not exists(newpathtmp):
-                    raise ChangesetApplicationFailure("Unsure how to handle disjunct rename of %s"
-                                                          % newname)
+
+                # First, some sanity checks.
+                if exists(newpath):
+                    raise ChangesetApplicationFailure(
+                        "Cannot rename since target already exists: %s" % newname)
+
+                if not exists(newpathtmp):
+                    raise ChangesetApplicationFailure(
+                        "Cannot rename since actual target not found: %s" % newnametmp)
+
                 self.repository.runCommand(['mv', oldname, newname])