Patchwork D1319: py3: handle keyword arguments in hgext/journal.py

login
register
mail settings
Submitter phabricator
Date Nov. 9, 2017, 1:14 p.m.
Message ID <809de999f212747726b83303076d8682@localhost.localdomain>
Download mbox | patch
Permalink /patch/25439/
State Not Applicable
Headers show

Comments

phabricator - Nov. 9, 2017, 1:14 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG135edf120d76: py3: handle keyword arguments in hgext/journal.py (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1319?vs=3282&id=3363

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

AFFECTED FILES
  hgext/journal.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/journal.py b/hgext/journal.py
--- a/hgext/journal.py
+++ b/hgext/journal.py
@@ -30,6 +30,7 @@ 
     localrepo,
     lock,
     node,
+    pycompat,
     registrar,
     util,
 )
@@ -133,7 +134,7 @@ 
 
     Note that by default entries go from most recent to oldest.
     """
-    order = kwargs.pop('order', max)
+    order = kwargs.pop(r'order', max)
     iterables = [iter(it) for it in iterables]
     # this tracks still active iterables; iterables are deleted as they are
     # exhausted, which is why this is a dictionary and why each entry also
@@ -458,6 +459,7 @@ 
     `hg journal -T json` can be used to produce machine readable output.
 
     """
+    opts = pycompat.byteskwargs(opts)
     name = '.'
     if opts.get('all'):
         if args: