Show More
@@ -34,14 +34,14 b' stringio = util.stringio' | |||||
34 |
|
34 | |||
35 | # patch comments based on the git one |
|
35 | # patch comments based on the git one | |
36 | diffhelptext = _( |
|
36 | diffhelptext = _( | |
37 | """# To remove '-' lines, make them ' ' lines (context). |
|
37 | b"""# To remove '-' lines, make them ' ' lines (context). | |
38 | # To remove '+' lines, delete them. |
|
38 | # To remove '+' lines, delete them. | |
39 | # Lines starting with # will be removed from the patch. |
|
39 | # Lines starting with # will be removed from the patch. | |
40 | """ |
|
40 | """ | |
41 | ) |
|
41 | ) | |
42 |
|
42 | |||
43 | hunkhelptext = _( |
|
43 | hunkhelptext = _( | |
44 | """# |
|
44 | b"""# | |
45 | # If the patch applies cleanly, the edited hunk will immediately be |
|
45 | # If the patch applies cleanly, the edited hunk will immediately be | |
46 | # added to the record list. If it does not apply cleanly, a rejects file |
|
46 | # added to the record list. If it does not apply cleanly, a rejects file | |
47 | # will be generated. You can use that when you try again. If all lines |
|
47 | # will be generated. You can use that when you try again. If all lines | |
@@ -51,7 +51,7 b' hunkhelptext = _(' | |||||
51 | ) |
|
51 | ) | |
52 |
|
52 | |||
53 | patchhelptext = _( |
|
53 | patchhelptext = _( | |
54 | """# |
|
54 | b"""# | |
55 | # If the patch applies cleanly, the edited patch will immediately |
|
55 | # If the patch applies cleanly, the edited patch will immediately | |
56 | # be finalised. If it does not apply cleanly, rejects files will be |
|
56 | # be finalised. If it does not apply cleanly, rejects files will be | |
57 | # generated. You can use those when you try again. |
|
57 | # generated. You can use those when you try again. | |
@@ -611,7 +611,8 b' def testchunkselector(testfn, ui, header' | |||||
611 |
|
611 | |||
612 | chunkselector.stdscr = dummystdscr() |
|
612 | chunkselector.stdscr = dummystdscr() | |
613 | if testfn and os.path.exists(testfn): |
|
613 | if testfn and os.path.exists(testfn): | |
614 | testf = open(testfn, 'r') |
|
614 | testf = open(testfn, b'r') | |
|
615 | # TODO: open in binary mode? | |||
615 | testcommands = [x.rstrip('\n') for x in testf.readlines()] |
|
616 | testcommands = [x.rstrip('\n') for x in testf.readlines()] | |
616 | testf.close() |
|
617 | testf.close() | |
617 | while True: |
|
618 | while True: | |
@@ -1621,7 +1622,7 b' class curseschunkselector(object):' | |||||
1621 | def helpwindow(self): |
|
1622 | def helpwindow(self): | |
1622 | """print a help window to the screen. exit after any keypress.""" |
|
1623 | """print a help window to the screen. exit after any keypress.""" | |
1623 | helptext = _( |
|
1624 | helptext = _( | |
1624 | """ [press any key to return to the patch-display] |
|
1625 | b""" [press any key to return to the patch-display] | |
1625 |
|
1626 | |||
1626 | The curses hunk selector allows you to interactively choose among the |
|
1627 | The curses hunk selector allows you to interactively choose among the | |
1627 | changes you have made, and confirm only those changes you select for |
|
1628 | changes you have made, and confirm only those changes you select for | |
@@ -1745,7 +1746,7 b' smaller changesets. the following are va' | |||||
1745 | """ask for 'y' to be pressed to confirm selected. return True if |
|
1746 | """ask for 'y' to be pressed to confirm selected. return True if | |
1746 | confirmed.""" |
|
1747 | confirmed.""" | |
1747 | confirmtext = _( |
|
1748 | confirmtext = _( | |
1748 | """If you answer yes to the following, your currently chosen patch chunks |
|
1749 | b"""If you answer yes to the following, your currently chosen patch chunks | |
1749 | will be loaded into an editor. To modify the patch, make the changes in your |
|
1750 | will be loaded into an editor. To modify the patch, make the changes in your | |
1750 | editor and save. To accept the current patch as-is, close the editor without |
|
1751 | editor and save. To accept the current patch as-is, close the editor without | |
1751 | saving. |
|
1752 | saving. |
General Comments 0
You need to be logged in to leave comments.
Login now