deleted file mode 100644

@@ -1,53 +0,0 @@

-+++ b/mercurial/subrepo.py	Sun Mar 20 21:52:21 2016 -0700

-@@ -1383,6 +1383,11 @@

-         are not supported and very probably fail.

-         """

-         self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands)))

-+        if env is None:

-+            env = os.environ.copy()

-+        # fix for Git CVE-2015-7545

-+        if 'GIT_ALLOW_PROTOCOL' not in env:

-+            env['GIT_ALLOW_PROTOCOL'] = 'file:git:http:https:ssh'

-         # unless ui.quiet is set, print git's stderr,

-         # which is mostly progress and useful info

-         errpipe = None

-+++ b/tests/test-subrepo-git.t	Sun Mar 20 21:52:21 2016 -0700

-@@ -1132,4 +1132,36 @@

-   ? s/foobar.orig

-   ? s/snake.python.orig

- 

-+test for Git CVE-2016-3068

-+  $ hg init malicious-subrepository

-+  $ cd malicious-subrepository

-+  $ echo "s = [git]ext::sh -c echo% pwned% >&2" > .hgsub

-+  $ git init s

-+  Initialized empty Git repository in $TESTTMP/tc/malicious-subrepository/s/.git/

-+  $ cd s

-+  $ git commit --allow-empty -m 'empty'

-+  [master (root-commit) 153f934] empty

-   $ cd ..

-+  $ hg add .hgsub

-+  $ hg commit -m "add subrepo"

-+  $ cd ..

-+  $ env -u GIT_ALLOW_PROTOCOL hg clone malicious-subrepository malicious-subrepository-protected

-+  Cloning into '$TESTTMP/tc/malicious-subrepository-protected/s'...

-+  fatal: transport 'ext' not allowed

-+  updating to branch default

-+  cloning subrepo s from ext::sh -c echo% pwned% >&2

-+  abort: git clone error 128 in s (in subrepo s)

-+  [255]

-+

-+whitelisting of ext should be respected (that's the git submodule behaviour)

-+  $ env GIT_ALLOW_PROTOCOL=ext hg clone malicious-subrepository malicious-subrepository-clone-allowed

-+  Cloning into '$TESTTMP/tc/malicious-subrepository-clone-allowed/s'...

-+  pwned

-+  fatal: Could not read from remote repository.

-+  

-+  Please make sure you have the correct access rights

-+  and the repository exists.

-+  updating to branch default

-+  cloning subrepo s from ext::sh -c echo% pwned% >&2

-+  abort: git clone error 128 in s (in subrepo s)

-+  [255]

deleted file mode 100644

@@ -1,50 +0,0 @@

-+++ b/hgext/convert/git.py	Tue Mar 22 17:05:11 2016 -0700

-@@ -11,7 +11,7 @@

- from mercurial.node import hex, nullid

- from mercurial.i18n import _

- 

--from common import NoRepo, commit, converter_source, checktool

-+from common import NoRepo, commit, converter_source, checktool, commandline

- 

- class submodule(object):

-     def __init__(self, path, node, url):

-@@ -25,7 +25,7 @@

-     def hgsubstate(self):

-         return "%s %s" % (self.node, self.path)

- 

--class convert_git(converter_source):

-+class convert_git(converter_source, commandline):

-     # Windows does not support GIT_DIR= construct while other systems

-     # cannot remove environment variable. Just assume none have

-     # both issues.

-@@ -71,6 +71,21 @@

-         def gitpipe(self, s):

-             return util.popen3('GIT_DIR=%s %s' % (self.path, s))

- 

-+    def _gitcmd(self, cmd, *args, **kwargs):

-+        return cmd('--git-dir=%s' % self.path, *args, **kwargs)

-+

-+    def gitrun0(self, *args, **kwargs):

-+        return self._gitcmd(self.run0, *args, **kwargs)

-+

-+    def gitrun(self, *args, **kwargs):

-+        return self._gitcmd(self.run, *args, **kwargs)

-+

-+    def gitrunlines0(self, *args, **kwargs):

-+        return self._gitcmd(self.runlines0, *args, **kwargs)

-+

-+    def gitrunlines(self, *args, **kwargs):

-+        return self._gitcmd(self.runlines, *args, **kwargs)

-+

-     def popen_with_stderr(self, s):

-         p = subprocess.Popen(s, shell=True, bufsize=-1,

-                              close_fds=util.closefds,

-@@ -88,6 +103,7 @@

- 

-     def __init__(self, ui, path, revs=None):

-         super(convert_git, self).__init__(ui, path, revs=revs)

-+        commandline.__init__(self, ui, 'git')

- 

-         if os.path.isdir(path + "/.git"):

-             path += "/.git"

deleted file mode 100644

@@ -1,173 +0,0 @@

-+++ b/hgext/convert/git.py	Tue Mar 22 17:05:11 2016 -0700

-@@ -115,13 +115,13 @@

-         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 = []

- 

-         checktool('git', 'git')

- 

-@@ -136,14 +136,14 @@

- 

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

-@@ -203,7 +203,7 @@

-                 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 @@

-             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 @@

-         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" % (

--            self.simopt, version))

-+        cmd = ['diff-tree','-z', '--root', '-m', '-r'] + 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

- 

-@@ -298,8 +300,6 @@

-                     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]:

-@@ -345,17 +345,23 @@

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

--                          err=subprocess.STDOUT)

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

-+

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

-@@ -363,8 +369,6 @@

-             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:

-@@ -381,18 +385,20 @@

-     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 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 '

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

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

--        if fh.close():

--            raise error.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

- 

-@@ -412,8 +418,8 @@

-         ])

- 

-         try:

--            fh = self.gitopen('git show-ref', err=subprocess.PIPE)

--            for line in fh:

-+            output, status = self.gitrunlines('show-ref')

-+            for line in output:

-                 line = line.strip()

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

-                 # Process each type of branch

-+++ b/tests/test-convert-git.t	Tue Mar 22 17:05:11 2016 -0700

-@@ -714,7 +714,7 @@

-   $ 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

- 

deleted file mode 100644

@@ -1,59 +0,0 @@

-+++ b/hgext/convert/git.py	Tue Mar 22 17:05:11 2016 -0700

-@@ -30,23 +30,6 @@

-     # cannot remove environment variable. Just assume none have

-     # both issues.

-     if util.safehasattr(os, 'unsetenv'):

--        def gitopen(self, s, err=None):

--            prevgitdir = os.environ.get('GIT_DIR')

--            os.environ['GIT_DIR'] = self.path

--            try:

--                if err == subprocess.PIPE:

--                    (stdin, stdout, stderr) = util.popen3(s)

--                    return stdout

--                elif err == subprocess.STDOUT:

--                    return self.popen_with_stderr(s)

--                else:

--                    return util.popen(s, 'rb')

--            finally:

--                if prevgitdir is None:

--                    del os.environ['GIT_DIR']

--                else:

--                    os.environ['GIT_DIR'] = prevgitdir

--

-         def gitpipe(self, s):

-             prevgitdir = os.environ.get('GIT_DIR')

-             os.environ['GIT_DIR'] = self.path

-@@ -59,15 +42,6 @@

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

- 

-@@ -86,16 +60,6 @@

-     def gitrunlines(self, *args, **kwargs):

-         return self._gitcmd(self.runlines, *args, **kwargs)

- 

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

deleted file mode 100644

@@ -1,55 +0,0 @@

-+++ b/hgext/convert/common.py	Tue Mar 22 17:05:11 2016 -0700

-@@ -341,6 +341,9 @@

-     def _run2(self, cmd, *args, **kwargs):

-         return self._dorun(util.popen2, cmd, *args, **kwargs)

- 

-+    def _run3(self, cmd, *args, **kwargs):

-+        return self._dorun(util.popen3, cmd, *args, **kwargs)

-+

-     def _dorun(self, openfunc, cmd,  *args, **kwargs):

-         cmdline = self._cmdline(cmd, *args, **kwargs)

-         self.ui.debug('running: %s\n' % (cmdline,))

-+++ b/hgext/convert/git.py	Tue Mar 22 17:05:11 2016 -0700

-@@ -29,21 +29,6 @@

-     # 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 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 gitpipe(self, s):

--            return util.popen3('GIT_DIR=%s %s' % (self.path, s))

- 

-     def _gitcmd(self, cmd, *args, **kwargs):

-         return cmd('--git-dir=%s' % self.path, *args, **kwargs)

-@@ -60,6 +45,9 @@

-     def gitrunlines(self, *args, **kwargs):

-         return self._gitcmd(self.runlines, *args, **kwargs)

- 

-+    def gitpipe(self, *args, **kwargs):

-+        return self._gitcmd(self._run3, *args, **kwargs)

-+

-     def gitread(self, s):

-         fh = self.gitopen(s)

-         data = fh.read()

-@@ -92,7 +80,7 @@

-         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:

deleted file mode 100644

@@ -1,23 +0,0 @@

-+++ b/tests/test-convert-git.t	Tue Mar 22 17:27:27 2016 -0700

-@@ -729,3 +729,20 @@

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

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

-   abort: cannot read changes in 1c0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd

-+

-+test for escaping the repo name (CVE-2016-3069)

-+

-+  $ git init '`echo pwned >COMMAND-INJECTION`'

-+  Initialized empty Git repository in $TESTTMP/`echo pwned >COMMAND-INJECTION`/.git/

-+  $ cd '`echo pwned >COMMAND-INJECTION`'

-+  $ git commit -q --allow-empty -m 'empty'

-+  $ cd ..

-+  $ hg convert '`echo pwned >COMMAND-INJECTION`' 'converted'

-+  initializing destination converted repository

-+  scanning source...

-+  sorting...

-+  converting...

-+  0 empty

-+  updating bookmarks

-+  $ test -f COMMAND-INJECTION

-+  [1]

deleted file mode 100644

@@ -1,62 +0,0 @@

-+++ b/hgext/convert/git.py  Wed Apr 06 22:57:46 2016 -0500

-@@ -57,6 +57,10 @@ class convert_git(converter_source, commandline):

-         super(convert_git, self).__init__(ui, path, revs=revs)

-         commandline.__init__(self, ui, 'git')

- 

-+        # Pass an absolute path to git to prevent from ever being interpreted

-+        # as a URL

-+        path = os.path.abspath(path)

-+

-         if os.path.isdir(path + "/.git"):

-             path += "/.git"

-         if not os.path.exists(path + "/objects"):

-

-+++ b/tests/test-convert-git.t  Wed Apr 06 22:57:46 2016 -0500

-@@ -714,7 +714,7 @@

-   $ 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 retrieve number of commits in git-repo4/.git

-+  abort: cannot retrieve number of commits in $TESTTMP/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

- 

-@@ -746,3 +746,21 @@ test for escaping the repo name (CVE-2016-3069)

-   updating bookmarks

-   $ test -f COMMAND-INJECTION

-   [1]

-+

-+test for safely passing paths to git (CVE-2016-3105)

-+

-+  $ git init 'ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #'

-+  Initialized empty Git repository in $TESTTMP/ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #/.git/

-+  $ cd 'ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #'

-+  $ git commit -q --allow-empty -m 'empty'

-+  $ cd ..

-+  $ hg convert 'ext::sh -c echo% pwned% >GIT-EXT-COMMAND-INJECTION% #' 'converted-git-ext'

-+  initializing destination converted-git-ext repository

-+  scanning source...

-+  sorting...

-+  converting...

-+  0 empty

-+  updating bookmarks

-+  $ test -f GIT-EXT-COMMAND-INJECTION

-+  [1]

-+

-

-

-+++ b/tests/test-convert.t  Wed Apr 06 22:57:46 2016 -0500

-@@ -422,7 +422,7 @@

-   assuming destination emptydir-hg

-   initializing destination emptydir-hg repository

-   emptydir does not look like a CVS checkout

--  emptydir does not look like a Git repository

-+  $TESTTMP/emptydir does not look like a Git repository

-   emptydir does not look like a Subversion repository

-   emptydir is not a local Mercurial repository

-   emptydir does not look like a darcs repository

-

-

deleted file mode 100644

@@ -1,96 +0,0 @@

-

-+++ b/contrib/hg-ssh	Wed Apr 12 11:23:55 2017 -0700

-@@ -32,7 +32,7 @@ command="hg-ssh --read-only repos/*"

- # enable importing on demand to reduce startup time

- from mercurial import demandimport; demandimport.enable()

- 

--from mercurial import dispatch

-+from mercurial import dispatch, ui as uimod

- 

- import sys, os, shlex

- 

-@@ -61,14 +61,15 @@ def main():

-         repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path)))

-         if repo in allowed_paths:

-             cmd = ['-R', repo, 'serve', '--stdio']

-+            req = dispatch.request(cmd)

-             if readonly:

--                cmd += [

--                    '--config',

--                    'hooks.pretxnopen.hg-ssh=python:__main__.rejectpush',

--                    '--config',

--                    'hooks.prepushkey.hg-ssh=python:__main__.rejectpush'

--                    ]

--            dispatch.dispatch(dispatch.request(cmd))

-+                if not req.ui:

-+                    req.ui = uimod.ui.load()

-+                req.ui.setconfig('hooks', 'pretxnopen.hg-ssh',

-+                                 'python:__main__.rejectpush', 'hg-ssh')

-+                req.ui.setconfig('hooks', 'prepushkey.hg-ssh',

-+                                 'python:__main__.rejectpush', 'hg-ssh')

-+            dispatch.dispatch(req)

-         else:

-             sys.stderr.write('Illegal repository "%s"\n' % repo)

-             sys.exit(255)

-+++ b/mercurial/dispatch.py	Wed Apr 12 11:23:55 2017 -0700

-@@ -155,6 +155,37 @@ def _runcatch(req):

-         pass # happens if called in a thread

- 

-     def _runcatchfunc():

-+        realcmd = None

-+        try:

-+            cmdargs = fancyopts.fancyopts(req.args[:], commands.globalopts, {})

-+            cmd = cmdargs[0]

-+            aliases, entry = cmdutil.findcmd(cmd, commands.table, False)

-+            realcmd = aliases[0]

-+        except (error.UnknownCommand, error.AmbiguousCommand,

-+                IndexError, getopt.GetoptError):

-+            # Don't handle this here. We know the command is

-+            # invalid, but all we're worried about for now is that

-+            # it's not a command that server operators expect to

-+            # be safe to offer to users in a sandbox.

-+            pass

-+        if realcmd == 'serve' and '--stdio' in cmdargs:

-+            # We want to constrain 'hg serve --stdio' instances pretty

-+            # closely, as many shared-ssh access tools want to grant

-+            # access to run *only* 'hg -R $repo serve --stdio'. We

-+            # restrict to exactly that set of arguments, and prohibit

-+            # any repo name that starts with '--' to prevent

-+            # shenanigans wherein a user does something like pass

-+            # --debugger or --config=ui.debugger=1 as a repo

-+            # name. This used to actually run the debugger.

-+            if (len(req.args) != 4 or

-+                req.args[0] != '-R' or

-+                req.args[1].startswith('--') or

-+                req.args[2] != 'serve' or

-+                req.args[3] != '--stdio'):

-+                raise error.Abort(

-+                    _('potentially unsafe serve --stdio invocation: %r') %

-+                    (req.args,))

-+

-         try:

-             debugger = 'pdb'

-             debugtrace = {

-+++ b/tests/test-ssh.t	Wed Apr 12 11:23:55 2017 -0700

-@@ -356,6 +356,18 @@ Test (non-)escaping of remote paths with spaces when cloning (issue3145):

-   destination directory: a repo

-   abort: destination 'a repo' is not empty

-   [255]

-+Make sure hg is really paranoid in serve --stdio mode. It used to be

-+possible to get a debugger REPL by specifying a repo named --debugger.

-+  $ hg -R --debugger serve --stdio

-+  abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio']

-+  [255]

-+  $ hg -R --config=ui.debugger=yes serve --stdio

-+  abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio']

-+  [255]

-+Abbreviations of 'serve' also don't work, to avoid shenanigans.

-+  $ hg -R narf serv --stdio

-+  abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio']

-+  [255]

- 

- Test hg-ssh using a helper script that will restore PYTHONPATH (which might

- have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right

@@ -1,21 +1,20 @@

 %{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

-Summary:    A free, distributed source control management tool.

-Name:       mercurial

-Version:    4.1

-Release:    4%{?dist}

-License:    GPLv2+

-URL:        https://www.ruby-lang.org/en/

-Group:      System Environment/Security

-Vendor:     VMware, Inc.

-Distribution: Photon

-Source0:    http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz

-%define sha1 mercurial=d5f88e05cbbd8f13dd5fc4004433f54435fc27c8

-Patch0:         hg-CVE-2017-9462.patch

-BuildRequires: python2

-BuildRequires: python2-libs

-BuildRequires: python2-devel

-Requires:      python2

+Summary:        A free, distributed source control management tool.

+Name:           mercurial

+Version:        4.3.3

+Release:        1%{?dist}

+License:        GPLv2+

+URL:            https://www.mercurial-scm.org

+Group:          System Environment/Security

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        https://www.mercurial-scm.org/release/%{name}-%{version}.tar.gz

+%define sha1    mercurial=921c3c6302c4b1d4be6a56fcfa0a41553dd4bd44

+BuildRequires:  python2

+BuildRequires:  python2-libs

+BuildRequires:  python2-devel

+Requires:       python2

 %description

 Mercurial is a distributed source control management tool similar to Git and Bazaar.

@@ -23,7 +22,6 @@ Mercurial is written in Python and is used by projects such as Mozilla and Vim.

 %prep

 %setup -q

-%patch0 -p1

 %build

 make build

@@ -59,6 +57,8 @@ rm -rf %{buildroot}/*

 %{python2_sitelib}/*

 %changelog

+*   Tue Oct 17 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-1

+-   Update verion to 4.3.3 for CVE-2017-1000115, CVE-2017-1000116.

 *   Fri Aug 11 2017 Rongrong Qiu <rqiu@vmware.com> 4.1-4

 -   update error info in make check for bug 1900338

 *   Fri Jun 16 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.1-3