diff -r c7b98f0180ab -r 7fee3661c4f9 Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Aug 04 20:42:45 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Wed Aug 08 18:21:45 2012 +0200
@@ -17,16 +17,22 @@
"""
Class implementing a dialog to enter the data for a graft session.
"""
- def __init__(self, parent=None):
+ def __init__(self, vcs, parent=None):
"""
Constructor
+ @param vcs reference to the VCS object (Hg)
@param parent reference to the parent widget (QWidget)
"""
super().__init__(parent)
self.setupUi(self)
self.dateTimeEdit.setDateTime(QDateTime.currentDateTime())
+
+ if vcs.version < (2, 3):
+ self.logCheckBox.setEnabled(False)
+ self.logCheckBox.setChecked(False)
+ self.logCheckBox.setVisible(False)
self.__updateOk()
@@ -82,10 +88,12 @@
@return tuple with list of revisions, a tuple giving a
flag indicating to set the user, a flag indicating to use the
- current user and the user name and another tuple giving a flag
+ current user and the user name, another tuple giving a flag
indicating to set the date, a flag indicating to use the
- current date and the date (list of strings, (boolean, boolean, string),
- (boolean, boolean, string))
+ current date and the date, a flag indicating to append graft info
+ to the log message and a flag indicating a dry-run (list of strings,
+ (boolean, boolean, string), (boolean, boolean, string), boolean,
+ boolean)
"""
userData = (self.userGroup.isChecked(),
self.currentUserCheckBox.isChecked(),
@@ -94,4 +102,6 @@
self.currentDateCheckBox.isChecked(),
self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm"))
return (self.revisionsEdit.toPlainText().strip().splitlines(),
- userData, dateData)
+ userData, dateData,
+ self.logCheckBox.isChecked(),
+ self.dryRunCheckBox.isChecked())
