This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5857

merge: migrate to scmutil.backuppath()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGac8cf125d8d5: merge: migrate to scmutil.backuppath()
rHG8c8121c3dfcc: merge: migrate to scmutil.backuppath()
Summary

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 13862.Feb 6 2019, 6:59 PM
Closed by commit rHG8c8121c3dfcc: merge: 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
Mmercurial/merge.py (5 lines)

Diff 13879

mercurial/merge.py

# with a directory this file is in, and if so, back that up. # with a directory this file is in, and if so, back that up.
conflicting = f conflicting = f
if not repo.wvfs.lexists(f): if not repo.wvfs.lexists(f):
for p in util.finddirs(f): for p in util.finddirs(f):
if repo.wvfs.isfileorlink(p): if repo.wvfs.isfileorlink(p):
conflicting = p conflicting = p
break break
if repo.wvfs.lexists(conflicting): if repo.wvfs.lexists(conflicting):
absf = repo.wjoin(conflicting) orig = scmutil.backuppath(ui, repo, conflicting)
orig = scmutil.origpath(ui, repo, absf) util.rename(repo.wjoin(conflicting), orig)
util.rename(absf, orig)
wctx[f].clearunknown() wctx[f].clearunknown()
atomictemp = ui.configbool("experimental", "update.atomic-file") atomictemp = ui.configbool("experimental", "update.atomic-file")
wctx[f].write(fctx(f).data(), flags, backgroundclose=True, wctx[f].write(fctx(f).data(), flags, backgroundclose=True,
atomictemp=atomictemp) atomictemp=atomictemp)
if i == 100: if i == 100:
yield i, f yield i, f
i = 0 i = 0
i += 1 i += 1