Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable resolve: use simpler p1() and p2() revision sets

These are only available on Mercurial's current default branch, but there's
plenty other parts of thg that already require tip of default branch.

Changeset 37bccbc32810…

Parent 38abaa6d255d…

by Steve Borho

Changes to one file · Browse files at 37bccbc32810 Showing diff from parent 38abaa6d255d Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
196
197
198
199
 
200
201
202
 
206
207
208
209
 
210
211
212
 
196
197
198
 
199
200
201
202
 
206
207
208
 
209
210
211
212
@@ -196,7 +196,7 @@
  paths = self.getSelectedPaths(self.rtree)   if paths:   opts = {} - opts['rev'] = ['rev(%d)' % self.repo[None].p1().rev()] + opts['rev'] = ['p1()']   opts['tool'] = self.tcombo.readValue()   dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)   if dlg: @@ -206,7 +206,7 @@
  paths = self.getSelectedPaths(self.rtree)   if paths:   opts = {} - opts['rev'] = ['rev(%d)' % self.repo[None].p2().rev()] + opts['rev'] = ['p2()']   opts['tool'] = self.tcombo.readValue()   dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)   if dlg: