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

history: respect "Diff to second Parent" when doing "Visualize Change"

Changeset 23e60a084681…

Parent 74061568b17f…

by Adrian Buehlmann

Changes to one file · Browse files at 23e60a084681 Showing diff from parent 74061568b17f Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1473
1474
1475
1476
 
 
 
 
 
 
 
 
 
 
 
1477
1478
1479
 
1473
1474
1475
 
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
@@ -1473,7 +1473,17 @@
  dlg.hide()     def vdiff_change(self, menuitem, pats=[]): - opts = {'change':str(self.currevid), 'bundle':self.bfile} + opts = {'bundle':self.bfile} + rev = self.currevid + parents = self.repo[rev].parents() + if len(parents) == 2: + if self.changeview.other_parent_checkbutton.get_active(): + parent = parents[1].rev() + else: + parent = parents[0].rev() + opts['rev'] = [str(parent), str(rev)] + else: + opts['change'] = str(rev)   self._do_diff(pats, opts)     def vdiff_local(self, menuitem, pats=[]):