1431005 - `hg push` fails with Mercurial 4.5 due to TypeError: __init__() got an unexpected keyword argument 'memctx'

Status: RESOLVED FIXED

(MozReview Graveyard :: Integration: Mercurial, enhancement)

Description

[Gregory Szorc [:gps]]

`hg push` to MozReview fails with Mercurial 4.5 due to an upstream API change.

Here's a traceback fragment:

  File "/home/gps/.mozbuild/version-control-tools/hgext/reviewboard/client.py", line 316, in wrappedpush
    newbranch=False, **kwargs)
  File "/home/gps/.mozbuild/version-control-tools/hgext/reviewboard/client.py", line 375, in wrappedpush
    newbranch=newbranch, **kwargs)
  File "/home/gps/src/hgext/mutable-history/hgext3rd/evolve/__init__.py", line 841, in push
    return orig(repo, *args, **opts)
  File "/home/gps/lib/python/mercurial/exchange.py", line 473, in push
    _pushdiscovery(pushop)
  File "/home/gps/.mozbuild/version-control-tools/hgext/reviewboard/client.py", line 504, in wrappedpushdiscovery
    backuptopic='addcommitid')
  File "/home/gps/.mozbuild/version-control-tools/pylib/mozhg/mozhg/rewrite.py", line 201, in replacechangesets
    newnode = newctx.commit()
  File "/home/gps/lib/python/mercurial/context.py", line 2493, in commit
    return self._repo.commitctx(self)
  File "/home/gps/lib/python/mercurial/localrepo.py", line 142, in wrapper
    return orig(repo.unfiltered(), *args, **kwargs)
  File "/home/gps/lib/python/mercurial/localrepo.py", line 1917, in commitctx
    elif ctx.files():
  File "/home/gps/lib/python/mercurial/context.py", line 1425, in files
    return sorted(self._status.modified + self._status.added +
  File "/home/gps/lib/python/mercurial/util.py", line 933, in __get__
    result = self.func(obj)
  File "/home/gps/lib/python/mercurial/context.py", line 2541, in _status
    elif self[f]:
  File "/home/gps/lib/python/mercurial/context.py", line 99, in __getitem__
    return self.filectx(key)
  File "/home/gps/lib/python/mercurial/context.py", line 2489, in filectx
    return self._filectxfn(self._repo, self, path)
  File "/home/gps/lib/python/mercurial/context.py", line 2386, in getfilectx
    cache[path] = func(repo, memctx, path)
  File "/home/gps/.mozbuild/version-control-tools/pylib/mozhg/mozhg/rewrite.py", line 77, in filectxfn
    memctx=memctx)
TypeError: __init__() got an unexpected keyword argument 'memctx'

Comment 1

[Gregory Szorc [:gps]]

I /think/ this same bug prevents `mach try` from working, since that module also does some in-memory commits. What I'm not sure is whether it is using the same code.

Comment 2

[Phabricator Automation]

Comment on attachment 8946521 [details]
mozhg: adapt to new memfilectx API in Mercurial 4.5 (bug 1431005); r?glob

Byron Jones ‹:glob› has approved the revision.

https://phabricator.services.mozilla.com/D505

Comment 3

[Phabricator Automation]

Comment on attachment 8946521 [details]
mozhg: adapt to new memfilectx API in Mercurial 4.5 (bug 1431005); r?glob

Byron Jones ‹:glob› has approved the revision.

https://phabricator.services.mozilla.com/D505#11298

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/dc659492e299
mozhg: adapt to new memfilectx API in Mercurial 4.5 ; r=glob

Comment 5

[Phabricator Automation]

Comment on attachment 8946519 [details]
mozhg: remove unused import (bug 1431005); r=glob

Byron Jones ‹:glob› has approved the revision.

https://phabricator.services.mozilla.com/D503

Comment 6

[Phabricator Automation]

Comment on attachment 8946519 [details]
mozhg: remove unused import (bug 1431005); r=glob

Byron Jones ‹:glob› has approved the revision.

https://phabricator.services.mozilla.com/D503#11441

Comment 7

[Phabricator Automation]

Comment on attachment 8946520 [details]
mozhg: use preferred import style (bug 1431005); r=glob

Byron Jones ‹:glob› has approved the revision.

https://phabricator.services.mozilla.com/D504#11443

Comment 8

[Phabricator Automation]

Comment on attachment 8946522 [details]
overlay: port to Mercurial 4.5 (bug 1431005); r=glob

Byron Jones ‹:glob› has approved the revision.

https://phabricator.services.mozilla.com/D506#11445

Comment 9

[Phabricator Automation]

Comment on attachment 8946523 [details]
overlay: mark as compatible with Mercurial 4.5 (bug 1431005); r=glob

Byron Jones ‹:glob› has approved the revision.

https://phabricator.services.mozilla.com/D507#11447

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/c5214468971e
mozhg: remove unused import ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/ec01696b21e6
mozhg: use preferred import style ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/6e84610815c5
overlay: port to Mercurial 4.5 ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/8e6faf7e259c
overlay: mark as compatible with Mercurial 4.5 ; r=glob