Mercurial > hg-stable
comparison mercurial/repair.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 | 8accf5fa9930 c21aca51b392 |
comparison
equal
deleted
inserted
replaced
43116:defabf63e969 | 43117:8ff1ecfadcd1 |
---|---|
357 tostrip = set(repo.revs(revset, revs, revs, phases.internal, revs)) | 357 tostrip = set(repo.revs(revset, revs, revs, phases.internal, revs)) |
358 notstrip = revs - tostrip | 358 notstrip = revs - tostrip |
359 if notstrip: | 359 if notstrip: |
360 nodestr = b', '.join(sorted(short(repo[n].node()) for n in notstrip)) | 360 nodestr = b', '.join(sorted(short(repo[n].node()) for n in notstrip)) |
361 ui.warn( | 361 ui.warn( |
362 _(b'warning: orphaned descendants detected, ' b'not stripping %s\n') | 362 _(b'warning: orphaned descendants detected, not stripping %s\n') |
363 % nodestr | 363 % nodestr |
364 ) | 364 ) |
365 return [c.node() for c in repo.set(b'roots(%ld)', tostrip)] | 365 return [c.node() for c in repo.set(b'roots(%ld)', tostrip)] |
366 | 366 |
367 | 367 |