mercurial: comparison hgext/convert/git.py

equal deleted inserted replaced

-:c4b727795d6a
+:ff0d3b6b287f
 return "%s = [git]%s" % (self.path, self.url)
 def hgsubstate(self):
 return "%s %s" % (self.node, self.path)
-class convert_git(common.converter_source):
+class convert_git(common.converter_source, common.commandline):
 # Windows does not support GIT_DIR= construct while other systems
 # cannot remove environment variable. Just assume none have
 # both issues.
-if util.safehasattr(os, 'unsetenv'):
-def gitopen(self, s, err=None):
+def _gitcmd(self, cmd, *args, **kwargs):
-prevgitdir = os.environ.get('GIT_DIR')
+return cmd('--git-dir=%s' % self.path, *args, **kwargs)
-os.environ['GIT_DIR'] = self.path
-try:
+def gitrun0(self, *args, **kwargs):
-if err == subprocess.PIPE:
+return self._gitcmd(self.run0, *args, **kwargs)
-(stdin, stdout, stderr) = util.popen3(s)
-return stdout
+def gitrun(self, *args, **kwargs):
-elif err == subprocess.STDOUT:
+return self._gitcmd(self.run, *args, **kwargs)
-return self.popen_with_stderr(s)
-else:
+def gitrunlines0(self, *args, **kwargs):
-return util.popen(s, 'rb')
+return self._gitcmd(self.runlines0, *args, **kwargs)
-finally:
-if prevgitdir is None:
+def gitrunlines(self, *args, **kwargs):
-del os.environ['GIT_DIR']
+return self._gitcmd(self.runlines, *args, **kwargs)
-else:
-os.environ['GIT_DIR'] = prevgitdir
+def gitpipe(self, *args, **kwargs):
+return self._gitcmd(self._run3, *args, **kwargs)
-def gitpipe(self, s):
-prevgitdir = os.environ.get('GIT_DIR')
-os.environ['GIT_DIR'] = self.path
-try:
-return util.popen3(s)
-finally:
-if prevgitdir is None:
-del os.environ['GIT_DIR']
-else:
-os.environ['GIT_DIR'] = prevgitdir
-else:
-def gitopen(self, s, err=None):
-if err == subprocess.PIPE:
-(sin, so, se) = util.popen3('GIT_DIR=%s %s' % (self.path, s))
-return so
-elif err == subprocess.STDOUT:
-return self.popen_with_stderr(s)
-else:
-return util.popen('GIT_DIR=%s %s' % (self.path, s), 'rb')
-def gitpipe(self, s):
-return util.popen3('GIT_DIR=%s %s' % (self.path, s))
-def popen_with_stderr(self, s):
-p = subprocess.Popen(s, shell=True, bufsize=-1,
-close_fds=util.closefds,
-stdin=subprocess.PIPE,
-stdout=subprocess.PIPE,
-stderr=subprocess.STDOUT,
-universal_newlines=False,
-env=None)
-return p.stdout
 def gitread(self, s):
 fh = self.gitopen(s)
 data = fh.read()
 return data, fh.close()
 def __init__(self, ui, path, revs=None):
 super(convert_git, self).__init__(ui, path, revs=revs)
