diff -r 285c786c4a9c -r 5816200f021b eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Aug 28 19:34:39 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Aug 28 19:50:22 2020 +0200
@@ -319,10 +319,6 @@
self.tr("Pull Large Files"), self.__lfPullActTriggered)
self.__lfPullAct.setToolTip(self.tr(
"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()
@@ -1449,21 +1445,16 @@
if selectedIncomingItemsCount > 0:
self.__pullAct.setText(self.tr("Pull Selected Changes"))
- self.__fetchAct.setText(self.tr("Fetch Selected Changes"))
else:
self.__pullAct.setText(self.tr("Pull Changes"))
- self.__fetchAct.setText(self.tr("Fetch Changes"))
if self.vcs.canPull():
self.__pullAct.setEnabled(True)
self.__lfPullAct.setEnabled(
self.vcs.isExtensionActive("largefiles") and
selectedItemsCount > 0)
- self.__fetchAct.setEnabled(
- self.vcs.isExtensionActive("fetch"))
else:
self.__pullAct.setEnabled(False)
self.__lfPullAct.setEnabled(False)
- self.__fetchAct.setEnabled(False)
if self.vcs.canPush():
self.__pushAct.setEnabled(
@@ -1524,7 +1515,6 @@
act.setEnabled(False)
self.__pullAct.setText(self.tr("Pull Selected Changes"))
- self.__fetchAct.setText(self.tr("Fetch Selected Changes"))
if self.vcs.canPull() and not bool(self.__bundle):
selectedIncomingItemsCount = len([
itm for itm in self.logTree.selectedItems()
@@ -1534,13 +1524,9 @@
self.__lfPullAct.setEnabled(
self.vcs.isExtensionActive("largefiles") and
selectedIncomingItemsCount > 0)
- self.__fetchAct.setEnabled(
- self.vcs.isExtensionActive("fetch") and
- selectedIncomingItemsCount > 0)
else:
self.__pullAct.setEnabled(False)
self.__lfPullAct.setEnabled(False)
- self.__fetchAct.setEnabled(False)
self.__unbundleAct.setEnabled(bool(self.__bundle))
@@ -1550,7 +1536,7 @@
for act in [self.__phaseAct, self.__graftAct, self.__mergeAct,
self.__tagAct, self.__closeHeadsAct, self.__switchAct,
self.__bookmarkAct, self.__bookmarkMoveAct,
- self.__pullAct, self.__lfPullAct, self.__fetchAct,
+ self.__pullAct, self.__lfPullAct,
self.__stripAct, self.__gpgSignAct,
self.__gpgVerifyAct, self.__unbundleAct]:
act.setEnabled(False)
@@ -2151,41 +2137,6 @@
self.repodir, revisions=revs)
@pyqtSlot()
- def __fetchActTriggered(self):
- """
- Private slot to fetch changes from a remote repository.
- """
- shouldReopen = False
- refresh = False
- addNext = False
-
- if self.initialCommandMode in ("log", "full_log", "incoming"):
- revs = []
- for itm in [item for item in self.logTree.selectedItems()
- if item.data(0, self.__incomingRole)]:
- rev = itm.text(self.RevisionColumn).split(":")[1].strip()
- if rev:
- revs.append(rev)
- shouldReopen = self.vcs.getExtensionObject("fetch").hgFetch(
- self.repodir, revisions=revs)
- refresh = True
- if self.initialCommandMode == "incoming":
- addNext = True
- 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
-
- if refresh:
- self.on_refreshButton_clicked(addNext=addNext)
-
- @pyqtSlot()
def __pullActTriggered(self):
"""
Private slot to pull changes from a remote repository.
