Show More
@@ -7,7 +7,7 b'' | |||
|
7 | 7 | |
|
8 | 8 | '''commands to interactively select changes for commit/qrefresh''' |
|
9 | 9 | |
|
10 |
from mercurial.i18n import |
|
|
10 | from mercurial.i18n import _ | |
|
11 | 11 | from mercurial import cmdutil, commands, extensions, hg, patch |
|
12 | 12 | from mercurial import util |
|
13 | 13 | import copy, cStringIO, errno, os, re, shutil, tempfile |
@@ -286,21 +286,18 b' def filterpatch(ui, headers):' | |||
|
286 | 286 | resps = _('[Ynesfdaq?]' |
|
287 | 287 | '$$ &Yes, record this change' |
|
288 | 288 | '$$ &No, skip this change' |
|
289 |
'$$ &Edit th |
|
|
289 | '$$ &Edit this change manually' | |
|
290 | 290 | '$$ &Skip remaining changes to this file' |
|
291 | 291 | '$$ Record remaining changes to this &file' |
|
292 | 292 | '$$ &Done, skip remaining changes and files' |
|
293 | 293 | '$$ Record &all changes to all remaining files' |
|
294 | 294 | '$$ &Quit, recording no changes' |
|
295 | '$$ &?') | |
|
295 | '$$ &? (display help)') | |
|
296 | 296 | r = ui.promptchoice("%s %s" % (query, resps)) |
|
297 | 297 | ui.write("\n") |
|
298 | 298 | if r == 8: # ? |
|
299 | doc = gettext(record.__doc__) | |
|
300 | c = doc.find('::') + 2 | |
|
301 | for l in doc[c:].splitlines(): | |
|
302 | if l.startswith(' '): | |
|
303 | ui.write(l.strip(), '\n') | |
|
299 | for c, t in ui.extractchoices(resps)[1]: | |
|
300 | ui.write('%s - %s\n' % (c, t.lower())) | |
|
304 | 301 | continue |
|
305 | 302 | elif r == 0: # yes |
|
306 | 303 | ret = True |
@@ -673,15 +673,15 b' Help, quit' | |||
|
673 | 673 | diff --git a/subdir/f1 b/subdir/f1 |
|
674 | 674 | 1 hunks, 1 lines changed |
|
675 | 675 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
676 | y - record this change | |
|
677 | n - skip this change | |
|
676 | y - yes, record this change | |
|
677 | n - no, skip this change | |
|
678 | 678 | e - edit this change manually |
|
679 | 679 | s - skip remaining changes to this file |
|
680 | 680 | f - record remaining changes to this file |
|
681 | 681 | d - done, skip remaining changes and files |
|
682 | 682 | a - record all changes to all remaining files |
|
683 | 683 | q - quit, recording no changes |
|
684 | ? - display help | |
|
684 | ? - ? (display help) | |
|
685 | 685 |
|
|
686 | 686 | abort: user quit |
|
687 | 687 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now