Mercurial > public > mercurial-scm > hg-stable
diff mercurial/context.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 | 0171483b082f |
line wrap: on
line diff
--- a/mercurial/context.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/context.py Tue Oct 08 15:06:18 2019 -0700 @@ -1619,7 +1619,7 @@ return if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): self._repo.ui.warn( - _(b"copy failed: %s is not a file or a " b"symbolic link\n") + _(b"copy failed: %s is not a file or a symbolic link\n") % self._repo.dirstate.pathto(dest) ) else: @@ -1678,7 +1678,7 @@ or stringutil.binary(d) ): self._repo.ui.debug( - b'ignoring suspect symlink placeholder' b' "%s"\n' % f + b'ignoring suspect symlink placeholder "%s"\n' % f ) continue sane.append(f) @@ -1750,7 +1750,7 @@ # already changed simultaneously after last # caching (see also issue5584 for detail) self._repo.ui.debug( - b'skip updating dirstate: ' b'identity mismatch\n' + b'skip updating dirstate: identity mismatch\n' ) except error.LockError: pass