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 ea99f13eaaa4…

Parents 931724f7bde8…

Parents d78e44c21a04…

by Yuki KODAMA

Changes to 5 files · Browse files at ea99f13eaaa4 Showing diff from parent 931724f7bde8 d78e44c21a04 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
145
146
147
 
148
149
150
151
 
152
153
154
 
145
146
147
148
149
150
 
 
151
152
153
154
@@ -145,10 +145,10 @@
  gview = self.graphview   if oldother:   gview.model.clear_parents() + gview.queue_draw()   elif self.otherparent:   gview.model.set_parent(ctx.rev(), parent) - gview.hide() - gview.show() + gview.queue_draw()     # update dialog title   self.set_title(title)
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​clone.py Stacked
 
83
84
85
86
 
87
88
89
 
115
116
117
118
 
119
120
121
 
171
172
173
174
 
175
176
177
178
179
180
 
 
 
181
182
183
 
83
84
85
 
86
87
88
89
 
115
116
117
 
118
119
120
121
 
171
172
173
 
174
175
176
177
178
179
180
181
182
183
184
185
186
@@ -83,7 +83,7 @@
    # layout table for fixed options   self.table = table = gtklib.LayoutTable() - vbox.pack_start(table, True, True, 2) + vbox.pack_start(table, False, False, 2)     ## comboentry for source paths   self.srclist, srccombo = createcombo(self.srcpath, @@ -115,7 +115,7 @@
    # expander for advanced options   self.expander = expander = gtk.Expander(_('Advanced options')) - vbox.pack_start(expander, True, True, 2) + vbox.pack_start(expander, False, False, 2)     # layout table for advanced options   table = gtklib.LayoutTable() @@ -171,13 +171,16 @@
  def get_action_map(self):   return {gtk.RESPONSE_OK: self.clone}   - def switch_to(self, normal, *args): + def switch_to(self, normal, working, *args):   self.table.set_sensitive(normal)   self.expander.set_sensitive(normal)   self.buttons['clone'].set_property('visible', normal)   self.buttons['cancel'].set_property('visible', normal)   if normal:   self.buttons['cancel'].grab_focus() + if working: + self.set_resizable(True) + self.vbox.set_child_packing(self.cmd, True, True, 6, gtk.PACK_START)     def command_done(self, returncode, useraborted, src, dest):   self.add_src_to_recent(src)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgcmd.py Stacked
 
279
280
281
282
 
283
284
285
 
279
280
281
 
282
283
284
285
@@ -279,7 +279,7 @@
    # progress bar box   self.progbox = progbox = gtklib.SlimToolbar(tooltips) - self.pack_start(progbox) + self.pack_start(progbox, False, False)     def add_button(stock_id, tooltip, handler, toggle=False):   btn = progbox.append_button(stock_id, tooltip, toggle)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1146
1147
1148
1149
 
 
1150
1151
1152
 
1146
1147
1148
 
1149
1150
1151
1152
1153
@@ -1146,7 +1146,8 @@
  opts['filehist'] = lname   self.graphview.refresh(graphcol, [lname], opts)   if not opts.get('filehist'): - ftitle(self.filtercombo.get_active_text()) + ftitle('%s: %s' % (self.filtercombo.get_active_text(), + self.filterentry.get_text()))   self.graphview.refresh(False, npats, opts)   filtertext += self.filtercombo.get_active_text()   elif self.filter == 'all':
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
35
36
37
38
 
39
40
41
 
141
142
143
 
 
 
144
145
146
 
35
36
37
 
38
39
40
41
 
141
142
143
144
145
146
147
148
149
@@ -35,7 +35,7 @@
  def get_body(self, vbox):   # layout table   table = gtklib.LayoutTable() - vbox.pack_start(table, True, True, 2) + vbox.pack_start(table, False, False, 2)   self.table = table     ## revision label & combobox @@ -141,6 +141,9 @@
  self.buttons['close'].set_property('visible', normal)   if normal:   self.buttons['close'].grab_focus() + if working: + self.set_resizable(True) + self.vbox.set_child_packing(self.cmd, True, True, 6, gtk.PACK_START)   if cmd and self.opt_showlog.get_active():   self.cmd.show_log()