Mercurial > hg
changeset 43855:612951e08278
formatting: fix some recent formatting regressions
Differential Revision: https://phab.mercurial-scm.org/D7605
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 11 Dec 2019 10:00:24 -0800 |
| parents | 49fa0b31ee1d |
| children | 229215fc1c1c |
| files | contrib/fuzz/mpatch_corpus.py mercurial/cmdutil.py |
| diffstat | 2 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/fuzz/mpatch_corpus.py Thu Dec 05 20:41:23 2019 +0100 +++ b/contrib/fuzz/mpatch_corpus.py Wed Dec 11 10:00:24 2019 -0800 @@ -70,15 +70,15 @@ # Manually constructed entries zf.writestr( "one_delta_applies", - bytes(corpus(b'a', [delta([deltafrag(0, 1, b'b')])])) + bytes(corpus(b'a', [delta([deltafrag(0, 1, b'b')])])), ) zf.writestr( "one_delta_starts_late", - bytes(corpus(b'a', [delta([deltafrag(3, 1, b'b')])])) + bytes(corpus(b'a', [delta([deltafrag(3, 1, b'b')])])), ) zf.writestr( "one_delta_ends_late", - bytes(corpus(b'a', [delta([deltafrag(0, 20, b'b')])])) + bytes(corpus(b'a', [delta([deltafrag(0, 20, b'b')])])), ) try:
--- a/mercurial/cmdutil.py Thu Dec 05 20:41:23 2019 +0100 +++ b/mercurial/cmdutil.py Wed Dec 11 10:00:24 2019 -0800 @@ -793,14 +793,17 @@ fm.data(unresolved=True) def formatfooter(self, fm): - statemsg = _(b'The repository is in an unfinished *%s* state.' - ) % self.unfinishedop + statemsg = ( + _(b'The repository is in an unfinished *%s* state.') + % self.unfinishedop + ) fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) self._formatconflicts(fm) if self.unfinishedmsg: - fm.plain(b'%s\n' % _commentlines(self.unfinishedmsg), - label=self._label) + fm.plain( + b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label + ) def _formatconflicts(self, fm): if not self.inmergestate: @@ -809,8 +812,8 @@ if self.unresolvedpaths: mergeliststr = b'\n'.join( [ - b' %s' % util.pathto(self.reporoot, encoding.getcwd(), - path) + b' %s' + % util.pathto(self.reporoot, encoding.getcwd(), path) for path in self.unresolvedpaths ] ) @@ -841,8 +844,13 @@ unresolved = None if mergestate.active(): unresolved = sorted(mergestate.unresolved()) - return morestatus(repo.root, unfinishedop, unfinishedmsg, - unresolved is not None, unresolved) + return morestatus( + repo.root, + unfinishedop, + unfinishedmsg, + unresolved is not None, + unresolved, + ) def findpossible(cmd, table, strict=False):