Mercurial > hg
comparison hgext/histedit.py @ 43117:8ff1ecfadcd1
cleanup: join string literals that are already on one line
Thanks to Kyle for noticing this and for providing the regular
expression to run on the codebase.
This patch has been reviewed by the test suite and they approved of
it.
# skip-blame: fallout from mass reformatting
Differential Revision: https://phab.mercurial-scm.org/D7028
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 08 Oct 2019 15:06:18 -0700 |
parents | 649d3ac37a12 |
children | 0d609ed185ea |
comparison
equal
deleted
inserted
replaced
43116:defabf63e969 | 43117:8ff1ecfadcd1 |
---|---|
1882 if any((outg, revs, freeargs, rules, editplan)): | 1882 if any((outg, revs, freeargs, rules, editplan)): |
1883 raise error.Abort(_(b'no arguments allowed with --abort')) | 1883 raise error.Abort(_(b'no arguments allowed with --abort')) |
1884 elif goal == b'edit-plan': | 1884 elif goal == b'edit-plan': |
1885 if any((outg, revs, freeargs)): | 1885 if any((outg, revs, freeargs)): |
1886 raise error.Abort( | 1886 raise error.Abort( |
1887 _(b'only --commands argument allowed with ' b'--edit-plan') | 1887 _(b'only --commands argument allowed with --edit-plan') |
1888 ) | 1888 ) |
1889 else: | 1889 else: |
1890 if state.inprogress(): | 1890 if state.inprogress(): |
1891 raise error.Abort( | 1891 raise error.Abort( |
1892 _( | 1892 _( |