This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10202

crecord: change str literals to byte literals
ClosedPublic

Authored by mharbison72 on Mar 13 2021, 2:33 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG279edaaea711: crecord: change str literals to byte literals

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.

Event Timeline

mharbison72 created this revision.Mar 13 2021, 2:33 PM
mharbison72 added a comment.Mar 14 2021, 1:26 PM

I had the rest of this series on stable, but tried to reorder it from obvious bug fixes -> comment changes -> adding assertions in case whoever queues it wants to put the latter stuff on default.

pulkit accepted this revision.Mar 17 2021, 4:56 AM
This revision is now accepted and ready to land.Mar 17 2021, 4:56 AM
mharbison72 added a commit: rHG279edaaea711: crecord: change str literals to byte literals.Mar 17 2021, 6:12 AM
Closed by commit rHG279edaaea711: crecord: change str literals to byte literals (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/crecord.py (13 lines)

Diff 26475

mercurial/crecord.py

util, util,
) )
from .utils import stringutil from .utils import stringutil
stringio = util.stringio stringio = util.stringio
# patch comments based on the git one # patch comments based on the git one
diffhelptext = _( diffhelptext = _(
"""# To remove '-' lines, make them ' ' lines (context). b"""# To remove '-' lines, make them ' ' lines (context).
# To remove '+' lines, delete them. # To remove '+' lines, delete them.
# Lines starting with # will be removed from the patch. # Lines starting with # will be removed from the patch.
""" """
) )
hunkhelptext = _( hunkhelptext = _(
"""# b"""#
# If the patch applies cleanly, the edited hunk will immediately be # If the patch applies cleanly, the edited hunk will immediately be
# added to the record list. If it does not apply cleanly, a rejects file # added to the record list. If it does not apply cleanly, a rejects file
# will be generated. You can use that when you try again. If all lines # will be generated. You can use that when you try again. If all lines
# of the hunk are removed, then the edit is aborted and the hunk is left # of the hunk are removed, then the edit is aborted and the hunk is left
# unchanged. # unchanged.
""" """
) )
patchhelptext = _( patchhelptext = _(
"""# b"""#
# If the patch applies cleanly, the edited patch will immediately # If the patch applies cleanly, the edited patch will immediately
# be finalised. If it does not apply cleanly, rejects files will be # be finalised. If it does not apply cleanly, rejects files will be
# generated. You can use those when you try again. # generated. You can use those when you try again.
""" """
) )
try: try:
import curses import curses
def clear(self): def clear(self):
pass pass
def refresh(self): def refresh(self):
pass pass
chunkselector.stdscr = dummystdscr() chunkselector.stdscr = dummystdscr()
if testfn and os.path.exists(testfn): if testfn and os.path.exists(testfn):
testf = open(testfn, 'r') testf = open(testfn, b'r')
# TODO: open in binary mode?
testcommands = [x.rstrip('\n') for x in testf.readlines()] testcommands = [x.rstrip('\n') for x in testf.readlines()]
testf.close() testf.close()
while True: while True:
if chunkselector.handlekeypressed(testcommands.pop(0), test=True): if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
break break
return chunkselector.opts return chunkselector.opts
def initcolorpair(self, *args, **kwargs): def initcolorpair(self, *args, **kwargs):
"""same as getcolorpair.""" """same as getcolorpair."""
self.getcolorpair(*args, **kwargs) self.getcolorpair(*args, **kwargs)
def helpwindow(self): def helpwindow(self):
"""print a help window to the screen. exit after any keypress.""" """print a help window to the screen. exit after any keypress."""
helptext = _( helptext = _(
""" [press any key to return to the patch-display] b""" [press any key to return to the patch-display]
The curses hunk selector allows you to interactively choose among the The curses hunk selector allows you to interactively choose among the
changes you have made, and confirm only those changes you select for changes you have made, and confirm only those changes you select for
further processing by the command you are running (such as commit, further processing by the command you are running (such as commit,
shelve, or revert). After confirming the selected changes, the shelve, or revert). After confirming the selected changes, the
unselected changes are still present in your working copy, so you can unselected changes are still present in your working copy, so you can
use the hunk selector multiple times to split large changes into use the hunk selector multiple times to split large changes into
smaller changesets. the following are valid keystrokes: smaller changesets. the following are valid keystrokes:
response = None response = None
return response return response
def reviewcommit(self): def reviewcommit(self):
"""ask for 'y' to be pressed to confirm selected. return True if """ask for 'y' to be pressed to confirm selected. return True if
confirmed.""" confirmed."""
confirmtext = _( confirmtext = _(
"""If you answer yes to the following, your currently chosen patch chunks b"""If you answer yes to the following, your currently chosen patch chunks
will be loaded into an editor. To modify the patch, make the changes in your will be loaded into an editor. To modify the patch, make the changes in your
editor and save. To accept the current patch as-is, close the editor without editor and save. To accept the current patch as-is, close the editor without
saving. saving.
note: don't add/remove lines unless you also modify the range information. note: don't add/remove lines unless you also modify the range information.
failing to follow this rule will result in the commit aborting. failing to follow this rule will result in the commit aborting.
are you sure you want to review/edit and confirm the selected changes [yn]? are you sure you want to review/edit and confirm the selected changes [yn]?