Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Wed Oct 26 19:21:25 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Wed Oct 26 19:27:11 2016 +0200
@@ -214,6 +214,8 @@
             "Pull large files for selected revisions"))
         self.__fetchAct = self.__actionsMenu.addAction(
             self.tr("Fetch Changes"), self.__fetchActTriggered)
+        self.__fetchAct.setToolTip(self.tr(
+            "Fetch changes from a remote repository"))
         
         self.__actionsMenu.addSeparator()
         
@@ -231,6 +233,8 @@
         
         self.__stripAct = self.__actionsMenu.addAction(
             self.tr("Strip Changesets"), self.__stripActTriggered)
+        self.__stripAct.setToolTip(self.tr(
+            "Strip changesets from a repository"))
         
         self.actionsButton.setIcon(
             UI.PixmapCache.getIcon("actionsToolButton.png"))
@@ -1741,7 +1745,19 @@
         """
         Private slot to fetch changes from a remote repository.
         """
-        self.vcs.getExtensionObject("fetch").hgFetch(self.repodir)
+        shouldReopen = self.vcs.getExtensionObject("fetch").hgFetch(
+            self.repodir)
+        if shouldReopen:
+            res = E5MessageBox.yesNo(
+                None,
+                self.tr("Fetch Changes"),
+                self.tr(
+                    """The project should be reread. Do this now?"""),
+                yesDefault=True)
+            if res:
+                e5App().getObject("Project").reopenProject()
+                return
+        
         self.on_refreshButton_clicked()
     
     @pyqtSlot()
@@ -1749,7 +1765,18 @@
         """
         Private slot to pull changes from a remote repository.
         """
-        self.vcs.hgPull(self.repodir)
+        shouldReopen = self.vcs.hgPull(self.repodir)
+        if shouldReopen:
+            res = E5MessageBox.yesNo(
+                None,
+                self.tr("Pull Changes"),
+                self.tr(
+                    """The project should be reread. Do this now?"""),
+                yesDefault=True)
+            if res:
+                e5App().getObject("Project").reopenProject()
+                return
+        
         self.on_refreshButton_clicked()
     
     @pyqtSlot()
@@ -1779,7 +1806,19 @@
         """
         itm = self.logTree.selectedItems()[0]
         rev = itm.text(self.RevisionColumn).strip().split(":", 1)[1]
-        self.vcs.getExtensionObject("strip").hgStrip(self.repodir, rev=rev)
+        shouldReopen = self.vcs.getExtensionObject("strip").hgStrip(
+            self.repodir, rev=rev)
+        if shouldReopen:
+            res = E5MessageBox.yesNo(
+                None,
+                self.tr("Strip Changesets"),
+                self.tr(
+                    """The project should be reread. Do this now?"""),
+                yesDefault=True)
+            if res:
+                e5App().getObject("Project").reopenProject()
+                return
+        
         self.on_refreshButton_clicked()
     
     def __actionMode(self):