Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

changeset: fix request for git diffs

Changeset 6f82ad35dd59…

Parent ef51f086d93b…

by Steve Borho

Changes to one file · Browse files at 6f82ad35dd59 Showing diff from parent ef51f086d93b Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​changeset.py Stacked
 
10
11
12
13
 
14
15
16
 
185
186
187
188
189
 
 
 
190
191
192
193
 
194
195
196
 
10
11
12
 
13
14
15
16
 
185
186
187
 
 
188
189
190
191
192
193
194
195
196
197
198
@@ -10,7 +10,7 @@
 import pango  import Queue   -from mercurial import cmdutil, context, util, ui, hg, patch +from mercurial import cmdutil, context, util, ui, hg, patch, mdiff    from thgutil.i18n import _  from thgutil.hglib import * @@ -185,12 +185,14 @@
  n1, n2 = self.curnodes     lines = [] - matcher = cmdutil.match(self.repo, [file], {'git': True}) - for s in patch.diff(self.repo, n1, n2, match=matcher): + matcher = cmdutil.match(self.repo, [file]) + diffopts = mdiff.diffopts(git=True, nodates=True, nobinary=True) + for s in patch.diff(self.repo, n1, n2, match=matcher, opts=diffopts):   lines.extend(s.splitlines())     eob = buf.get_end_iter()   offset = eob.get_offset() + pos = buf.get_iter_at_offset(offset)   fileoffs, tags, lines, statmax = self.prepare_diff(lines, offset, file)   for l in lines:   buf.insert(eob, l)