+common.commandline.__init__(self, ui, 'git')
 if os.path.isdir(path + "/.git"):
 path += "/.git"
 if not os.path.exists(path + "/objects"):
 raise common.NoRepo(_("%s does not look like a Git repository") %
 # The default value (50) is based on the default for 'git diff'.
 similarity = ui.configint('convert', 'git.similarity', default=50)
 if similarity < 0 or similarity > 100:
 raise error.Abort(_('similarity must be between 0 and 100'))
 if similarity > 0:
-self.simopt = '-C%d%%' % similarity
+self.simopt = ['-C%d%%' % similarity]
 findcopiesharder = ui.configbool('convert', 'git.findcopiesharder',
 False)
 if findcopiesharder:
-self.simopt += ' --find-copies-harder'
+self.simopt.append('--find-copies-harder')
 else:
-self.simopt = ''
+self.simopt = []
 common.checktool('git', 'git')
 self.path = path
 self.submodules = []
-self.catfilepipe = self.gitpipe('git cat-file --batch')
+self.catfilepipe = self.gitpipe('cat-file', '--batch')
 def after(self):
 for f in self.catfilepipe:
 f.close()
 def getheads(self):
 if not self.revs:
-heads, ret = self.gitread('git rev-parse --branches --remotes')
+output, status = self.gitrun('rev-parse', '--branches', '--remotes')
-heads = heads.splitlines()
+heads = output.splitlines()
-if ret:
+if status:
 raise error.Abort(_('cannot retrieve git heads'))
 else:
 heads = []
 for rev in self.revs:
-rawhead, ret = self.gitread("git rev-parse --verify %s" % rev)
+rawhead, ret = self.gitrun('rev-parse', '--verify', rev)
 heads.append(rawhead[:-1])
 if ret:
 raise error.Abort(_('cannot retrieve git head "%s"') % rev)
 return heads
 s = c[sec]
 if 'url' in s and 'path' in s:
 self.submodules.append(submodule(s['path'], '', s['url']))
 def retrievegitmodules(self, version):
-modules, ret = self.gitread("git show %s:%s" % (version, '.gitmodules'))
+modules, ret = self.gitrun('show', '%s:%s' % (version, '.gitmodules'))
 if ret:
 # This can happen if a file is in the repo that has permissions
 # 160000, but there is no .gitmodules file.
 self.ui.warn(_("warning: cannot read submodules config file in "
 "%s\n") % version)
 self.ui.warn(_("warning: unable to parse .gitmodules in %s\n")
 % version)
 return
 for m in self.submodules:
-node, ret = self.gitread("git rev-parse %s:%s" % (version, m.path))
+node, ret = self.gitrun('rev-parse', '%s:%s' % (version, m.path))
 if ret:
 continue
 m.node = node.strip()
 def getchanges(self, version, full):
 if full:
 raise error.Abort(_("convert from git does not support --full"))
 self.modecache = {}
-fh = self.gitopen("git diff-tree -z --root -m -r %s %s" % (
+cmd = ['diff-tree','-z', '--root', '-m', '-r'] + self.simopt + [version]
-self.simopt, version))
+output, status = self.gitrun(*cmd)
+if status:
+raise error.Abort(_('cannot read changes in %s') % version)
 changes = []
 copies = {}
 seen = set()
 entry = None
 subexists = [False]
 subdeleted = [False]
-difftree = fh.read().split('\x00')
+difftree = output.split('\x00')
 lcount = len(difftree)
 i = 0
 skipsubmodules = self.ui.configbool('convert', 'git.skipsubmodules',
 False)
 # .gitmodules isn't imported at all, so it being copied to
 # and fro doesn't really make sense
 if f != '.gitmodules' and fdest != '.gitmodules':
 copies[fdest] = f
 entry = None
-if fh.close():
-raise error.Abort(_('cannot read changes in %s') % version)
 if subexists[0]:
 if subdeleted[0]:
 changes.append(('.hgsubstate', nodemod.nullhex))
 else:
 desc=message,
 rev=version)
 return c
 def numcommits(self):
-return len([None for _ in self.gitopen('git rev-list --all')])
+output, ret = self.gitrunlines('rev-list', '--all')
+if ret:
+raise error.Abort(_('cannot retrieve number of commits in %s') \
+% self.path)
+return len(output)
 def gettags(self):
 tags = {}
 alltags = {}
-fh = self.gitopen('git ls-remote --tags "%s"' % self.path,
+output, status = self.gitrunlines('ls-remote', '--tags', self.path)
-err=subprocess.STDOUT)
+if status:
+raise error.Abort(_('cannot read tags from %s') % self.path)
 prefix = 'refs/tags/'
 # Build complete list of tags, both annotated and bare ones
-for line in fh:
+for line in output:
 line = line.strip()
 if line.startswith("error:") or line.startswith("fatal:"):
 raise error.Abort(_('cannot read tags from %s') % self.path)
 node, tag = line.split(None, 1)
 if not tag.startswith(prefix):
 continue
 alltags[tag[len(prefix):]] = node
-if fh.close():
-raise error.Abort(_('cannot read tags from %s') % self.path)
 # Filter out tag objects for annotated tag refs
 for tag in alltags:
 if tag.endswith('^{}'):
 tags[tag[:-3]] = alltags[tag]
 return tags
 def getchangedfiles(self, version, i):
 changes = []
 if i is None:
-fh = self.gitopen("git diff-tree --root -m -r %s" % version)
+output, status = self.gitrunlines('diff-tree', '--root', '-m',
-for l in fh:
+'-r', version)
+if status:
+raise error.Abort(_('cannot read changes in %s') % version)
+for l in output:
 if "\t" not in l:
 continue
 m, f = l[:-1].split("\t")
 changes.append(f)
 else:
-fh = self.gitopen('git diff-tree --name-only --root -r %s '
+output, status = self.gitrunlines('diff-tree', '--name-only',
-'"%s^%s" --' % (version, version, i + 1))
+'--root', '-r', version,
-changes = [f.rstrip('\n') for f in fh]
+'%s^%s' % (version, i + 1), '--')
-if fh.close():
+changes = [f.rstrip('\n') for f in output]
-raise error.Abort(_('cannot read changes in %s') % version)
 return changes
 def getbookmarks(self):
 bookmarks = {}
 exclude = set([
 'refs/remotes/origin/HEAD',
 ])
 try:
-fh = self.gitopen('git show-ref', err=subprocess.PIPE)
+output, status = self.gitrunlines('show-ref')
-for line in fh:
+for line in output:
 line = line.strip()
 rev, name = line.split(None, 1)
 # Process each type of branch
 for gitprefix, hgprefix in reftypes:
 if not name.startswith(gitprefix) or name in exclude:

changeset 28670	ff0d3b6b287f
parent 28365	cd599bc179fb
parent 28662	80cac1de6aea
child 28671	96ed01f6514b