1713490 - Cross-channel generation broken on 2021-05-30

Status: RESOLVED FIXED

(Localization Infrastructure and Tools :: General, defect)

Description

[Francesco Lodolo [:flod]]

Running cross-channel generation creates a traceback

Traceback (most recent call last):
  File "/usr/lib/python3.8/runpy.py", line 194, in _run_module_as_main
    return _run_code(code, main_globals, None,
  File "/usr/lib/python3.8/runpy.py", line 87, in _run_code
    exec(code, run_globals)
  File "/home/flodolo/src/cross-channel-experimental/initial/cli/create.py", line 64, in <module>
    i.commit_revisions(src_repo, target, revisions)
  File "/home/flodolo/src/cross-channel-experimental/initial/__init__.py", line 553, in commit_revisions
    cw.walkGraph()
  File "/home/flodolo/src/version-control-tools/cross-channel-l10n/mozxchannel/graph.py", line 202, in walkGraph
    self.handlerev(src_rev)
  File "/home/flodolo/src/cross-channel-experimental/initial/__init__.py", line 398, in handlerev
    ms = mergemod.mergestate.read(self.target)
AttributeError: module 'mercurial.merge' has no attribute 'mergestate'
Traceback (most recent call last):
  File "/usr/lib/python3.8/runpy.py", line 194, in _run_module_as_main
    return _run_code(code, main_globals, None,
  File "/usr/lib/python3.8/runpy.py", line 87, in _run_code
    exec(code, run_globals)
  File "/home/flodolo/src/cross-channel-experimental/initial/cli/automate.py", line 138, in <module>
    subprocess.check_call(cmd)
  File "/usr/lib/python3.8/subprocess.py", line 364, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['python', '-m', 'initial.cli.create', '-R/home/flodolo/src/mozilla-central', '--repo-name=mozilla-central', '-R/home/flodolo/src/mozilla-central', '--repo-name=releases/mozilla-beta', '-R/home/flodolo/src/mozilla-central', '--repo-name=releases/mozilla-release', '-R/home/flodolo/src/mozilla-central', '--repo-name=releases/mozilla-esr78', '../output', 'mozilla-central', '16915d90a511634cd1ed18d5e98dd81e0994b1ef', 'browser/locales/l10n.toml', 'mobile/android/locales/l10n.toml']' returned non-zero exit status 1.

Running it a second time generates content, but it's absolutely unclear in what state the repository is.

Comment 1

[Francesco Lodolo [:flod]]

Yep, this is broken

abort: push creates new remote head b14d9ac58bee
(merge or see 'hg help push' for details about pushing new heads)

Comment 2

[Francesco Lodolo [:flod]]

Given there was some urgent content, I pushed changes using code from bug 1659691
https://hg.mozilla.org/l10n/gecko-strings/rev/d4e73bb9e72a74a9f767886bbab07bedad803dbe
https://hg.mozilla.org/l10n/gecko-strings/rev/28badc57c567d634c4cd45a0f8dc0a30fe8716ed