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

Merge with stable

Changeset f9e72325f117…

Parents 19713f6b9977…

Parents 0ba604b055f2…

by Steve Borho

Changes to 2 files · Browse files at f9e72325f117 Showing diff from parent 19713f6b9977 0ba604b055f2 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
705
706
707
708
709
 
 
710
711
712
 
705
706
707
 
 
708
709
710
711
712
@@ -705,8 +705,8 @@
  opts['npreviews'] = self.npreviews   opts['no_merges'] = self.no_merges   - self.cmd_set_sensitive('load-more', True) - self.cmd_set_sensitive('load-all', True) + self.cmd_set_sensitive('load-more', len(self.repo)>0) + self.cmd_set_sensitive('load-all', len(self.repo)>0)   self.ancestrybutton.set_sensitive(False)   pats = opts.get('pats', [])   self.changeview.pats = pats
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
 
124
125
126
 
 
127
128
129
 
308
309
310
 
 
 
311
312
313
 
315
316
317
 
 
 
318
319
320
 
124
125
126
127
128
129
130
131
 
310
311
312
313
314
315
316
317
318
 
320
321
322
323
324
325
326
327
328
@@ -124,6 +124,8 @@
  self.repo = repo   self.currevid = None   self.pbar = pbar + self.grapher = None + self.graphdata = []   self.index = {}   self.opts = { 'outgoing':[], 'orig-tip':None, 'npreviews':0,   'branch-color':False, 'show-graph':True } @@ -308,6 +310,9 @@
  return None     def next_revision_batch(self, size): + if not self.grapher: + self.emit('revisions-loaded') + return   self.batchsize = size   self.limit += self.batchsize   if self.pbar is not None: @@ -315,6 +320,9 @@
  gobject.idle_add(self.populate)     def load_all_revisions(self): + if not self.grapher: + self.emit('revisions-loaded') + return   self.limit = None   if self.pbar is not None:   self.pbar.begin()