This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3482

cvsps: add b prefixes to regular expressions
ClosedPublic

Authored by durin42 on May 8 2018, 9:36 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG72284d296b02: cvsps: add b prefixes to regular expressions
Summary
  1. skip-blame just b prefixes

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 8 2018, 9:36 AM
indygreg accepted this revision.May 8 2018, 2:19 PM
This revision is now accepted and ready to land.May 8 2018, 2:19 PM
Closed by commit rHG72284d296b02: cvsps: add b prefixes to regular expressions (authored by durin42). · Explain WhyMay 8 2018, 2:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/cvsps.py (40 lines)

Diff 8557

hgext/convert/cvsps.py

"return a shared version of a string" "return a shared version of a string"
return _scache.setdefault(s, s) return _scache.setdefault(s, s)
ui.status(_('collecting CVS rlog\n')) ui.status(_('collecting CVS rlog\n'))
log = [] # list of logentry objects containing the CVS state log = [] # list of logentry objects containing the CVS state
# patterns to match in CVS (r)log output, by state of use # patterns to match in CVS (r)log output, by state of use
re_00 = re.compile('RCS file: (.+)$') re_00 = re.compile(b'RCS file: (.+)$')
re_01 = re.compile('cvs \\[r?log aborted\\]: (.+)$') re_01 = re.compile(b'cvs \\[r?log aborted\\]: (.+)$')
re_02 = re.compile('cvs (r?log|server): (.+)\n$') re_02 = re.compile(b'cvs (r?log|server): (.+)\n$')
re_03 = re.compile("(Cannot access.+CVSROOT)|" re_03 = re.compile(b"(Cannot access.+CVSROOT)|"
"(can't create temporary directory.+)$") b"(can't create temporary directory.+)$")
re_10 = re.compile('Working file: (.+)$') re_10 = re.compile(b'Working file: (.+)$')
re_20 = re.compile('symbolic names:') re_20 = re.compile(b'symbolic names:')
re_30 = re.compile('\t(.+): ([\\d.]+)$') re_30 = re.compile(b'\t(.+): ([\\d.]+)$')
re_31 = re.compile('----------------------------$') re_31 = re.compile(b'----------------------------$')
re_32 = re.compile('=======================================' re_32 = re.compile(b'======================================='
'======================================$') b'======================================$')
re_50 = re.compile('revision ([\\d.]+)(\s+locked by:\s+.+;)?$') re_50 = re.compile(b'revision ([\\d.]+)(\s+locked by:\s+.+;)?$')
re_60 = re.compile(r'date:\s+(.+);\s+author:\s+(.+);\s+state:\s+(.+?);' re_60 = re.compile(br'date:\s+(.+);\s+author:\s+(.+);\s+state:\s+(.+?);'
r'(\s+lines:\s+(\+\d+)?\s+(-\d+)?;)?' br'(\s+lines:\s+(\+\d+)?\s+(-\d+)?;)?'
r'(\s+commitid:\s+([^;]+);)?' br'(\s+commitid:\s+([^;]+);)?'
r'(.*mergepoint:\s+([^;]+);)?') br'(.*mergepoint:\s+([^;]+);)?')
re_70 = re.compile('branches: (.+);$') re_70 = re.compile(b'branches: (.+);$')
file_added_re = re.compile(r'file [^/]+ was (initially )?added on branch') file_added_re = re.compile(br'file [^/]+ was (initially )?added on branch')
prefix = '' # leading path to strip of what we get from CVS prefix = '' # leading path to strip of what we get from CVS
if directory is None: if directory is None:
# Current working directory # Current working directory
# Get the real directory in the repository # Get the real directory in the repository
try: try:
# remember tags only if this is the latest changeset to have it # remember tags only if this is the latest changeset to have it
c.tags = sorted(tag for tag in tags if globaltags[tag] is c) c.tags = sorted(tag for tag in tags if globaltags[tag] is c)
# Find parent changesets, handle {{mergetobranch BRANCHNAME}} # Find parent changesets, handle {{mergetobranch BRANCHNAME}}
# by inserting dummy changesets with two parents, and handle # by inserting dummy changesets with two parents, and handle
# {{mergefrombranch BRANCHNAME}} by setting two parents. # {{mergefrombranch BRANCHNAME}} by setting two parents.
if mergeto is None: if mergeto is None:
mergeto = r'{{mergetobranch ([-\w]+)}}' mergeto = br'{{mergetobranch ([-\w]+)}}'
if mergeto: if mergeto:
mergeto = re.compile(mergeto) mergeto = re.compile(mergeto)
if mergefrom is None: if mergefrom is None:
mergefrom = r'{{mergefrombranch ([-\w]+)}}' mergefrom = br'{{mergefrombranch ([-\w]+)}}'
if mergefrom: if mergefrom:
mergefrom = re.compile(mergefrom) mergefrom = re.compile(mergefrom)
versions = {} # changeset index where we saw any particular file version versions = {} # changeset index where we saw any particular file version
branches = {} # changeset index where we saw a branch branches = {} # changeset index where we saw a branch
n = len(changesets) n = len(changesets)
i = 0 i = 0
while i < n: while i < n: