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: add diff_other_parent

Changeset 7025078f20c3…

Parent 23e60a084681…

by Adrian Buehlmann

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

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
66
67
68
 
 
 
69
70
71
 
82
83
84
85
 
86
87
88
 
99
100
101
102
 
103
104
105
 
268
269
270
271
 
272
273
274
 
66
67
68
69
70
71
72
73
74
 
85
86
87
 
88
89
90
91
 
102
103
104
 
105
106
107
108
 
271
272
273
 
274
275
276
277
@@ -66,6 +66,9 @@
  else:   self._setting_hpos = -1   + def diff_other_parent(self): + return self.other_parent_checkbutton.get_active() +   def load_details(self, rev):   'Load selected changeset details into buffer and filelist'   self.currev = rev @@ -82,7 +85,7 @@
  title = self.get_title()   if len(parents) == 2:   self.other_parent_box.show_all() - if self.other_parent_checkbutton.get_active(): + if self.diff_other_parent():   title += ':' + str(parents[1].rev())   else:   title += ':' + str(parents[0].rev()) @@ -99,7 +102,7 @@
  self.clipboard.set_text(str(ctx))     self.set_title(title) - if self.other_parent_checkbutton.get_active(): + if self.diff_other_parent():   parent = parents[1].node()   elif parents:   parent = parents[0].node() @@ -268,7 +271,7 @@
    ismerge = (len(ctx.parents()) == 2)   - if ismerge and self.other_parent_checkbutton.get_active(): + if ismerge and self.diff_other_parent():   parentindex = 1   else:   parentindex = 0