Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status: show diffs with git markup

Changeset ac922ec71fe2…

Parent cc562138276b…

by Steve Borho

Changes to one file · Browse files at ac922ec71fe2 Showing diff from parent cc562138276b Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
28
29
30
 
31
32
33
 
175
176
177
178
 
179
180
181
 
189
190
191
192
 
193
194
195
 
197
198
199
200
 
 
201
202
203
 
207
208
209
210
 
211
212
213
 
28
29
30
31
32
33
34
 
176
177
178
 
179
180
181
182
 
190
191
192
 
193
194
195
196
 
198
199
200
 
201
202
203
204
205
 
209
210
211
 
212
213
214
215
@@ -28,6 +28,7 @@
 # Thread rowSelected, connect to an external progress bar  # Need mechanisms to clear pats and toggle visibility options  # Need mechanism to override file size/binary check +# Improve behavior of !?IC files in diff pane  # Show subrepos better  # Save splitter position to parent's QSetting  # Chunk selection @@ -175,7 +176,7 @@
  m = cmdutil.matchfiles(self.repo, [wfile])   try:   try: - for s, l in patch.difflabel(self.wctx.diff, match=m): + for s, l in patch.difflabel(self.wctx.diff, match=m, git=True):   hu.write(s, label=l)   except AttributeError:   # your mercurial source is not new enough, falling back @@ -189,7 +190,7 @@
  self.status_error = str(e)   return   o, e = hu.getdata() - diff = o or _('<em>No change</em>') + diff = o or _('<em>No displayable differences</em>')   if self.isMerge():   text = header + diff   else: @@ -197,7 +198,8 @@
  return     try: - for s, l in patch.difflabel(self.wctx.diff, self.wctx.p2(), match=m): + for s, l in patch.difflabel(self.wctx.diff, self.wctx.p2(), + match=m, git=True):   hu.write(s, label=l)   except (IOError, error.RepoError, error.LookupError, util.Abort), e:   self.status_error = str(e) @@ -207,7 +209,7 @@
  self.wctx.p2().rev(), str(self.wctx.p2()))   text += '</h3></br>'   o, e = hu.getdata() - diff = o or _('<em>No change</em>') + diff = o or _('<em>No displayable differences</em>')   self.te.setHtml(text + diff)