comparison mercurial/cmdutil.py @ 23453:341e4798c24d

jsonchangeset: don't honor whitespace and format-changing diffopts JSON is meant to be parsed by computers, and format changes can break them.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 18 Nov 2014 22:13:05 -0800
parents b913c394386f
children afa3fbbcabd3
comparison
equal deleted inserted replaced
23452:86c0d8c1484f 23453:341e4798c24d
1091 1091
1092 matchfn = self.matchfn 1092 matchfn = self.matchfn
1093 if matchfn: 1093 if matchfn:
1094 stat = self.diffopts.get('stat') 1094 stat = self.diffopts.get('stat')
1095 diff = self.diffopts.get('patch') 1095 diff = self.diffopts.get('patch')
1096 diffopts = patch.diffopts(self.ui, self.diffopts) 1096 diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
1097 node, prev = ctx.node(), ctx.p1().node() 1097 node, prev = ctx.node(), ctx.p1().node()
1098 if stat: 1098 if stat:
1099 self.ui.pushbuffer() 1099 self.ui.pushbuffer()
1100 diffordiffstat(self.ui, self.repo, diffopts, prev, node, 1100 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1101 match=matchfn, stat=True) 1101 match=matchfn, stat=True)