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

merge with stable

Changeset 80b6b46e7bb7…

Parents 1445e887b24d…

Parents a88261eec1f4…

by Steve Borho

Changes to 4 files · Browse files at 80b6b46e7bb7 Showing diff from parent 1445e887b24d a88261eec1f4 Diff from another changeset...

Show Entire File hggtk/​bugreport.py Stacked
(No changes)
Change 1 of 2 Show Entire File hggtk/​datamine.py Stacked
 
353
354
355
356
 
357
358
359
 
651
652
653
654
 
655
656
657
 
353
354
355
 
356
357
358
359
 
651
652
653
 
654
655
656
657
@@ -353,7 +353,7 @@
  tip, user = self.get_rev_desc(long(revid))   if self.tabwidth:   text = text.expandtabs(self.tabwidth) - model.append((revid, toutf(text), tip, toutf(path))) + model.append((revid, toutf(text[:128]), tip, toutf(path)))   if thread.isAlive():   return True   else: @@ -651,7 +651,7 @@
  color = colormap.get_color(ctx, curdate)   if self.tabwidth:   text = text.expandtabs(self.tabwidth) - model.append((revid, toutf(text), tip, toutf(path.strip()), + model.append((revid, toutf(text[:128]), tip, toutf(path.strip()),   color, toutf(user), len(model)+1))   if thread.isAlive():   return True
Change 1 of 1 Show Entire File hggtk/​hgcmd.py Stacked
 
18
19
20
21
 
22
23
24
 
18
19
20
 
21
22
23
24
@@ -18,7 +18,7 @@
  def __init__(self, cmdline, progressbar=True, width=520, height=400):   title = 'hg ' + ' '.join(cmdline[1:])   if len(title) > 80: - title = toutf(title[:80] + '...') + title = title[:80] + '...'   title = toutf(title.replace('\n', ' '))   gtk.Dialog.__init__(self,   title=title,
Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
906
907
908
909
 
910
911
912
 
925
926
927
928
 
929
930
931
 
906
907
908
 
909
910
911
912
 
925
926
927
 
928
929
930
931
@@ -906,7 +906,7 @@
  lines = chunk.readlines()   lines[-1] = lines[-1].strip('\n\r')   for line in lines: - line = gobject.markup_escape_text(toutf(line)) + line = gobject.markup_escape_text(toutf(line[:128]))   if line.startswith('---') or line.startswith('+++'):   hunk += '<span foreground="#000090">%s</span>' % line   elif line.startswith('-'): @@ -925,7 +925,7 @@
  lines = fp.readlines()   lines[-1] = lines[-1].strip('\n\r')   for line in lines: - hunk += gobject.markup_escape_text(toutf(line)) + hunk += gobject.markup_escape_text(toutf(line[:128]))   return hunk     def dohgdiff():