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

Merge with stable

Changeset 927a7a9750d8…

Parents db02396200d4…

Parents 6eed5860fb97…

by Yuki KODAMA

Changes to 2 files · Browse files at 927a7a9750d8 Showing diff from parent db02396200d4 6eed5860fb97 Diff from another changeset...

Change 1 of 1 Show Entire File thgtaskbar.py Stacked
 
233
234
235
236
 
237
238
239
 
233
234
235
 
236
237
238
239
@@ -233,7 +233,7 @@
  logger.msg('Failed updating %s (check permissions)' % r)   failedroots.add(r)   except (error.Abort, error.ConfigError, error.RepoError, - error.RevlogError), e: + error.RevlogError, ImportError), e:   logger.msg('Failed updating %s (%s)' % (r, str(e)))   failedroots.add(r)   notifypaths -= failedroots
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
 
608
609
610
 
 
611
 
612
613
614
615
616
617
618
619
 
620
621
622
623
 
 
 
 
624
625
626
 
608
609
610
611
612
613
614
615
616
617
618
619
620
 
 
621
622
623
624
 
625
626
627
628
629
630
631
@@ -608,19 +608,24 @@
  self.vbox.pack_start(wrapbox)     # create combo to select the target + hbox = gtk.HBox() + wrapbox.pack_start(hbox, False, False, 1)   combo = gtk.combo_box_new_text() + hbox.pack_start(combo, False, False)   combo.append_text(_('User global settings'))   if repo:   combo.append_text(_('%s repository settings') % hglib.toutf(name))   combo.connect('changed', self.fileselect)   self.confcombo = combo   - hbox = gtk.HBox() - hbox.pack_start(combo, False, False) + # command buttons   edit = gtk.Button(_('Edit File'))   hbox.pack_start(edit, False, False, 6)   edit.connect('clicked', self.edit_clicked) - wrapbox.pack_start(hbox, False, False, 1) + + reload = gtk.Button(_('Reload')) + hbox.pack_start(reload, False, False) + reload.connect('clicked', lambda *a: self.refresh())     # insert padding of between combo and middle pane   wrapbox.pack_start(gtk.VBox(), False, False, 4)