D4694: py3: fix kwargs handling in hgext/absorb.py

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Mon Sep 24 01:09:17 UTC 2018


pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This fixes couple of tests on Python 3. There is only one absorb test left
  failing on Python 3.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  contrib/python3-whitelist
  hgext/absorb.py

CHANGE DETAILS

diff --git a/hgext/absorb.py b/hgext/absorb.py
--- a/hgext/absorb.py
+++ b/hgext/absorb.py
@@ -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
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -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



To: pulkit, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list