Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vfs: replace avoiding ambiguity in abstractvfs.rename with _avoidambig
authorFUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Tue, 04 Jul 2017 23:13:47 +0900
changeset 33281 6af0f023d014
parent 33280 646352291f5b
child 33282 d1db7af81548
vfs: replace avoiding ambiguity in abstractvfs.rename with _avoidambig This centralizes common logic to forcibly avoid file stat ambiguity into _avoidambig(), which was introduced by previous patch.
mercurial/vfs.py file | annotate | diff | comparison | revisions 
--- a/mercurial/vfs.py	Tue Jul 04 23:13:47 2017 +0900
+++ b/mercurial/vfs.py	Tue Jul 04 23:13:47 2017 +0900
@@ -195,18 +195,8 @@
         dstpath = self.join(dst)
         oldstat = checkambig and util.filestat.frompath(dstpath)
         if oldstat and oldstat.stat:
-            def dorename(spath, dpath):
-                ret = util.rename(spath, dpath)
-                newstat = util.filestat.frompath(dpath)
-                if newstat.isambig(oldstat):
-                    # stat of renamed file is ambiguous to original one
-                    return ret, newstat.avoidambig(dpath, oldstat)
-                return ret, True
-            ret, avoided = dorename(srcpath, dstpath)
-            if not avoided:
-                # simply copy to change owner of srcpath (see issue5418)
-                util.copyfile(dstpath, srcpath)
-                ret, avoided = dorename(srcpath, dstpath)
+            ret = util.rename(srcpath, dstpath)
+            _avoidambig(dstpath, oldstat)
             return ret
         return util.rename(srcpath, dstpath)
Mercurial