Patchwork D5912: forget: use relative paths for --interactive

login
register
mail settings
Submitter phabricator
Date Feb. 10, 2019, 3:41 a.m.
Message ID <57e33b1047451d1cbe22b5c51c18df39@localhost.localdomain>
Download mbox | patch
Permalink /patch/38640/
State Not Applicable
Headers show

Comments

phabricator - Feb. 10, 2019, 3:41 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG05433ad59c52: forget: use relative paths for --interactive (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5912?vs=13939&id=13993

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

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
@@ -2138,13 +2138,14 @@ 
                       '$$ Include &all remaining files'
                       '$$ &? (display help)')
         for filename in forget[:]:
-            r = ui.promptchoice(_('forget %s %s') % (filename, responses))
+            r = ui.promptchoice(_('forget %s %s') %
+                                (uipathfn(filename), responses))
             if r == 4: # ?
                 while r == 4:
                     for c, t in ui.extractchoices(responses)[1]:
                         ui.write('%s - %s\n' % (c, encoding.lower(t)))
-                    r = ui.promptchoice(_('forget %s %s') % (filename,
-                                                                 responses))
+                    r = ui.promptchoice(_('forget %s %s') %
+                                        (uipathfn(filename), responses))
             if r == 0: # yes
                 continue
             elif r == 1: # no