Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 45f760e2a4c1 (bug 1583234) when causing linting failures CLOSED TREE

Browse Source
This commit is contained in:
Ciure Andrei 2019-10-01 00:20:12 +03:00
parent 16081f5205
commit c3cb84e1d5
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/mozbuild/mozbuild/artifacts.py
View File

@ -879,13 +879,6 @@ class Artifacts(object):
if self._log:
self._log(*args, **kwargs)
def run_hg(self, *args, **kwargs):
env = kwargs.get('env', {})
env['HGPLAIN'] = '1'
kwargs['env'] = env
return subprocess.check_output([self._hg] + list(args),
**kwargs)
def _guess_artifact_job(self):
# Add the "-debug" suffix to the guessed artifact job name
# if MOZ_DEBUG is enabled.
@ -992,10 +985,12 @@ class Artifacts(object):
# Mercurial updated the ordering of "last" in 4.3. We use revision
# numbers to order here to accommodate multiple versions of hg.
last_revs = self.run_hg('log', '--template', '{rev}:{node}\n',
last_revs = subprocess.check_output([
self._hg, 'log',
'--template', '{rev}:{node}\n',
'-r', 'last(public() and ::., {num})'.format(
num=NUM_REVISIONS_TO_QUERY),
cwd=self._topsrcdir).splitlines()
num=NUM_REVISIONS_TO_QUERY)
], cwd=self._topsrcdir).splitlines()
if len(last_revs) == 0:
raise Exception("""\
@ -1182,8 +1177,8 @@ see https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Source_Code
revision = None
try:
if self._hg:
revision = self.run_hg('log', '--template', '{node}\n', '-r', revset,
cwd=self._topsrcdir).strip()
revision = subprocess.check_output([self._hg, 'log', '--template', '{node}\n',
'-r', revset], cwd=self._topsrcdir).strip()
elif self._git:
revset = subprocess.check_output([
self._git, 'rev-parse', '%s^{commit}' % revset],