This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5858

resolve: migrate to scmutil.backuppath()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG92bd3d86f2e0: resolve: migrate to scmutil.backuppath()
rHG31ae4129ff8a: resolve: 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 13863.Feb 6 2019, 6:59 PM
Closed by commit rHG31ae4129ff8a: resolve: 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/commands.py (4 lines)

Diff 13880

mercurial/commands.py

finally: finally:
ms.commit() ms.commit()
# replace filemerge's .orig file with our resolve file, but only # replace filemerge's .orig file with our resolve file, but only
# for merges that are complete # for merges that are complete
if complete: if complete:
try: try:
util.rename(a + ".resolve", util.rename(a + ".resolve",
scmutil.origpath(ui, repo, a)) scmutil.backuppath(ui, repo, f))
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
if hasconflictmarkers: if hasconflictmarkers:
ui.warn(_('warning: the following files still have conflict ' ui.warn(_('warning: the following files still have conflict '
'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n') 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
if markcheck == 'abort' and not all and not pats: if markcheck == 'abort' and not all and not pats:
if r: if r:
ret = 1 ret = 1
finally: finally:
ms.commit() ms.commit()
# replace filemerge's .orig file with our resolve file # replace filemerge's .orig file with our resolve file
a = repo.wjoin(f) a = repo.wjoin(f)
try: try:
util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f))
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
ms.commit() ms.commit()
ms.recordactions() ms.recordactions()
if not didwork and pats: if not didwork and pats: