Mercurial Repositories > eric / changeset
changeset
Last changes to the Mercurial shelve extension interface.
Mon, 24 Feb 2014 19:43:31 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 24 Feb 2014 19:43:31 +0100
- changeset 3306
- 0a4e5082cbc6
- parent 3305
- cf4f22a19dc6
- child 3307
- d75b159bf80c
Last changes to the Mercurial shelve extension interface.
--- a/APIs/Python3/eric5.api Mon Feb 24 19:27:39 2014 +0100 +++ b/APIs/Python3/eric5.api Mon Feb 24 19:43:31 2014 +0100 @@ -4498,7 +4498,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_dirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_targetEdit_textChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog?1(source, parent=None, move=False, force=False) +eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog?1(source, parent=None, move=False) eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.hasAddOrDelete?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.normalExit?4() @@ -4595,7 +4595,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_idEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(force, tagsList, branchesList, bookmarksList=None, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.getRevisions?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html Mon Feb 24 19:27:39 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html Mon Feb 24 19:43:31 2014 +0100 @@ -77,7 +77,7 @@ </table> <a NAME="HgCopyDialog.__init__" ID="HgCopyDialog.__init__"></a> <h4>HgCopyDialog (Constructor)</h4> -<b>HgCopyDialog</b>(<i>source, parent=None, move=False, force=False</i>) +<b>HgCopyDialog</b>(<i>source, parent=None, move=False</i>) <p> Constructor </p><dl> @@ -90,9 +90,6 @@ </dd><dt><i>move</i></dt> <dd> flag indicating a move operation (boolean) -</dd><dt><i>force</i></dt> -<dd> -flag indicating a forced operation (boolean) </dd> </dl><a NAME="HgCopyDialog.getData" ID="HgCopyDialog.getData"></a> <h4>HgCopyDialog.getData</h4>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Mon Feb 24 19:27:39 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Mon Feb 24 19:43:31 2014 +0100 @@ -97,14 +97,11 @@ </table> <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> <h4>HgMergeDialog (Constructor)</h4> -<b>HgMergeDialog</b>(<i>force, tagsList, branchesList, bookmarksList=None, parent=None</i>) +<b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) <p> Constructor </p><dl> -<dt><i>force</i></dt> -<dd> -flag indicating a forced merge (boolean) -</dd><dt><i>tagsList</i></dt> +<dt><i>tagsList</i></dt> <dd> list of tags (list of strings) </dd><dt><i>branchesList</i></dt>
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Mon Feb 24 19:27:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Mon Feb 24 19:43:31 2014 +0100 @@ -26,14 +26,13 @@ Class implementing a dialog to enter the data for a copy or rename operation. """ - def __init__(self, source, parent=None, move=False, force=False): + def __init__(self, source, parent=None, move=False): """ Constructor @param source name of the source file/directory (string) @param parent parent widget (QWidget) @param move flag indicating a move operation (boolean) - @param force flag indicating a forced operation (boolean) """ super().__init__(parent) self.setupUi(self) @@ -50,7 +49,6 @@ self.setWindowTitle(self.tr('Mercurial Move')) else: self.forceCheckBox.setEnabled(False) - self.forceCheckBox.setChecked(force) self.sourceEdit.setText(source)
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Mon Feb 24 19:27:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Mon Feb 24 19:43:31 2014 +0100 @@ -17,12 +17,11 @@ """ Class implementing a dialog to enter the data for a merge operation. """ - def __init__(self, force, tagsList, branchesList, bookmarksList=None, + def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): """ Constructor - @param force flag indicating a forced merge (boolean) @param tagsList list of tags (list of strings) @param branchesList list of branches (list of strings) @param bookmarksList list of bookmarks (list of strings) @@ -33,7 +32,6 @@ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - self.forceCheckBox.setChecked(force) self.tagCombo.addItems(sorted(tagsList)) self.branchCombo.addItems(["default"] + sorted(branchesList)) if bookmarksList is not None:
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Mon Feb 24 19:27:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Mon Feb 24 19:43:31 2014 +0100 @@ -258,9 +258,14 @@ elif '|' in line: # file stats: foo.py | 3 ++- file, changes = line.strip().split("|", 1) - total, addDelete = changes.strip().split(None, 1) - additions = str(addDelete.count("+")) - deletions = str(addDelete.count("-")) + if changes.strip().endswith(("+", "-")): + total, addDelete = changes.strip().split(None, 1) + additions = str(addDelete.count("+")) + deletions = str(addDelete.count("-")) + else: + total = changes.strip() + additions = '0' + deletions = '0' itemData["files"].append((file, total, additions, deletions)) lastWasFileStats = True elif lastWasFileStats:
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Feb 24 19:27:39 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Feb 24 19:43:31 2014 +0100 @@ -736,8 +736,6 @@ @return flag indicating successfull operation (boolean) """ isDir = os.path.isdir(name) - # TODO: get rid of this - force = False res = False if noDialog: @@ -747,7 +745,7 @@ accepted = True else: from .HgCopyDialog import HgCopyDialog - dlg = HgCopyDialog(name, None, True, force) + dlg = HgCopyDialog(name, None, True) accepted = dlg.exec_() == QDialog.Accepted if accepted: target, force = dlg.getData() @@ -1021,9 +1019,6 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - # TODO: get rid of this - force = False - if self.isExtensionActive("bookmarks"): bookmarksList = \ self.getExtensionObject("bookmarks")\ @@ -1031,7 +1026,7 @@ else: bookmarksList = None from .HgMergeDialog import HgMergeDialog - dlg = HgMergeDialog(force, self.hgGetTagsList(repodir), + dlg = HgMergeDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), bookmarksList) if dlg.exec_() == QDialog.Accepted:
