This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8841

cleanup: fix bad formatting of state.py from D8811
ClosedPublic

Authored by martinvonz on Jul 28 2020, 2:11 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd4a28b76fa54: cleanup: fix bad formatting of state.py from D8811
Summary

test-check-format.t was failing for me. Do I just have the wrong
version?

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

martinvonz created this revision.Jul 28 2020, 2:11 PM
marmoute accepted this revision.Jul 29 2020, 12:16 PM
pulkit accepted this revision.Jul 31 2020, 7:37 AM
This revision is now accepted and ready to land.Jul 31 2020, 7:37 AM
martinvonz added a commit: rHGd4a28b76fa54: cleanup: fix bad formatting of state.py from D8811.Jul 31 2020, 9:14 AM
Closed by commit rHGd4a28b76fa54: cleanup: fix bad formatting of state.py from D8811 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/state.py (10 lines)

Diff 22159

mercurial/state.py

""" """
if not self._cmdhint: if not self._cmdhint:
if not self._stopflag: if not self._stopflag:
return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( return _(b"use 'hg %s --continue' or 'hg %s --abort'") % (
self._opname, self._opname,
self._opname, self._opname,
) )
else: else:
return _(b"use 'hg %s --continue', 'hg %s --abort', " return _(
b"or 'hg %s --stop'") % ( b"use 'hg %s --continue', 'hg %s --abort', "
self._opname, b"or 'hg %s --stop'"
self._opname, ) % (self._opname, self._opname, self._opname,)
self._opname,
)
return self._cmdhint return self._cmdhint
def msg(self): def msg(self):
"""returns the status message corresponding to the command""" """returns the status message corresponding to the command"""
if not self._cmdmsg: if not self._cmdmsg:
return _(b'%s in progress') % (self._opname) return _(b'%s in progress') % (self._opname)
return self._cmdmsg return self._cmdmsg