1666520 - hg push fails in firefoxtree prepushoutgoinghook

Status: RESOLVED FIXED

(Developer Services :: Mercurial: firefoxtree, defect)

Description

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

I've run ./mach bootstrap.

hg --version > Mercurial Distributed SCM (version 5.1.1)

hg log of version-control-tools
changeset:   7610:d200c669f83a
bookmark:    @
tag:         tip
user:        Peter Van der Beken <[e-mail]>
date:        Mon Sep 21 20:41:15 2020 +0000
summary:     Bug 1666342 - Add Andrew Sutherland to the WebIDL hook. r=sheehan

   File "/usr/local/Cellar/mercurial/5.1.1_2/lib/python2.7/site-packages/mercurial/util.py", line 3129, in __call__
    results.append(hook(*args))
  File "/Users/tritter/.mozbuild/version-control-tools/hgext/firefoxtree/__init__.py", line 343, in prepushoutgoinghook
    if len(outgoing.ancestorsof) > 1:
AttributeError: 'outgoing' object has no attribute 'ancestorsof'

Comment 1

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

dir(outgoing) shows ['__class__', '__delattr__', '__dict__', '__doc__', '__format__', '__getattribute__', '__hash__', '__init__', '__module__', '__new__', '__reduce__', '__reduce_ex__', '__repr__', '__setattr__', '__sizeof__', '__str__', '__subclasshook__', '__weakref__', '_common', '_computecommonmissing', '_missing', '_revlog', 'common', 'commonheads', 'excluded', 'missing', 'missingheads']

Comment 2

[Connor Sheehan [:sheehan]]

Regressed by 60d9824ff108c6.

Forgot to add a compatibility shim for older versions of hg.

Comment 3

[Connor Sheehan [:sheehan]]

Attachment: firefoxtree: add compatibility branch so older versions of Mercurial still work (Bug 1666520) r?zeid

missingheads was renamed to ancestorsof in newer versions of Mercurial,
but the patch from 60d9824ff108c6 does not take the older variable name into
account. Add a check for the attribute so both variable names work in the
prepushoutgoinghook.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/1cec2d7c777b
firefoxtree: add compatibility branch so older versions of Mercurial still work r=zeid