kallithea Changeset - 6329c0f26ace

Changeset - 6329c0f26ace

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 5 years ago 2020-10-22 15:45:58
mads@kiilerich.com

Grafted from: 82cf29c921d4

hg: support update with Mercurial 5.6

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

1 file changed with 5 insertions and 1 deletions:

kallithea/lib/vcs/backends/hg/workdir.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/hg/workdir.py

➞

Show inline comments

@@ @@ -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)

0 comments (0 inline, 0 general)