Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

history: fix interactions with synch dialog

Changeset b0ba2e29db96…

Parent b71beec349aa…

by Steve Borho

Changes to 2 files · Browse files at b0ba2e29db96 Showing diff from parent b71beec349aa Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
78
79
80
 
81
82
 
83
84
85
 
86
 
87
88
 
 
 
 
 
 
89
90
91
 
344
345
346
347
348
 
349
350
351
 
78
79
80
81
82
 
83
84
85
 
86
87
88
89
 
90
91
92
93
94
95
96
97
98
 
351
352
353
 
 
354
355
356
357
@@ -78,14 +78,21 @@
    def synch_clicked(self, toolbutton, data):   from hggtk import synch + parents = [x.node() for x in self.repo.parents()]   dlg = synch.SynchDialog([], False, True) - dlg.set_notify_func(self.synch_complete, None) + dlg.set_notify_func(self.synch_complete, parents)   dlg.show_all()   - def synch_complete(self, _): + def synch_complete(self, parents):   self.repo.invalidate() + newparents = [x.node() for x in self.repo.parents()]   if len(self.repo) != self.origtip: - self.newbutton.set_active(True) + if self.newbutton.get_active(): + self.reload_log() + else: + self.newbutton.set_active(True) + elif not oldparents == newparents: + self.refresh_model()     def toggle_view_column(self, button, property):   active = button.get_active() @@ -344,8 +351,7 @@
  elif self.filter == 'all':   self.graphview.refresh(True, None, self.opts)   elif self.filter == 'new': - newtip = len(self.repo)-1 - self.opts['revrange'] = [newtip, self.origtip+1] + self.opts['revrange'] = [len(self.repo)-1, self.origtip]   self.graphview.refresh(True, None, self.opts)   elif self.filter == 'only_merges':   self.opts['only_merges'] = True
Change 1 of 2 Show Entire File hggtk/​logview/​treeview.py Stacked
 
457
458
459
460
 
461
462
463
 
476
477
478
479
 
480
481
482
 
457
458
459
 
460
461
462
463
 
476
477
478
 
479
480
481
482
@@ -457,7 +457,7 @@
  self.treeview.append_column(self.utc_column)     def text_color_orig(self, parents, rev, author): - if self.origtip is not None and int(rev) > self.origtip: + if self.origtip is not None and int(rev) >= self.origtip:   return 'darkgreen'   if len(parents) == 2:   # mark merge changesets blue @@ -476,7 +476,7 @@
  color_cache = {}     def text_color_author(self, parents, rev, author): - if self.origtip is not None and int(rev) > self.origtip: + if self.origtip is not None and int(rev) >= self.origtip:   return 'darkgreen'   for re, v in self.author_pats:   if (re.search(author)):