Mercurial > hg
changeset 41597:9e545c9a4dfe
revert: migrate to scmutil.backuppath()
Differential Revision: https://phab.mercurial-scm.org/D5853
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 05 Feb 2019 11:14:07 -0800 |
| parents | 630af04d4ae4 |
| children | e89e78a725ee |
| files | mercurial/cmdutil.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Feb 04 20:49:45 2019 -0800 +++ b/mercurial/cmdutil.py Tue Feb 05 11:14:07 2019 -0800 @@ -3017,7 +3017,7 @@ if dobackup == backupinteractive: tobackup.add(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) ui.note(_('saving current version of %s as %s\n') % (rel, relbakname)) @@ -3170,7 +3170,7 @@ # Create a backup file only if this hunk should be backed up if c.header.filename() in tobackup: target = repo.wjoin(abs) - bakname = scmutil.origpath(repo.ui, repo, m.rel(abs)) + bakname = scmutil.backuppath(repo.ui, repo, abs) util.copyfile(target, bakname) tobackup.remove(abs) c.write(fp)