Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Wed Jul 13 14:55:47 2022 +0200
@@ -17,30 +17,43 @@
     """
     Class implementing the rebase extension interface.
     """
+
     def __init__(self, vcs):
         """
         Constructor
-        
+
         @param vcs reference to the Mercurial vcs object
         """
         super().__init__(vcs)
-    
+
     def hgRebase(self):
         """
         Public method to rebase changesets to a different branch.
-        
+
         @return flag indicating that the project should be reread (boolean)
         """
         res = False
         from .HgRebaseDialog import HgRebaseDialog
-        dlg = HgRebaseDialog(self.vcs.hgGetTagsList(),
-                             self.vcs.hgGetBranchesList(),
-                             self.vcs.hgGetBookmarksList(),
-                             self.vcs.version)
+
+        dlg = HgRebaseDialog(
+            self.vcs.hgGetTagsList(),
+            self.vcs.hgGetBranchesList(),
+            self.vcs.hgGetBookmarksList(),
+            self.vcs.version,
+        )
         if dlg.exec() == QDialog.DialogCode.Accepted:
-            (indicator, sourceRev, destRev, collapse, keep, keepBranches,
-             detach, dryRunOnly, dryRunConfirm) = dlg.getData()
-            
+            (
+                indicator,
+                sourceRev,
+                destRev,
+                collapse,
+                keep,
+                keepBranches,
+                detach,
+                dryRunOnly,
+                dryRunConfirm,
+            ) = dlg.getData()
+
             args = self.vcs.initCommand("rebase")
             if indicator == "S":
                 args.append("--source")
@@ -64,44 +77,44 @@
             elif dryRunConfirm:
                 args.append("--confirm")
             args.append("--verbose")
-            
-            dia = HgDialog(self.tr('Rebase Changesets'), self.vcs)
+
+            dia = HgDialog(self.tr("Rebase Changesets"), self.vcs)
             res = dia.startProcess(args)
             if res:
                 dia.exec()
                 res = dia.hasAddOrDelete()
                 self.vcs.checkVCSStatus()
         return res
-    
+
     def hgRebaseContinue(self):
         """
         Public method to continue rebasing changesets from another branch.
-        
+
         @return flag indicating that the project should be reread (boolean)
         """
         args = self.vcs.initCommand("rebase")
         args.append("--continue")
         args.append("--verbose")
-        
-        dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs)
+
+        dia = HgDialog(self.tr("Rebase Changesets (Continue)"), self.vcs)
         res = dia.startProcess(args)
         if res:
             dia.exec()
             res = dia.hasAddOrDelete()
             self.vcs.checkVCSStatus()
         return res
-    
+
     def hgRebaseAbort(self):
         """
         Public method to abort rebasing changesets from another branch.
-        
+
         @return flag indicating that the project should be reread (boolean)
         """
         args = self.vcs.initCommand("rebase")
         args.append("--abort")
         args.append("--verbose")
-        
-        dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs)
+
+        dia = HgDialog(self.tr("Rebase Changesets (Abort)"), self.vcs)
         res = dia.startProcess(args)
         if res:
             dia.exec()