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 for pulling/pushing operations

Changeset b554f2a66290…

Parent e816730f92da…

by Yuki KODAMA

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

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1410
1411
1412
 
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
 
 
 
 
 
 
 
 
 
 
 
 
1501
1502
1503
 
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1926
1927
 
 
 
1928
1929
1930
 
1395
1396
1397
 
 
 
 
 
 
 
 
 
 
 
 
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
 
1496
1497
1498
 
 
 
 
 
 
 
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
 
1908
1909
1910
 
 
 
 
 
 
 
 
 
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
 
1947
1948
1949
1950
1951
1952
@@ -1395,18 +1395,23 @@
  self.pathentry.grab_focus()   return   cmdline = ['hg'] + cmd + self.get_proxy_args() + [remote_path] - dlg = hgcmd.CmdDialog(cmdline, text=' '.join(['hg'] + cmd)) - dlg.show_all() - dlg.run() - dlg.hide() - if dlg.return_code() == 0: - self.repo.invalidate() - self.changeview.clear_cache() - if '--rebase' in cmd: - self.origtip = len(self.repo) - self.reload_log() - elif len(self.repo) > self.origtip: - self.reload_log() + + def callback(return_code, *args): + self.stbar.end() + if return_code == 0: + self.repo.invalidate() + self.changeview.clear_cache() + if '--rebase' in cmd: + self.origtip = len(self.repo) + self.reload_log() + elif len(self.repo) > self.origtip: + self.reload_log() + if self.runner.execute(cmdline, callback): + self.stbar.begin(_('Pulling changesets...')) + else: + gdialog.Prompt(_('Cannot run now'), + _('Please try again after running ' + 'operation is completed'), self).run()     def outgoing_clicked(self, toolbutton):   path = hglib.fromutf(self.pathentry.get_text()).strip() @@ -1491,13 +1496,18 @@
  if self.forcepush:   cmdline += ['--force']   cmdline += [remote_path] - dlg = hgcmd.CmdDialog(cmdline, text=' '.join(cmdline[:-1])) - dlg.show_all() - dlg.run() - dlg.hide() - if dlg.return_code() == 0 and self.outgoing: - self.outgoing = [] - self.reload_log() + + def callback(return_code, *args): + self.stbar.end() + if return_code == 0 and self.outgoing: + self.outgoing = [] + self.reload_log() + if self.runner.execute(cmdline, callback): + self.stbar.begin(_('Pushing changesets...')) + else: + gdialog.Prompt(_('Cannot run now'), + _('Please try again after running ' + 'operation is completed'), self).run()     def conf_clicked(self, toolbutton, combo):   newpath = hglib.fromutf(self.pathentry.get_text()).strip() @@ -1898,33 +1908,45 @@
  self.pathentry.grab_focus()   return   node = self.repo[self.currevid].node() - cmdline = ['hg', 'push', '--rev', str(self.currevid), remote_path] - dlg = hgcmd.CmdDialog(cmdline, text='hg push') - dlg.show_all() - dlg.run() - dlg.hide() - if dlg.return_code() == 0 and self.outgoing: - d = self.outgoing.index(node) - self.outgoing = self.outgoing[d+1:] - self.reload_log() + rev = str(self.currevid) + cmdline = ['hg', 'push', '--rev', rev, remote_path] + + def callback(return_code, *args): + self.stbar.end() + if return_code == 0 and self.outgoing: + d = self.outgoing.index(node) + self.outgoing = self.outgoing[d+1:] + self.reload_log() + if self.runner.execute(cmdline, callback): + self.stbar.begin(_("Pushing changesets to %s...") % rev) + else: + gdialog.Prompt(_('Cannot run now'), + _('Please try again after running ' + 'operation is completed'), self).run()     def pull_to(self, menuitem): - cmdline = ['hg', 'pull', '--rev', str(self.currevid), self.bfile] - dlg = hgcmd.CmdDialog(cmdline) - dlg.show_all() - dlg.run() - dlg.hide() - curtip = len(hg.repository(self.ui, self.repo.root)) - self.repo = hg.repository(self.ui, path=self.bfile) - self.graphview.set_repo(self.repo, self.stbar) - self.changeview.set_repo(self.repo) - if hasattr(self, 'mqwidget'): - self.mqwidget.set_repo(self.repo) - self.npreviews = len(self.repo) - curtip - if self.npreviews == 0: - self.remove_overlay(False) + rev = str(self.currevid) + cmdline = ['hg', 'pull', '--rev', rev, self.bfile] + + def callback(*args): + self.stbar.end() + curtip = len(hg.repository(self.ui, self.repo.root)) + self.repo = hg.repository(self.ui, path=self.bfile) + self.graphview.set_repo(self.repo, self.stbar) + self.changeview.set_repo(self.repo) + if hasattr(self, 'mqwidget'): + self.mqwidget.set_repo(self.repo) + self.npreviews = len(self.repo) - curtip + if self.npreviews == 0: + self.remove_overlay(False) + else: + self.reload_log() + if self.runner.execute(cmdline, callback): + self.stbar.begin(_("Pulling changesets to %s...") % rev)   else: - self.reload_log() + gdialog.Prompt(_('Cannot run now'), + _('Please try again after running ' + 'operation is completed'), self).run()     def copy_hash(self, menuitem):   hash = self.repo[self.currevid].hex()