diff hgext/uncommit.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 c21aca51b392
line wrap: on
line diff
--- a/hgext/uncommit.py	Tue Oct 08 15:15:37 2019 -0700
+++ b/hgext/uncommit.py	Tue Oct 08 15:06:18 2019 -0700
@@ -165,7 +165,7 @@
         if not allowdirtywcopy and (not pats or isdirtypath):
             cmdutil.bailifchanged(
                 repo,
-                hint=_(b'requires ' b'--allow-dirty-working-copy to uncommit'),
+                hint=_(b'requires --allow-dirty-working-copy to uncommit'),
             )
         old = repo[b'.']
         rewriteutil.precheck(repo, [old.rev()], b'uncommit')
@@ -190,7 +190,7 @@
             for f in sorted(badfiles):
                 if f in s.clean:
                     hint = _(
-                        b"file was not changed in working directory " b"parent"
+                        b"file was not changed in working directory parent"
                     )
                 elif repo.wvfs.exists(f):
                     hint = _(b"file was untracked in working directory parent")