Mercurial Repositories > eric / file diff

diff -r 1ddd2cb3aebe -r 1800956305ca src/eric7/Plugins/VcsPlugins/vcsGit/git.py
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Sun Jan 07 14:20:42 2024 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Sun Jan 07 19:54:03 2024 +0100
@@ -2089,7 +2089,7 @@
         @return flag indicating a performed tag action
         @rtype bool
         """
-        from .GitTagDialog import GitTagDialog
+        from .GitTagDialog import GitTagDialog, GitTagOperation, GitTagType
 
         dname, fname = self.splitPath(name)
 
@@ -2105,24 +2105,24 @@
             return False
 
         args = self.initCommand("tag")
-        if tagOp == GitTagDialog.CreateTag:
+        if tagOp == GitTagOperation.Create:
             msg = "Created tag <{0}>.".format(tag)
-            if tagType == GitTagDialog.AnnotatedTag:
+            if tagType == GitTagType.Annotated:
                 args.append("--annotate")
                 args.append("--message={0}".format(msg))
-            elif tagType == GitTagDialog.SignedTag:
+            elif tagType == GitTagType.Signed:
                 args.append("--sign")
                 args.append("--message={0}".format(msg))
             if force:
                 args.append("--force")
-        elif tagOp == GitTagDialog.DeleteTag:
+        elif tagOp == GitTagOperation.Delete:
             args.append("--delete")
-        elif tagOp == GitTagDialog.VerifyTag:
+        elif tagOp == GitTagOperation.Verify:
             args.append("--verify")
         else:
             return False
         args.append(tag)
-        if tagOp == GitTagDialog.CreateTag and revision:
+        if tagOp == GitTagOperation.Create and revision:
             args.append(revision)
 
         dia = GitDialog(self.tr("Tagging in the Git repository"), self)
@@ -3522,7 +3522,7 @@
         @return flag indicating, that the save contained an add or delete
         @rtype bool
         """
-        from .GitStashDataDialog import GitStashDataDialog
+        from .GitStashDataDialog import GitStashDataDialog, GitStashKind
 
         # find the root of the repo
         repodir = self.findRepoRoot(projectDir)
@@ -3537,9 +3537,9 @@
             args.append("save")
             if keepIndex:
                 args.append("--keep-index")
-            if untracked == GitStashDataDialog.UntrackedOnly:
+            if untracked == GitStashKind.UntrackedOnly:
                 args.append("--include-untracked")
-            elif untracked == GitStashDataDialog.UntrackedAndIgnored:
+            elif untracked == GitStashKind.UntrackedAndIgnored:
                 args.append("--all")
             if message:
                 args.append(message)