Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

chunks: reverting back to f46c3ea2f429

Changeset 9cdeea94eada…

Parent cb075cbd8e07…

by Adrian Buehlmann

Changes to one file · Browse files at 9cdeea94eada Showing diff from parent cb075cbd8e07 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgtk/​chunks.py Stacked
 
14
15
16
17
18
19
20
 
104
105
106
 
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
 
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
 
294
295
296
297
298
 
 
 
 
299
 
300
301
302
 
304
305
306
307
 
308
309
 
310
311
312
313
 
314
315
316
 
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
 
14
15
16
 
17
18
19
 
103
104
105
106
107
 
 
 
 
 
 
 
 
 
 
 
108
109
110
 
129
130
131
 
 
 
 
 
 
 
 
 
 
 
 
 
 
132
133
134
 
269
270
271
 
 
272
273
274
275
276
277
278
279
280
 
282
283
284
 
285
286
 
287
288
289
290
 
291
292
293
294
 
373
374
375
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -14,7 +14,6 @@
   from mercurial import cmdutil, util, patch, mdiff, error   -from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, hgshelve    from tortoisehg.hgtk import gtklib @@ -104,18 +103,8 @@
  if getattr(dt, 'enable-grid-lines', None) is not None:   dt.set_property('enable-grid-lines', True)   + dt.connect('row-activated', self.diff_tree_row_act)   dt.connect('copy-clipboard', self.copy_to_clipboard) - dt.connect('popup-menu', self.tree_popup_menu) - dt.connect('button-release-event', self.tree_button_release) - - toggle_cell = gtk.CellRendererToggle() - toggle_cell.connect('toggled', self.select_toggle) - toggle_cell.set_property('activatable', True) - - col0 = gtk.TreeViewColumn('', toggle_cell) - col0.set_resizable(False) - col0.set_cell_data_func(toggle_cell, self.selected_cell_func) - dt.append_column(col0)     cell = gtk.CellRendererText()   diffcol = gtk.TreeViewColumn('diff', cell) @@ -140,20 +129,6 @@
    return dt   - def select_toggle(self, cell_renderer, path): - 'User manually toggled file status via checkbox' - row = self.diffmodel[path] - rejected = not row[DM_REJECTED] - row[DM_REJECTED] = rejected - self.activate_chunk(row, not rejected) - return True - - def selected_cell_func(self, column, cell_renderer, model, iter): - is_header = model.get_value(iter, DM_IS_HEADER) - cell_renderer.set_property('visible', not is_header) - is_rejected = model.get_value(iter, DM_REJECTED) - cell_renderer.set_property('active', not is_rejected) -   def __getitem__(self, wfile):   return self.filechunks[wfile]   @@ -294,9 +269,12 @@
    return len(rows)   - def activate_chunk(self, row, active): - dmodel = self.diffmodel + def diff_tree_row_act(self, dtree, path, column): + 'Row in diff tree (hunk) activated/toggled' + dmodel = dtree.get_model() + row = dmodel[path]   wfile = row[DM_PATH] + checked = self.stat.get_checked(wfile)   try:   chunks = self.filechunks[wfile]   except IndexError: @@ -304,13 +282,13 @@
  chunkrows = xrange(1, len(chunks))   if row[DM_IS_HEADER]:   for n, chunk in enumerate(chunks[1:]): - chunk.active = active + chunk.active = not checked   self.update_diff_hunk(dmodel[n+1]) - newvalue = active + newvalue = not checked   partial = False   else:   chunk = chunks[row[DM_CHUNK_ID]] - chunk.active = active + chunk.active = not chunk.active   self.update_diff_hunk(row)   rej = [ n for n in chunkrows if dmodel[n][DM_REJECTED] ]   nonrej = [ n for n in chunkrows if not dmodel[n][DM_REJECTED] ] @@ -395,31 +373,3 @@
  self.stat.stbar.set_text(str(e))   difftext.seek(0)   return hgshelve.parsepatch(difftext) - - def tree_button_release(self, treeview, event): - if event.button != 3: - return False - self.tree_popup_menu(treeview) - return True - - def tree_popup_menu(self, treeview): - model, tpaths = treeview.get_selection().get_selected_rows() - srows = [model[p] for p in tpaths] - - def select(menuitem): - for row in srows: - self.activate_chunk(row, True) - - def deselect(menuitem): - for row in srows: - self.activate_chunk(row, False) - - menu = gtklib.MenuBuilder() - menu.append(_('_Select'), select) - menu.append(_('_Deselect'), deselect) - - menu = menu.build() - if len(menu.get_children()) > 0: - menu.show_all() - menu.popup(None, None, None, 0, 0) - return True