From patchwork Wed Feb 6 23:59:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D5854: largefiles: migrate to scmutil.backuppath() From: phabricator X-Patchwork-Id: 38486 Message-Id: <9db916141162c1d4530a0f5ff01a1e3d@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Wed, 6 Feb 2019 23:59:58 +0000 martinvonz updated this revision to Diff 13859. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5854?vs=13818&id=13859 REVISION DETAIL https://phab.mercurial-scm.org/D5854 AFFECTED FILES hgext/largefiles/lfcommands.py CHANGE DETAILS To: martinvonz, #hg-reviewers Cc: mercurial-devel diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py --- a/hgext/largefiles/lfcommands.py +++ b/hgext/largefiles/lfcommands.py @@ -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