Mercurial > hg
comparison mercurial/patch.py @ 31631:a7acda2de4b8
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 | 451c980a8b57 |
children | 6c80f985a13c |
comparison
equal
deleted
inserted
replaced
31630:451c980a8b57 | 31631:a7acda2de4b8 |
---|---|
2211 if formatchanging: | 2211 if formatchanging: |
2212 buildopts['text'] = opts and opts.get('text') | 2212 buildopts['text'] = opts and opts.get('text') |
2213 buildopts['nobinary'] = get('nobinary', forceplain=False) | 2213 buildopts['nobinary'] = get('nobinary', forceplain=False) |
2214 buildopts['noprefix'] = get('noprefix', forceplain=False) | 2214 buildopts['noprefix'] = get('noprefix', forceplain=False) |
2215 | 2215 |
2216 return mdiff.diffopts(**buildopts) | 2216 return mdiff.diffopts(**pycompat.strkwargs(buildopts)) |
2217 | 2217 |
2218 def diff(repo, node1=None, node2=None, match=None, changes=None, | 2218 def diff(repo, node1=None, node2=None, match=None, changes=None, |
2219 opts=None, losedatafn=None, prefix='', relroot='', copy=None): | 2219 opts=None, losedatafn=None, prefix='', relroot='', copy=None): |
2220 '''yields diff of changes to files between two nodes, or node and | 2220 '''yields diff of changes to files between two nodes, or node and |
2221 working directory. | 2221 working directory. |