# HG changeset patch

# User Mateusz Kwapich <mitrandir@fb.com>

# Date 1458691511 25200

#      Tue Mar 22 17:05:11 2016 -0700

# Branch stable

# Node ID cdda7b96afff3433eafdeeb83ded83a5b25b7a5b

# Parent  a47006d8d01537c6a765ac77b66bf1c73b4cf7db

convert: rewrite calls to Git to use the new shelling mechanism (SEC)

CVE-2016-3069 (2/5)

One test output changed because we were ignoring git return code in numcommits

before.

diff --git a/hgext/convert/git.py b/hgext/convert/git.py

--- a/hgext/convert/git.py

+++ b/hgext/convert/git.py

@@ -115,13 +115,13 @@ class convert_git(converter_source, comm

         if similarity < 0 or similarity > 100:

             raise util.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 = []

         checktool('git', 'git')

@@ -136,14 +136,14 @@ class convert_git(converter_source, comm

     def getheads(self):

         if not self.revs:

-            heads, ret = self.gitread('git rev-parse --branches --remotes')

-            heads = heads.splitlines()

-            if ret:

+            output, status = self.gitrun('rev-parse', '--branches', '--remotes')

+            heads = output.splitlines()

+            if status:

                 raise util.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 util.Abort(_('cannot retrieve git head "%s"') % rev)

@@ -203,7 +203,7 @@ class convert_git(converter_source, comm

                 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.

@@ -219,7 +219,7 @@ class convert_git(converter_source, comm

             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()

@@ -228,15 +228,17 @@ class convert_git(converter_source, comm

         if full:

             raise util.Abort(_("convert from git do not support --full"))

         self.modecache = {}

-        fh = self.gitopen("git diff-tree -z --root -m -r %s %s" % (

-            self.simopt, version))

+        cmd = ['diff-tree','-z', '--root', '-m', '-r'] + self.simopt + [version]

+        output, status = self.gitrun(*cmd)

+        if status:

+            raise util.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

@@ -292,8 +294,6 @@ class convert_git(converter_source, comm

                     if f != '.gitmodules' and fdest != '.gitmodules':

                         copies[fdest] = f

             entry = None

-        if fh.close():

-            raise util.Abort(_('cannot read changes in %s') % version)

         if subexists[0]:

             if subdeleted[0]:

@@ -339,17 +339,23 @@ class convert_git(converter_source, comm

         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 util.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,

-                          err=subprocess.STDOUT)

+        output, status = self.gitrunlines('ls-remote', '--tags', self.path)

+

+        if status:

+            raise util.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 util.Abort(_('cannot read tags from %s') % self.path)

@@ -357,8 +363,6 @@ class convert_git(converter_source, comm

             if not tag.startswith(prefix):

                 continue

             alltags[tag[len(prefix):]] = node

-        if fh.close():

-            raise util.Abort(_('cannot read tags from %s') % self.path)

         # Filter out tag objects for annotated tag refs

         for tag in alltags:

@@ -375,18 +379,20 @@ class convert_git(converter_source, comm

     def getchangedfiles(self, version, i):

         changes = []

         if i is None:

-            fh = self.gitopen("git diff-tree --root -m -r %s" % version)

-            for l in fh:

+            output, status = self.gitrunlines('diff-tree', '--root', '-m',

+                                              '-r', version)

+            if status:

+                raise util.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 '

-                              '"%s^%s" --' % (version, version, i + 1))

-            changes = [f.rstrip('\n') for f in fh]

-        if fh.close():

-            raise util.Abort(_('cannot read changes in %s') % version)

+            output, status = self.gitrunlines('diff-tree', '--name-only',

+                                              '--root', '-r', version,

+                                              '%s^%s' % (version, i + 1), '--')

+            changes = [f.rstrip('\n') for f in output]

         return changes

@@ -399,14 +405,14 @@ class convert_git(converter_source, comm

         # factor two commands

         remoteprefix = self.ui.config('convert', 'git.remoteprefix', 'remote')

-        gitcmd = { remoteprefix + '/': 'git ls-remote --heads origin',

-                                   '': 'git show-ref'}

+        gitcmd = { remoteprefix + '/': ['ls-remote', '--heads', 'origin'],

+                                   '': ['show-ref']}

         # Origin heads

         for reftype in gitcmd:

             try:

-                fh = self.gitopen(gitcmd[reftype], err=subprocess.PIPE)

-                for line in fh:

+                output, status = self.gitrunlines(*gitcmd[reftype])

+                for line in output:

                     line = line.strip()

                     rev, name = line.split(None, 1)

                     if not name.startswith(prefix):

diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t

--- a/tests/test-convert-git.t

+++ b/tests/test-convert-git.t

@@ -534,7 +534,6 @@ test missing .gitmodules

   $ git commit -q -m "missing .gitmodules"

   $ cd ..

   $ hg convert git-repo6 hg-repo6 --traceback

-  fatal: Path '.gitmodules' does not exist in '*' (glob)

   initializing destination hg-repo6 repository

   scanning source...

   sorting...

@@ -689,7 +688,7 @@ damage git repository by renaming a comm

   $ COMMIT_OBJ=1c/0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd

   $ mv git-repo4/.git/objects/$COMMIT_OBJ git-repo4/.git/objects/$COMMIT_OBJ.tmp

   $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:'

-  abort: cannot read tags from git-repo4/.git

+  abort: cannot retrieve number of commits in git-repo4/.git

   $ mv git-repo4/.git/objects/$COMMIT_OBJ.tmp git-repo4/.git/objects/$COMMIT_OBJ

 damage git repository by renaming a blob object