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

Parents 562778fb35e9…

Parents fc43a344f860…

by Steve Borho

Changes to one file · Browse files at dee5a3638080 Showing diff from parent 562778fb35e9 fc43a344f860 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
10
11
12
13
14
15
16
 
19
20
21
22
 
23
24
25
 
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
 
1390
1391
1392
1393
1394
 
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
 
 
 
 
 
 
 
 
 
1407
1408
 
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
 
 
 
 
1433
1434
1435
 
10
11
12
 
13
14
15
 
18
19
20
 
21
22
23
24
 
1024
1025
1026
 
 
 
1027
 
1028
1029
 
1030
1031
1032
 
1384
1385
1386
 
 
1387
1388
1389
1390
 
 
 
 
 
 
 
 
 
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
 
1401
1402
1403
1404
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1405
1406
1407
1408
1409
1410
1411
@@ -10,7 +10,6 @@
 import sys  import gtk  import gobject -import Queue  import shutil  import tempfile  import atexit @@ -19,7 +18,7 @@
 from mercurial import hbisect    from tortoisehg.util.i18n import _ -from tortoisehg.util import hglib, thread2 +from tortoisehg.util import hglib    from tortoisehg.hgtk.logview.treeview import TreeView as LogTreeView   @@ -1025,14 +1024,9 @@
  _('Push outgoing changesets'))   email = syncbox.append_stock(gtk.STOCK_GOTO_LAST,   _('Email outgoing changesets')) - syncbox.append_widget(gtk.VSeparator()) - stop = syncbox.append_stock(gtk.STOCK_STOP, - _('Stop current transaction'))   - stop.set_sensitive(False)   apply.set_sensitive(False)   reject.set_sensitive(False) - self.stop_button = stop   self.syncbar_apply = apply   self.syncbar_reject = reject   @@ -1390,46 +1384,28 @@
  self).run()   self.pathentry.grab_focus()   return - q = Queue.Queue() - cmd = [q, 'outgoing', '--quiet', '--template', '{node}\n'] + cmd = ['hg', 'outgoing', '--quiet', '--template', '{node}\n']   cmd += self.get_proxy_args()   cmd += [hglib.validate_synch_path(path, self.repo)]   - def threadfunc(q, *args): - try: - hglib.hgcmd_toq(q, *args) - except (util.Abort, hglib.RepoError), e: - self.stbar.set_status_text(_('Abort: %s') % str(e)) - - def out_wait(): - while q.qsize(): - hash = q.get(0).strip() + dlg = hgcmd.CmdDialog(cmd, text='hg outgoing') + dlg.show_all() + dlg.run() + dlg.hide() + if dlg.return_code() == 0: + outgoing = [] + buf = dlg.textbuffer + begin, end = buf.get_bounds() + for line in buf.get_text(begin, end).splitlines()[:-1]:   try: - node = self.repo[hash].node() + node = self.repo[line].node()   outgoing.append(node)   except:   pass - if thread.isAlive(): - return True - else: - self.stbar.end() - self.outgoing = outgoing - self.reload_log() - text = _('%d outgoing Changesets') % len(outgoing) - self.stbar.set_idle_text(text) - self.stop_button.disconnect(stop_handler) - self.stop_button.set_sensitive(False) - - def stop_clicked(button): - thread.terminate() - - outgoing = [] - thread = thread2.Thread(target=threadfunc, args=cmd) - thread.start() - self.stbar.begin() - stop_handler = self.stop_button.connect('clicked', stop_clicked) - self.stop_button.set_sensitive(True) - gobject.timeout_add(50, out_wait) + self.outgoing = outgoing + self.reload_log() + text = _('%d outgoing changesets') % len(outgoing) + self.stbar.set_idle_text(text)     def email_clicked(self, toolbutton):   path = hglib.fromutf(self.pathentry.get_text()).strip()