Mercurial > public > mercurial-scm > hg-stable
diff hgext/histedit.py @ 47031:f38bf44e077f stable
black: make codebase compatible with black v21.4b2 and v20.8b1
I don't know what exact version of black made it care about these whitespace
differences, but this is the version I got when I just installed it with
`pip3 install black`.
I'm intentionally not increasing the version of black required, as I don't want
to force everyone to upgrade their version of black, and these fixes are
backwards compatible with black v20.8b1. If there are more issues in the future
and this becomes a maintenance burden I may do so in a future change.
Tested with both versions of black (I got the older version via
`pip3 install black==20.8b1`)
Differential Revision: https://phab.mercurial-scm.org/D10539
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Fri, 30 Apr 2021 16:13:02 -0700 |
| parents | d689d48527ea |
| children | 5eb52edc08bd |
line wrap: on
line diff
--- a/hgext/histedit.py Tue May 04 13:28:42 2021 -0400 +++ b/hgext/histedit.py Fri Apr 30 16:13:02 2021 -0700 @@ -510,7 +510,7 @@ return cls(state, rev) def verify(self, prev, expected, seen): - """ Verifies semantic correctness of the rule""" + """Verifies semantic correctness of the rule""" repo = self.repo ha = hex(self.node) self.node = scmutil.resolvehexnodeidprefix(repo, ha) @@ -819,7 +819,7 @@ @action([b'fold', b'f'], _(b'use commit, but combine it with the one above')) class fold(histeditaction): def verify(self, prev, expected, seen): - """ Verifies semantic correctness of the fold rule""" + """Verifies semantic correctness of the fold rule""" super(fold, self).verify(prev, expected, seen) repo = self.repo if not prev: @@ -2403,7 +2403,7 @@ def parserules(rules, state): - """Read the histedit rules string and return list of action objects """ + """Read the histedit rules string and return list of action objects""" rules = [ l for l in (r.strip() for r in rules.splitlines())