Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 019dbdf97618…

Parents 529de39db722…

Parents 8407dab2642a…

by Steve Borho

Changes to 3 files · Browse files at 019dbdf97618 Showing diff from parent 529de39db722 8407dab2642a Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1183
1184
1185
1186
 
 
 
 
1187
1188
1189
 
1247
1248
1249
 
 
1250
1251
1252
 
1183
1184
1185
 
1186
1187
1188
1189
1190
1191
1192
 
1250
1251
1252
1253
1254
1255
1256
1257
@@ -1183,7 +1183,10 @@
  def remove_overlay(self, resettip):   self.bfile = None   self.npreviews = 0 - self.urlcombo.set_active(self.origurl) + if isinstance(self.origurl, int): + self.urlcombo.set_active(self.origurl) + else: + self.pathentry.set_text(self.origurl)   self.repo = hg.repository(self.ui, path=self.repo.root)   self.graphview.set_repo(self.repo, self.stbar)   self.changeview.set_repo(self.repo) @@ -1247,6 +1250,8 @@
    def set_bundlefile(self, bfile, **kwopts):   self.origurl = self.urlcombo.get_active() + if self.origurl == -1: + self.origurl = self.pathentry.get_text()   self.pathentry.set_text(bfile)     # create apply/reject toolbar buttons
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treemodel.py Stacked
 
156
157
158
159
 
 
160
161
162
163
164
165
166
167
 
 
168
169
170
171
172
173
 
 
174
175
176
 
156
157
158
 
159
160
161
162
163
164
165
166
 
 
167
168
169
170
171
172
 
 
173
174
175
176
177
@@ -156,21 +156,22 @@
  else:   lines = summary.splitlines()   summary = lines and lines[0] or '' - summary = gtklib.markup_escape_text(hglib.toutf(summary)) + escape = gtklib.markup_escape_text + summary = escape(hglib.toutf(summary))   node = ctx.node()   tags = self.repo.nodetags(node)   taglist = hglib.toutf(', '.join(tags))   tstr = ''   for tag in tags:   if tag not in self.hidetags: - tstr += '<span color="%s" background="%s"> %s </span> ' % \ - ('black', '#ffffaa', tag) + tstr += gtklib.markup(' %s ' % tag, color='black', + background='#ffffaa') + ' '     branch = ctx.branch()   bstr = ''   if self.branchtags.get(branch) == node: - bstr += '<span color="%s" background="%s"> %s </span> ' % \ - ('black', '#aaffaa', branch) + bstr += gtklib.markup(' %s ' % branch, color='black', + background='#aaffaa') + ' '     author = hglib.toutf(hglib.username(ctx.user()))   age = hglib.age(ctx.date())
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
 
423
424
425
 
426
427
428
429
430
 
423
424
425
426
427
 
428
429
430
@@ -423,8 +423,8 @@
  col.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)   col.set_fixed_width(cell.get_size(self.treeview)[2])   col.pack_start(cell, expand=True) + col.add_attribute(cell, "text", treemodel.BRANCH)   col.add_attribute(cell, "foreground", treemodel.FGCOLOR) - col.add_attribute(cell, "markup", treemodel.BRANCH)     cell = gtk.CellRendererText()