diff -r 62eff8b34a8d -r c4ee8a81584c eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Tue Jan 12 17:19:02 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Tue Jan 12 20:03:30 2021 +0100
@@ -8,8 +8,6 @@
conflicts.
"""
-import os
-
from PyQt5.QtCore import pyqtSlot, Qt, QPoint
from PyQt5.QtWidgets import (
QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem,
@@ -83,25 +81,14 @@
super(HgConflictsListDialog, self).show()
- def start(self, path):
+ def start(self):
"""
Public slot to start the tags command.
-
- @param path name of directory to list conflicts for (string)
"""
self.errorGroup.hide()
QApplication.processEvents()
self.intercept = False
- dname, fname = self.vcs.splitPath(path)
-
- # find the root of the repo
- self.__repodir = dname
- while not os.path.isdir(
- os.path.join(self.__repodir, self.vcs.adminDir)):
- self.__repodir = os.path.dirname(self.__repodir)
- if os.path.splitdrive(self.__repodir)[1] == os.sep:
- return
self.activateWindow()
self.raise_()
@@ -220,7 +207,7 @@
self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
self.refreshButton.setEnabled(False)
- self.start(self.__repodir)
+ self.start()
@pyqtSlot(QTreeWidgetItem, int)
def on_conflictsList_itemDoubleClicked(self, item, column):
