Mercurial > hg > truffle

comparison mxtool/mx.py @ 12504:1d68b3962a10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied autoformat
author Doug Simon <doug.simon@oracle.com>
date Mon, 21 Oct 2013 18:16:37 +0200
parents 11f217e8476a
children 5cde653f58f9
comparison
equal deleted inserted replaced
12503:d7f8dd4fe876 12504:1d68b3962a10
888 if importMxDir is None: 888 if importMxDir is None:
889 abort('import ' + suite_import.name + ' not found') 889 abort('import ' + suite_import.name + ' not found')
890 suite.imports.append(suite_import) 890 suite.imports.append(suite_import)
891 imported_suite = _loadSuite(importMxDir, False) 891 imported_suite = _loadSuite(importMxDir, False)
892 if imported_suite.version != suite.version: 892 if imported_suite.version != suite.version:
893 warn('import version of ' + imported_suite.name +' does not match tip of ' + suite.version) 893 warn('import version of ' + imported_suite.name + ' does not match tip of ' + suite.version)
894 894
895 def _load_imports(self): 895 def _load_imports(self):
896 self._visit_imports(self._find_and_loadsuite) 896 self._visit_imports(self._find_and_loadsuite)
897 897
898 def _load_env(self): 898 def _load_env(self):
4116 4116
4117 def _hgtip(s, abortOnError=True): 4117 def _hgtip(s, abortOnError=True):
4118 try: 4118 try:
4119 version = subprocess.check_output(['hg', 'tip', '-R', s.dir, '--template', '{node}']) 4119 version = subprocess.check_output(['hg', 'tip', '-R', s.dir, '--template', '{node}'])
4120 if s.version is not None and s.version != version: 4120 if s.version is not None and s.version != version:
4121 abort('version of suite ' + s.name +' has changed during run') 4121 abort('version of suite ' + s.name + ' has changed during run')
4122 return version 4122 return version
4123 except subprocess.CalledProcessError: 4123 except subprocess.CalledProcessError:
4124 if abortOnError: 4124 if abortOnError:
4125 abort('failed to get tip revision id') 4125 abort('failed to get tip revision id')
4126 else: 4126 else: