Closed Bug 1482325 Opened 7 years ago Closed 7 years ago

mozext is not compatible with mercurial 4.7

Categories

(Developer Services :: Mercurial: mozext, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: glandium, Unassigned)

References

Details

Attachments

(2 files)

** Unknown exception encountered with possibly-broken third-party extension firefoxtree ** which supports versions 4.6 of Mercurial. ** Please disable firefoxtree and try your action again. ** If that fixes the bug please report it to https://bugzilla.mozilla.org/enter_bug.cgi?product=Dev ** Python 2.7.15 (default, Jul 28 2018, 11:29:29) [GCC 8.1.0] ** Mercurial Distributed SCM (version 4.7) ** Extensions loaded: share, rebase, purge, strip, mq, graphlog, transplant, patchbomb, record, fir Traceback (most recent call last): File "/usr/bin/hg", line 41, in <module> dispatch.run() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 90, in run status = dispatch(req) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 213, in dispatch ret = _runcatch(req) or 0 File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 354, in _runcatch return _callcatch(ui, _runcatchfunc) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 362, in _callcatch return scmutil.callcatch(ui, func) File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 161, in callcatch return func() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 344, in _runcatchfunc return _dispatch(req) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 984, in _dispatch cmdpats, cmdoptions) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 730, in runcommand ret = _runcommand(ui, options, cmd, d) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 992, in _runcommand return cmdfunc() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 981, in <lambda> d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1530, in check return func(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1530, in check return func(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3600, in mqcommand return orig(ui, repo, *args, **kwargs) File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1530, in check return func(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 3639, in log displayfn(ui, repo, revs, displayer, getrenamed) File "/usr/lib/python2.7/dist-packages/mercurial/logcmdutil.py", line 897, in displayrevs displayer.show(ctx, copies=copies) File "/usr/lib/python2.7/dist-packages/mercurial/logcmdutil.py", line 186, in show self._show(ctx, copies, props) File "/usr/lib/python2.7/dist-packages/mercurial/logcmdutil.py", line 460, in _show self.ui.write(self.t.render(key, props)) File "/usr/lib/python2.7/dist-packages/mercurial/templater.py", line 926, in render return b''.join(self.generate(t, mapping)) File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1439, in increasingchunks for chunk in source: File "/usr/lib/python2.7/dist-packages/mercurial/templateutil.py", line 659, in flatten for i in thing: File "/usr/lib/python2.7/dist-packages/mercurial/templateutil.py", line 848, in runtemplate yield evalrawexp(context, mapping, arg) File "/usr/lib/python2.7/dist-packages/mercurial/templateutil.py", line 707, in evalrawexp return func(context, mapping, data) File "/usr/lib/python2.7/dist-packages/mercurial/templateutil.py", line 836, in runsymbol return v(**pycompat.strkwargs(props)) File "/home/glandium/mozilla/version-control-tools/hgext/mozext/__init__.py", line 1291, in template_firstpushdate return util.makedate(pushes[0][2]) AttributeError: 'module' object has no attribute 'makedate'
Note that interestingly, mercurial thinks the problem is in firefoxtree, when the exception clearly comes from mozext...
Blocks: hg47
This commit makes mozext template keywords wrap output in `hybridlist` wrappers on modern versions of Mercurial. This also makes mozext tests pass under version 4.7, so we mark as compatible.
The tests pass for mozext, but this failure was mentioned in the bug report for the bug. We must be missing some test coverage here.
Pushed by gszorc@mozilla.com: https://hg.mozilla.org/hgcustom/version-control-tools/rev/8624be27fa49 mozext: wrap relevant output in `template.hybridlist` r=gps https://hg.mozilla.org/hgcustom/version-control-tools/rev/4746932b4cf6 mozext: use `makedate` from new module on modern Mercurial r=gps
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: