Show More
@@ -18,15 +18,6 b" testedwith = 'internal'" | |||
|
18 | 18 | |
|
19 | 19 | lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') |
|
20 | 20 | |
|
21 | diffopts = [ | |
|
22 | ('w', 'ignore-all-space', False, | |
|
23 | _('ignore white space when comparing lines')), | |
|
24 | ('b', 'ignore-space-change', None, | |
|
25 | _('ignore changes in the amount of white space')), | |
|
26 | ('B', 'ignore-blank-lines', None, | |
|
27 | _('ignore changes whose lines are all blank')), | |
|
28 | ] | |
|
29 | ||
|
30 | 21 | def scanpatch(fp): |
|
31 | 22 | """like patch.iterhunks, but yield different events |
|
32 | 23 | |
@@ -420,7 +411,7 b' the hunk is left unchanged.' | |||
|
420 | 411 | |
|
421 | 412 | @command("record", |
|
422 | 413 | # same options as commit + white space diff options |
|
423 | commands.table['^commit|ci'][1][:] + diffopts, | |
|
414 | commands.table['^commit|ci'][1][:] + commands.diffwsopts, | |
|
424 | 415 | _('hg record [OPTION]... [FILE]...')) |
|
425 | 416 | def record(ui, repo, *pats, **opts): |
|
426 | 417 | '''interactively select changes to commit |
@@ -665,7 +656,7 b' def uisetup(ui):' | |||
|
665 | 656 | (qrecord, |
|
666 | 657 | # same options as qnew, but copy them so we don't get |
|
667 | 658 | # -i/--interactive for qrecord and add white space diff options |
|
668 | mq.cmdtable['^qnew'][1][:] + diffopts, | |
|
659 | mq.cmdtable['^qnew'][1][:] + commands.diffwsopts, | |
|
669 | 660 | _('hg qrecord [OPTION]... PATCH [FILE]...')) |
|
670 | 661 | |
|
671 | 662 | _wrapcmd('qnew', mq.cmdtable, qnew, _("interactively record a new patch")) |
General Comments 0
You need to be logged in to leave comments.
Login now