This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5912

forget: use relative paths for --interactive
ClosedPublic

Authored by martinvonz on Feb 8 2019, 4:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG05433ad59c52: forget: use relative paths for --interactive
Summary

Seems more consistent.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (7 lines)

Diff 13993

mercurial/cmdutil.py

if interactive: if interactive:
responses = _('[Ynsa?]' responses = _('[Ynsa?]'
'$$ &Yes, forget this file' '$$ &Yes, forget this file'
'$$ &No, skip this file' '$$ &No, skip this file'
'$$ &Skip remaining files' '$$ &Skip remaining files'
'$$ Include &all remaining files' '$$ Include &all remaining files'
'$$ &? (display help)') '$$ &? (display help)')
for filename in forget[:]: for filename in forget[:]:
r = ui.promptchoice(_('forget %s %s') % (filename, responses)) r = ui.promptchoice(_('forget %s %s') %
(uipathfn(filename), responses))
if r == 4: # ? if r == 4: # ?
while r == 4: while r == 4:
for c, t in ui.extractchoices(responses)[1]: for c, t in ui.extractchoices(responses)[1]:
ui.write('%s - %s\n' % (c, encoding.lower(t))) ui.write('%s - %s\n' % (c, encoding.lower(t)))
r = ui.promptchoice(_('forget %s %s') % (filename, r = ui.promptchoice(_('forget %s %s') %
responses)) (uipathfn(filename), responses))
if r == 0: # yes if r == 0: # yes
continue continue
elif r == 1: # no elif r == 1: # no
forget.remove(filename) forget.remove(filename)
elif r == 2: # Skip elif r == 2: # Skip
fnindex = forget.index(filename) fnindex = forget.index(filename)
del forget[fnindex:] del forget[fnindex:]
break break