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

logview: working parents get slightly larger graph nodes

Not the optimal way to delineate parents, but this was the easiest thing to do.

Changeset aa57290fc684…

Parent 3114adb69ac5…

by Steve Borho

Changes to 2 files · Browse files at aa57290fc684 Showing diff from parent 3114adb69ac5 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​logview/​graphcell.py Stacked
 
172
173
174
175
176
 
 
 
 
 
 
 
177
178
179
 
202
203
204
205
 
206
207
208
 
209
210
211
 
212
213
214
 
172
173
174
 
 
175
176
177
178
179
180
181
182
183
184
 
207
208
209
 
210
211
212
 
213
214
215
 
216
217
218
219
@@ -172,8 +172,13 @@
  (column, colour, status) = self.node   arc_start_position_x = cell_area.x + box_size * column + box_size / 2;   arc_start_position_y = cell_area.y + cell_area.height / 2; - ctx.arc(arc_start_position_x, arc_start_position_y, - box_size / 5, 0, 2 * math.pi) + if status >= 4: # working directory parent + ctx.arc(arc_start_position_x, arc_start_position_y, + box_size / 4, 0, 2 * math.pi) + status -= 4 + else: + ctx.arc(arc_start_position_x, arc_start_position_y, + box_size / 5, 0, 2 * math.pi)   self.set_colour(ctx, colour, 0.0, 0.5)   ctx.stroke_preserve()   @@ -202,13 +207,13 @@
    arrow_y = arc_start_position_y - box_size / 4   arrow_x = arc_start_position_x + 7; - if status == -1: # Outgoing arrow + if status == 1: # Outgoing arrow   ctx.rectangle(arrow_x, arrow_y, 2, 5)   draw_arrow(arrow_x, arrow_y, -3) - elif status == 1: # New changeset, recently added to tip + elif status == 2: # New changeset, recently added to tip   ctx.set_source_rgb(0, 1, 0)   draw_star(arrow_x + box_size / 4, arc_start_position_y , 4, 6) - elif status == 2: # Incoming (bundle preview) arrow + elif status == 3: # Incoming (bundle preview) arrow   ctx.rectangle(arrow_x, arrow_y, 2, 5)   draw_arrow(arrow_x, arrow_y + 5, 3)   ctx.stroke_preserve()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treemodel.py Stacked
 
179
180
181
182
 
183
184
185
186
187
 
 
188
189
190
191
192
193
 
 
 
194
195
196
 
179
180
181
 
182
183
184
185
186
187
188
189
190
 
 
191
192
193
194
195
196
197
198
199
@@ -179,18 +179,21 @@
  if not self.showgraph:   marker = hglib.toutf(u'\u2191 ') # up arrow   sumstr = marker + sumstr - status = -1 + status = 1   elif revid >= self.origtip:   if revid >= len(self.repo) - self.npreviews:   if not self.showgraph:   marker = hglib.toutf(u'\u2193 ') # down arrow   sumstr = marker + sumstr + status = 3 + else:   status = 2 - else: - status = 1   else:   status = 0   + if revid in self.wcparents: + status += 4 +   revision = (sumstr, author, taglist, color, age, status)   self.revisions[revid] = revision   else: