1485882 - Make unifyrepo compatible with Mercurial 4.7

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Connor Sheehan [:sheehan]]

Test output:

--- /home/connor/version-control-tools/hgext/unifyrepo/tests/test-unify.t
+++ /home/connor/version-control-tools/hgext/unifyrepo/tests/test-unify.t.err
@@ -238,6 +238,42 @@
   new changesets fef1d0f689fc:bd139f07f0da
   inserting 5 pushlog entries
   writing 2 bookmarks
+  ** Unknown exception encountered with possibly-broken third-party extension unifyrepo
+  ** which supports versions 4.6 of Mercurial.
+  ** Please disable unifyrepo and try your action again.
+  ** If that fixes the bug please report it to the extension author.
+  ** Python 2.7.15rc1 (default, Apr 15 2018, 21:51:34) [GCC 7.3.0]
+  ** Mercurial Distributed SCM (version 4.7)
+  ** Extensions loaded: unifyrepo, pushlog
+  Traceback (most recent call last):
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/bin/hg", line 41, in <module>
+      dispatch.run()
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 90, in run
+      status = dispatch(req)
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 213, in dispatch
+      ret = _runcatch(req) or 0
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 354, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 362, in _callcatch
+      return scmutil.callcatch(ui, func)
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/scmutil.py", line 161, in callcatch
+      return func()
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 344, in _runcatchfunc
+      return _dispatch(req)
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 984, in _dispatch
+      cmdpats, cmdoptions)
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 730, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 992, in _runcommand
+      return cmdfunc()
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/dispatch.py", line 981, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+    File "/home/connor/version-control-tools/venv/mercurials/4.7/lib/python2.7/site-packages/mercurial/util.py", line 1528, in check
+      return func(*args, **kwargs)
+    File "/home/connor/version-control-tools/hgext/unifyrepo/__init__.py", line 480, in unifyrepo
+      bm.clear()
+  AttributeError: 'bmstore' object has no attribute 'clear'
+  [1]
 
   $ cd ../servers/destrepo
   $ hg log -G -T '{desc}\n'

ERROR: test-unify.t output changed

Comment 1

[Connor Sheehan [:sheehan]]

Attachment: unifyrepo: remove call to `bm.clear()` (Bug 1485882) r?gps

In Mercurial 4.7, the `bmstore` class is no long a subclass
of dict, making the call to `clear()` invalid. Since the call
to `applychanges` does everything we need, we can just remove
this call. The tests pass under 4.6.2 and 4.7.

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 9005255 [details]
unifyrepo: remove call to `bm.clear()` (Bug 1485882) r?gps

Gregory Szorc [:gps] has approved the revision.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/ae9466c50359
unifyrepo: remove call to `bm.clear()` r=gps