narrow: drop checkambig=True when restoring backup
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 03 Aug 2018 13:53:02 -0700
changeset 38910 204e074c188e
parent 38909 ae2962bb56a3
child 38911 576eef1ab43d
narrow: drop checkambig=True when restoring backup IIUC, checkambig is about updating timestamps of the file while renaming. That's important for the dirstate, but we never check the timestamp of the narrowspec file. We can therefore avoid checking passing checkambig=True. Differential Revision: https://phab.mercurial-scm.org/D4098
mercurial/narrowspec.py
--- a/mercurial/narrowspec.py	Thu Aug 02 14:30:40 2018 -0700
+++ b/mercurial/narrowspec.py	Fri Aug 03 13:53:02 2018 -0700
@@ -137,7 +137,7 @@
 def restorebackup(repo, backupname):
     if repository.NARROW_REQUIREMENT not in repo.requirements:
         return
-    repo.vfs.rename(backupname, FILENAME, checkambig=True)
+    repo.vfs.rename(backupname, FILENAME)
 
 def clearbackup(repo, backupname):
     if repository.NARROW_REQUIREMENT not in repo.requirements: