Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable sync: show urls in status messages

Changeset 7b532ef8286e…

Parent 20c47445087d…

by Adrian Buehlmann

Changes to one file · Browse files at 7b532ef8286e Showing diff from parent 20c47445087d Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
634
635
636
637
638
 
639
640
641
642
643
 
644
645
646
 
647
648
 
649
650
651
 
658
659
660
661
 
662
663
 
664
665
 
666
667
668
669
670
 
671
672
673
 
674
675
 
676
677
678
 
690
691
692
693
 
694
695
696
 
703
704
705
706
 
 
707
708
709
710
711
712
713
 
 
714
715
 
716
717
 
718
719
720
 
768
769
770
 
771
772
773
774
 
775
776
 
777
778
779
 
780
781
782
 
783
784
 
785
786
787
 
634
635
636
 
637
638
639
640
641
642
 
643
644
645
 
646
647
 
648
649
650
651
 
658
659
660
 
661
662
 
663
664
 
665
666
667
668
669
670
671
672
673
 
674
675
 
676
677
678
679
 
691
692
693
 
694
695
696
697
 
704
705
706
 
707
708
709
710
711
712
713
 
 
714
715
716
 
717
718
 
719
720
721
722
 
770
771
772
773
774
775
776
 
777
778
 
779
780
781
 
782
783
784
 
785
786
 
787
788
789
790
@@ -634,18 +634,18 @@
  ##     def inclicked(self): - self.showMessage.emit(_('Incoming...'))   url = self.currentUrl(True) + self.showMessage.emit(_('Getting incoming changesets from %s...') % url)   if self.embedded and not url.startswith('p4://') and \   not self.opts.get('subrepos'):   def finished(ret, output):   if ret == 0 and os.path.exists(bfile): - self.showMessage.emit(_('Incoming changesets found')) + self.showMessage.emit(_('Found incoming changesets from %s') % url)   self.incomingBundle.emit(bfile)   elif ret == 1: - self.showMessage.emit(_('No incoming changesets')) + self.showMessage.emit(_('No incoming changesets from %s') % url)   else: - self.showMessage.emit(_('Incoming aborted, ret %d') % ret) + self.showMessage.emit(_('Incoming from %s aborted, ret %d') % (url, ret))   bfile = url   for badchar in (':', '*', '\\', '?', '#'):   bfile = bfile.replace(badchar, '') @@ -658,21 +658,22 @@
  else:   def finished(ret, output):   if ret == 0: - self.showMessage.emit(_('Incoming changesets found')) + self.showMessage.emit(_('Found incoming changesets from %s') % url)   elif ret == 1: - self.showMessage.emit(_('No incoming changesets')) + self.showMessage.emit(_('No incoming changesets from %s') % url)   else: - self.showMessage.emit(_('Incoming aborted, ret %d') % ret) + self.showMessage.emit(_('Incoming from %s aborted, ret %d') % (url, ret))   self.finishfunc = finished   cmdline = ['--repository', self.repo.root, 'incoming']   self.run(cmdline, ('force', 'branch', 'rev', 'subrepos'))     def pullclicked(self): + url = self.currentUrl(True)   def finished(ret, output):   if ret == 0: - self.showMessage.emit(_('Pull completed successfully')) + self.showMessage.emit(_('Pull from %s completed') % url)   else: - self.showMessage.emit(_('Pull aborted, ret %d') % ret) + self.showMessage.emit(_('Pull from %s aborted, ret %d') % (url, ret))   # handle file conflicts during rebase   if os.path.exists(self.repo.join('rebasestate')):   dlg = rebase.RebaseDialog(self.repo, self) @@ -690,7 +691,7 @@
  dlg.exec_()   return   self.finishfunc = finished - self.showMessage.emit(_('Pulling...')) + self.showMessage.emit(_('Pulling from %s...') % url)   cmdline = ['--repository', self.repo.root, 'pull', '--verbose']   uimerge = self.repo.ui.configbool('tortoisehg', 'autoresolve') \   and 'ui.merge=internal:merge' or 'ui.merge=internal:fail' @@ -703,18 +704,19 @@
  self.run(cmdline, ('force', 'branch', 'rev'))     def outclicked(self): - self.showMessage.emit(_('Outgoing...')) + url = self.currentUrl(True) + self.showMessage.emit(_('Finding outgoing changesets to %s...') % url)   if self.embedded and not self.opts.get('subrepos'):   def outputnodes(ret, data):   if ret == 0:   nodes = [n for n in data.splitlines() if len(n) == 40]   self.outgoingNodes.emit(nodes) - self.showMessage.emit(_('%d outgoing changesets') % - len(nodes)) + self.showMessage.emit(_('%d outgoing changesets to %url') % + (len(nodes), url))   elif ret == 1: - self.showMessage.emit(_('No outgoing changesets')) + self.showMessage.emit(_('No outgoing changesets to %s') % url)   else: - self.showMessage.emit(_('Outgoing aborted, ret %d') % ret) + self.showMessage.emit(_('Outgoing to %s aborted, ret %d') % (url, ret))   self.finishfunc = outputnodes   cmdline = ['--repository', self.repo.root, 'outgoing', '--quiet',   '--template', '{node}\n'] @@ -768,20 +770,21 @@
  self.run(['--repository', self.repo.root, 'p4pending', '--verbose'], ())     def pushclicked(self): + url = self.currentUrl(True)   if not hg.islocal(self.currentUrl(False)):   r = qtlib.QuestionMsgBox(_('Confirm Push to remote Repository'),   _('Push to remote repository\n%s\n?') - % self.currentUrl(True)) + % url)   if not r: - self.showMessage.emit(_('Push aborted.')) + self.showMessage.emit(_('Push to %s aborted') % url)   return   - self.showMessage.emit(_('Pushing...')) + self.showMessage.emit(_('Pushing to %s...') % url)   def finished(ret, output):   if ret == 0: - self.showMessage.emit(_('Push completed successfully')) + self.showMessage.emit(_('Push to %s completed') % url)   else: - self.showMessage.emit(_('Push aborted, ret %d') % ret) + self.showMessage.emit(_('Push to %s aborted, ret %d') % (url, ret))   self.finishfunc = finished   cmdline = ['--repository', self.repo.root, 'push']   self.run(cmdline, ('force', 'new-branch', 'branch', 'rev'))