This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3584

patch: fix import-time syntax error in test-check-module-imports.t
ClosedPublic

Authored by durin42 on May 18 2018, 7:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG468797392cc6: patch: fix import-time syntax error in test-check-module-imports.t
Summary

This is more correct, though we were getting lucky in practice with
our rewriter saving us.

  1. skip-blame just a b prefix

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.May 18 2018, 7:55 PM
Closed by commit rHG468797392cc6: patch: fix import-time syntax error in test-check-module-imports.t (authored by durin42). · Explain WhyMay 18 2018, 10:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)

Diff 8756

mercurial/patch.py

stringutil, stringutil,
) )
stringio = util.stringio stringio = util.stringio
gitre = re.compile(br'diff --git a/(.*) b/(.*)') gitre = re.compile(br'diff --git a/(.*) b/(.*)')
tabsplitter = re.compile(br'(\t+|[^\t]+)') tabsplitter = re.compile(br'(\t+|[^\t]+)')
wordsplitter = re.compile(br'(\t+| +|[a-zA-Z0-9_\x80-\xff]+|' wordsplitter = re.compile(br'(\t+| +|[a-zA-Z0-9_\x80-\xff]+|'
'[^ \ta-zA-Z0-9_\x80-\xff])') b'[^ \ta-zA-Z0-9_\x80-\xff])')
PatchError = error.PatchError PatchError = error.PatchError
# public functions # public functions
def split(stream): def split(stream):
'''return an iterator of individual patches from a stream''' '''return an iterator of individual patches from a stream'''
def isheader(line, inheader): def isheader(line, inheader):