Mercurial > public > mercurial-scm > hg-stable
diff mercurial/rewriteutil.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 | 8c6329fa6038 |
children | 687b865b95ad |
line wrap: on
line diff
--- a/mercurial/rewriteutil.py Fri Oct 04 15:53:45 2019 -0400 +++ b/mercurial/rewriteutil.py Sat Oct 05 10:29:34 2019 -0400 @@ -16,6 +16,7 @@ revset, ) + def precheck(repo, revs, action='rewrite'): """check if revs can be rewritten action is used to control the error message. @@ -23,7 +24,7 @@ Make sure this function is called after taking the lock. """ if node.nullrev in revs: - msg = _("cannot %s null changeset") % (action) + msg = _("cannot %s null changeset") % action hint = _("no changeset checked out") raise error.Abort(msg, hint=hint) @@ -32,7 +33,7 @@ publicrevs = repo.revs('%ld and public()', revs) if publicrevs: - msg = _("cannot %s public changesets") % (action) + msg = _("cannot %s public changesets") % action hint = _("see 'hg help phases' for details") raise error.Abort(msg, hint=hint) @@ -40,6 +41,7 @@ if newunstable: raise error.Abort(_("cannot %s changeset with children") % action) + def disallowednewunstable(repo, revs): """Checks whether editing the revs will create new unstable changesets and are we allowed to create them.