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

stable changeset: fix other parent box

was erroneously shown from datamine for non-merges

Changeset 5d448227ee32…

Parent f5ec4035ce66…

by Adrian Buehlmann

Changes to one file · Browse files at 5d448227ee32 Showing diff from parent f5ec4035ce66 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
25
26
27
28
 
29
30
31
 
86
87
88
89
90
91
92
93
94
95
96
 
 
 
 
97
98
99
 
25
26
27
 
28
29
30
31
 
86
87
88
 
 
 
 
 
89
90
91
92
93
94
95
96
97
98
@@ -25,7 +25,7 @@
  self.stbar = stbar   self.glog_parent = None   self.bfile = None - self.nothing_loaded = True + self.other_parent_box_added = False     def get_title(self):   title = _('%s changeset ') % self.get_reponame() @@ -86,14 +86,13 @@
  if not ctx:   return   - if self.nothing_loaded: - self.other_parent_box.pack_start( - self.other_parent_checkbutton, False, False) - self.nothing_loaded = False -   parents = ctx.parents()   title = self.get_title()   if len(parents) == 2: + if not self.other_parent_box_added: + self.other_parent_box.pack_start( + self.other_parent_checkbutton, False, False) + self.other_parent_box_added = True   self.other_parent_box.show_all()   if self.diff_other_parent():   title += ':' + str(parents[1].rev())