Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
addremove: respect ui.relative-paths
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 11 Feb 2019 09:40:24 -0800
changeset 41685 b81ecf3571d5
parent 41684 a8d3a4be066e
child 41686 935e06e95b91
addremove: respect ui.relative-paths I previously changed these code paths while trying to not change any behavior to avoid inconsistencies between them in the intermediate commits. They're now all ready to be switched over to respecting ui.relative-paths. Differential Revision: https://phab.mercurial-scm.org/D5936
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
mercurial/commands.py file | annotate | diff | comparison | revisions
mercurial/scmutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Mon Feb 11 09:12:23 2019 -0800
+++ b/mercurial/cmdutil.py	Mon Feb 11 09:40:24 2019 -0800
@@ -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(
--- a/mercurial/commands.py	Mon Feb 11 09:12:23 2019 -0800
+++ b/mercurial/commands.py	Mon Feb 11 09:40:24 2019 -0800
@@ -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
 
@@ -256,7 +256,7 @@
         opts['similarity'] = '100'
     matcher = scmutil.match(repo[None], pats, opts)
     relative = scmutil.anypats(pats, opts)
-    uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
     return scmutil.addremove(repo, matcher, "", uipathfn, opts)
 
 @command('annotate|blame',
@@ -2258,7 +2258,7 @@
 
     m = scmutil.match(repo[None], pats, opts)
     dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
-    uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=True)
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
     rejected = cmdutil.forget(ui, repo, m, prefix="", uipathfn=uipathfn,
                               explicitonly=False, dryrun=dryrun,
                               interactive=interactive)[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)
 
--- a/mercurial/scmutil.py	Mon Feb 11 09:12:23 2019 -0800
+++ b/mercurial/scmutil.py	Mon Feb 11 09:40:24 2019 -0800
@@ -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)
Mercurial