Mercurial > public > mercurial-scm > hg

comparison mercurial/mdiff.py @ 31631:a7acda2de4b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: use pycompat.{byteskwargs, strkwargs} to switch opts b/w bytes and str
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 26 Mar 2017 20:58:21 +0530
parents 92714858dd3e
children 6c80f985a13c
comparison
equal deleted inserted replaced
31630:451c980a8b57 31631:a7acda2de4b8
15 from . import ( 15 from . import (
16 base85, 16 base85,
17 bdiff, 17 bdiff,
18 error, 18 error,
19 mpatch, 19 mpatch,
20 pycompat,
20 util, 21 util,
21 ) 22 )
22 23
23 def splitnewlines(text): 24 def splitnewlines(text):
24 '''like str.splitlines, but only split on newlines.''' 25 '''like str.splitlines, but only split on newlines.'''
59 'upgrade': False, 60 'upgrade': False,
60 'showsimilarity': False, 61 'showsimilarity': False,
61 } 62 }
62 63
63 def __init__(self, **opts): 64 def __init__(self, **opts):
65 opts = pycompat.byteskwargs(opts)
64 for k in self.defaults.keys(): 66 for k in self.defaults.keys():
65 v = opts.get(k) 67 v = opts.get(k)
66 if v is None: 68 if v is None:
67 v = self.defaults[k] 69 v = self.defaults[k]
68 setattr(self, k, v) 70 setattr(self, k, v)