--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Nov 04 13:46:31 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Nov 04 13:52:26 2022 +0100 @@ -7,26 +7,23 @@ Module implementing the version control systems interface to Mercurial. """ +import contextlib import os +import pathlib import shutil -import contextlib -import pathlib - -from PyQt6.QtCore import pyqtSignal, QFileSystemWatcher, QCoreApplication + +from PyQt6.QtCore import QCoreApplication, QFileSystemWatcher, pyqtSignal from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog -from eric7.EricWidgets.EricApplication import ericApp -from eric7.EricWidgets import EricMessageBox, EricFileDialog - -from eric7.QScintilla.MiniEditor import MiniEditor - -from eric7.VCS.VersionControl import VersionControl -from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog - -from .HgDialog import HgDialog -from .HgClient import HgClient - from eric7 import Preferences, Utilities +from eric7.EricWidgets import EricFileDialog, EricMessageBox +from eric7.EricWidgets.EricApplication import ericApp +from eric7.QScintilla.MiniEditor import MiniEditor +from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog +from eric7.VCS.VersionControl import VersionControl + +from .HgClient import HgClient +from .HgDialog import HgDialog class Hg(VersionControl): @@ -138,15 +135,15 @@ self.__defaultPushConfigured = False # instantiate the extensions - from .QueuesExtension.queues import Queues + from .CloseheadExtension.closehead import Closehead + from .GpgExtension.gpg import Gpg + from .HisteditExtension.histedit import Histedit + from .LargefilesExtension.largefiles import Largefiles from .PurgeExtension.purge import Purge - from .GpgExtension.gpg import Gpg + from .QueuesExtension.queues import Queues from .RebaseExtension.rebase import Rebase from .ShelveExtension.shelve import Shelve - from .LargefilesExtension.largefiles import Largefiles from .StripExtension.strip import Strip - from .HisteditExtension.histedit import Histedit - from .CloseheadExtension.closehead import Closehead self.__extensions = { "mq": Queues(self),