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 0d0955c1e3fb…

Parents 6f87af1aae64…

Parents c7b16144f4b3…

by Steve Borho

Changes to one file · Browse files at 0d0955c1e3fb Showing diff from parent 6f87af1aae64 c7b16144f4b3 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
35
36
37
38
39
40
41
 
57
58
59
60
61
62
63
64
65
66
 
83
84
85
 
 
 
 
 
86
87
88
 
35
36
37
 
38
39
40
 
56
57
58
 
59
60
 
61
62
63
 
80
81
82
83
84
85
86
87
88
89
90
@@ -35,7 +35,6 @@
  gtklib.set_tortoise_keys(self)   self.set_resizable(False)   self.set_has_separator(False) - self.connect('response', self.response)     self.newbranch = None   self.closebranch = False @@ -57,10 +56,8 @@
  self.newbranchradio = gtk.RadioButton(nochanges,   _('Open a new named branch'))   self.newbranchradio.set_active(True) - self.newbranchradio.connect('toggled', self.nbtoggle)   branchcombo = gtk.combo_box_entry_new_text()   self.branchentry = branchcombo.child - self.branchentry.connect('activate', self.activated)     dblist = repo.ui.config('tortoisehg', 'deadbranch', '')   deadbranches = [ x.strip() for x in dblist.split(',') ] @@ -83,6 +80,11 @@
  table.add_row(self.closebranchradio)   table.add_row(nochanges)   + # signal handlers + self.connect('response', self.response) + self.newbranchradio.connect('toggled', self.nbtoggle) + self.branchentry.connect('activate', self.activated) +   # prepare to show   if branch:   self.newbranch = branch