This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5854

largefiles: migrate to scmutil.backuppath()
ClosedPublic

Authored by martinvonz on Feb 5 2019, 12:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe89e78a725ee: largefiles: migrate to scmutil.backuppath()
Summary

It seems unnecessary to convert the paths here back to repo-relative
paths, but I'll leave that for someone else to clean up.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 5 2019, 12:52 PM
martinvonz updated this revision to Diff 13859.Feb 6 2019, 6:59 PM
Closed by commit rHGe89e78a725ee: largefiles: migrate to scmutil.backuppath() (authored by martinvonz). · Explain WhyFeb 6 2019, 9:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/lfcommands.py (4 lines)

Diff 13876

hgext/largefiles/lfcommands.py

update = {} update = {}
dropped = set() dropped = set()
updated, removed = 0, 0 updated, removed = 0, 0
wvfs = repo.wvfs wvfs = repo.wvfs
wctx = repo[None] wctx = repo[None]
for lfile in lfiles: for lfile in lfiles:
lfileorig = os.path.relpath( lfileorig = os.path.relpath(
scmutil.origpath(ui, repo, wvfs.join(lfile)), scmutil.backuppath(ui, repo, lfile),
start=repo.root) start=repo.root)
standin = lfutil.standin(lfile) standin = lfutil.standin(lfile)
standinorig = os.path.relpath( standinorig = os.path.relpath(
scmutil.origpath(ui, repo, wvfs.join(standin)), scmutil.backuppath(ui, repo, standin),
start=repo.root) start=repo.root)
if wvfs.exists(standin): if wvfs.exists(standin):
if (wvfs.exists(standinorig) and if (wvfs.exists(standinorig) and
wvfs.exists(lfile)): wvfs.exists(lfile)):
shutil.copyfile(wvfs.join(lfile), shutil.copyfile(wvfs.join(lfile),
wvfs.join(lfileorig)) wvfs.join(lfileorig))
wvfs.unlinkpath(standinorig) wvfs.unlinkpath(standinorig)
expecthash = lfutil.readasstandin(wctx[standin]) expecthash = lfutil.readasstandin(wctx[standin])