graal-compiler: mxtool/mx.py comparison

comparison mxtool/mx.py @ 12508:5cde653f58f9

mxtool: handle missing hg executable gracefully

author	Mick Jordan <mick.jordan@oracle.com>
date	Mon, 21 Oct 2013 15:14:43 -0700
parents	1d68b3962a10
children	21aa1ce5c666 8ee3a8dd762e

comparison

equal deleted inserted replaced

-:d72864a2886e
+:5cde653f58f9
 _dst_suitemodel = None
 _opts = None
 _java = None
 _check_global_structures = True  # can be set False to allow suites with duplicate definitions to load without aborting
 _warn = False
+_hg = None
 """
 A distribution is a jar or zip file containing the output from one or more Java projects.
 """
 if not includeLibs or not includeSelf:
 return deps
 deps.append(self)
 return deps
+class HgConfig:
+"""
+Encapsulates access to Mercurial (hg)
+"""
+def __init__(self):
+self.missing = 'no hg executable found'
+try:
+subprocess.check_output(['hg'])
+self.has_hg = True
+except OSError:
+self.has_hg = False
+warn(self.missing)
+def _check(self, abortOnFail=True):
+if not self.has_hg:
+if abortOnFail:
+abort(self.missing)
+else:
+warn(self.missing)
+return self.has_hg
+def _tip(self, s, abortOnError=True):
+if not self.has_hg:
+return None
+try:
+version = subprocess.check_output(['hg', 'tip', '-R', s.dir, '--template', '{node}'])
+if s.version is not None and s.version != version:
+abort('version of suite ' + s.name +' has changed during run')
+return version
+except subprocess.CalledProcessError:
+if abortOnError:
+abort('failed to get tip revision id')
+else:
+return None
+def _canpush(self, s, strict=True):
+try:
+output = subprocess.check_output(['hg', '-R', s.dir, 'status'])
+# super strict
+return output == ''
+except subprocess.CalledProcessError:
+return False
+def _default_push(self, sdir):
+with open(join(sdir, '.hg', 'hgrc')) as f:
+for line in f:
+line = line.rstrip()
+if line.startswith('default = '):
+return line[len('default = '):]
+return None
 class SuiteModel:
 """
 Defines how to locate a URL/path for a suite, including imported suites.
 Conceptually a SuiteModel is defined by a primary suite URL/path and a
 map from suite name to URL/path for imported suites.
 src_suitemodel_arg = _get_argvalue(arg, args, i + 1)
 elif arg == '--dst-suitemodel':
 dst_suitemodel_arg = _get_argvalue(arg, args, i + 1)
 elif arg == '--suitemap':
 suitemap_arg = _get_argvalue(arg, args, i + 1)
+elif arg == '-w':
+# to get warnings on suite loading issues before command line is parsed
+global _warn
+_warn = True
 i = i + 1
 global _src_suitemodel
 _src_suitemodel = SuiteModel._set_suitemodel(src_suitemodel_arg, suitemap_arg)
 global _dst_suitemodel
 @staticmethod
 def _tostring(name, version):
 return name + ',' + version
-def _self_tostring(self):
+def __str__(self):
 return self.name + ',' + self.version
 class Suite:
 def __init__(self, mxDir, primary, load=True):
 self.dir = dirname(mxDir)
 self.dists = []
 self.imports = []
 self.commands = None
 self.primary = primary
 self.name = _suitename(mxDir)  # validated in _load_projects
-self.version = None  # _hgtip checks current version if not None
+self.version = None  # _hg._tip checks current version if not None
-self.version = _hgtip(self, False)
+self.version = _hg._tip(self, False)
 if load:
 # load suites bottom up to make sure command overriding works properly
 self._load_imports()
 self._load_env()
 self._load_commands()
 if importMxDir is None:
 abort('import ' + suite_import.name + ' not found')
 suite.imports.append(suite_import)
 imported_suite = _loadSuite(importMxDir, False)
 if imported_suite.version != suite.version:
-warn('import version of ' + imported_suite.name + ' does not match tip of ' + suite.version)
+warn('import version of ' + imported_suite.name +' does not match tip of ' + suite.version)
 def _load_imports(self):
 self._visit_imports(self._find_and_loadsuite)
 def _load_env(self):
 return kwargs.pop(0)
 return None
 def sclone(args):
 """clone a suite repository, and its imported suites"""
+_hg._check(True)
 parser = ArgumentParser(prog='mx sclone')
 parser.add_argument('--source', help='url/path of repo containing suite', metavar='<url>')
 parser.add_argument('--dest', help='destination directory (default basename of source)', metavar='<path>')
 parser.add_argument("--no-imports", action='store_true', help='do not clone imported suites')
 parser.add_argument('nonKWArgs', nargs=REMAINDER, metavar='source [dest]...')
 _sclone(importee_source, importee_dest, suite_import.version, False)
 # _clone handles the recursive visit of the new imports
 def scloneimports(args):
 """clone the imports of an existing suite"""
+_hg._check(True)
 parser = ArgumentParser(prog='mx scloneimports')
 parser.add_argument('--source', help='url/path of repo containing suite', metavar='<url>')
 parser.add_argument('nonKWArgs', nargs=REMAINDER, metavar='source [dest]...')
 args = parser.parse_args(args)
 # check for non keyword args
 if not os.path.isdir(args.source):
 abort(args.source + ' is not a directory')
 s = _scloneimports_suitehelper(args.source)
-default_path = _hgdefault_push(args.source)
+default_path = _hg._default_push(args.source)
 if default_path is None:
 abort('no default path in ' + join(args.source, '.hg', 'hgrc'))
 # We can now set the primary dir for the dst suitemodel
 dest = _dst_suitemodel._importee_dir(dest, suite_import.name)
 _spush(suite(suite_import.name), suite_import, dest, checks, clonemissing)
 def _spush_check_import_visitor(s, suite_import, **extra_args):
 """push check visitor for Suite._visit_imports"""
-currentTip = _hgtip(suite(suite_import.name))
+currentTip = _hg._tip(suite(suite_import.name))
 if currentTip != suite_import.version:
 abort('import version of ' + suite_import.name + ' in suite ' + s.name + ' does not match tip')
 def _spush(s, suite_import, dest, checks, clonemissing):
 if checks:
-if not _hgcanpush(s):
+if not _hg._canpush(s):
 abort('working directory ' + s.dir + ' contains uncommitted changes, push aborted')
 # check imports first
 if checks:
 s._visit_imports(_spush_check_import_visitor)
 cmd.append(dest)
 run(cmd)
 def spush(args):
 """push primary suite and all its imports"""
+_hg._check(True)
 parser = ArgumentParser(prog='mx spush')
 parser.add_argument('--dest', help='url/path of repo to push to (default as per hg push)', metavar='<path>')
 parser.add_argument('--no-checks', action='store_true', help='checks on status, versions are disabled')
 parser.add_argument('--clonemissing', action='store_true', help='clone missing imported repos at destination (forces --no-checks)')
 parser.add_argument('nonKWArgs', nargs=REMAINDER, metavar='source [dest]...')
 args.nochecks = True
 if args.dest is not None:
 _dst_suitemodel._set_primary_dir(args.dest)
-_spush(s, None, args.dest, not args.nochecks, args.clonemissing)
+_spush(s, None, args.dest, not args.no_checks, args.clonemissing)
 def _supdate_import_visitor(s, suite_import, **extra_args):
 _supdate(suite(suite_import.name), suite_import)
 def _supdate(s, suite_import):
 run(['hg', '-R', s.dir, 'update'])
 def supdate(args):
 """update primary suite and all its imports"""
+_hg._check(True)
 s = _check_primary_suite()
 _supdate(s, None)
 def _scheck_imports_visitor(s, suite_import, update_versions, updated_imports):
 def _scheck_imports(s, suite_import, update_versions, updated_imports):
 # check imports recursively
 s._visit_imports(_scheck_imports_visitor, update_versions=update_versions)
-currentTip = _hgtip(s)
+currentTip = _hg._tip(s)
 if currentTip != suite_import.version:
 print('import version of ' + s.name + ' does not match tip' + (': updating' if update_versions else ''))
 if update_versions:
 suite_import.version = currentTip
-line = suite_import._self_tostring()
+line = str(suite_import)
 updated_imports.write(line + '\n')
 def scheckimports(args):
 """check that suite import versions are up to date"""
 parser = ArgumentParser(prog='mx scheckimports')
 parser.add_argument('--update-versions', help='update imported version ids', action='store_true')
 args = parser.parse_args(args)
 _check_primary_suite()._visit_imports(_scheck_imports_visitor, update_versions=args.update_versions)
-def _hgtip(s, abortOnError=True):
-try:
-version = subprocess.check_output(['hg', 'tip', '-R', s.dir, '--template', '{node}'])
-if s.version is not None and s.version != version:
-abort('version of suite ' + s.name + ' has changed during run')
-return version
-except subprocess.CalledProcessError:
-if abortOnError:
-abort('failed to get tip revision id')
-else:
-return None
-def _hgcanpush(s):
-try:
-output = subprocess.check_output(['hg', '-R', s.dir, 'status'])
-# super strict
-return output == ''
-except subprocess.CalledProcessError:
-return False
-def _hgdefault_push(sdir):
-with open(join(sdir, '.hg', 'hgrc')) as f:
-for line in f:
-line = line.rstrip()
-if line.startswith('default = '):
-return line[len('default = '):]
-return None
 def _spull_import_visitor(s, suite_import, update_versions, updated_imports):
 """pull visitor for Suite._visit_imports"""
 _spull(suite(suite_import.name), update_versions, updated_imports)
 def _spull(s, update_versions, updated_imports):
+_hg._check(True)
 # pull imports first
 s._visit_imports(_spull_import_visitor, update_versions=update_versions)
 run(['hg', '-R', s.dir, 'pull', '-u'])
 if update_versions and updated_imports is not None:
-tip = _hgtip(s)
+tip = _hg._tip(s)
 updated_imports.write(SuiteImport._tostring(s.name, tip) + '\n')
 def spull(args):
 """pull primary suite and all its imports"""
+_hg._check(True)
 parser = ArgumentParser(prog='mx spull')
 parser.add_argument('--update-versions', action='store_true', help='update version ids of imported suites')
 args = parser.parse_args(args)
 _spull(_check_primary_suite(), args.update_versions, None)
 return None
 def main():
 SuiteModel._parse_options()
+global _hg
+_hg = HgConfig()
 primarySuiteMxDir = _findPrimarySuiteMxDir()
 if primarySuiteMxDir:
 _src_suitemodel._set_primary_dir(dirname(primarySuiteMxDir))
 global _mainSuite
 _mainSuite = _loadSuite(primarySuiteMxDir, True)

Mercurial > hg > graal-compiler

comparison mxtool/mx.py @ 12508:5cde653f58f9