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

history: improve status messages for pull/push

Changeset 9cb65f3f50ac…

Parent 81424f66558c…

by Yuki KODAMA

Changes to one file · Browse files at 9cb65f3f50ac Showing diff from parent 81424f66558c Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1408
1409
1410
 
1411
1412
 
 
 
 
 
 
1413
1414
1415
 
1507
1508
1509
1510
1511
1512
 
 
 
 
 
 
 
 
1513
1514
1515
 
1921
1922
1923
1924
1925
1926
1927
 
 
 
 
 
 
 
 
 
1928
1929
 
1930
1931
1932
 
1936
1937
1938
1939
 
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
 
 
 
 
 
 
 
 
 
 
 
 
 
1950
1951
 
 
1952
1953
 
1954
1955
1956
 
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
 
1514
1515
1516
 
 
 
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
 
1933
1934
1935
 
 
 
 
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
 
1946
1947
1948
1949
 
1953
1954
1955
 
1956
1957
 
 
 
 
 
 
 
 
 
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
 
1972
1973
1974
 
1975
1976
1977
1978
@@ -1408,8 +1408,15 @@
  if '--rebase' in cmd:   self.origtip = len(self.repo)   self.reload_log() + text = _('Finished pull with rebase')   elif len(self.repo) > self.origtip:   self.reload_log() + text = _('Finished pull') + else: + text = _('No changesets to pull') + else: + text = _('Aborted pull') + self.stbar.set_idle_text(text)   if self.runner.execute(cmdline, callback):   self.stbar.begin(_('Pulling changesets...'))   else: @@ -1507,9 +1514,14 @@
    def callback(return_code, *args):   self.stbar.end() - if return_code == 0 and self.outgoing: - self.outgoing = [] - self.reload_log() + if return_code == 0: + if self.outgoing: + self.outgoing = [] + self.reload_log() + text = _('Finished push') + else: + text = _('Aborted push') + self.stbar.set_idle_text(text)   if self.runner.execute(cmdline, callback):   self.stbar.begin(_('Pushing changesets...'))   else: @@ -1921,12 +1933,17 @@
    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 return_code == 0: + if self.outgoing: + d = self.outgoing.index(node) + self.outgoing = self.outgoing[d + 1:] + self.reload_log() + text = _('Finished push to revision %s') % rev + else: + text = _('Aborted push') + self.stbar.set_idle_text(text)   if self.runner.execute(cmdline, callback): - self.stbar.begin(_("Pushing changesets to %s...") % rev) + self.stbar.begin(_('Pushing changesets to revision %s...') % rev)   else:   gdialog.Prompt(_('Cannot run now'),   _('Please try again after running ' @@ -1936,21 +1953,26 @@
  rev = str(self.currevid)   cmdline = ['hg', 'pull', '--rev', rev, self.bfile]   - def callback(*args): + def callback(return_code, *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) + if return_code == 0: + 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() + text = _('Finished pull to revision %s') % rev   else: - self.reload_log() + text = _('Aborted pull') + self.stbar.set_idle_text(text)   if self.runner.execute(cmdline, callback): - self.stbar.begin(_("Pulling changesets to %s...") % rev) + self.stbar.begin(_('Pulling changesets to revision %s...') % rev)   else:   gdialog.Prompt(_('Cannot run now'),   _('Please try again after running '