##// END OF EJS Templates
keyword: rename kw_diff to kwdiff in keeping with Mercurial style rules...
Siddharth Agarwal -
r24369:109a2acc default
parent child Browse files
Show More
@@ -643,7 +643,7 b' def reposetup(ui, repo):'
643 # shrink keywords read from working dir
643 # shrink keywords read from working dir
644 self.lines = kwt.shrinklines(self.fname, self.lines)
644 self.lines = kwt.shrinklines(self.fname, self.lines)
645
645
646 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
646 def kwdiff(orig, repo, node1=None, node2=None, match=None, changes=None,
647 opts=None, prefix=''):
647 opts=None, prefix=''):
648 '''Monkeypatch patch.diff to avoid expansion.'''
648 '''Monkeypatch patch.diff to avoid expansion.'''
649 kwt.restrict = True
649 kwt.restrict = True
@@ -737,7 +737,7 b' def reposetup(ui, repo):'
737
737
738 extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp)
738 extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp)
739 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
739 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
740 extensions.wrapfunction(patch, 'diff', kw_diff)
740 extensions.wrapfunction(patch, 'diff', kwdiff)
741 extensions.wrapfunction(cmdutil, 'amend', kw_amend)
741 extensions.wrapfunction(cmdutil, 'amend', kw_amend)
742 extensions.wrapfunction(cmdutil, 'copy', kw_copy)
742 extensions.wrapfunction(cmdutil, 'copy', kw_copy)
743 extensions.wrapfunction(cmdutil, 'dorecord', kw_dorecord)
743 extensions.wrapfunction(cmdutil, 'dorecord', kw_dorecord)
General Comments 0
You need to be logged in to leave comments. Login now