largefiles: migrate to scmutil.backuppath()
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 04 Feb 2019 21:00:58 -0800
changeset 41598 e89e78a725ee
parent 41597 9e545c9a4dfe
child 41599 106b0bec162a
largefiles: migrate to scmutil.backuppath() It seems unnecessary to convert the paths here back to repo-relative paths, but I'll leave that for someone else to clean up. Differential Revision: https://phab.mercurial-scm.org/D5854
hgext/largefiles/lfcommands.py
--- a/hgext/largefiles/lfcommands.py	Tue Feb 05 11:14:07 2019 -0800
+++ b/hgext/largefiles/lfcommands.py	Mon Feb 04 21:00:58 2019 -0800
@@ -465,11 +465,11 @@
         wctx = repo[None]
         for lfile in lfiles:
             lfileorig = os.path.relpath(
-                scmutil.origpath(ui, repo, wvfs.join(lfile)),
+                scmutil.backuppath(ui, repo, lfile),
                 start=repo.root)
             standin = lfutil.standin(lfile)
             standinorig = os.path.relpath(
-                scmutil.origpath(ui, repo, wvfs.join(standin)),
+                scmutil.backuppath(ui, repo, standin),
                 start=repo.root)
             if wvfs.exists(standin):
                 if (wvfs.exists(standinorig) and