Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

thgpbranch: Fix graph generation

Changeset 49d69fd64f7e…

Parent be8349bcb224…

by Peer Sommerlund

Changes to one file · Browse files at 49d69fd64f7e Showing diff from parent be8349bcb224 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​thgpbranch.py Stacked
 
230
231
232
233
 
234
235
236
 
297
298
299
300
 
301
302
303
304
305
306
307
 
 
308
309
310
 
230
231
232
 
233
234
235
236
 
297
298
299
 
300
301
302
303
304
305
 
 
306
307
308
309
310
@@ -230,7 +230,7 @@
  patchname = name   msg = '%s' % parents # summary (utf-8)   msg_esc = 'what-is-this-for' # escaped summary (utf-8) - self.model.append((node, in_lines, out_lines, stat, patchname, msg, msg_esc)) + self.model.append((node, in_lines, out_lines, patchname))   # Loop   in_lines = out_lines   dep_list = next_dep_list @@ -297,14 +297,14 @@
  heads = self.repo.branchheads(patch_name)   if len(heads) > 1:   status.append(_('needs merge of %i heads\n') % len(heads)) - for dep, through in graph.pendingmerges(patch): + for dep, through in graph.pendingmerges(patch_name):   if through:   status.append(_('needs merge with %s (through %s)\n') %   (dep, ", ".join(through)))   else:   status.append(_('needs merge with %s\n') % dep) - for dep in graph.pendingrebases(patch): - ui.status(_('needs update of diff base to tip of %s\n') % dep) + for dep in graph.pendingrebases(patch_name): + status.append(_('needs update of diff base to tip of %s\n') % dep)   return status     def pnew(self, patch_name):