Skip to content

feat(tags): allow to forcefully replace an existing tag #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keplicz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(tags): allow to forcefully replace an existing tag #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions gitfourchette/forms/newtagdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,20 @@ def __init__(
self.ui = Ui_NewTagDialog()
self.ui.setupUi(self)

self.reservedNames = reservedNames

okButton = self.ui.buttonBox.button(QDialogButtonBox.StandardButton.Ok)
okButton.setIcon(stockIcon("git-tag"))
okCaptions = [_("&Create"), _("&Create && Push")]
self.ui.pushCheckBox.toggled.connect(lambda push: okButton.setText(okCaptions[push]))

populateRemoteComboBox(self.ui.remoteComboBox, remotes)

nameTaken = _("This name is already taken by another tag.")
validator = ValidatorMultiplexer(self)
validator.setGatedWidgets(okButton)
validator.connectInput(self.ui.nameEdit, lambda name: nameValidationMessage(name, reservedNames, nameTaken))
validator.connectInput(self.ui.nameEdit, self.validateTagName)
validator.run(silenceEmptyWarnings=True)
self.ui.forceCheckBox.toggled.connect(validator.run)

# Prime enabled state
self.ui.pushCheckBox.click()
Expand All @@ -62,3 +64,7 @@ def __init__(
tquo(targetSubtitle))

self.resize(max(512, self.width()), self.height())

def validateTagName(self, name):
nameTaken = _("This name is already taken by another tag.")
return nameValidationMessage(name, [] if self.ui.forceCheckBox.isChecked() else self.reservedNames, nameTaken)
9 changes: 8 additions & 1 deletion gitfourchette/forms/newtagdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
Expand All @@ -74,6 +74,13 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="forceCheckBox">
<property name="text">
<string>Replace an existing tag</string>
</property>
</widget>
</item>
</layout>
</widget>
<tabstops>
Expand Down
53 changes: 29 additions & 24 deletions gitfourchette/forms/ui_newtagdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,67 @@
# Form implementation generated from reading ui file 'newtagdialog.ui'
#
# Created by: PyQt6 UI code generator 6.10.2
# Created by: PyQt6 UI code generator 6.11.0
#
# WARNING: Any manual changes made to this file will be lost when pyuic6 is
# run again. Do not edit this file unless you know what you are doing.


from gitfourchette.localization import *
from gitfourchette.qt import *
from PyQt6 import QtCore, QtGui, QtWidgets


class Ui_NewTagDialog(object):
def setupUi(self, NewTagDialog):
NewTagDialog.setObjectName("NewTagDialog")
NewTagDialog.setWindowModality(Qt.WindowModality.WindowModal)
NewTagDialog.setWindowModality(QtCore.Qt.WindowModality.WindowModal)
NewTagDialog.resize(405, 303)
self.formLayout = QFormLayout(NewTagDialog)
self.formLayout.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.ExpandingFieldsGrow)
self.formLayout = QtWidgets.QFormLayout(NewTagDialog)
self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.FieldGrowthPolicy.ExpandingFieldsGrow)
self.formLayout.setObjectName("formLayout")
self.label = QLabel(parent=NewTagDialog)
self.label = QtWidgets.QLabel(parent=NewTagDialog)
self.label.setObjectName("label")
self.formLayout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.label)
self.nameEdit = QLineEdit(parent=NewTagDialog)
sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label)
self.nameEdit = QtWidgets.QLineEdit(parent=NewTagDialog)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.nameEdit.sizePolicy().hasHeightForWidth())
self.nameEdit.setSizePolicy(sizePolicy)
self.nameEdit.setObjectName("nameEdit")
self.formLayout.setWidget(0, QFormLayout.ItemRole.FieldRole, self.nameEdit)
self.horizontalLayout = QHBoxLayout()
self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.nameEdit)
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
self.pushCheckBox = QCheckBox(parent=NewTagDialog)
self.pushCheckBox = QtWidgets.QCheckBox(parent=NewTagDialog)
self.pushCheckBox.setObjectName("pushCheckBox")
self.horizontalLayout.addWidget(self.pushCheckBox)
self.remoteComboBox = QComboBox(parent=NewTagDialog)
sizePolicy = QSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Fixed)
self.remoteComboBox = QtWidgets.QComboBox(parent=NewTagDialog)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.remoteComboBox.sizePolicy().hasHeightForWidth())
self.remoteComboBox.setSizePolicy(sizePolicy)
self.remoteComboBox.setObjectName("remoteComboBox")
self.horizontalLayout.addWidget(self.remoteComboBox)
self.formLayout.setLayout(1, QFormLayout.ItemRole.FieldRole, self.horizontalLayout)
self.buttonBox = QDialogButtonBox(parent=NewTagDialog)
self.buttonBox.setOrientation(Qt.Orientation.Horizontal)
self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok)
self.formLayout.setLayout(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.horizontalLayout)
self.buttonBox = QtWidgets.QDialogButtonBox(parent=NewTagDialog)
self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
self.buttonBox.setObjectName("buttonBox")
self.formLayout.setWidget(2, QFormLayout.ItemRole.SpanningRole, self.buttonBox)
self.formLayout.setWidget(5, QtWidgets.QFormLayout.ItemRole.SpanningRole, self.buttonBox)
self.forceCheckBox = QtWidgets.QCheckBox(parent=NewTagDialog)
self.forceCheckBox.setObjectName("forceCheckBox")
self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.forceCheckBox)
self.label.setBuddy(self.nameEdit)

self.retranslateUi(NewTagDialog)
self.buttonBox.accepted.connect(NewTagDialog.accept) # type: ignore
self.buttonBox.rejected.connect(NewTagDialog.reject) # type: ignore
self.pushCheckBox.toggled['bool'].connect(self.remoteComboBox.setEnabled) # type: ignore
QtCore.QMetaObject.connectSlotsByName(NewTagDialog)

def retranslateUi(self, NewTagDialog):
NewTagDialog.setWindowTitle(_p("NewTagDialog", "New tag"))
self.label.setText(_p("NewTagDialog", "&Name:"))
self.nameEdit.setPlaceholderText(_p("NewTagDialog", "Enter tag name"))
self.pushCheckBox.setText(_p("NewTagDialog", "&Push to:"))
_translate = QtCore.QCoreApplication.translate
NewTagDialog.setWindowTitle(_translate("NewTagDialog", "New tag"))
self.label.setText(_translate("NewTagDialog", "&Name:"))
self.nameEdit.setPlaceholderText(_translate("NewTagDialog", "Enter tag name"))
self.pushCheckBox.setText(_translate("NewTagDialog", "&Push to:"))
self.forceCheckBox.setText(_translate("NewTagDialog", "Replace an existing tag"))
3 changes: 2 additions & 1 deletion gitfourchette/tasks/committasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ def flow(self, oid: Oid = NULL_OID, signIt: bool = False):
tagName = dlg.ui.nameEdit.text()
pushIt = dlg.ui.pushCheckBox.isChecked()
pushTo = dlg.ui.remoteComboBox.currentData()
forceCreate = dlg.ui.forceCheckBox.isChecked()
dlg.deleteLater()

yield from self.flowEnterWorkerThread()
Expand All @@ -412,7 +413,7 @@ def flow(self, oid: Oid = NULL_OID, signIt: bool = False):
if signIt:
repo.create_tag(tagName, oid, ObjectType.COMMIT, self.repo.default_signature, "")
else:
repo.create_reference(refName, oid)
repo.create_reference(refName, oid, force=forceCreate)

self.postStatus = _("Tag {0} created on commit {1}.", tquo(tagName), tquo(shortHash(oid)))

Expand Down