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

history: add 'merge with' to the diff menu

only sensitive when rev[0] is the only working parent

Changeset ace26d8a71c5…

Parent 564846271733…

by Steve Borho

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

Change 1 of 3 Show Entire File hggtk/​history.py Stacked
 
419
420
421
 
 
422
423
424
 
715
716
717
 
 
718
719
720
 
779
780
781
 
 
 
 
 
 
 
782
783
784
 
419
420
421
422
423
424
425
426
 
717
718
719
720
721
722
723
724
 
783
784
785
786
787
788
789
790
791
792
793
794
795
@@ -419,6 +419,8 @@
  self.email_revs))   m.append(create_menu(_('bundle from here to selected'),   self.bundle_revs)) + self.cmenu_merge2 = create_menu(_('_merge with'), self.merge) + m.append(self.cmenu_merge2)   m.connect_after('selection-done', self.restore_original_selection)   m.show_all()   return m @@ -715,6 +717,8 @@
  def merge(self, menuitem):   rev = self.currow[treemodel.REVID]   parents = [x.node() for x in self.repo.parents()] + if rev == self.repo.parents()[0].rev(): + rev = self.revs[1]   dialog = merge.MergeDialog(rev)   dialog.set_transient_for(self)   dialog.show_all() @@ -779,6 +783,13 @@
  return True     def tree_popup_menu_diff(self, treeview, button=0, time=0): + selrev = self.revs[0] + + # disable/enable menus as required + parents = [x.rev() for x in self.repo.parents()] + can_merge = selrev in parents and len(parents) < 2 + self.cmenu_merge2.set_sensitive(can_merge) +   # display the context menu   self._menu2.popup(None, None, None, button, time)   return True