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

history: prune old changeset mark code

the marking mechanism has been removed, so this code was no
longer reachable.

Changeset 2a0b937c89e4…

Parent 00b3acb9a208…

by Steve Borho

Changes to 4 files · Browse files at 2a0b937c89e4 Showing diff from parent 00b3acb9a208 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​changeset.py Stacked
 
458
459
460
461
462
463
464
465
466
467
468
469
 
600
601
602
603
604
605
606
607
608
609
610
611
 
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
 
697
698
699
 
458
459
460
 
 
 
 
 
 
461
462
463
 
594
595
596
 
 
 
 
 
 
597
598
599
 
647
648
649
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
650
 
651
652
653
654
@@ -458,12 +458,6 @@
  self._ann_menu = create_menu('_annotate file', self._ann_file)   _menu.append(self._ann_menu)   _menu.append(create_menu('_revert file contents', self._revert_file)) - self._file_diff_to_mark_menu = create_menu('_diff file to mark', - self._diff_file_to_mark) - self._file_diff_from_mark_menu = create_menu('diff file _from mark', - self._diff_file_from_mark) - _menu.append(self._file_diff_to_mark_menu) - _menu.append(self._file_diff_from_mark_menu)   _menu.show_all()   return _menu   @@ -600,12 +594,6 @@
  def _file_popup_menu(self, treeview, button=0, time=0):   if self.curfile is None:   return - if self.graphview: - is_mark = self.graphview.get_mark_rev() is not None - else: - is_mark = False - self._file_diff_to_mark_menu.set_sensitive(is_mark) - self._file_diff_from_mark_menu.set_sensitive(is_mark)   self._filemenu.popup(None, None, None, button, time)     # If the filelog entry this changeset references does not link @@ -659,41 +647,8 @@
  self._node1, self._node2 = cmdutil.revpair(self.repo, [pair])   self._view_file('M', self.curfile, force_left=False)   - def _diff_file_to_mark(self, menuitem): - '''User selected diff to mark from the file list context menu''' - from status import GStatus - from gtools import cmdtable - rev0 = self.graphview.get_mark_rev() - rev1 = self.currev - statopts = self.merge_opts(cmdtable['gstatus|gst'][1], - ('include', 'exclude', 'git')) - statopts['rev'] = ['%u:%u' % (rev1, rev0)] - statopts['modified'] = True - statopts['added'] = True - statopts['removed'] = True - dialog = GStatus(self.ui, self.repo, self.cwd, [self.curfile], - statopts, False) - dialog.display() - return True - - def _diff_file_from_mark(self, menuitem): - '''User selected diff from mark from the file list context menu''' - from status import GStatus - from gtools import cmdtable - rev0 = self.graphview.get_mark_rev() - rev1 = self.currev - statopts = self.merge_opts(cmdtable['gstatus|gst'][1], - ('include', 'exclude', 'git')) - statopts['rev'] = ['%u:%u' % (rev0, rev1)] - statopts['modified'] = True - statopts['added'] = True - statopts['removed'] = True - dialog = GStatus(self.ui, self.repo, self.cwd, [self.curfile], - statopts, False) - dialog.display() -   def _ann_file(self, menuitem): - '''User selected diff from mark from the file list context menu''' + '''User selected annotate file from the file list context menu'''   from datamine import DataMineDialog   rev = self.currev   dialog = DataMineDialog(self.ui, self.repo, self.cwd, [], {}, False)
Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
110
111
112
113
114
115
116
117
 
479
480
481
482
483
484
485
486
487
488
 
110
111
112
 
 
113
114
115
 
477
478
479
 
 
 
 
480
481
482
@@ -110,8 +110,6 @@
  revs = []   if self.currow is not None:   revs.append(self.currow[treemodel.REVID]) - if self.graphview.get_mark_rev() is not None: - revs.append(self.graphview.get_mark_rev())     dlg = FilterDialog(self.repo.root, revs, self.pats,   filterfunc=do_reload) @@ -479,10 +477,6 @@
  self.opts['rev'] = ["%s:%s" % (rev0, rev1)]   self._diff_file(None, '')   - def _mark_rev(self, menuitem): - rev = self.currow[treemodel.REVID] - self.graphview.set_mark_rev(rev) -   def _add_tag(self, menuitem):   from tagadd import TagAddDialog  
Change 1 of 3 Show Entire File hggtk/​vis/​treemodel.py Stacked
 
40
41
42
43
44
45
 
 
46
47
48
 
75
76
77
78
79
80
81
 
150
151
152
153
154
155
156
157
 
40
41
42
 
 
 
43
44
45
46
47
 
74
75
76
 
77
78
79
 
148
149
150
 
 
151
152
153
@@ -40,9 +40,8 @@
 WCPARENT = 9  HEAD = 10  TAGS = 11 -MARKED = 12 -FGCOLOR = 13 -HEXID = 14 +FGCOLOR = 12 +HEXID = 13    class TreeModel(gtk.GenericTreeModel):   @@ -75,7 +74,6 @@
  if index == WCPARENT: return gobject.TYPE_BOOLEAN   if index == HEAD: return gobject.TYPE_BOOLEAN   if index == TAGS: return gobject.TYPE_STRING - if index == MARKED: return gobject.TYPE_BOOLEAN   if index == FGCOLOR: return gobject.TYPE_STRING   if index == HEXID: return gobject.TYPE_STRING   @@ -150,8 +148,6 @@
    if column == REVISION:   return revision - if column == MARKED: - return revid == self.marked_rev   return revision[column]     def on_iter_next(self, rowref):
Change 1 of 3 Show Entire File hggtk/​vis/​treeview.py Stacked
 
80
81
82
83
84
85
86
 
166
167
168
169
170
171
172
 
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
 
80
81
82
 
83
84
85
 
165
166
167
 
168
169
170
 
369
370
371
 
 
 
 
 
 
 
 
 
 
372
373
374
@@ -80,7 +80,6 @@
  self.batchsize = limit   self.repo = repo   self.currev = None - self.marked_rev = None   self.construct_treeview()   self.pbar = pbar   @@ -166,7 +165,6 @@
  self.model = treemodel.TreeModel(self.repo, self.graphdata,   self.color_func)   self.treeview.set_model(self.model) - self.model.marked_rev = self.marked_rev     self.graph_cell.columns_len = self.max_cols   width = self.graph_cell.get_size(self.treeview)[2] @@ -371,16 +369,6 @@
  self.date_column.add_attribute(cell, "foreground", treemodel.FGCOLOR)   self.treeview.append_column(self.date_column)   - def set_mark_rev(self, rev): - '''User has marked a revision for diff''' - self.marked_rev = long(rev) - self.msg_column.queue_resize() - if self.model: - self.model.marked_rev = self.marked_rev - - def get_mark_rev(self): - return self.marked_rev -   def text_color_orig(self, parents, rev, author):   if len(parents) == 2:   # mark merge changesets green