Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

changeset: respect "Diff to second Parent" when doing "Visual Diff"

Changeset 7d91c4a48d37…

Parent 415f2720e312…

by Adrian Buehlmann

Changes to one file · Browse files at 7d91c4a48d37 Showing diff from parent 415f2720e312 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
743
744
745
746
 
 
 
 
 
 
 
 
 
 
 
 
 
747
748
749
 
743
744
745
 
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
@@ -743,7 +743,19 @@
  'User selected visual diff file from the file list context menu'   if not self.curfile:   return - opts = {'change':str(self.currev), 'bundle':self.bfile} + + opts = {'bundle':self.bfile} + rev = self.currev + parents = self.repo[rev].parents() + if len(parents) == 2: + if self.diff_other_parent(): + parent = parents[1].rev() + else: + parent = parents[0].rev() + opts['rev'] = [str(parent), str(rev)] + else: + opts['change'] = str(rev) +   self._do_diff([self.curfile], opts)     def view_file_rev(self, menuitem):