Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 38052:468797392cc6
patch: fix import-time syntax error in test-check-module-imports.t
This is more correct, though we were getting lucky in practice with
our rewriter saving us.
# skip-blame just a b prefix
Differential Revision: https://phab.mercurial-scm.org/D3584
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 18 May 2018 19:54:50 -0400 |
| parents | b403e87df069 |
| children | 86e0a4bede5d |
comparison
equal
deleted
inserted
replaced
| 38051:cab398cb9b49 | 38052:468797392cc6 |
|---|---|
| 49 stringio = util.stringio | 49 stringio = util.stringio |
| 50 | 50 |
| 51 gitre = re.compile(br'diff --git a/(.*) b/(.*)') | 51 gitre = re.compile(br'diff --git a/(.*) b/(.*)') |
| 52 tabsplitter = re.compile(br'(\t+|[^\t]+)') | 52 tabsplitter = re.compile(br'(\t+|[^\t]+)') |
| 53 wordsplitter = re.compile(br'(\t+| +|[a-zA-Z0-9_\x80-\xff]+|' | 53 wordsplitter = re.compile(br'(\t+| +|[a-zA-Z0-9_\x80-\xff]+|' |
| 54 '[^ \ta-zA-Z0-9_\x80-\xff])') | 54 b'[^ \ta-zA-Z0-9_\x80-\xff])') |
| 55 | 55 |
| 56 PatchError = error.PatchError | 56 PatchError = error.PatchError |
| 57 | 57 |
| 58 # public functions | 58 # public functions |
| 59 | 59 |