Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 34068:6d21737c35bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix type of regex literals in subrepo.py
author Yuya Nishihara <yuya@tcha.org>
date Sun, 03 Sep 2017 15:01:23 +0900
parents d5b2beca16c0
children 0fa781320203
comparison
equal deleted inserted replaced
34067:8b8b70cb4288 34068:6d21737c35bf
132 # does a string decode. 132 # does a string decode.
133 repl = util.escapestr(repl) 133 repl = util.escapestr(repl)
134 # However, we still want to allow back references to go 134 # However, we still want to allow back references to go
135 # through unharmed, so we turn r'\\1' into r'\1'. Again, 135 # through unharmed, so we turn r'\\1' into r'\1'. Again,
136 # extra escapes are needed because re.sub string decodes. 136 # extra escapes are needed because re.sub string decodes.
137 repl = re.sub(r'\\\\([0-9]+)', r'\\\1', repl) 137 repl = re.sub(br'\\\\([0-9]+)', br'\\\1', repl)
138 try: 138 try:
139 src = re.sub(pattern, repl, src, 1) 139 src = re.sub(pattern, repl, src, 1)
140 except re.error as e: 140 except re.error as e:
141 raise error.Abort(_("bad subrepository pattern in %s: %s") 141 raise error.Abort(_("bad subrepository pattern in %s: %s")
142 % (p.source('subpaths', pattern), e)) 142 % (p.source('subpaths', pattern), e))
1152 return stdout, stderr 1152 return stdout, stderr
1153 1153
1154 @propertycache 1154 @propertycache
1155 def _svnversion(self): 1155 def _svnversion(self):
1156 output, err = self._svncommand(['--version', '--quiet'], filename=None) 1156 output, err = self._svncommand(['--version', '--quiet'], filename=None)
1157 m = re.search(r'^(\d+)\.(\d+)', output) 1157 m = re.search(br'^(\d+)\.(\d+)', output)
1158 if not m: 1158 if not m:
1159 raise error.Abort(_('cannot retrieve svn tool version')) 1159 raise error.Abort(_('cannot retrieve svn tool version'))
1160 return (int(m.group(1)), int(m.group(2))) 1160 return (int(m.group(1)), int(m.group(2)))
1161 1161
1162 def _wcrevs(self): 1162 def _wcrevs(self):
1371 elif versionstatus == 'warning': 1371 elif versionstatus == 'warning':
1372 self.ui.warn(_('git subrepo requires at least 1.6.0 or later\n')) 1372 self.ui.warn(_('git subrepo requires at least 1.6.0 or later\n'))
1373 1373
1374 @staticmethod 1374 @staticmethod
1375 def _gitversion(out): 1375 def _gitversion(out):
1376 m = re.search(r'^git version (\d+)\.(\d+)\.(\d+)', out) 1376 m = re.search(br'^git version (\d+)\.(\d+)\.(\d+)', out)
1377 if m: 1377 if m:
1378 return (int(m.group(1)), int(m.group(2)), int(m.group(3))) 1378 return (int(m.group(1)), int(m.group(2)), int(m.group(3)))
1379 1379
1380 m = re.search(r'^git version (\d+)\.(\d+)', out) 1380 m = re.search(br'^git version (\d+)\.(\d+)', out)
1381 if m: 1381 if m:
1382 return (int(m.group(1)), int(m.group(2)), 0) 1382 return (int(m.group(1)), int(m.group(2)), 0)
1383 1383
1384 return -1 1384 return -1
1385 1385