Patchwork D5853: revert: migrate to scmutil.backuppath()

login
register
mail settings
Submitter phabricator
Date Feb. 7, 2019, 2:03 a.m.
Message ID <8a46dc4968e15f48c1b4c683fabfa36c@localhost.localdomain>
Download mbox | patch
Permalink /patch/38507/
State Not Applicable
Headers show

Comments

phabricator - Feb. 7, 2019, 2:03 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG9e545c9a4dfe: revert: migrate to scmutil.backuppath() (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5853?vs=13858&id=13875

REVISION DETAIL
  https://phab.mercurial-scm.org/D5853

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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)