Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

logview, changeset: reflect current parent to 'Changes' column

Changeset f931a576adff…

Parent ba178804fc20…

by Yuki KODAMA

Changes to 2 files · Browse files at f931a576adff Showing diff from parent ba178804fc20 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
133
134
135
 
 
 
 
 
 
 
 
 
 
 
 
 
136
137
138
 
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
@@ -133,6 +133,19 @@
  else:   parent = self.repo[-1]   + oldother = hasattr(self, 'otherparent') and self.otherparent or None + self.otherparent = len(parents) == 2 and self.diff_other_parent() + + # refresh merge row without graph redrawing + if self.graphview: + gview = self.graphview + if oldother: + gview.model.clear_parents() + elif self.otherparent: + gview.model.set_parent(ctx.rev(), parent) + gview.hide() + gview.show() +   # update dialog title   self.set_title(title)  
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​logview/​treemodel.py Stacked
 
51
52
53
54
55
 
56
57
58
 
230
231
232
233
 
 
 
 
234
235
236
 
309
310
311
 
 
 
 
 
 
 
 
 
 
 
51
52
53
 
54
55
56
57
58
 
230
231
232
 
233
234
235
236
237
238
239
 
312
313
314
315
316
317
318
319
320
321
322
323
324
@@ -51,8 +51,8 @@
  self.origtip = opts['orig-tip']   self.npreviews = opts['npreviews']   self.showgraph = opts['show-graph'] - self.revisions = {}   self.graphdata = graphdata + self.revisions, self.parents = {}, {}   self.wcparents, self.tagrevs, self.branchtags = [], [], {}   self.refresh()   @@ -230,7 +230,10 @@
  # new   status += 2   - M, A, R = self.repo.status(ctx.parents()[0].node(), ctx.node())[:3] + parent = self.parents.get(revid, None) + if parent is None: + parent = ctx.parents()[0].node() + M, A, R = self.repo.status(parent, ctx.node())[:3]   common = dict(color='black')   M = M and gtklib.markup(' %s ' % len(M),   background=gtklib.PORANGE, **common) or '' @@ -309,3 +312,13 @@
  self.color_cache[author] = color   return self.color_cache[author]   + def set_parent(self, rev, parent): + self.parents[rev] = parent + if rev in self.revisions: + del self.revisions[rev] + + def clear_parents(self): + for rev in self.parents.keys(): + if rev in self.revisions: + del self.revisions[rev] + self.parents = {}