This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5853

revert: migrate to scmutil.backuppath()
ClosedPublic

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

Details

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 5 2019, 12:52 PM
martinvonz added inline comments.Feb 5 2019, 1:22 PM
mercurial/cmdutil.py
3022–3023

Sorry, there is a regression here: if you're in a subdirectory, this used to say "saving current version of foo as foo.orig", but now it will say "saving current version of foo as dir/foo.orig". So please don't queue this yet. I'll need to insert some patches earlier in the series.

martinvonz updated this revision to Diff 13858.Feb 6 2019, 6:58 PM
martinvonz marked an inline comment as done.Feb 6 2019, 6:59 PM
martinvonz planned changes to this revision.
martinvonz added inline comments.
mercurial/cmdutil.py
3022–3023

This is now ready for review again.

martinvonz marked an inline comment as done.Feb 6 2019, 6:59 PM
martinvonz requested review of this revision.
Closed by commit rHG9e545c9a4dfe: revert: 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/cmdutil.py (4 lines)

Diff 13858

mercurial/cmdutil.py

if xlist is not None: if xlist is not None:
xlist.append(abs) xlist.append(abs)
if dobackup: if dobackup:
# If in interactive mode, don't automatically create # If in interactive mode, don't automatically create
# .orig files (issue4793) # .orig files (issue4793)
if dobackup == backupinteractive: if dobackup == backupinteractive:
tobackup.add(abs) tobackup.add(abs)
elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])): elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])):
bakname = scmutil.origpath(ui, repo, rel) bakname = scmutil.backuppath(ui, repo, abs)
relbakname = os.path.relpath(bakname) relbakname = os.path.relpath(bakname)
ui.note(_('saving current version of %s as %s\n') % ui.note(_('saving current version of %s as %s\n') %
(rel, relbakname)) (rel, relbakname))
martinvonzAuthorUnsubmitted
Done

Sorry, there is a regression here: if you're in a subdirectory, this used to say "saving current version of foo as foo.orig", but now it will say "saving current version of foo as dir/foo.orig". So please don't queue this yet. I'll need to insert some patches earlier in the series.

martinvonz: Sorry, there is a regression here: if you're in a subdirectory, this used to say "saving…
martinvonzAuthorUnsubmitted
Not Done

This is now ready for review again.

martinvonz: This is now ready for review again.
if not opts.get('dry_run'): if not opts.get('dry_run'):
if interactive: if interactive:
util.copyfile(target, bakname) util.copyfile(target, bakname)
else: else:
util.rename(target, bakname) util.rename(target, bakname)
if opts.get('dry_run'): if opts.get('dry_run'):
if ui.verbose or not exact: if ui.verbose or not exact:
ui.status(msg % rel) ui.status(msg % rel)
for f in sorted(set(c.header.filename() for c in chunks if ishunk(c))): for f in sorted(set(c.header.filename() for c in chunks if ishunk(c))):
prntstatusmsg('revert', f) prntstatusmsg('revert', f)
for c in chunks: for c in chunks:
if ishunk(c): if ishunk(c):
abs = c.header.filename() abs = c.header.filename()
# Create a backup file only if this hunk should be backed up # Create a backup file only if this hunk should be backed up
if c.header.filename() in tobackup: if c.header.filename() in tobackup:
target = repo.wjoin(abs) target = repo.wjoin(abs)
bakname = scmutil.origpath(repo.ui, repo, m.rel(abs)) bakname = scmutil.backuppath(repo.ui, repo, abs)
util.copyfile(target, bakname) util.copyfile(target, bakname)
tobackup.remove(abs) tobackup.remove(abs)
c.write(fp) c.write(fp)
dopatch = fp.tell() dopatch = fp.tell()
fp.seek(0) fp.seek(0)
if dopatch: if dopatch:
try: try:
patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)