D5936: addremove: respect ui.relative-paths

[martinvonz (Martin von Zweigbergk)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf44ab808eb91: addremove: respect ui.relative-paths (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5936?vs=14032&id=14059

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

AFFECTED FILES
  mercurial/cmdutil.py
  mercurial/commands.py
  mercurial/scmutil.py

CHANGE DETAILS

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1125,7 +1125,7 @@
     # TODO: We should probably have the caller pass in uipathfn and apply it to
     # the messages above too. forcerelativevalue=True is consistent with how
     # it used to work.
-    uipathfn = getuipathfn(repo, forcerelativevalue=True)
+    uipathfn = getuipathfn(repo, legacyrelativevalue=True)
     renames = _findrenames(repo, m, added + unknown, removed + deleted,
                            similarity, uipathfn)
 
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -180,7 +180,7 @@
     """
 
     m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
-    uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=True)
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
     rejected = cmdutil.add(ui, repo, m, "", uipathfn, False, **opts)
     return rejected and 1 or 0
 
@@ -4720,7 +4720,7 @@
 
     m = scmutil.match(repo[None], pats, opts)
     subrepos = opts.get('subrepos')
-    uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=True)
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
     return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
                           dryrun=dryrun)
 
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2401,7 +2401,7 @@
     with dsguard or util.nullcontextmanager():
         if dsguard:
             relative = scmutil.anypats(pats, opts)
-            uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
+            uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
             if scmutil.addremove(repo, matcher, "", uipathfn, opts) != 0:
                 raise error.Abort(
                     _("failed to mark all new/missing files as added/removed"))
@@ -2481,7 +2481,7 @@
         # was specified.
         matcher = scmutil.match(wctx, pats, opts)
         relative = scmutil.anypats(pats, opts)
-        uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
+        uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
         if (opts.get('addremove')
             and scmutil.addremove(repo, matcher, "", uipathfn, opts)):
             raise error.Abort(



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