mercurial: comparison hgext/convert/common.py

equal deleted inserted replaced

-:2372284d9457
+:687b865b95ad
 def get_token(self):
 return _encodeornone(self._l.get_token())
 @property
 def infile(self):
-return self._l.infile or '<unknown>'
+return self._l.infile or b'<unknown>'
 @property
 def lineno(self):
 return self._l.lineno
 def shlexer(data=None, filepath=None, wordchars=None, whitespace=None):
 if data is None:
 if pycompat.ispy3:
-data = open(filepath, 'r', encoding=r'latin1')
+data = open(filepath, b'r', encoding=r'latin1')
 else:
-data = open(filepath, 'r')
+data = open(filepath, b'r')
 else:
 if filepath is not None:
 raise error.ProgrammingError(
-'shlexer only accepts data or filepath, not both'
+b'shlexer only accepts data or filepath, not both'
 )
 if pycompat.ispy3:
 data = data.decode('latin1')
 l = shlex.shlex(data, infile=filepath, posix=True)
 if whitespace is not None:
 def encodeargs(args):
 def encodearg(s):
 lines = base64.encodestring(s)
 lines = [l.splitlines()[0] for l in lines]
-return ''.join(lines)
+return b''.join(lines)
 s = pickle.dumps(args)
 return encodearg(s)
 if not procutil.findexe(exe):
 if abort:
 exc = error.Abort
 else:
 exc = MissingTool
-raise exc(_('cannot find required "%s" tool') % name)
+raise exc(_(b'cannot find required "%s" tool') % name)
 class NoRepo(Exception):
 pass
-SKIPREV = 'SKIP'
+SKIPREV = b'SKIP'
 class commit(object):
 def __init__(
 self,
 saverev=True,
 phase=phases.draft,
 optparents=None,
 ctx=None,
 ):
-self.author = author or 'unknown'
+self.author = author or b'unknown'
-self.date = date or '0 0'
+self.date = date or b'0 0'
 self.desc = desc
 self.parents = parents  # will be converted and used as parents
 self.optparents = optparents or []  # will be used if already converted
 self.branch = branch
 self.rev = rev
 self.ui = ui
 self.path = path
 self.revs = revs
 self.repotype = repotype
-self.encoding = 'utf-8'
+self.encoding = b'utf-8'
-def checkhexformat(self, revstr, mapname='splicemap'):
+def checkhexformat(self, revstr, mapname=b'splicemap'):
 """ fails if revstr is not a 40 byte hex. mercurial and git both uses
 such format for their revision numbering
 """
 if not re.match(br'[0-9a-fA-F]{40,40}$', revstr):
 raise error.Abort(
-_('%s entry %s is not a valid revision' ' identifier')
+_(b'%s entry %s is not a valid revision' b' identifier')
 % (mapname, revstr)
 )
 def before(self):
 pass
 """
 raise NotImplementedError
 def recode(self, s, encoding=None):
 if not encoding:
-encoding = self.encoding or 'utf-8'
+encoding = self.encoding or b'utf-8'
 if isinstance(s, pycompat.unicode):
 return s.encode("utf-8")
 try:
 return s.decode(pycompat.sysstr(encoding)).encode("utf-8")
 Bookmark names are to be UTF-8 strings.
 """
 return {}
-def checkrevformat(self, revstr, mapname='splicemap'):
+def checkrevformat(self, revstr, mapname=b'splicemap'):
 """revstr is a string that describes a revision in the given
 source control system.  Return true if revstr has correct
 format.
 """
 return True
 def _cmdline(self, cmd, *args, **kwargs):
 kwargs = pycompat.byteskwargs(kwargs)
 cmdline = [self.command, cmd] + list(args)
 for k, v in kwargs.iteritems():
 if len(k) == 1:
-cmdline.append('-' + k)
+cmdline.append(b'-' + k)
 else:
-cmdline.append('--' + k.replace('_', '-'))
+cmdline.append(b'--' + k.replace(b'_', b'-'))
 try:
 if len(k) == 1:
