comparison mercurial/cmdutil.py @ 41661:05433ad59c52

forget: use relative paths for --interactive Seems more consistent. Differential Revision: https://phab.mercurial-scm.org/D5912
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 07 Feb 2019 14:22:11 -0800
parents e41449818bee
children 28ce9184d495
comparison
equal deleted inserted replaced
41660:f89aad980025 41661:05433ad59c52
2136 '$$ &No, skip this file' 2136 '$$ &No, skip this file'
2137 '$$ &Skip remaining files' 2137 '$$ &Skip remaining files'
2138 '$$ Include &all remaining files' 2138 '$$ Include &all remaining files'
2139 '$$ &? (display help)') 2139 '$$ &? (display help)')
2140 for filename in forget[:]: 2140 for filename in forget[:]:
2141 r = ui.promptchoice(_('forget %s %s') % (filename, responses)) 2141 r = ui.promptchoice(_('forget %s %s') %
2142 (uipathfn(filename), responses))
2142 if r == 4: # ? 2143 if r == 4: # ?
2143 while r == 4: 2144 while r == 4:
2144 for c, t in ui.extractchoices(responses)[1]: 2145 for c, t in ui.extractchoices(responses)[1]:
2145 ui.write('%s - %s\n' % (c, encoding.lower(t))) 2146 ui.write('%s - %s\n' % (c, encoding.lower(t)))
2146 r = ui.promptchoice(_('forget %s %s') % (filename, 2147 r = ui.promptchoice(_('forget %s %s') %
2147 responses)) 2148 (uipathfn(filename), responses))
2148 if r == 0: # yes 2149 if r == 0: # yes
2149 continue 2150 continue
2150 elif r == 1: # no 2151 elif r == 1: # no
2151 forget.remove(filename) 2152 forget.remove(filename)
2152 elif r == 2: # Skip 2153 elif r == 2: # Skip