Patchwork D1639: py3: handle keyword arguments correctly in patch.py

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2017, 2:51 a.m.
Message ID <e3ed9d222b1e0c25124ddd9dc0734468@localhost.localdomain>
Download mbox | patch
Permalink /patch/26189/
State Not Applicable
Headers show

Comments

phabricator - Dec. 10, 2017, 2:51 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdce761558329: py3: handle keyword arguments correctly in patch.py (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1639?vs=4318&id=4330

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

AFFECTED FILES
  mercurial/patch.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -2466,8 +2466,8 @@ 
 def difflabel(func, *args, **kw):
     '''yields 2-tuples of (output, label) based on the output of func()'''
     inlinecolor = False
-    if kw.get('opts'):
-        inlinecolor = kw['opts'].worddiff
+    if kw.get(r'opts'):
+        inlinecolor = kw[r'opts'].worddiff
     headprefixes = [('diff', 'diff.diffline'),
                     ('copy', 'diff.extended'),
                     ('rename', 'diff.extended'),