Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.6, 0.7, and 0.7.1

diff: expand tabs to spaces in diff dialog

Changeset 88cf992591aa…

Parent b105ad0b82e9…

by Steve Borho

Changes to one file · Browse files at 88cf992591aa Showing diff from parent b105ad0b82e9 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​diff.py Stacked
 
12
13
14
 
15
16
17
 
76
77
78
 
79
80
81
 
158
159
160
161
 
 
 
 
162
163
164
 
12
13
14
15
16
17
18
 
77
78
79
80
81
82
83
 
160
161
162
 
163
164
165
166
167
168
169
@@ -12,6 +12,7 @@
 import gtk  import pango  import sys +from hglib import gettabwidth  from mercurial import hg, ui, cmdutil, util, patch  from mercurial.i18n import _  from shlib import set_tortoise_icon @@ -76,6 +77,7 @@
  scrollwin.set_shadow_type(gtk.SHADOW_IN)   pane.pack2(scrollwin)   scrollwin.show() + self.tabwidth = gettabwidth(self.ui)     try:   import gtksourceview @@ -158,7 +160,10 @@
  specific_files = self.files     diff = self._get_hg_diff(specific_files) - self.buffer.set_text(diff.decode(sys.getdefaultencoding(), 'replace')) + diff = diff.decode(sys.getdefaultencoding(), 'replace') + if self.tabwidth: + diff = diff.expandtabs(self.tabwidth) + self.buffer.set_text(diff)     def _get_hg_diff(self, files):   self.repo.ui.pushbuffer()