diff -r defabf63e969 -r 8ff1ecfadcd1 mercurial/patch.py --- a/mercurial/patch.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/patch.py Tue Oct 08 15:06:18 2019 -0700 @@ -51,7 +51,7 @@ gitre = re.compile(br'diff --git a/(.*) b/(.*)') tabsplitter = re.compile(br'(\t+|[^\t]+)') wordsplitter = re.compile( - br'(\t+| +|[a-zA-Z0-9_\x80-\xff]+|' b'[^ \ta-zA-Z0-9_\x80-\xff])' + br'(\t+| +|[a-zA-Z0-9_\x80-\xff]+|[^ \ta-zA-Z0-9_\x80-\xff])' ) PatchError = error.PatchError @@ -805,7 +805,7 @@ if self.exists and self.create: if self.copysource: self.ui.warn( - _(b"cannot create %s: destination already " b"exists\n") + _(b"cannot create %s: destination already exists\n") % self.fname ) else: @@ -3191,7 +3191,7 @@ if stats: output.append( - _(b' %d files changed, %d insertions(+), ' b'%d deletions(-)\n') + _(b' %d files changed, %d insertions(+), %d deletions(-)\n') % (len(stats), totaladds, totalremoves) )