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

history: keep track of the number of preview changesets

Instead of a boolean value, store the number of preview
changesets, so the history log is able to display new and
preview changesets at the same time.

Changeset 6c36e4400f01…

Parent bd6c5a380d98…

by Wagner Bruna

Changes to 3 files · Browse files at 6c36e4400f01 Showing diff from parent bd6c5a380d98 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
48
49
50
 
51
52
53
 
488
489
490
 
 
 
491
492
 
493
494
495
 
923
924
925
 
926
927
928
 
989
990
991
992
 
993
994
995
996
 
997
998
999
 
48
49
50
51
52
53
54
 
489
490
491
492
493
494
495
 
496
497
498
499
 
927
928
929
930
931
932
933
 
994
995
996
 
997
998
999
1000
1001
1002
1003
1004
1005
@@ -48,6 +48,7 @@
  self.filteropts = None   self.bundledir = None   self.bfile = None + self.npreviews = 0   os.chdir(self.repo.root)     # Load extension support for commands which need it @@ -488,8 +489,11 @@
    # handle strips, rebases, etc   self.origtip = min(len(self.repo), self.origtip) + if not self.bfile: + self.npreviews = 0 +   opts['orig-tip'] = self.origtip - opts['bundleview'] = bool(self.bfile) + opts['npreviews'] = self.npreviews     opts['no_merges'] = self.no_merges   @@ -923,6 +927,7 @@
    def remove_overlay(resettip):   self.bfile = None + self.npreviews = 0   combo.get_child().set_text('')   self.repo = hg.repository(self.ui, path=self.repo.root)   self.graphview.set_repo(self.repo, self.stbar) @@ -989,11 +994,12 @@
  disabled.append(self.syncbox)     self.bfile = bfile - self.origtip = len(self.repo) + oldtip = len(self.repo)   self.repo = hg.repository(self.ui, path=bfile)   self.graphview.set_repo(self.repo, self.stbar)   self.changeview.repo = self.repo   self.changeview.bfile = bfile + self.npreviews = len(self.repo) - oldtip   self.reload_log()     def pull_clicked(self, toolbutton, combo, ppullcombo, ppulldata):
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​logview/​treemodel.py Stacked
 
40
41
42
43
 
44
45
46
 
51
52
53
54
 
55
56
57
 
177
178
179
180
 
 
 
 
181
182
183
 
40
41
42
 
43
44
45
46
 
51
52
53
 
54
55
56
57
 
177
178
179
 
180
181
182
183
184
185
186
@@ -40,7 +40,7 @@
   class TreeModel(gtk.GenericTreeModel):   - def __init__ (self, repo, graphdata, color_func, outgoing, origtip, bview): + def __init__ (self, repo, graphdata, color_func, outgoing, origtip, npreviews):   gtk.GenericTreeModel.__init__(self)   self.repo = repo   self.outgoing = outgoing @@ -51,7 +51,7 @@
  self.tagrevs = [repo[r].rev() for t, r in repo.tagslist()]   self.branchtags = repo.branchtags()   self.origtip = origtip - self.bundleview = bview + self.npreviews = npreviews   self.hidetags = self.repo.ui.config(   'tortoisehg', 'hidetags', '').split()   @@ -177,7 +177,10 @@
  if node in self.outgoing:   status = -1   elif revid >= self.origtip: - status = self.bundleview and 2 or 1 + if revid >= len(self.repo) - self.npreviews: + status = 2 + else: + status = 1   else:   status = 0  
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
 
129
130
131
132
 
133
134
135
 
250
251
252
253
 
254
255
256
 
359
360
361
362
 
363
364
365
 
129
130
131
 
132
133
134
135
 
250
251
252
 
253
254
255
256
 
359
360
361
 
362
363
364
365
@@ -129,7 +129,7 @@
  self.origtip = None   self.branch_color = False   self.outgoing = [] - self.bundleview = False + self.npreviews = 0     def set_outgoing(self, outgoing):   self.outgoing = outgoing @@ -250,7 +250,7 @@
  if not self.model:   model = treemodel.TreeModel(self.repo, self.graphdata,   self.color_func, self.outgoing, self.origtip, - self.bundleview) + self.npreviews)   self.treeview.set_model(model)   self.model = model   @@ -359,7 +359,7 @@
    def refresh(self, graphcol, pats, opts):   self.origtip = opts['orig-tip'] - self.bundleview = opts['bundleview'] + self.npreviews = opts['npreviews']   if self.repo is not None:   hglib.invalidaterepo(self.repo)   if len(self.repo) > 0: