Mercurial > public > mercurial-scm > hg
comparison mercurial/sparse.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 | d783f945a701 |
| children | a61287a95dc3 |
comparison
equal
deleted
inserted
replaced
| 43116:defabf63e969 | 43117:8ff1ecfadcd1 |
|---|---|
| 119 if not raw: | 119 if not raw: |
| 120 return set(), set(), set() | 120 return set(), set(), set() |
| 121 | 121 |
| 122 if rev is None: | 122 if rev is None: |
| 123 raise error.Abort( | 123 raise error.Abort( |
| 124 _(b'cannot parse sparse patterns from working ' b'directory') | 124 _(b'cannot parse sparse patterns from working directory') |
| 125 ) | 125 ) |
| 126 | 126 |
| 127 includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse') | 127 includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse') |
| 128 ctx = repo[rev] | 128 ctx = repo[rev] |
| 129 | 129 |
| 481 repo.ui.warn(_(b"pending changes to '%s'\n") % f) | 481 repo.ui.warn(_(b"pending changes to '%s'\n") % f) |
| 482 abort = not force | 482 abort = not force |
| 483 | 483 |
| 484 if abort: | 484 if abort: |
| 485 raise error.Abort( | 485 raise error.Abort( |
| 486 _(b'could not update sparseness due to pending ' b'changes') | 486 _(b'could not update sparseness due to pending changes') |
| 487 ) | 487 ) |
| 488 | 488 |
| 489 # Calculate actions | 489 # Calculate actions |
| 490 dirstate = repo.dirstate | 490 dirstate = repo.dirstate |
| 491 ctx = repo[b'.'] | 491 ctx = repo[b'.'] |