# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2020-10-22 15:45:58
# Node ID 6329c0f26ace3e53da94b17afb550cd37fcf3c9e
# Parent  3669e58f3002325ce06aac73d945fc067fafc8a4

hg: support update with Mercurial 5.6

Fix:
  TypeError: update() takes from 1 to 3 positional arguments but 5 were given

diff --git a/kallithea/lib/vcs/backends/hg/workdir.py b/kallithea/lib/vcs/backends/hg/workdir.py
--- a/kallithea/lib/vcs/backends/hg/workdir.py
+++ b/kallithea/lib/vcs/backends/hg/workdir.py
@@ -21,4 +21,8 @@ class MercurialWorkdir(BaseWorkdir):
             raise BranchDoesNotExistError
 
         raw_id = self.repository.branches[branch]
-        mercurial.merge.update(self.repository._repo, ascii_bytes(raw_id), False, False, None)
+        try:
+            mercurial.merge.update(self.repository._repo[ascii_bytes(raw_id)])
+        except TypeError:  # mergeupdate() missing 3 required positional arguments: 'node', 'branchmerge', and 'force'
+            # update-update was introduced with Mercurial 5.6 (2c86b9587740/c1b603cdc95a)
+            mercurial.merge.update(self.repository._repo, ascii_bytes(raw_id), False, False, None)