Mercurial > public > mercurial-scm > hg-stable
diff mercurial/diffhelper.py @ 43075:57875cf423c9
style: run a patched black on a subset of mercurial
This applied black to the 20 smallest files in mercurial/:
ls -S1 mercurial/*.py | tail -n20 | xargs black --skip-string-normalization
Note that a few files failed to format, presumably due to a bug in my
patch. The intent is to be able to compare results to D5064 with
https://github.com/python/black/pull/826 applied to black.
I skipped string normalization on this patch for clarity - in reality
I think we'd want one pass without string normalization, followed by
another to normalize strings (which is basically replacing ' with "
globally.)
# skip-blame mass-reformatting only
Differential Revision: https://phab.mercurial-scm.org/D6342
author | Augie Fackler <augie@google.com> |
---|---|
date | Sat, 05 Oct 2019 10:29:34 -0400 |
parents | e7aa113b14f7 |
children | 687b865b95ad |
line wrap: on
line diff
--- a/mercurial/diffhelper.py Fri Oct 04 15:53:45 2019 -0400 +++ b/mercurial/diffhelper.py Sat Oct 05 10:29:34 2019 -0400 @@ -14,6 +14,7 @@ pycompat, ) + def addlines(fp, hunk, lena, lenb, a, b): """Read lines from fp into the hunk @@ -47,6 +48,7 @@ b.append(s[1:]) a.append(s) + def fixnewline(hunk, a, b): """Fix up the last lines of a and b when the patch has no newline at EOF""" l = hunk[-1] @@ -62,6 +64,7 @@ a[-1] = hline hunk[-1] = hline + def testhunk(a, b, bstart): """Compare the lines in a with the lines in b