eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py

Wed, 13 Apr 2022 19:49:25 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 13 Apr 2022 19:49:25 +0200
branch
eric7
changeset 9025
9fe8cfa14542
parent 8881
54e42bc2437a
permissions
-rw-r--r--

Mercurial Interface
- added capability to enter a revset expression when defining a revision to operate on

220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1 # -*- coding: utf-8 -*-
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2
8881
54e42bc2437a Updated copyright for 2022.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8629
diff changeset
3 # Copyright (c) 2010 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
4 #
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
5
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
6 """
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
7 Module implementing a dialog to enter the data for a backout operation.
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
8 """
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
9
8318
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
10 from PyQt6.QtCore import pyqtSlot, QDateTime
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
11 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
12
8629
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
13 from EricWidgets.EricApplication import ericApp
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
14
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
15 from .Ui_HgBackoutDialog import Ui_HgBackoutDialog
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
16
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
17
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
18 class HgBackoutDialog(QDialog, Ui_HgBackoutDialog):
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
19 """
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
20 Class implementing a dialog to enter the data for a backout operation.
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
21 """
3008
7848489bcb92 Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2302
diff changeset
22 def __init__(self, tagsList, branchesList, bookmarksList=None,
7848489bcb92 Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2302
diff changeset
23 parent=None):
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
24 """
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
25 Constructor
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
26
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
27 @param tagsList list of tags
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
28 @type list of str
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
29 @param branchesList list of branches
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
30 @type list of str
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
31 @param bookmarksList list of bookmarks
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
32 @type list of str
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
33 @param parent parent widget
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
34 @type QWidget
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
35 """
8218
7c09585bd960 Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8143
diff changeset
36 super().__init__(parent)
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
37 self.setupUi(self)
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
38
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
39 self.buttonBox.button(
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
40 QDialogButtonBox.StandardButton.Ok).setEnabled(False)
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
41
8629
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
42 project = ericApp().getObject("Project")
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
43 pwl, pel = project.getProjectDictionaries()
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
44 language = project.getProjectSpellLanguage()
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
45 self.messageEdit.setLanguageWithPWL(
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
46 language, pwl or None, pel or None)
1b58dc890b87 Extended the Quick Commit (and other commit alike dialogs) to respect the project spell check language settings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
47
739
efbfe57c8219 Modified some list(sorted(...)) calls.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 220
diff changeset
48 self.tagCombo.addItems(sorted(tagsList))
efbfe57c8219 Modified some list(sorted(...)) calls.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 220
diff changeset
49 self.branchCombo.addItems(["default"] + sorted(branchesList))
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
50 if bookmarksList is not None:
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
51 self.bookmarkCombo.addItems(sorted(bookmarksList))
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
52 else:
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
53 self.bookmarkButton.setHidden(True)
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
54 self.bookmarkCombo.setHidden(True)
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
55
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
56 # connect various radio buttons and input fields
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
57 self.idButton.toggled.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
58 self.tagButton.toggled.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
59 self.branchButton.toggled.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
60 self.bookmarkButton.toggled.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
61 self.expressionButton.toggled.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
62 self.noneButton.toggled.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
63
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
64 self.idEdit.textChanged.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
65 self.expressionEdit.textChanged.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
66
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
67 self.tagCombo.editTextChanged.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
68 self.branchCombo.editTextChanged.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
69 self.bookmarkCombo.editTextChanged.connect(self.__updateOK)
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
70
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
71 self.__initDateTime = QDateTime.currentDateTime()
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
72 self.dateEdit.setDateTime(self.__initDateTime)
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
73
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
74 @pyqtSlot()
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
75 def __updateOK(self):
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
76 """
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
77 Private slot to update the OK button.
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
78 """
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
79 enabled = True
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
80 if self.noneButton.isChecked():
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
81 enabled = False
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
82 elif self.idButton.isChecked():
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
83 enabled = bool(self.idEdit.text())
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
84 elif self.tagButton.isChecked():
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
85 enabled = bool(self.tagCombo.currentText())
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
86 elif self.branchButton.isChecked():
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
87 enabled = bool(self.branchCombo.currentText())
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
88 elif self.bookmarkButton.isChecked():
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
89 enabled = bool(self.bookmarkCombo.currentText())
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
90 elif self.expressionButton.isChecked():
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
91 enabled = enabled and bool(self.expressionEdit.text())
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
92
8143
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
93 self.buttonBox.button(
2c730d5fd177 Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7923
diff changeset
94 QDialogButtonBox.StandardButton.Ok).setEnabled(enabled)
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
95
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
96 def getParameters(self):
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
97 """
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
98 Public method to retrieve the backout data.
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
99
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
100 @return tuple naming the revision, a flag indicating a
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
101 merge, the commit date, the commit user and a commit message
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
102 @rtype tuple of (str, bool, str, str, str)
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
103 """
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
104 if self.numberButton.isChecked():
3337
49faa820151a Corrected some Mercurial input dialogs offering to enter either a revision number or a changeset id to use rev() and id() to make the operation unambigous.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3190
diff changeset
105 rev = "rev({0})".format(self.numberSpinBox.value())
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
106 elif self.idButton.isChecked():
3337
49faa820151a Corrected some Mercurial input dialogs offering to enter either a revision number or a changeset id to use rev() and id() to make the operation unambigous.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3190
diff changeset
107 rev = "id({0})".format(self.idEdit.text())
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
108 elif self.tagButton.isChecked():
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
109 rev = self.tagCombo.currentText()
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
110 elif self.branchButton.isChecked():
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
111 rev = self.branchCombo.currentText()
1017
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
112 elif self.bookmarkButton.isChecked():
919147f2b518 Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 945
diff changeset
113 rev = self.bookmarkCombo.currentText()
9025
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
114 elif self.expressionButton.isChecked():
9fe8cfa14542 Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8881
diff changeset
115 rev = self.expressionEdit.text()
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
116 else:
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
117 rev = ""
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
118
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
119 date = (
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
120 self.dateEdit.dateTime().toString("yyyy-MM-dd hh:mm")
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
121 if self.dateEdit.dateTime() != self.__initDateTime else
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
122 ""
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
123 )
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
124
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
125 msg = (
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
126 self.messageEdit.toPlainText()
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
127 if self.messageEdit.toPlainText() else
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
128 self.tr("Backed out changeset <{0}>.").format(rev)
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8218
diff changeset
129 )
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
130
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
131 return (rev,
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
132 self.mergeCheckBox.isChecked,
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
133 date,
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
134 self.userEdit.text(),
220
92b796009140 Added files forgotten in previous commits.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
135 msg
3036
30c81c9e88b8 Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3008
diff changeset
136 )

eric ide

mercurial