##// END OF EJS Templates
keyword: do not inspect node1 for diff if node2 is given
Christian Ebert -
r6117:c74f1d90 default
parent child Browse files
Show More
@@ -123,7 +123,7 b' def _kw_diff(repo, node1=None, node2=Non'
123 comparing against working dir.'''
123 comparing against working dir.'''
124 if node2 is not None:
124 if node2 is not None:
125 kwtools['templater'].matcher = util.never
125 kwtools['templater'].matcher = util.never
126 if node1 is not None and node1 != repo.changectx().node():
126 elif node1 is not None and node1 != repo.changectx().node():
127 kwtools['templater'].restrict = True
127 kwtools['templater'].restrict = True
128 _patch_diff(repo, node1=node1, node2=node2, files=files, match=match,
128 _patch_diff(repo, node1=node1, node2=node2, files=files, match=match,
129 fp=fp, changes=changes, opts=opts)
129 fp=fp, changes=changes, opts=opts)
General Comments 0
You need to be logged in to leave comments. Login now