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

stable history: use gdialog._do_diff() directly

Fixes visual diffs of selected file in a changeset
Fixes visual diff of range of changesets
Clarifies visual diff behavior

Changeset 7d55e324ff71…

Parent ac4b569854a7…

by Steve Borho

Changes to 2 files · Browse files at 7d55e324ff71 Showing diff from parent ac4b569854a7 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​changeset.py Stacked
 
473
474
475
476
 
477
478
479
 
503
504
505
506
507
 
508
509
510
511
512
513
514
515
 
516
517
518
 
473
474
475
 
476
477
478
479
 
503
504
505
 
 
506
507
508
509
510
511
 
 
 
512
513
514
515
@@ -473,7 +473,7 @@
  return False   if not self.curfile:   return False - self._diff_file('M', self.curfile) + self._do_diff([self.curfile], {'change' : self.currev})     def file_row_act(self, tree, path, column) :   'Default action is the first entry in the context menu' @@ -503,16 +503,13 @@
  def diff_to_local(self, menuitem):   if not self.curfile:   return - self.opts['rev'] = [str(self.currev)] - self._diff_file('M', self.curfile) + self._do_diff([self.curfile], {'rev' : str(self.currev)})     def diff_file_rev(self, menuitem):   'User selected visual diff file from the file list context menu'   if not self.curfile:   return - self.opts['change'] = str(self.currev) - self._diff_file('M', self.curfile) - del self.opts['change'] + self._do_diff([self.curfile], {'change' : str(self.currev)})     def view_file_rev(self, menuitem):   'User selected view file revision from the file list context menu'
Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
581
582
583
584
585
586
587
588
589
 
 
590
591
592
 
581
582
583
 
 
 
 
 
 
584
585
586
587
588
@@ -581,12 +581,8 @@
  return True     def vdiff_selected(self, menuitem): - rev0, rev1 = self.revs - self.opts['rev'] = ["%s:%s" % (rev0, rev1)] - if len(self.pats) == 1: - self._diff_file(None, self.pats[0]) - else: - self._diff_file(None, None) + strrevs = [str(r) for r in self.revs] + self._do_diff(self.pats, {'rev' : strrevs})     def email_revs(self, menuitem):   revs = list(self.revs)