-cmdline.append('' + v)
+cmdline.append(b'' + v)
 else:
-cmdline[-1] += '=' + v
+cmdline[-1] += b'=' + v
 except TypeError:
 pass
 cmdline = [procutil.shellquote(arg) for arg in cmdline]
 if not self.ui.debugflag:
-cmdline += ['2>', pycompat.bytestr(os.devnull)]
+cmdline += [b'2>', pycompat.bytestr(os.devnull)]
-cmdline = ' '.join(cmdline)
+cmdline = b' '.join(cmdline)
 return cmdline
 def _run(self, cmd, *args, **kwargs):
 def popen(cmdline):
 p = subprocess.Popen(
 def _run3(self, cmd, *args, **kwargs):
 return self._dorun(procutil.popen3, cmd, *args, **kwargs)
 def _dorun(self, openfunc, cmd, *args, **kwargs):
 cmdline = self._cmdline(cmd, *args, **kwargs)
-self.ui.debug('running: %s\n' % (cmdline,))
+self.ui.debug(b'running: %s\n' % (cmdline,))
 self.prerun()
 try:
 return openfunc(cmdline)
 finally:
 self.postrun()
 def runlines(self, cmd, *args, **kwargs):
 p = self._run(cmd, *args, **kwargs)
 output = p.stdout.readlines()
 p.wait()
-self.ui.debug(''.join(output))
+self.ui.debug(b''.join(output))
 return output, p.returncode
-def checkexit(self, status, output=''):
+def checkexit(self, status, output=b''):
 if status:
 if output:
-self.ui.warn(_('%s error:\n') % self.command)
+self.ui.warn(_(b'%s error:\n') % self.command)
 self.ui.warn(output)
 msg = procutil.explainexit(status)
-raise error.Abort('%s %s' % (self.command, msg))
+raise error.Abort(b'%s %s' % (self.command, msg))
 def run0(self, cmd, *args, **kwargs):
 output, status = self.run(cmd, *args, **kwargs)
 self.checkexit(status, output)
 return output
 def runlines0(self, cmd, *args, **kwargs):
 output, status = self.runlines(cmd, *args, **kwargs)
-self.checkexit(status, ''.join(output))
+self.checkexit(status, b''.join(output))
 return output
 @propertycache
 def argmax(self):
 # POSIX requires at least 4096 bytes for ARG_MAX
 def _read(self):
 if not self.path:
 return
 try:
-fp = open(self.path, 'rb')
+fp = open(self.path, b'rb')
 except IOError as err:
 if err.errno != errno.ENOENT:
 raise
 return
 for i, line in enumerate(util.iterfile(fp)):
 line = line.splitlines()[0].rstrip()
 if not line:
 # Ignore blank lines
 continue
 try:
-key, value = line.rsplit(' ', 1)
+key, value = line.rsplit(b' ', 1)
 except ValueError:
 raise error.Abort(
-_('syntax error in %s(%d): key/value pair expected')
+_(b'syntax error in %s(%d): key/value pair expected')
 % (self.path, i + 1)
 )
 if key not in self:
 self.order.append(key)
 super(mapfile, self).__setitem__(key, value)
 fp.close()
 def __setitem__(self, key, value):
 if self.fp is None:
 try:
-self.fp = open(self.path, 'ab')
+self.fp = open(self.path, b'ab')
 except IOError as err:
 raise error.Abort(
-_('could not open map file %r: %s')
+_(b'could not open map file %r: %s')
 % (self.path, encoding.strtolocal(err.strerror))
 )
-self.fp.write(util.tonativeeol('%s %s\n' % (key, value)))
+self.fp.write(util.tonativeeol(b'%s %s\n' % (key, value)))
 self.fp.flush()
 super(mapfile, self).__setitem__(key, value)
 def close(self):
 if self.fp:

changeset 43077	687b865b95ad
parent 43076	2372284d9457
child 43085	eef9a2d67051