Mercurial > hg

changeset 39786:d50125dec2c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix kwargs handling in hgext/absorb.py This fixes couple of tests on Python 3. There is only one absorb test left failing on Python 3. Differential Revision: https://phab.mercurial-scm.org/D4694
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sun, 23 Sep 2018 22:57:17 +0300
parents 979e9f124caa
children e05d7c71f209
files contrib/python3-whitelist hgext/absorb.py
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/python3-whitelist	Tue Sep 18 19:26:44 2018 -0700
+++ b/contrib/python3-whitelist	Sun Sep 23 22:57:17 2018 +0300
@@ -1,7 +1,9 @@
 test-abort-checkin.t
 test-absorb-filefixupstate.py
 test-absorb-phase.t
+test-absorb-rename.t
 test-absorb-strip.t
+test-absorb.t
 test-add.t
 test-addremove-similar.t
 test-addremove.t
--- a/hgext/absorb.py	Tue Sep 18 19:26:44 2018 -0700
+++ b/hgext/absorb.py	Sun Sep 23 22:57:17 2018 +0300
@@ -972,6 +972,7 @@
 
     Returns 0 on success, 1 if all chunks were ignored and nothing amended.
     """
+    opts = pycompat.byteskwargs(opts)
     state = absorb(ui, repo, pats=pats, opts=opts)
     if sum(s[0] for s in state.chunkstats.values()) == 0:
         return 1