Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

history: use CmdRunner instead of CmdDialog

Changeset a8addc74ec48…

Parent a50c8c108a8b…

by Yuki KODAMA

Changes to one file · Browse files at a8addc74ec48 Showing diff from parent a50c8c108a8b Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1230
1231
1232
1233
 
1234
1235
1236
 
1241
1242
1243
1244
1245
 
 
1246
1247
1248
 
1261
1262
1263
1264
1265
1266
1267
1268
 
 
 
 
 
 
 
 
 
 
 
 
1269
1270
1271
 
1337
1338
1339
 
1340
1341
1342
 
1230
1231
1232
 
1233
1234
1235
1236
 
1241
1242
1243
 
 
1244
1245
1246
1247
1248
 
1261
1262
1263
 
 
 
 
 
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
 
1344
1345
1346
1347
1348
1349
1350
@@ -1230,7 +1230,7 @@
  else:   if newmarkers != oldmarkers:   self.refresh_model() - +   def refresh_on_current_marker_change(self, oldlen, oldmarkers,   oldcurrent, newmarkers,   newcurrent): @@ -1241,8 +1241,8 @@
  else:   if newmarkers != oldmarkers or \   oldcurrent != newcurrent: - self.refresh_model() - + self.refresh_model() +   def apply_clicked(self, button):   combo = self.ppullcombo   list, iter = combo.get_model(), combo.get_active_iter() @@ -1261,11 +1261,18 @@
  hglib.loadextension(self.ui, 'rebase')     cmdline = ['hg'] + cmd + [self.bfile] - dlg = hgcmd.CmdDialog(cmdline) - dlg.show_all() - dlg.run() - dlg.hide() - self.remove_overlay('--rebase' in cmd) + + def callback(return_code, *args): + self.stbar.end() + self.remove_overlay('--rebase' in cmd) + + if self.runner.execute(cmdline, callback): + self.runner.set_title(_('Applying bundle')) + self.stbar.begin(_('Applying bundle...')) + else: + gdialog.Prompt(_('Cannot run now'), + _('Please try again after running ' + 'operation is completed'), self).run()     def remove_overlay(self, resettip):   self.bfile = None @@ -1337,6 +1344,7 @@
  else:   text = _('No incoming changesets')   self.stbar.set_idle_text(text) +   if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Incoming'))   self.stbar.begin(_('Checking incoming changesets...'))