Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc1, 0.4rc2, and 0.4rc3

hggtk/changeset: show MAR status in separate column

The '[Description]' row now looks odd. Not sure if this is the best
solution.

Changeset bb03d0657a4c…

Parent fcd096482711…

by Steve Borho

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

Change 1 of 4 Show Entire File hggtk/​changeset.py Stacked
 
172
173
174
175
 
176
177
178
 
184
185
186
187
 
188
189
 
190
191
 
192
193
194
 
195
196
197
 
324
325
326
327
 
 
 
328
329
330
331
332
333
 
 
 
334
335
336
 
395
396
397
398
 
399
400
401
 
172
173
174
 
175
176
177
178
 
184
185
186
 
187
188
 
189
190
 
191
192
193
 
194
195
196
197
 
324
325
326
 
327
328
329
330
331
332
333
334
 
335
336
337
338
339
340
 
399
400
401
 
402
403
404
405
@@ -172,7 +172,7 @@
  buf.apply_tag_by_name(name, i0, i1)     buf.create_mark('begmark', buf.get_start_iter()) - filelist.append(('[Description]', 'begmark', False, ())) + filelist.append(('*', '[Description]', 'begmark', False, ()))     # inserts the marks   pctx = self.repo.changectx(parent) @@ -184,14 +184,14 @@
  # means it was just deleted. If we can't find it in the   # parent, it means it was just added. Else it was modified.   try: - fs = 'R ' + f + s = 'R'   ctx.filectx(f) - fs = 'A ' + f + s = 'A'   pctx.filectx(f) - fs = 'M ' + f + s = 'M'   except revlog.LookupError:   pass - filelist.append((fs, mark, True, (stats[0],stats[1],statmax))) + filelist.append((s, f, mark, True, (stats[0],stats[1],statmax)))     sob, eob = buf.get_bounds()   buf.apply_tag_by_name("mono", sob, eob) @@ -324,13 +324,17 @@
  filelist_tree.connect('popup-menu', self._file_popup_menu)   filelist_tree.connect('row-activated', self._file_row_act)   - self._filelist = gtk.ListStore(gobject.TYPE_STRING, # filename + self._filelist = gtk.ListStore( + gobject.TYPE_STRING, # MAR status + gobject.TYPE_STRING, # filename   gobject.TYPE_PYOBJECT, # mark   gobject.TYPE_PYOBJECT, # give cmenu   gobject.TYPE_PYOBJECT # diffstats   )   filelist_tree.set_model(self._filelist) - column = gtk.TreeViewColumn('Files', gtk.CellRendererText(), text=0) + column = gtk.TreeViewColumn('Stat', gtk.CellRendererText(), text=0) + filelist_tree.append_column(column) + column = gtk.TreeViewColumn('Files', gtk.CellRendererText(), text=1)   filelist_tree.append_column(column)     list_frame = gtk.Frame() @@ -395,7 +399,7 @@
  mark = self._buffer.get_mark(model[iter][1])   self.textview.scroll_to_mark(mark, 0.0, True, 0.0, 0.0)   if model[iter][2]: - self.curfile = model[iter][0][3:] + self.curfile = model[iter][1]   else:   self.curfile = None