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: support visual diffs when a bundle is overlayed

Found and fixed #598 while doing this, then back-ported fix
to the stable branch.

Changeset 35f196b81d14…

Parent 2147a9a35226…

by Steve Borho

Changes to 2 files · Browse files at 35f196b81d14 Showing diff from parent 2147a9a35226 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
26
27
28
 
29
30
31
 
683
684
685
686
 
 
687
688
689
 
716
717
718
719
 
 
720
721
722
723
724
725
 
 
726
727
728
 
26
27
28
29
30
31
32
 
684
685
686
 
687
688
689
690
691
 
718
719
720
 
721
722
723
724
725
726
727
 
728
729
730
731
732
@@ -26,6 +26,7 @@
  gdialog.GDialog.__init__(self, ui, repo, cwd, pats, opts)   self.stbar = stbar   self.glog_parent = None + self.bfile = None     def get_title(self):   title = _('%s changeset ') % self.get_reponame() @@ -683,7 +684,8 @@
  return False   if not self.curfile:   return False - self._do_diff([self.curfile], {'change' : self.currev}) + opts = {'change':str(self.currev), 'bundle':self.bfile} + self._do_diff([self.curfile], opts)     def file_row_act(self, tree, path, column) :   'Default action is the first entry in the context menu' @@ -716,13 +718,15 @@
  def diff_to_local(self, menuitem):   if not self.curfile:   return - self._do_diff([self.curfile], {'rev' : str(self.currev)}) + opts = {'rev':[str(self.currev)], 'bundle':self.bfile} + self._do_diff([self.curfile], opts)     def diff_file_rev(self, menuitem):   'User selected visual diff file from the file list context menu'   if not self.curfile:   return - self._do_diff([self.curfile], {'change' : str(self.currev)}) + opts = {'change':str(self.currev), 'bundle':self.bfile} + self._do_diff([self.curfile], opts)     def view_file_rev(self, menuitem):   'User selected view file revision from the file list context menu'
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
924
925
926
 
927
928
929
 
989
990
991
 
992
993
994
 
1230
1231
1232
1233
 
 
1234
1235
 
1236
1237
1238
 
924
925
926
927
928
929
930
 
990
991
992
993
994
995
996
 
1232
1233
1234
 
1235
1236
1237
1238
1239
1240
1241
1242
@@ -924,6 +924,7 @@
  self.repo = hg.repository(self.ui, path=self.repo.root)   self.graphview.set_repo(self.repo, self.stbar)   self.changeview.repo = self.repo + self.changeview.bfile = None   if resettip:   self.origtip = len(self.repo)   self.reload_log() @@ -989,6 +990,7 @@
  self.repo = hg.repository(self.ui, path=bfile)   self.graphview.set_repo(self.repo, self.stbar)   self.changeview.repo = self.repo + self.changeview.bfile = bfile   self.reload_log()     def pull_clicked(self, toolbutton, combo, ppullcombo, ppulldata): @@ -1230,9 +1232,11 @@
  dlg.hide()     def vdiff_change(self, menuitem, pats=[]): - self._do_diff(pats, {'change' : str(self.currevid)}) + opts = {'change':str(self.currevid), 'bundle':self.bfile} + self._do_diff(pats, opts)     def vdiff_local(self, menuitem, pats=[]): + opts = {'rev':[str(self.currevid)], 'bundle':self.bfile}   self._do_diff(pats, {'rev' : [str(self.currevid)]})     def diff_revs(self, menuitem):