comparison hgext/split.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 687b865b95ad
children 705738def50c
comparison
equal deleted inserted replaced
43116:defabf63e969 43117:8ff1ecfadcd1
106 b'%ld - (%ld & obsolete())::', descendants, descendants 106 b'%ld - (%ld & obsolete())::', descendants, descendants
107 ) 107 )
108 ) 108 )
109 if not alloworphaned and len(torebase) != len(descendants): 109 if not alloworphaned and len(torebase) != len(descendants):
110 raise error.Abort( 110 raise error.Abort(
111 _(b'split would leave orphaned changesets ' b'behind') 111 _(b'split would leave orphaned changesets behind')
112 ) 112 )
113 else: 113 else:
114 if not alloworphaned and descendants: 114 if not alloworphaned and descendants:
115 raise error.Abort( 115 raise error.Abort(
116 _(b'cannot split changeset with children without rebase') 116 _(b'cannot split changeset with children without rebase')
162 ) % short(ctx.node()) 162 ) % short(ctx.node())
163 for c in committed: 163 for c in committed:
164 firstline = c.description().split(b'\n', 1)[0] 164 firstline = c.description().split(b'\n', 1)[0]
165 header += _(b'HG: - %s: %s\n') % (short(c.node()), firstline) 165 header += _(b'HG: - %s: %s\n') % (short(c.node()), firstline)
166 header += _( 166 header += _(
167 b'HG: Write commit message for the next split ' b'changeset.\n' 167 b'HG: Write commit message for the next split changeset.\n'
168 ) 168 )
169 else: 169 else:
170 header = _( 170 header = _(
171 b'HG: Splitting %s. Write commit message for the ' 171 b'HG: Splitting %s. Write commit message for the '
172 b'first split changeset.\n' 172 b'first split changeset.\n'