D6776: bookmarks: validate changes on push

[durin42 (Augie Fackler)]

durin42 added a comment.


  I get a fair number of test failures with this, eg `test-bookmarks-corner-case.t`:
  
    --- /usr/local/google/home/augie/hgtest/tests/test-bookmarks-corner-case.t
    +++ /usr/local/google/home/augie/hgtest/tests/test-bookmarks-corner-case.t.err
    @@ -178,11 +178,48 @@
       $ hg push -R client-B -r book-B
       pushing to ssh://user@dummy/bookrace-server
       searching for changes
    -  remote: adding changesets
    -  remote: adding manifests
    -  remote: adding file changes
    -  remote: added 1 changesets with 1 changes to 1 files
    -  updating bookmark book-B
    +  ** unknown exception encountered, please report by visiting
    +  ** https://mercurial-scm.org/wiki/BugTracker
    +  ** Python 2.7.16 (default, Apr  6 2019, 01:42:57) [GCC 7.3.0]
    +  ** Mercurial Distributed SCM (version 5.1.1+253-85a0f0de90e5)
    +  ** Extensions loaded:
    +  Traceback (most recent call last):
    +    File "/tmp/hgtests.lYOPXh/install/bin/hg", line 43, in <module>
    +      dispatch.run()
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 99, in run
    +      status = dispatch(req)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 225, in dispatch
    +      ret = _runcatch(req) or 0
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 376, in _runcatch
    +      return _callcatch(ui, _runcatchfunc)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 384, in _callcatch
    +      return scmutil.callcatch(ui, func)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/scmutil.py", line 167, in callcatch
    +      return func()
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 367, in _runcatchfunc
    +      return _dispatch(req)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 1021, in _dispatch
    +      cmdpats, cmdoptions)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 756, in runcommand
    +      ret = _runcommand(ui, options, cmd, d)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 1030, in _runcommand
    +      return cmdfunc()
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/dispatch.py", line 1018, in <lambda>
    +      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/util.py", line 1682, in check
    +      return func(*args, **kwargs)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/commands.py", line 4667, in push
    +      opargs=opargs)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/exchange.py", line 570, in push
    +      _pushbundle2(pushop)
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/exchange.py", line 1164, in _pushbundle2
    +      'force': pushop.force,
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/thirdparty/concurrent/futures/_base.py", line 457, in result
    +      return self.__get_result()
    +    File "/tmp/hgtests.lYOPXh/install/lib/python/mercurial/wireprotov1peer.py", line 211, in sendcommands
    +      result = fn(**pycompat.strkwargs(args))
    +  TypeError: unbundle() got an unexpected keyword argument 'force'
    +  [1]
  
  Could I get you to take a look? I like where this is going, but I don't have the time at the moment to hunt down the issues in the tests.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6776/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6776

To: idlsoft, #hg-reviewers, durin42
Cc: durin42, valentin.gatienbaron, mercurial-devel