Mon, 12 May 2014 18:19:22 +0200
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
--- a/APIs/Python3/eric5.api Fri May 09 15:53:40 2014 +0200 +++ b/APIs/Python3/eric5.api Mon May 12 18:19:22 2014 +0200 @@ -4404,58 +4404,6 @@ eric5.Plugins.PluginWizardQRegularExpression.python2Compatible?7 eric5.Plugins.PluginWizardQRegularExpression.shortDescription?7 eric5.Plugins.PluginWizardQRegularExpression.version?7 -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.DEFINE_MODE?7 -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.MOVE_MODE?7 -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_bookmarkButton_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_bookmarkCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_branchButton_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_branchCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_idButton_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_idEdit_textChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_nameCombo_activated?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_nameEdit_textChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_tagButton_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_tagCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog?1(mode, tagsList, branchesList, bookmarksList, parent=None) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog.on_nameEdit_textChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog?1(bookmarksList, parent=None) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.INCOMING?7 -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.OUTGOING?7 -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.closeEvent?4(e) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.keyPressEvent?4(evt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_input_returnPressed?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_passwordCheckBox_toggled?4(isOn) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.start?4(path) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog?1(vcs, mode, parent=None) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.closeEvent?4(e) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.keyPressEvent?4(evt) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_input_returnPressed?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_passwordCheckBox_toggled?4(isOn) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.start?4(path, bookmarksList) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog?1(vcs, parent=None) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper.initActions?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper.initMenu?4(mainMenu) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper.menuTitle?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper?1() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkDefine?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkDelete?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkIncoming?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkMove?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkOutgoing?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkPull?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkPush?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkRename?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgGetBookmarksList?4(repodir) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgListBookmarks?4(path) -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.shutdown?4() -eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks?1(vcs) eric5.Plugins.VcsPlugins.vcsMercurial.Config.ConfigHgProtocols?7 eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_configButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4() @@ -4529,6 +4477,42 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_tagButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_tagCombo_editTextChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.DEFINE_MODE?7 +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.MOVE_MODE?7 +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_bookmarkButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_branchButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_branchCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_idButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_idEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_nameCombo_activated?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_nameEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_tagButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog.on_tagCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.HgBookmarkDialog?1(mode, tagsList, branchesList, bookmarksList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.HgBookmarkRenameDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.HgBookmarkRenameDialog.on_nameEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.HgBookmarkRenameDialog?1(bookmarksList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.INCOMING?7 +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.OUTGOING?7 +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.closeEvent?4(e) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_input_returnPressed?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_passwordCheckBox_toggled?4(isOn) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.start?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog?1(vcs, mode, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.closeEvent?4(e) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_input_returnPressed?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_passwordCheckBox_toggled?4(isOn) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.start?4(path, bookmarksList) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.HgBranchInputDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.HgBranchInputDialog.on_branchComboBox_editTextChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.HgBranchInputDialog?1(branches, parent=None) @@ -5037,6 +5021,14 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgArchive?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBackout?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBisect?4(name, subcommand) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkDefine?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkDelete?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkIncoming?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkMove?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkOutgoing?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkPull?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkPush?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkRename?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCancelMerge?4(name) @@ -5047,6 +5039,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExport?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBookmarksList?4(repodir) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4(repodir) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(repodir, withType=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(path, revs=None) @@ -5055,6 +5048,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgImport?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgInfo?4(ppath, mode="heads") +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgListBookmarks?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name)
--- a/APIs/Python3/eric5.bas Fri May 09 15:53:40 2014 +0200 +++ b/APIs/Python3/eric5.bas Mon May 12 18:19:22 2014 +0200 @@ -34,7 +34,6 @@ BookmarkInfoDialog QDialog Ui_BookmarkInfoDialog BookmarkPropertiesDialog QDialog Ui_BookmarkPropertiesDialog BookmarkedFilesDialog QDialog Ui_BookmarkedFilesDialog -Bookmarks HgExtension BookmarksDialog QDialog Ui_BookmarksDialog BookmarksImportDialog QDialog Ui_BookmarksImportDialog BookmarksImporter QObject @@ -42,7 +41,6 @@ BookmarksMenu E5ModelMenu BookmarksMenuBarMenu BookmarksMenu BookmarksModel QAbstractItemModel -BookmarksProjectHelper HgExtensionProjectHelper BookmarksToolBar E5ModelToolBar BreakPointModel QAbstractItemModel BreakPointViewer QTreeView
--- a/Documentation/Help/source.qhp Fri May 09 15:53:40 2014 +0200 +++ b/Documentation/Help/source.qhp Mon May 12 18:19:22 2014 +0200 @@ -488,14 +488,6 @@ </section> <section title="eric5.Plugins.VcsPlugins" ref="index-eric5.Plugins.VcsPlugins.html"> <section title="eric5.Plugins.VcsPlugins.vcsMercurial" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.html"> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html"> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html" /> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html" /> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html" /> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html" /> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html" /> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html" /> - </section> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html"> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> </section> @@ -561,6 +553,10 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgArchiveDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgArchiveDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html" /> @@ -1560,21 +1556,7 @@ <keyword name="BookmarkedFilesDialog.on_fileEdit_textChanged" id="BookmarkedFilesDialog.on_fileEdit_textChanged" ref="eric5.ViewManager.BookmarkedFilesDialog.html#BookmarkedFilesDialog.on_fileEdit_textChanged" /> <keyword name="BookmarkedFilesDialog.on_filesList_currentRowChanged" id="BookmarkedFilesDialog.on_filesList_currentRowChanged" ref="eric5.ViewManager.BookmarkedFilesDialog.html#BookmarkedFilesDialog.on_filesList_currentRowChanged" /> <keyword name="BookmarkedFilesDialog.on_upButton_clicked" id="BookmarkedFilesDialog.on_upButton_clicked" ref="eric5.ViewManager.BookmarkedFilesDialog.html#BookmarkedFilesDialog.on_upButton_clicked" /> - <keyword name="Bookmarks" id="Bookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks" /> - <keyword name="Bookmarks (Constructor)" id="Bookmarks (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.__init__" /> <keyword name="Bookmarks (Package)" id="Bookmarks (Package)" ref="index-eric5.Helpviewer.Bookmarks.html" /> - <keyword name="Bookmarks.__getInOutBookmarks" id="Bookmarks.__getInOutBookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.__getInOutBookmarks" /> - <keyword name="Bookmarks.hgBookmarkDefine" id="Bookmarks.hgBookmarkDefine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkDefine" /> - <keyword name="Bookmarks.hgBookmarkDelete" id="Bookmarks.hgBookmarkDelete" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkDelete" /> - <keyword name="Bookmarks.hgBookmarkIncoming" id="Bookmarks.hgBookmarkIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkIncoming" /> - <keyword name="Bookmarks.hgBookmarkMove" id="Bookmarks.hgBookmarkMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkMove" /> - <keyword name="Bookmarks.hgBookmarkOutgoing" id="Bookmarks.hgBookmarkOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkOutgoing" /> - <keyword name="Bookmarks.hgBookmarkPull" id="Bookmarks.hgBookmarkPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkPull" /> - <keyword name="Bookmarks.hgBookmarkPush" id="Bookmarks.hgBookmarkPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkPush" /> - <keyword name="Bookmarks.hgBookmarkRename" id="Bookmarks.hgBookmarkRename" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkRename" /> - <keyword name="Bookmarks.hgGetBookmarksList" id="Bookmarks.hgGetBookmarksList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgGetBookmarksList" /> - <keyword name="Bookmarks.hgListBookmarks" id="Bookmarks.hgListBookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgListBookmarks" /> - <keyword name="Bookmarks.shutdown" id="Bookmarks.shutdown" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.shutdown" /> <keyword name="BookmarksDialog" id="BookmarksDialog" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html#BookmarksDialog" /> <keyword name="BookmarksDialog (Constructor)" id="BookmarksDialog (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html#BookmarksDialog.__init__" /> <keyword name="BookmarksDialog (Module)" id="BookmarksDialog (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html" /> @@ -1592,7 +1574,6 @@ <keyword name="BookmarksDialog.__shutdown" id="BookmarksDialog.__shutdown" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html#BookmarksDialog.__shutdown" /> <keyword name="BookmarksDialog.closeEvent" id="BookmarksDialog.closeEvent" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html#BookmarksDialog.closeEvent" /> <keyword name="BookmarksDialog.reject" id="BookmarksDialog.reject" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html#BookmarksDialog.reject" /> - <keyword name="BookmarksExtension (Package)" id="BookmarksExtension (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html" /> <keyword name="BookmarksImportDialog" id="BookmarksImportDialog" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog" /> <keyword name="BookmarksImportDialog (Constructor)" id="BookmarksImportDialog (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.__init__" /> <keyword name="BookmarksImportDialog (Module)" id="BookmarksImportDialog (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html" /> @@ -1682,21 +1663,6 @@ <keyword name="BookmarksModel.rowCount" id="BookmarksModel.rowCount" ref="eric5.Helpviewer.Bookmarks.BookmarksModel.html#BookmarksModel.rowCount" /> <keyword name="BookmarksModel.setData" id="BookmarksModel.setData" ref="eric5.Helpviewer.Bookmarks.BookmarksModel.html#BookmarksModel.setData" /> <keyword name="BookmarksModel.supportedDropActions" id="BookmarksModel.supportedDropActions" ref="eric5.Helpviewer.Bookmarks.BookmarksModel.html#BookmarksModel.supportedDropActions" /> - <keyword name="BookmarksProjectHelper" id="BookmarksProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper" /> - <keyword name="BookmarksProjectHelper (Constructor)" id="BookmarksProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__init__" /> - <keyword name="BookmarksProjectHelper.__aboutToShowMenu" id="BookmarksProjectHelper.__aboutToShowMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__aboutToShowMenu" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkDefine" id="BookmarksProjectHelper.__hgBookmarkDefine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkDefine" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkDelete" id="BookmarksProjectHelper.__hgBookmarkDelete" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkDelete" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkIncoming" id="BookmarksProjectHelper.__hgBookmarkIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkIncoming" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkMove" id="BookmarksProjectHelper.__hgBookmarkMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkMove" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkOutgoing" id="BookmarksProjectHelper.__hgBookmarkOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkOutgoing" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkPull" id="BookmarksProjectHelper.__hgBookmarkPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkPull" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkPush" id="BookmarksProjectHelper.__hgBookmarkPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkPush" /> - <keyword name="BookmarksProjectHelper.__hgBookmarkRename" id="BookmarksProjectHelper.__hgBookmarkRename" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkRename" /> - <keyword name="BookmarksProjectHelper.__hgBookmarksList" id="BookmarksProjectHelper.__hgBookmarksList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarksList" /> - <keyword name="BookmarksProjectHelper.initActions" id="BookmarksProjectHelper.initActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.initActions" /> - <keyword name="BookmarksProjectHelper.initMenu" id="BookmarksProjectHelper.initMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.initMenu" /> - <keyword name="BookmarksProjectHelper.menuTitle" id="BookmarksProjectHelper.menuTitle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.menuTitle" /> <keyword name="BookmarksToolBar" id="BookmarksToolBar" ref="eric5.Helpviewer.Bookmarks.BookmarksToolBar.html#BookmarksToolBar" /> <keyword name="BookmarksToolBar (Constructor)" id="BookmarksToolBar (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksToolBar.html#BookmarksToolBar.__init__" /> <keyword name="BookmarksToolBar (Module)" id="BookmarksToolBar (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksToolBar.html" /> @@ -5611,6 +5577,7 @@ <keyword name="Hg (Constructor)" id="Hg (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__init__" /> <keyword name="Hg.__checkDefaults" id="Hg.__checkDefaults" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__checkDefaults" /> <keyword name="Hg.__getExtensionsInfo" id="Hg.__getExtensionsInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getExtensionsInfo" /> + <keyword name="Hg.__getInOutBookmarks" id="Hg.__getInOutBookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getInOutBookmarks" /> <keyword name="Hg.__hgGetFileForRevision" id="Hg.__hgGetFileForRevision" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__hgGetFileForRevision" /> <keyword name="Hg.__hgURL" id="Hg.__hgURL" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__hgURL" /> <keyword name="Hg.__iniFileChanged" id="Hg.__iniFileChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__iniFileChanged" /> @@ -5631,6 +5598,14 @@ <keyword name="Hg.hgArchive" id="Hg.hgArchive" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgArchive" /> <keyword name="Hg.hgBackout" id="Hg.hgBackout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBackout" /> <keyword name="Hg.hgBisect" id="Hg.hgBisect" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBisect" /> + <keyword name="Hg.hgBookmarkDefine" id="Hg.hgBookmarkDefine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkDefine" /> + <keyword name="Hg.hgBookmarkDelete" id="Hg.hgBookmarkDelete" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkDelete" /> + <keyword name="Hg.hgBookmarkIncoming" id="Hg.hgBookmarkIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkIncoming" /> + <keyword name="Hg.hgBookmarkMove" id="Hg.hgBookmarkMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkMove" /> + <keyword name="Hg.hgBookmarkOutgoing" id="Hg.hgBookmarkOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkOutgoing" /> + <keyword name="Hg.hgBookmarkPull" id="Hg.hgBookmarkPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkPull" /> + <keyword name="Hg.hgBookmarkPush" id="Hg.hgBookmarkPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkPush" /> + <keyword name="Hg.hgBookmarkRename" id="Hg.hgBookmarkRename" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkRename" /> <keyword name="Hg.hgBranch" id="Hg.hgBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBranch" /> <keyword name="Hg.hgBundle" id="Hg.hgBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBundle" /> <keyword name="Hg.hgCancelMerge" id="Hg.hgCancelMerge" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCancelMerge" /> @@ -5641,6 +5616,7 @@ <keyword name="Hg.hgExport" id="Hg.hgExport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgExport" /> <keyword name="Hg.hgExtendedDiff" id="Hg.hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgExtendedDiff" /> <keyword name="Hg.hgForget" id="Hg.hgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgForget" /> + <keyword name="Hg.hgGetBookmarksList" id="Hg.hgGetBookmarksList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetBookmarksList" /> <keyword name="Hg.hgGetBranchesList" id="Hg.hgGetBranchesList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetBranchesList" /> <keyword name="Hg.hgGetTagsList" id="Hg.hgGetTagsList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetTagsList" /> <keyword name="Hg.hgGraft" id="Hg.hgGraft" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraft" /> @@ -5649,6 +5625,7 @@ <keyword name="Hg.hgImport" id="Hg.hgImport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgImport" /> <keyword name="Hg.hgIncoming" id="Hg.hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIncoming" /> <keyword name="Hg.hgInfo" id="Hg.hgInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgInfo" /> + <keyword name="Hg.hgListBookmarks" id="Hg.hgListBookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgListBookmarks" /> <keyword name="Hg.hgListTagBranch" id="Hg.hgListTagBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgListTagBranch" /> <keyword name="Hg.hgNormalizeURL" id="Hg.hgNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgNormalizeURL" /> <keyword name="Hg.hgOutgoing" id="Hg.hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgOutgoing" /> @@ -5751,67 +5728,67 @@ <keyword name="HgBackoutDialog.on_noneButton_toggled" id="HgBackoutDialog.on_noneButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_noneButton_toggled" /> <keyword name="HgBackoutDialog.on_tagButton_toggled" id="HgBackoutDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_tagButton_toggled" /> <keyword name="HgBackoutDialog.on_tagCombo_editTextChanged" id="HgBackoutDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_tagCombo_editTextChanged" /> - <keyword name="HgBookmarkDialog" id="HgBookmarkDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog" /> - <keyword name="HgBookmarkDialog (Constructor)" id="HgBookmarkDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.__init__" /> - <keyword name="HgBookmarkDialog (Module)" id="HgBookmarkDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html" /> - <keyword name="HgBookmarkDialog.__updateBookmarksCombo" id="HgBookmarkDialog.__updateBookmarksCombo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.__updateBookmarksCombo" /> - <keyword name="HgBookmarkDialog.__updateOK" id="HgBookmarkDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.__updateOK" /> - <keyword name="HgBookmarkDialog.getData" id="HgBookmarkDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.getData" /> - <keyword name="HgBookmarkDialog.on_bookmarkButton_toggled" id="HgBookmarkDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_bookmarkButton_toggled" /> - <keyword name="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" id="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_bookmarkCombo_editTextChanged" /> - <keyword name="HgBookmarkDialog.on_branchButton_toggled" id="HgBookmarkDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_branchButton_toggled" /> - <keyword name="HgBookmarkDialog.on_branchCombo_editTextChanged" id="HgBookmarkDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_branchCombo_editTextChanged" /> - <keyword name="HgBookmarkDialog.on_idButton_toggled" id="HgBookmarkDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_idButton_toggled" /> - <keyword name="HgBookmarkDialog.on_idEdit_textChanged" id="HgBookmarkDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_idEdit_textChanged" /> - <keyword name="HgBookmarkDialog.on_nameCombo_activated" id="HgBookmarkDialog.on_nameCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_nameCombo_activated" /> - <keyword name="HgBookmarkDialog.on_nameEdit_textChanged" id="HgBookmarkDialog.on_nameEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_nameEdit_textChanged" /> - <keyword name="HgBookmarkDialog.on_tagButton_toggled" id="HgBookmarkDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_tagButton_toggled" /> - <keyword name="HgBookmarkDialog.on_tagCombo_editTextChanged" id="HgBookmarkDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_tagCombo_editTextChanged" /> - <keyword name="HgBookmarkRenameDialog" id="HgBookmarkRenameDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog" /> - <keyword name="HgBookmarkRenameDialog (Constructor)" id="HgBookmarkRenameDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.__init__" /> - <keyword name="HgBookmarkRenameDialog (Module)" id="HgBookmarkRenameDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html" /> - <keyword name="HgBookmarkRenameDialog.__updateUI" id="HgBookmarkRenameDialog.__updateUI" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.__updateUI" /> - <keyword name="HgBookmarkRenameDialog.getData" id="HgBookmarkRenameDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.getData" /> - <keyword name="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" id="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" /> - <keyword name="HgBookmarkRenameDialog.on_nameEdit_textChanged" id="HgBookmarkRenameDialog.on_nameEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.on_nameEdit_textChanged" /> - <keyword name="HgBookmarksInOutDialog" id="HgBookmarksInOutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog" /> - <keyword name="HgBookmarksInOutDialog (Constructor)" id="HgBookmarksInOutDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__init__" /> - <keyword name="HgBookmarksInOutDialog (Module)" id="HgBookmarksInOutDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html" /> - <keyword name="HgBookmarksInOutDialog.__finish" id="HgBookmarksInOutDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__finish" /> - <keyword name="HgBookmarksInOutDialog.__generateItem" id="HgBookmarksInOutDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__generateItem" /> - <keyword name="HgBookmarksInOutDialog.__procFinished" id="HgBookmarksInOutDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__procFinished" /> - <keyword name="HgBookmarksInOutDialog.__processOutputLine" id="HgBookmarksInOutDialog.__processOutputLine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__processOutputLine" /> - <keyword name="HgBookmarksInOutDialog.__readStderr" id="HgBookmarksInOutDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStderr" /> - <keyword name="HgBookmarksInOutDialog.__readStdout" id="HgBookmarksInOutDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStdout" /> - <keyword name="HgBookmarksInOutDialog.__resizeColumns" id="HgBookmarksInOutDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resizeColumns" /> - <keyword name="HgBookmarksInOutDialog.__resort" id="HgBookmarksInOutDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resort" /> - <keyword name="HgBookmarksInOutDialog.__showError" id="HgBookmarksInOutDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__showError" /> - <keyword name="HgBookmarksInOutDialog.closeEvent" id="HgBookmarksInOutDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.closeEvent" /> - <keyword name="HgBookmarksInOutDialog.keyPressEvent" id="HgBookmarksInOutDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.keyPressEvent" /> - <keyword name="HgBookmarksInOutDialog.on_buttonBox_clicked" id="HgBookmarksInOutDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_buttonBox_clicked" /> - <keyword name="HgBookmarksInOutDialog.on_input_returnPressed" id="HgBookmarksInOutDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_input_returnPressed" /> - <keyword name="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" id="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgBookmarksInOutDialog.on_sendButton_clicked" id="HgBookmarksInOutDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_sendButton_clicked" /> - <keyword name="HgBookmarksInOutDialog.start" id="HgBookmarksInOutDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.start" /> - <keyword name="HgBookmarksListDialog" id="HgBookmarksListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog" /> - <keyword name="HgBookmarksListDialog (Constructor)" id="HgBookmarksListDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__init__" /> - <keyword name="HgBookmarksListDialog (Module)" id="HgBookmarksListDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html" /> - <keyword name="HgBookmarksListDialog.__finish" id="HgBookmarksListDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__finish" /> - <keyword name="HgBookmarksListDialog.__generateItem" id="HgBookmarksListDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__generateItem" /> - <keyword name="HgBookmarksListDialog.__procFinished" id="HgBookmarksListDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__procFinished" /> - <keyword name="HgBookmarksListDialog.__processOutputLine" id="HgBookmarksListDialog.__processOutputLine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__processOutputLine" /> - <keyword name="HgBookmarksListDialog.__readStderr" id="HgBookmarksListDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStderr" /> - <keyword name="HgBookmarksListDialog.__readStdout" id="HgBookmarksListDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStdout" /> - <keyword name="HgBookmarksListDialog.__resizeColumns" id="HgBookmarksListDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__resizeColumns" /> - <keyword name="HgBookmarksListDialog.__resort" id="HgBookmarksListDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__resort" /> - <keyword name="HgBookmarksListDialog.__showError" id="HgBookmarksListDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__showError" /> - <keyword name="HgBookmarksListDialog.closeEvent" id="HgBookmarksListDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.closeEvent" /> - <keyword name="HgBookmarksListDialog.keyPressEvent" id="HgBookmarksListDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.keyPressEvent" /> - <keyword name="HgBookmarksListDialog.on_buttonBox_clicked" id="HgBookmarksListDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_buttonBox_clicked" /> - <keyword name="HgBookmarksListDialog.on_input_returnPressed" id="HgBookmarksListDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_input_returnPressed" /> - <keyword name="HgBookmarksListDialog.on_passwordCheckBox_toggled" id="HgBookmarksListDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgBookmarksListDialog.on_sendButton_clicked" id="HgBookmarksListDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_sendButton_clicked" /> - <keyword name="HgBookmarksListDialog.start" id="HgBookmarksListDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.start" /> + <keyword name="HgBookmarkDialog" id="HgBookmarkDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog" /> + <keyword name="HgBookmarkDialog (Constructor)" id="HgBookmarkDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.__init__" /> + <keyword name="HgBookmarkDialog (Module)" id="HgBookmarkDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html" /> + <keyword name="HgBookmarkDialog.__updateBookmarksCombo" id="HgBookmarkDialog.__updateBookmarksCombo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.__updateBookmarksCombo" /> + <keyword name="HgBookmarkDialog.__updateOK" id="HgBookmarkDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.__updateOK" /> + <keyword name="HgBookmarkDialog.getData" id="HgBookmarkDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.getData" /> + <keyword name="HgBookmarkDialog.on_bookmarkButton_toggled" id="HgBookmarkDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_bookmarkButton_toggled" /> + <keyword name="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" id="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgBookmarkDialog.on_branchButton_toggled" id="HgBookmarkDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_branchButton_toggled" /> + <keyword name="HgBookmarkDialog.on_branchCombo_editTextChanged" id="HgBookmarkDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgBookmarkDialog.on_idButton_toggled" id="HgBookmarkDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_idButton_toggled" /> + <keyword name="HgBookmarkDialog.on_idEdit_textChanged" id="HgBookmarkDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_idEdit_textChanged" /> + <keyword name="HgBookmarkDialog.on_nameCombo_activated" id="HgBookmarkDialog.on_nameCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_nameCombo_activated" /> + <keyword name="HgBookmarkDialog.on_nameEdit_textChanged" id="HgBookmarkDialog.on_nameEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_nameEdit_textChanged" /> + <keyword name="HgBookmarkDialog.on_tagButton_toggled" id="HgBookmarkDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_tagButton_toggled" /> + <keyword name="HgBookmarkDialog.on_tagCombo_editTextChanged" id="HgBookmarkDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html#HgBookmarkDialog.on_tagCombo_editTextChanged" /> + <keyword name="HgBookmarkRenameDialog" id="HgBookmarkRenameDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog" /> + <keyword name="HgBookmarkRenameDialog (Constructor)" id="HgBookmarkRenameDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.__init__" /> + <keyword name="HgBookmarkRenameDialog (Module)" id="HgBookmarkRenameDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html" /> + <keyword name="HgBookmarkRenameDialog.__updateUI" id="HgBookmarkRenameDialog.__updateUI" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.__updateUI" /> + <keyword name="HgBookmarkRenameDialog.getData" id="HgBookmarkRenameDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.getData" /> + <keyword name="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" id="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgBookmarkRenameDialog.on_nameEdit_textChanged" id="HgBookmarkRenameDialog.on_nameEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.on_nameEdit_textChanged" /> + <keyword name="HgBookmarksInOutDialog" id="HgBookmarksInOutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog" /> + <keyword name="HgBookmarksInOutDialog (Constructor)" id="HgBookmarksInOutDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__init__" /> + <keyword name="HgBookmarksInOutDialog (Module)" id="HgBookmarksInOutDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html" /> + <keyword name="HgBookmarksInOutDialog.__finish" id="HgBookmarksInOutDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__finish" /> + <keyword name="HgBookmarksInOutDialog.__generateItem" id="HgBookmarksInOutDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__generateItem" /> + <keyword name="HgBookmarksInOutDialog.__procFinished" id="HgBookmarksInOutDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__procFinished" /> + <keyword name="HgBookmarksInOutDialog.__processOutputLine" id="HgBookmarksInOutDialog.__processOutputLine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__processOutputLine" /> + <keyword name="HgBookmarksInOutDialog.__readStderr" id="HgBookmarksInOutDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStderr" /> + <keyword name="HgBookmarksInOutDialog.__readStdout" id="HgBookmarksInOutDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStdout" /> + <keyword name="HgBookmarksInOutDialog.__resizeColumns" id="HgBookmarksInOutDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resizeColumns" /> + <keyword name="HgBookmarksInOutDialog.__resort" id="HgBookmarksInOutDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resort" /> + <keyword name="HgBookmarksInOutDialog.__showError" id="HgBookmarksInOutDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__showError" /> + <keyword name="HgBookmarksInOutDialog.closeEvent" id="HgBookmarksInOutDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.closeEvent" /> + <keyword name="HgBookmarksInOutDialog.keyPressEvent" id="HgBookmarksInOutDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.keyPressEvent" /> + <keyword name="HgBookmarksInOutDialog.on_buttonBox_clicked" id="HgBookmarksInOutDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_buttonBox_clicked" /> + <keyword name="HgBookmarksInOutDialog.on_input_returnPressed" id="HgBookmarksInOutDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_input_returnPressed" /> + <keyword name="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" id="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_passwordCheckBox_toggled" /> + <keyword name="HgBookmarksInOutDialog.on_sendButton_clicked" id="HgBookmarksInOutDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_sendButton_clicked" /> + <keyword name="HgBookmarksInOutDialog.start" id="HgBookmarksInOutDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.start" /> + <keyword name="HgBookmarksListDialog" id="HgBookmarksListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog" /> + <keyword name="HgBookmarksListDialog (Constructor)" id="HgBookmarksListDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__init__" /> + <keyword name="HgBookmarksListDialog (Module)" id="HgBookmarksListDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html" /> + <keyword name="HgBookmarksListDialog.__finish" id="HgBookmarksListDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__finish" /> + <keyword name="HgBookmarksListDialog.__generateItem" id="HgBookmarksListDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__generateItem" /> + <keyword name="HgBookmarksListDialog.__procFinished" id="HgBookmarksListDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__procFinished" /> + <keyword name="HgBookmarksListDialog.__processOutputLine" id="HgBookmarksListDialog.__processOutputLine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__processOutputLine" /> + <keyword name="HgBookmarksListDialog.__readStderr" id="HgBookmarksListDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStderr" /> + <keyword name="HgBookmarksListDialog.__readStdout" id="HgBookmarksListDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStdout" /> + <keyword name="HgBookmarksListDialog.__resizeColumns" id="HgBookmarksListDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__resizeColumns" /> + <keyword name="HgBookmarksListDialog.__resort" id="HgBookmarksListDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__resort" /> + <keyword name="HgBookmarksListDialog.__showError" id="HgBookmarksListDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__showError" /> + <keyword name="HgBookmarksListDialog.closeEvent" id="HgBookmarksListDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.closeEvent" /> + <keyword name="HgBookmarksListDialog.keyPressEvent" id="HgBookmarksListDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.keyPressEvent" /> + <keyword name="HgBookmarksListDialog.on_buttonBox_clicked" id="HgBookmarksListDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_buttonBox_clicked" /> + <keyword name="HgBookmarksListDialog.on_input_returnPressed" id="HgBookmarksListDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_input_returnPressed" /> + <keyword name="HgBookmarksListDialog.on_passwordCheckBox_toggled" id="HgBookmarksListDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_passwordCheckBox_toggled" /> + <keyword name="HgBookmarksListDialog.on_sendButton_clicked" id="HgBookmarksListDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_sendButton_clicked" /> + <keyword name="HgBookmarksListDialog.start" id="HgBookmarksListDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.start" /> <keyword name="HgBranchInputDialog" id="HgBranchInputDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html#HgBranchInputDialog" /> <keyword name="HgBranchInputDialog (Constructor)" id="HgBranchInputDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html#HgBranchInputDialog.__init__" /> <keyword name="HgBranchInputDialog (Module)" id="HgBranchInputDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html" /> @@ -6155,6 +6132,15 @@ <keyword name="HgProjectHelper.__hgBisectGood" id="HgProjectHelper.__hgBisectGood" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBisectGood" /> <keyword name="HgProjectHelper.__hgBisectReset" id="HgProjectHelper.__hgBisectReset" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBisectReset" /> <keyword name="HgProjectHelper.__hgBisectSkip" id="HgProjectHelper.__hgBisectSkip" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBisectSkip" /> + <keyword name="HgProjectHelper.__hgBookmarkDefine" id="HgProjectHelper.__hgBookmarkDefine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkDefine" /> + <keyword name="HgProjectHelper.__hgBookmarkDelete" id="HgProjectHelper.__hgBookmarkDelete" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkDelete" /> + <keyword name="HgProjectHelper.__hgBookmarkIncoming" id="HgProjectHelper.__hgBookmarkIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkIncoming" /> + <keyword name="HgProjectHelper.__hgBookmarkMove" id="HgProjectHelper.__hgBookmarkMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkMove" /> + <keyword name="HgProjectHelper.__hgBookmarkOutgoing" id="HgProjectHelper.__hgBookmarkOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkOutgoing" /> + <keyword name="HgProjectHelper.__hgBookmarkPull" id="HgProjectHelper.__hgBookmarkPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkPull" /> + <keyword name="HgProjectHelper.__hgBookmarkPush" id="HgProjectHelper.__hgBookmarkPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkPush" /> + <keyword name="HgProjectHelper.__hgBookmarkRename" id="HgProjectHelper.__hgBookmarkRename" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarkRename" /> + <keyword name="HgProjectHelper.__hgBookmarksList" id="HgProjectHelper.__hgBookmarksList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBookmarksList" /> <keyword name="HgProjectHelper.__hgBranch" id="HgProjectHelper.__hgBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBranch" /> <keyword name="HgProjectHelper.__hgBranchList" id="HgProjectHelper.__hgBranchList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBranchList" /> <keyword name="HgProjectHelper.__hgBundle" id="HgProjectHelper.__hgBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBundle" /> @@ -8931,7 +8917,6 @@ <keyword name="ProjectFormsBrowser._openItem" id="ProjectFormsBrowser._openItem" ref="eric5.Project.ProjectFormsBrowser.html#ProjectFormsBrowser._openItem" /> <keyword name="ProjectFormsBrowser.compileChangedForms" id="ProjectFormsBrowser.compileChangedForms" ref="eric5.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.compileChangedForms" /> <keyword name="ProjectFormsBrowser.handlePreferencesChanged" id="ProjectFormsBrowser.handlePreferencesChanged" ref="eric5.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.handlePreferencesChanged" /> - <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html" /> @@ -12828,7 +12813,6 @@ <keyword name="append_PKCS7_padding" id="append_PKCS7_padding" ref="eric5.Utilities.crypto.py3AES.html#append_PKCS7_padding" /> <keyword name="binplistlib (Module)" id="binplistlib (Module)" ref="eric5.Utilities.binplistlib.html" /> <keyword name="blank_lines" id="blank_lines" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#blank_lines" /> - <keyword name="bookmarks (Module)" id="bookmarks (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html" /> <keyword name="changeRememberedMaster" id="changeRememberedMaster" ref="eric5.Utilities.crypto.__init__.html#changeRememberedMaster" /> <keyword name="check" id="check" ref="eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#check" /> <keyword name="checkBlacklistedVersions" id="checkBlacklistedVersions" ref="eric5.Globals.__init__.html#checkBlacklistedVersions" /> @@ -13848,12 +13832,6 @@ <file>eric5.Plugins.PluginWizardQMessageBox.html</file> <file>eric5.Plugins.PluginWizardQRegExp.html</file> <file>eric5.Plugins.PluginWizardQRegularExpression.html</file> - <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html</file> - <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html</file> - <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html</file> - <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html</file> - <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html</file> - <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.Config.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html</file> @@ -13867,6 +13845,10 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgArchiveDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html</file> @@ -14333,7 +14315,6 @@ <file>index-eric5.Plugins.DocumentationPlugins.Ericdoc.html</file> <file>index-eric5.Plugins.DocumentationPlugins.html</file> <file>index-eric5.Plugins.VcsPlugins.html</file> - <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html</file>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,253 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog</h1> -<p> -Module implementing the bookmark dialog. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgBookmarkDialog">HgBookmarkDialog</a></td> -<td>Class mplementing the bookmark dialog.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgBookmarkDialog" ID="HgBookmarkDialog"></a> -<h2>HgBookmarkDialog</h2> -<p> - Class mplementing the bookmark dialog. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgBookmarkDialog -<h3>Class Attributes</h3> -<table> -<tr><td>DEFINE_MODE</td></tr><tr><td>MOVE_MODE</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgBookmarkDialog.__init__">HgBookmarkDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.__updateBookmarksCombo">__updateBookmarksCombo</a></td> -<td>Private slot to update the bookmarks combo.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.__updateOK">__updateOK</a></td> -<td>Private slot to update the OK button.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.getData">getData</a></td> -<td>Public method to retrieve the entered data.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> -<td>Private slot to handle changes of the Bookmark select button.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Bookmark combo.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> -<td>Private slot to handle changes of the Branch select button.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Branch combo.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_idButton_toggled">on_idButton_toggled</a></td> -<td>Private slot to handle changes of the ID select button.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> -<td>Private slot to handle changes of the ID edit.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_nameCombo_activated">on_nameCombo_activated</a></td> -<td>Private slot to handle changes of the selected bookmark name.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_nameEdit_textChanged">on_nameEdit_textChanged</a></td> -<td>Private slot to handle changes of the bookmark name.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> -<td>Private slot to handle changes of the Tag select button.</td> -</tr><tr> -<td><a href="#HgBookmarkDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Tag combo.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgBookmarkDialog.__init__" ID="HgBookmarkDialog.__init__"></a> -<h4>HgBookmarkDialog (Constructor)</h4> -<b>HgBookmarkDialog</b>(<i>mode, tagsList, branchesList, bookmarksList, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>mode</i></dt> -<dd> -of the dialog (integer) -</dd><dt><i>tagsList</i></dt> -<dd> -list of tags (list of strings) -</dd><dt><i>branchesList</i></dt> -<dd> -list of branches (list of strings) -</dd><dt><i>bookmarksList</i></dt> -<dd> -list of bookmarks (list of strings) -</dd><dt><i>parent</i></dt> -<dd> -reference to the parent widget (QWidget) -</dd> -</dl><a NAME="HgBookmarkDialog.__updateBookmarksCombo" ID="HgBookmarkDialog.__updateBookmarksCombo"></a> -<h4>HgBookmarkDialog.__updateBookmarksCombo</h4> -<b>__updateBookmarksCombo</b>(<i></i>) -<p> - Private slot to update the bookmarks combo. -</p><a NAME="HgBookmarkDialog.__updateOK" ID="HgBookmarkDialog.__updateOK"></a> -<h4>HgBookmarkDialog.__updateOK</h4> -<b>__updateOK</b>(<i></i>) -<p> - Private slot to update the OK button. -</p><a NAME="HgBookmarkDialog.getData" ID="HgBookmarkDialog.getData"></a> -<h4>HgBookmarkDialog.getData</h4> -<b>getData</b>(<i></i>) -<p> - Public method to retrieve the entered data. -</p><dl> -<dt>Returns:</dt> -<dd> -tuple naming the revision and the bookmark name - (string, string) -</dd> -</dl><a NAME="HgBookmarkDialog.on_bookmarkButton_toggled" ID="HgBookmarkDialog.on_bookmarkButton_toggled"></a> -<h4>HgBookmarkDialog.on_bookmarkButton_toggled</h4> -<b>on_bookmarkButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Bookmark select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" ID="HgBookmarkDialog.on_bookmarkCombo_editTextChanged"></a> -<h4>HgBookmarkDialog.on_bookmarkCombo_editTextChanged</h4> -<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Bookmark combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl><a NAME="HgBookmarkDialog.on_branchButton_toggled" ID="HgBookmarkDialog.on_branchButton_toggled"></a> -<h4>HgBookmarkDialog.on_branchButton_toggled</h4> -<b>on_branchButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Branch select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgBookmarkDialog.on_branchCombo_editTextChanged" ID="HgBookmarkDialog.on_branchCombo_editTextChanged"></a> -<h4>HgBookmarkDialog.on_branchCombo_editTextChanged</h4> -<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Branch combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl><a NAME="HgBookmarkDialog.on_idButton_toggled" ID="HgBookmarkDialog.on_idButton_toggled"></a> -<h4>HgBookmarkDialog.on_idButton_toggled</h4> -<b>on_idButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the ID select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgBookmarkDialog.on_idEdit_textChanged" ID="HgBookmarkDialog.on_idEdit_textChanged"></a> -<h4>HgBookmarkDialog.on_idEdit_textChanged</h4> -<b>on_idEdit_textChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the ID edit. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the edit (string) -</dd> -</dl><a NAME="HgBookmarkDialog.on_nameCombo_activated" ID="HgBookmarkDialog.on_nameCombo_activated"></a> -<h4>HgBookmarkDialog.on_nameCombo_activated</h4> -<b>on_nameCombo_activated</b>(<i>txt</i>) -<p> - Private slot to handle changes of the selected bookmark name. -</p><dl> -<dt><i>txt</i></dt> -<dd> -selected combo entry (string) -</dd> -</dl><a NAME="HgBookmarkDialog.on_nameEdit_textChanged" ID="HgBookmarkDialog.on_nameEdit_textChanged"></a> -<h4>HgBookmarkDialog.on_nameEdit_textChanged</h4> -<b>on_nameEdit_textChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the bookmark name. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the edit (string) -</dd> -</dl><a NAME="HgBookmarkDialog.on_tagButton_toggled" ID="HgBookmarkDialog.on_tagButton_toggled"></a> -<h4>HgBookmarkDialog.on_tagButton_toggled</h4> -<b>on_tagButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Tag select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgBookmarkDialog.on_tagCombo_editTextChanged" ID="HgBookmarkDialog.on_tagCombo_editTextChanged"></a> -<h4>HgBookmarkDialog.on_tagCombo_editTextChanged</h4> -<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Tag combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog</h1> -<p> -Module implementing a dialog to get the data to rename a bookmark. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgBookmarkRenameDialog">HgBookmarkRenameDialog</a></td> -<td>Class implementing a dialog to get the data to rename a bookmark.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgBookmarkRenameDialog" ID="HgBookmarkRenameDialog"></a> -<h2>HgBookmarkRenameDialog</h2> -<p> - Class implementing a dialog to get the data to rename a bookmark. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgBookmarkRenameDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgBookmarkRenameDialog.__init__">HgBookmarkRenameDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgBookmarkRenameDialog.__updateUI">__updateUI</a></td> -<td>Private slot to update the UI.</td> -</tr><tr> -<td><a href="#HgBookmarkRenameDialog.getData">getData</a></td> -<td>Public method to retrieve the entered data.</td> -</tr><tr> -<td><a href="#HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the selected bookmark.</td> -</tr><tr> -<td><a href="#HgBookmarkRenameDialog.on_nameEdit_textChanged">on_nameEdit_textChanged</a></td> -<td>Private slot to handle changes of the bookmark name.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgBookmarkRenameDialog.__init__" ID="HgBookmarkRenameDialog.__init__"></a> -<h4>HgBookmarkRenameDialog (Constructor)</h4> -<b>HgBookmarkRenameDialog</b>(<i>bookmarksList, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>bookmarksList</i></dt> -<dd> -list of bookmarks (list of strings) -</dd><dt><i>parent</i></dt> -<dd> -reference to the parent widget (QWidget) -</dd> -</dl><a NAME="HgBookmarkRenameDialog.__updateUI" ID="HgBookmarkRenameDialog.__updateUI"></a> -<h4>HgBookmarkRenameDialog.__updateUI</h4> -<b>__updateUI</b>(<i></i>) -<p> - Private slot to update the UI. -</p><a NAME="HgBookmarkRenameDialog.getData" ID="HgBookmarkRenameDialog.getData"></a> -<h4>HgBookmarkRenameDialog.getData</h4> -<b>getData</b>(<i></i>) -<p> - Public method to retrieve the entered data. -</p><dl> -<dt>Returns:</dt> -<dd> -tuple naming the new and old bookmark names - (string, string) -</dd> -</dl><a NAME="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" ID="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged"></a> -<h4>HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged</h4> -<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the selected bookmark. -</p><dl> -<dt><i>txt</i></dt> -<dd> -name of the selected bookmark (string) -</dd> -</dl><a NAME="HgBookmarkRenameDialog.on_nameEdit_textChanged" ID="HgBookmarkRenameDialog.on_nameEdit_textChanged"></a> -<h4>HgBookmarkRenameDialog.on_nameEdit_textChanged</h4> -<b>on_nameEdit_textChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the bookmark name. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the edit (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,285 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog</h1> -<p> -Module implementing a dialog to show a list of incoming or outgoing bookmarks. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgBookmarksInOutDialog">HgBookmarksInOutDialog</a></td> -<td>Class implementing a dialog to show a list of incoming or outgoing bookmarks.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgBookmarksInOutDialog" ID="HgBookmarksInOutDialog"></a> -<h2>HgBookmarksInOutDialog</h2> -<p> - Class implementing a dialog to show a list of incoming or outgoing - bookmarks. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgBookmarksInOutDialog -<h3>Class Attributes</h3> -<table> -<tr><td>INCOMING</td></tr><tr><td>OUTGOING</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgBookmarksInOutDialog.__init__">HgBookmarksInOutDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__finish">__finish</a></td> -<td>Private slot called when the process finished or the user pressed the button.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__generateItem">__generateItem</a></td> -<td>Private method to generate a bookmark item in the bookmarks list.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__processOutputLine">__processOutputLine</a></td> -<td>Private method to process the lines of output.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__resizeColumns">__resizeColumns</a></td> -<td>Private method to resize the list columns.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__resort">__resort</a></td> -<td>Private method to resort the tree.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.__showError">__showError</a></td> -<td>Private slot to show some error.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.closeEvent">closeEvent</a></td> -<td>Private slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> -<td>Private slot called by a button of the button box clicked.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr><tr> -<td><a href="#HgBookmarksInOutDialog.start">start</a></td> -<td>Public slot to start the bookmarks command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgBookmarksInOutDialog.__init__" ID="HgBookmarksInOutDialog.__init__"></a> -<h4>HgBookmarksInOutDialog (Constructor)</h4> -<b>HgBookmarksInOutDialog</b>(<i>vcs, mode, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>mode</i></dt> -<dd> -mode of the dialog (HgBookmarksInOutDialog.INCOMING, - HgBookmarksInOutDialog.OUTGOING) -</dd><dt><i>parent</i></dt> -<dd> -reference to the parent widget (QWidget) -</dd> -</dl><dl> -<dt>Raises <b>ValueError</b>:</dt> -<dd> -raised to indicate an invalid dialog mode -</dd> -</dl><a NAME="HgBookmarksInOutDialog.__finish" ID="HgBookmarksInOutDialog.__finish"></a> -<h4>HgBookmarksInOutDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the process finished or the user pressed - the button. -</p><a NAME="HgBookmarksInOutDialog.__generateItem" ID="HgBookmarksInOutDialog.__generateItem"></a> -<h4>HgBookmarksInOutDialog.__generateItem</h4> -<b>__generateItem</b>(<i>changeset, name</i>) -<p> - Private method to generate a bookmark item in the bookmarks list. -</p><dl> -<dt><i>changeset</i></dt> -<dd> -changeset of the bookmark (string) -</dd><dt><i>name</i></dt> -<dd> -name of the bookmark (string) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.__procFinished" ID="HgBookmarksInOutDialog.__procFinished"></a> -<h4>HgBookmarksInOutDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) -<p> - Private slot connected to the finished signal. -</p><dl> -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd><dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.__processOutputLine" ID="HgBookmarksInOutDialog.__processOutputLine"></a> -<h4>HgBookmarksInOutDialog.__processOutputLine</h4> -<b>__processOutputLine</b>(<i>line</i>) -<p> - Private method to process the lines of output. -</p><dl> -<dt><i>line</i></dt> -<dd> -output line to be processed (string) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.__readStderr" ID="HgBookmarksInOutDialog.__readStderr"></a> -<h4>HgBookmarksInOutDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStderr signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="HgBookmarksInOutDialog.__readStdout" ID="HgBookmarksInOutDialog.__readStdout"></a> -<h4>HgBookmarksInOutDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStdout signal. -</p><p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p><a NAME="HgBookmarksInOutDialog.__resizeColumns" ID="HgBookmarksInOutDialog.__resizeColumns"></a> -<h4>HgBookmarksInOutDialog.__resizeColumns</h4> -<b>__resizeColumns</b>(<i></i>) -<p> - Private method to resize the list columns. -</p><a NAME="HgBookmarksInOutDialog.__resort" ID="HgBookmarksInOutDialog.__resort"></a> -<h4>HgBookmarksInOutDialog.__resort</h4> -<b>__resort</b>(<i></i>) -<p> - Private method to resort the tree. -</p><a NAME="HgBookmarksInOutDialog.__showError" ID="HgBookmarksInOutDialog.__showError"></a> -<h4>HgBookmarksInOutDialog.__showError</h4> -<b>__showError</b>(<i>out</i>) -<p> - Private slot to show some error. -</p><dl> -<dt><i>out</i></dt> -<dd> -error to be shown (string) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.closeEvent" ID="HgBookmarksInOutDialog.closeEvent"></a> -<h4>HgBookmarksInOutDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Private slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.keyPressEvent" ID="HgBookmarksInOutDialog.keyPressEvent"></a> -<h4>HgBookmarksInOutDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) -<p> - Protected slot to handle a key press event. -</p><dl> -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.on_buttonBox_clicked" ID="HgBookmarksInOutDialog.on_buttonBox_clicked"></a> -<h4>HgBookmarksInOutDialog.on_buttonBox_clicked</h4> -<b>on_buttonBox_clicked</b>(<i>button</i>) -<p> - Private slot called by a button of the button box clicked. -</p><dl> -<dt><i>button</i></dt> -<dd> -button that was clicked (QAbstractButton) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.on_input_returnPressed" ID="HgBookmarksInOutDialog.on_input_returnPressed"></a> -<h4>HgBookmarksInOutDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) -<p> - Private slot to handle the press of the return key in the input field. -</p><a NAME="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ID="HgBookmarksInOutDialog.on_passwordCheckBox_toggled"></a> -<h4>HgBookmarksInOutDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) -<p> - Private slot to handle the password checkbox toggled. -</p><dl> -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl><a NAME="HgBookmarksInOutDialog.on_sendButton_clicked" ID="HgBookmarksInOutDialog.on_sendButton_clicked"></a> -<h4>HgBookmarksInOutDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) -<p> - Private slot to send the input to the subversion process. -</p><a NAME="HgBookmarksInOutDialog.start" ID="HgBookmarksInOutDialog.start"></a> -<h4>HgBookmarksInOutDialog.start</h4> -<b>start</b>(<i>path</i>) -<p> - Public slot to start the bookmarks command. -</p><dl> -<dt><i>path</i></dt> -<dd> -name of directory to be listed (string) -</dd> -</dl><dl> -<dt>Raises <b>ValueError</b>:</dt> -<dd> -raised to indicate an invalid dialog mode -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,280 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog</h1> -<p> -Module implementing a dialog to show a list of bookmarks. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgBookmarksListDialog">HgBookmarksListDialog</a></td> -<td>Class implementing a dialog to show a list of bookmarks.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgBookmarksListDialog" ID="HgBookmarksListDialog"></a> -<h2>HgBookmarksListDialog</h2> -<p> - Class implementing a dialog to show a list of bookmarks. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgBookmarksListDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgBookmarksListDialog.__init__">HgBookmarksListDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__finish">__finish</a></td> -<td>Private slot called when the process finished or the user pressed the button.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__generateItem">__generateItem</a></td> -<td>Private method to generate a bookmark item in the bookmarks list.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__processOutputLine">__processOutputLine</a></td> -<td>Private method to process the lines of output.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__resizeColumns">__resizeColumns</a></td> -<td>Private method to resize the list columns.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__resort">__resort</a></td> -<td>Private method to resort the tree.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.__showError">__showError</a></td> -<td>Private slot to show some error.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.closeEvent">closeEvent</a></td> -<td>Private slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> -<td>Private slot called by a button of the button box clicked.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr><tr> -<td><a href="#HgBookmarksListDialog.start">start</a></td> -<td>Public slot to start the bookmarks command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgBookmarksListDialog.__init__" ID="HgBookmarksListDialog.__init__"></a> -<h4>HgBookmarksListDialog (Constructor)</h4> -<b>HgBookmarksListDialog</b>(<i>vcs, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="HgBookmarksListDialog.__finish" ID="HgBookmarksListDialog.__finish"></a> -<h4>HgBookmarksListDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the process finished or the user pressed - the button. -</p><a NAME="HgBookmarksListDialog.__generateItem" ID="HgBookmarksListDialog.__generateItem"></a> -<h4>HgBookmarksListDialog.__generateItem</h4> -<b>__generateItem</b>(<i>revision, changeset, status, name</i>) -<p> - Private method to generate a bookmark item in the bookmarks list. -</p><dl> -<dt><i>revision</i></dt> -<dd> -revision of the bookmark (string) -</dd><dt><i>changeset</i></dt> -<dd> -changeset of the bookmark (string) -</dd><dt><i>status</i></dt> -<dd> -of the bookmark (string) -</dd><dt><i>name</i></dt> -<dd> -name of the bookmark (string) -</dd> -</dl><a NAME="HgBookmarksListDialog.__procFinished" ID="HgBookmarksListDialog.__procFinished"></a> -<h4>HgBookmarksListDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) -<p> - Private slot connected to the finished signal. -</p><dl> -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd><dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl><a NAME="HgBookmarksListDialog.__processOutputLine" ID="HgBookmarksListDialog.__processOutputLine"></a> -<h4>HgBookmarksListDialog.__processOutputLine</h4> -<b>__processOutputLine</b>(<i>line</i>) -<p> - Private method to process the lines of output. -</p><dl> -<dt><i>line</i></dt> -<dd> -output line to be processed (string) -</dd> -</dl><a NAME="HgBookmarksListDialog.__readStderr" ID="HgBookmarksListDialog.__readStderr"></a> -<h4>HgBookmarksListDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStderr signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="HgBookmarksListDialog.__readStdout" ID="HgBookmarksListDialog.__readStdout"></a> -<h4>HgBookmarksListDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStdout signal. -</p><p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p><a NAME="HgBookmarksListDialog.__resizeColumns" ID="HgBookmarksListDialog.__resizeColumns"></a> -<h4>HgBookmarksListDialog.__resizeColumns</h4> -<b>__resizeColumns</b>(<i></i>) -<p> - Private method to resize the list columns. -</p><a NAME="HgBookmarksListDialog.__resort" ID="HgBookmarksListDialog.__resort"></a> -<h4>HgBookmarksListDialog.__resort</h4> -<b>__resort</b>(<i></i>) -<p> - Private method to resort the tree. -</p><a NAME="HgBookmarksListDialog.__showError" ID="HgBookmarksListDialog.__showError"></a> -<h4>HgBookmarksListDialog.__showError</h4> -<b>__showError</b>(<i>out</i>) -<p> - Private slot to show some error. -</p><dl> -<dt><i>out</i></dt> -<dd> -error to be shown (string) -</dd> -</dl><a NAME="HgBookmarksListDialog.closeEvent" ID="HgBookmarksListDialog.closeEvent"></a> -<h4>HgBookmarksListDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Private slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="HgBookmarksListDialog.keyPressEvent" ID="HgBookmarksListDialog.keyPressEvent"></a> -<h4>HgBookmarksListDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) -<p> - Protected slot to handle a key press event. -</p><dl> -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl><a NAME="HgBookmarksListDialog.on_buttonBox_clicked" ID="HgBookmarksListDialog.on_buttonBox_clicked"></a> -<h4>HgBookmarksListDialog.on_buttonBox_clicked</h4> -<b>on_buttonBox_clicked</b>(<i>button</i>) -<p> - Private slot called by a button of the button box clicked. -</p><dl> -<dt><i>button</i></dt> -<dd> -button that was clicked (QAbstractButton) -</dd> -</dl><a NAME="HgBookmarksListDialog.on_input_returnPressed" ID="HgBookmarksListDialog.on_input_returnPressed"></a> -<h4>HgBookmarksListDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) -<p> - Private slot to handle the press of the return key in the input field. -</p><a NAME="HgBookmarksListDialog.on_passwordCheckBox_toggled" ID="HgBookmarksListDialog.on_passwordCheckBox_toggled"></a> -<h4>HgBookmarksListDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) -<p> - Private slot to handle the password checkbox toggled. -</p><dl> -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl><a NAME="HgBookmarksListDialog.on_sendButton_clicked" ID="HgBookmarksListDialog.on_sendButton_clicked"></a> -<h4>HgBookmarksListDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) -<p> - Private slot to send the input to the subversion process. -</p><a NAME="HgBookmarksListDialog.start" ID="HgBookmarksListDialog.start"></a> -<h4>HgBookmarksListDialog.start</h4> -<b>start</b>(<i>path, bookmarksList</i>) -<p> - Public slot to start the bookmarks command. -</p><dl> -<dt><i>path</i></dt> -<dd> -name of directory to be listed (string) -</dd><dt><i>bookmarksList</i></dt> -<dd> -reference to string list receiving the bookmarks - (list of strings) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,195 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper</h1> -<p> -Module implementing the bookmarks extension project helper. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#BookmarksProjectHelper">BookmarksProjectHelper</a></td> -<td>Class implementing the bookmarks extension project helper.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="BookmarksProjectHelper" ID="BookmarksProjectHelper"></a> -<h2>BookmarksProjectHelper</h2> -<p> - Class implementing the bookmarks extension project helper. -</p> -<h3>Derived from</h3> -HgExtensionProjectHelper -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#BookmarksProjectHelper.__init__">BookmarksProjectHelper</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__aboutToShowMenu">__aboutToShowMenu</a></td> -<td>Private slot to handle the aboutToShow signal of the background menu.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkDefine">__hgBookmarkDefine</a></td> -<td>Private slot used to define a bookmark.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkDelete">__hgBookmarkDelete</a></td> -<td>Private slot used to delete a bookmark.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkIncoming">__hgBookmarkIncoming</a></td> -<td>Private slot used to show a list of incoming bookmarks.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkMove">__hgBookmarkMove</a></td> -<td>Private slot used to move a bookmark.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkOutgoing">__hgBookmarkOutgoing</a></td> -<td>Private slot used to show a list of outgoing bookmarks.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkPull">__hgBookmarkPull</a></td> -<td>Private slot used to pull a bookmark from a remote repository.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkPush">__hgBookmarkPush</a></td> -<td>Private slot used to push a bookmark to a remote repository.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarkRename">__hgBookmarkRename</a></td> -<td>Private slot used to rename a bookmark.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.__hgBookmarksList">__hgBookmarksList</a></td> -<td>Private slot used to list the bookmarks.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.initActions">initActions</a></td> -<td>Public method to generate the action objects.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.initMenu">initMenu</a></td> -<td>Public method to generate the extension menu.</td> -</tr><tr> -<td><a href="#BookmarksProjectHelper.menuTitle">menuTitle</a></td> -<td>Public method to get the menu title.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="BookmarksProjectHelper.__init__" ID="BookmarksProjectHelper.__init__"></a> -<h4>BookmarksProjectHelper (Constructor)</h4> -<b>BookmarksProjectHelper</b>(<i></i>) -<p> - Constructor -</p><a NAME="BookmarksProjectHelper.__aboutToShowMenu" ID="BookmarksProjectHelper.__aboutToShowMenu"></a> -<h4>BookmarksProjectHelper.__aboutToShowMenu</h4> -<b>__aboutToShowMenu</b>(<i></i>) -<p> - Private slot to handle the aboutToShow signal of the background menu. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkDefine" ID="BookmarksProjectHelper.__hgBookmarkDefine"></a> -<h4>BookmarksProjectHelper.__hgBookmarkDefine</h4> -<b>__hgBookmarkDefine</b>(<i></i>) -<p> - Private slot used to define a bookmark. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkDelete" ID="BookmarksProjectHelper.__hgBookmarkDelete"></a> -<h4>BookmarksProjectHelper.__hgBookmarkDelete</h4> -<b>__hgBookmarkDelete</b>(<i></i>) -<p> - Private slot used to delete a bookmark. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkIncoming" ID="BookmarksProjectHelper.__hgBookmarkIncoming"></a> -<h4>BookmarksProjectHelper.__hgBookmarkIncoming</h4> -<b>__hgBookmarkIncoming</b>(<i></i>) -<p> - Private slot used to show a list of incoming bookmarks. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkMove" ID="BookmarksProjectHelper.__hgBookmarkMove"></a> -<h4>BookmarksProjectHelper.__hgBookmarkMove</h4> -<b>__hgBookmarkMove</b>(<i></i>) -<p> - Private slot used to move a bookmark. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkOutgoing" ID="BookmarksProjectHelper.__hgBookmarkOutgoing"></a> -<h4>BookmarksProjectHelper.__hgBookmarkOutgoing</h4> -<b>__hgBookmarkOutgoing</b>(<i></i>) -<p> - Private slot used to show a list of outgoing bookmarks. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkPull" ID="BookmarksProjectHelper.__hgBookmarkPull"></a> -<h4>BookmarksProjectHelper.__hgBookmarkPull</h4> -<b>__hgBookmarkPull</b>(<i></i>) -<p> - Private slot used to pull a bookmark from a remote repository. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkPush" ID="BookmarksProjectHelper.__hgBookmarkPush"></a> -<h4>BookmarksProjectHelper.__hgBookmarkPush</h4> -<b>__hgBookmarkPush</b>(<i></i>) -<p> - Private slot used to push a bookmark to a remote repository. -</p><a NAME="BookmarksProjectHelper.__hgBookmarkRename" ID="BookmarksProjectHelper.__hgBookmarkRename"></a> -<h4>BookmarksProjectHelper.__hgBookmarkRename</h4> -<b>__hgBookmarkRename</b>(<i></i>) -<p> - Private slot used to rename a bookmark. -</p><a NAME="BookmarksProjectHelper.__hgBookmarksList" ID="BookmarksProjectHelper.__hgBookmarksList"></a> -<h4>BookmarksProjectHelper.__hgBookmarksList</h4> -<b>__hgBookmarksList</b>(<i></i>) -<p> - Private slot used to list the bookmarks. -</p><a NAME="BookmarksProjectHelper.initActions" ID="BookmarksProjectHelper.initActions"></a> -<h4>BookmarksProjectHelper.initActions</h4> -<b>initActions</b>(<i></i>) -<p> - Public method to generate the action objects. -</p><a NAME="BookmarksProjectHelper.initMenu" ID="BookmarksProjectHelper.initMenu"></a> -<h4>BookmarksProjectHelper.initMenu</h4> -<b>initMenu</b>(<i>mainMenu</i>) -<p> - Public method to generate the extension menu. -</p><dl> -<dt><i>mainMenu</i></dt> -<dd> -reference to the main menu (QMenu) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -populated menu (QMenu) -</dd> -</dl><a NAME="BookmarksProjectHelper.menuTitle" ID="BookmarksProjectHelper.menuTitle"></a> -<h4>BookmarksProjectHelper.menuTitle</h4> -<b>menuTitle</b>(<i></i>) -<p> - Public method to get the menu title. -</p><dl> -<dt>Returns:</dt> -<dd> -title of the menu (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,245 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks</h1> -<p> -Module implementing the bookmarks extension interface. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#Bookmarks">Bookmarks</a></td> -<td>Class implementing the bookmarks extension interface.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="Bookmarks" ID="Bookmarks"></a> -<h2>Bookmarks</h2> -<p> - Class implementing the bookmarks extension interface. -</p> -<h3>Derived from</h3> -HgExtension -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#Bookmarks.__init__">Bookmarks</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#Bookmarks.__getInOutBookmarks">__getInOutBookmarks</a></td> -<td>Public method to get the list of incoming or outgoing bookmarks.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkDefine">hgBookmarkDefine</a></td> -<td>Public method to define a bookmark.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkDelete">hgBookmarkDelete</a></td> -<td>Public method to delete a bookmark.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkIncoming">hgBookmarkIncoming</a></td> -<td>Public method to show a list of incoming bookmarks.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkMove">hgBookmarkMove</a></td> -<td>Public method to move a bookmark.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkOutgoing">hgBookmarkOutgoing</a></td> -<td>Public method to show a list of outgoing bookmarks.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkPull">hgBookmarkPull</a></td> -<td>Public method to pull a bookmark from a remote repository.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkPush">hgBookmarkPush</a></td> -<td>Public method to push a bookmark to a remote repository.</td> -</tr><tr> -<td><a href="#Bookmarks.hgBookmarkRename">hgBookmarkRename</a></td> -<td>Public method to rename a bookmark.</td> -</tr><tr> -<td><a href="#Bookmarks.hgGetBookmarksList">hgGetBookmarksList</a></td> -<td>Public method to get the list of bookmarks.</td> -</tr><tr> -<td><a href="#Bookmarks.hgListBookmarks">hgListBookmarks</a></td> -<td>Public method used to list the available bookmarks.</td> -</tr><tr> -<td><a href="#Bookmarks.shutdown">shutdown</a></td> -<td>Public method used to shutdown the bookmarks interface.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="Bookmarks.__init__" ID="Bookmarks.__init__"></a> -<h4>Bookmarks (Constructor)</h4> -<b>Bookmarks</b>(<i>vcs</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the Mercurial vcs object -</dd> -</dl><a NAME="Bookmarks.__getInOutBookmarks" ID="Bookmarks.__getInOutBookmarks"></a> -<h4>Bookmarks.__getInOutBookmarks</h4> -<b>__getInOutBookmarks</b>(<i>repodir, incoming</i>) -<p> - Public method to get the list of incoming or outgoing bookmarks. -</p><dl> -<dt><i>repodir</i></dt> -<dd> -directory name of the repository (string) -</dd><dt><i>incoming</i></dt> -<dd> -flag indicating to get incoming bookmarks (boolean) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -list of bookmarks (list of string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkDefine" ID="Bookmarks.hgBookmarkDefine"></a> -<h4>Bookmarks.hgBookmarkDefine</h4> -<b>hgBookmarkDefine</b>(<i>name</i>) -<p> - Public method to define a bookmark. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkDelete" ID="Bookmarks.hgBookmarkDelete"></a> -<h4>Bookmarks.hgBookmarkDelete</h4> -<b>hgBookmarkDelete</b>(<i>name</i>) -<p> - Public method to delete a bookmark. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkIncoming" ID="Bookmarks.hgBookmarkIncoming"></a> -<h4>Bookmarks.hgBookmarkIncoming</h4> -<b>hgBookmarkIncoming</b>(<i>name</i>) -<p> - Public method to show a list of incoming bookmarks. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkMove" ID="Bookmarks.hgBookmarkMove"></a> -<h4>Bookmarks.hgBookmarkMove</h4> -<b>hgBookmarkMove</b>(<i>name</i>) -<p> - Public method to move a bookmark. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkOutgoing" ID="Bookmarks.hgBookmarkOutgoing"></a> -<h4>Bookmarks.hgBookmarkOutgoing</h4> -<b>hgBookmarkOutgoing</b>(<i>name</i>) -<p> - Public method to show a list of outgoing bookmarks. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkPull" ID="Bookmarks.hgBookmarkPull"></a> -<h4>Bookmarks.hgBookmarkPull</h4> -<b>hgBookmarkPull</b>(<i>name</i>) -<p> - Public method to pull a bookmark from a remote repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkPush" ID="Bookmarks.hgBookmarkPush"></a> -<h4>Bookmarks.hgBookmarkPush</h4> -<b>hgBookmarkPush</b>(<i>name</i>) -<p> - Public method to push a bookmark to a remote repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgBookmarkRename" ID="Bookmarks.hgBookmarkRename"></a> -<h4>Bookmarks.hgBookmarkRename</h4> -<b>hgBookmarkRename</b>(<i>name</i>) -<p> - Public method to rename a bookmark. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name (string) -</dd> -</dl><a NAME="Bookmarks.hgGetBookmarksList" ID="Bookmarks.hgGetBookmarksList"></a> -<h4>Bookmarks.hgGetBookmarksList</h4> -<b>hgGetBookmarksList</b>(<i>repodir</i>) -<p> - Public method to get the list of bookmarks. -</p><dl> -<dt><i>repodir</i></dt> -<dd> -directory name of the repository (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -list of bookmarks (list of string) -</dd> -</dl><a NAME="Bookmarks.hgListBookmarks" ID="Bookmarks.hgListBookmarks"></a> -<h4>Bookmarks.hgListBookmarks</h4> -<b>hgListBookmarks</b>(<i>path</i>) -<p> - Public method used to list the available bookmarks. -</p><dl> -<dt><i>path</i></dt> -<dd> -directory name of the project (string) -</dd> -</dl><a NAME="Bookmarks.shutdown" ID="Bookmarks.shutdown"></a> -<h4>Bookmarks.shutdown</h4> -<b>shutdown</b>(<i></i>) -<p> - Public method used to shutdown the bookmarks interface. -</p> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,253 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog</h1> +<p> +Module implementing the bookmark dialog. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarkDialog">HgBookmarkDialog</a></td> +<td>Class mplementing the bookmark dialog.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarkDialog" ID="HgBookmarkDialog"></a> +<h2>HgBookmarkDialog</h2> +<p> + Class mplementing the bookmark dialog. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarkDialog +<h3>Class Attributes</h3> +<table> +<tr><td>DEFINE_MODE</td></tr><tr><td>MOVE_MODE</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarkDialog.__init__">HgBookmarkDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.__updateBookmarksCombo">__updateBookmarksCombo</a></td> +<td>Private slot to update the bookmarks combo.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the ID edit.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_nameCombo_activated">on_nameCombo_activated</a></td> +<td>Private slot to handle changes of the selected bookmark name.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_nameEdit_textChanged">on_nameEdit_textChanged</a></td> +<td>Private slot to handle changes of the bookmark name.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgBookmarkDialog.__init__" ID="HgBookmarkDialog.__init__"></a> +<h4>HgBookmarkDialog (Constructor)</h4> +<b>HgBookmarkDialog</b>(<i>mode, tagsList, branchesList, bookmarksList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>mode</i></dt> +<dd> +of the dialog (integer) +</dd><dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgBookmarkDialog.__updateBookmarksCombo" ID="HgBookmarkDialog.__updateBookmarksCombo"></a> +<h4>HgBookmarkDialog.__updateBookmarksCombo</h4> +<b>__updateBookmarksCombo</b>(<i></i>) +<p> + Private slot to update the bookmarks combo. +</p><a NAME="HgBookmarkDialog.__updateOK" ID="HgBookmarkDialog.__updateOK"></a> +<h4>HgBookmarkDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgBookmarkDialog.getData" ID="HgBookmarkDialog.getData"></a> +<h4>HgBookmarkDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple naming the revision and the bookmark name + (string, string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_bookmarkButton_toggled" ID="HgBookmarkDialog.on_bookmarkButton_toggled"></a> +<h4>HgBookmarkDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" ID="HgBookmarkDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgBookmarkDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_branchButton_toggled" ID="HgBookmarkDialog.on_branchButton_toggled"></a> +<h4>HgBookmarkDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_branchCombo_editTextChanged" ID="HgBookmarkDialog.on_branchCombo_editTextChanged"></a> +<h4>HgBookmarkDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_idButton_toggled" ID="HgBookmarkDialog.on_idButton_toggled"></a> +<h4>HgBookmarkDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_idEdit_textChanged" ID="HgBookmarkDialog.on_idEdit_textChanged"></a> +<h4>HgBookmarkDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_nameCombo_activated" ID="HgBookmarkDialog.on_nameCombo_activated"></a> +<h4>HgBookmarkDialog.on_nameCombo_activated</h4> +<b>on_nameCombo_activated</b>(<i>txt</i>) +<p> + Private slot to handle changes of the selected bookmark name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +selected combo entry (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_nameEdit_textChanged" ID="HgBookmarkDialog.on_nameEdit_textChanged"></a> +<h4>HgBookmarkDialog.on_nameEdit_textChanged</h4> +<b>on_nameEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the bookmark name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_tagButton_toggled" ID="HgBookmarkDialog.on_tagButton_toggled"></a> +<h4>HgBookmarkDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_tagCombo_editTextChanged" ID="HgBookmarkDialog.on_tagCombo_editTextChanged"></a> +<h4>HgBookmarkDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,132 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog</h1> +<p> +Module implementing a dialog to get the data to rename a bookmark. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarkRenameDialog">HgBookmarkRenameDialog</a></td> +<td>Class implementing a dialog to get the data to rename a bookmark.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarkRenameDialog" ID="HgBookmarkRenameDialog"></a> +<h2>HgBookmarkRenameDialog</h2> +<p> + Class implementing a dialog to get the data to rename a bookmark. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarkRenameDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarkRenameDialog.__init__">HgBookmarkRenameDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.__updateUI">__updateUI</a></td> +<td>Private slot to update the UI.</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the selected bookmark.</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.on_nameEdit_textChanged">on_nameEdit_textChanged</a></td> +<td>Private slot to handle changes of the bookmark name.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgBookmarkRenameDialog.__init__" ID="HgBookmarkRenameDialog.__init__"></a> +<h4>HgBookmarkRenameDialog (Constructor)</h4> +<b>HgBookmarkRenameDialog</b>(<i>bookmarksList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgBookmarkRenameDialog.__updateUI" ID="HgBookmarkRenameDialog.__updateUI"></a> +<h4>HgBookmarkRenameDialog.__updateUI</h4> +<b>__updateUI</b>(<i></i>) +<p> + Private slot to update the UI. +</p><a NAME="HgBookmarkRenameDialog.getData" ID="HgBookmarkRenameDialog.getData"></a> +<h4>HgBookmarkRenameDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple naming the new and old bookmark names + (string, string) +</dd> +</dl><a NAME="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" ID="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the selected bookmark. +</p><dl> +<dt><i>txt</i></dt> +<dd> +name of the selected bookmark (string) +</dd> +</dl><a NAME="HgBookmarkRenameDialog.on_nameEdit_textChanged" ID="HgBookmarkRenameDialog.on_nameEdit_textChanged"></a> +<h4>HgBookmarkRenameDialog.on_nameEdit_textChanged</h4> +<b>on_nameEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the bookmark name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,285 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog</h1> +<p> +Module implementing a dialog to show a list of incoming or outgoing bookmarks. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarksInOutDialog">HgBookmarksInOutDialog</a></td> +<td>Class implementing a dialog to show a list of incoming or outgoing bookmarks.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarksInOutDialog" ID="HgBookmarksInOutDialog"></a> +<h2>HgBookmarksInOutDialog</h2> +<p> + Class implementing a dialog to show a list of incoming or outgoing + bookmarks. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarksInOutDialog +<h3>Class Attributes</h3> +<table> +<tr><td>INCOMING</td></tr><tr><td>OUTGOING</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarksInOutDialog.__init__">HgBookmarksInOutDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a bookmark item in the bookmarks list.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__processOutputLine">__processOutputLine</a></td> +<td>Private method to process the lines of output.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.closeEvent">closeEvent</a></td> +<td>Private slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> +<td>Private slot called by a button of the button box clicked.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_input_returnPressed">on_input_returnPressed</a></td> +<td>Private slot to handle the press of the return key in the input field.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the subversion process.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.start">start</a></td> +<td>Public slot to start the bookmarks command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgBookmarksInOutDialog.__init__" ID="HgBookmarksInOutDialog.__init__"></a> +<h4>HgBookmarksInOutDialog (Constructor)</h4> +<b>HgBookmarksInOutDialog</b>(<i>vcs, mode, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>mode</i></dt> +<dd> +mode of the dialog (HgBookmarksInOutDialog.INCOMING, + HgBookmarksInOutDialog.OUTGOING) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><dl> +<dt>Raises <b>ValueError</b>:</dt> +<dd> +raised to indicate an invalid dialog mode +</dd> +</dl><a NAME="HgBookmarksInOutDialog.__finish" ID="HgBookmarksInOutDialog.__finish"></a> +<h4>HgBookmarksInOutDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="HgBookmarksInOutDialog.__generateItem" ID="HgBookmarksInOutDialog.__generateItem"></a> +<h4>HgBookmarksInOutDialog.__generateItem</h4> +<b>__generateItem</b>(<i>changeset, name</i>) +<p> + Private method to generate a bookmark item in the bookmarks list. +</p><dl> +<dt><i>changeset</i></dt> +<dd> +changeset of the bookmark (string) +</dd><dt><i>name</i></dt> +<dd> +name of the bookmark (string) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.__procFinished" ID="HgBookmarksInOutDialog.__procFinished"></a> +<h4>HgBookmarksInOutDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.__processOutputLine" ID="HgBookmarksInOutDialog.__processOutputLine"></a> +<h4>HgBookmarksInOutDialog.__processOutputLine</h4> +<b>__processOutputLine</b>(<i>line</i>) +<p> + Private method to process the lines of output. +</p><dl> +<dt><i>line</i></dt> +<dd> +output line to be processed (string) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.__readStderr" ID="HgBookmarksInOutDialog.__readStderr"></a> +<h4>HgBookmarksInOutDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="HgBookmarksInOutDialog.__readStdout" ID="HgBookmarksInOutDialog.__readStdout"></a> +<h4>HgBookmarksInOutDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="HgBookmarksInOutDialog.__resizeColumns" ID="HgBookmarksInOutDialog.__resizeColumns"></a> +<h4>HgBookmarksInOutDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="HgBookmarksInOutDialog.__resort" ID="HgBookmarksInOutDialog.__resort"></a> +<h4>HgBookmarksInOutDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="HgBookmarksInOutDialog.__showError" ID="HgBookmarksInOutDialog.__showError"></a> +<h4>HgBookmarksInOutDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.closeEvent" ID="HgBookmarksInOutDialog.closeEvent"></a> +<h4>HgBookmarksInOutDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Private slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.keyPressEvent" ID="HgBookmarksInOutDialog.keyPressEvent"></a> +<h4>HgBookmarksInOutDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.on_buttonBox_clicked" ID="HgBookmarksInOutDialog.on_buttonBox_clicked"></a> +<h4>HgBookmarksInOutDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.on_input_returnPressed" ID="HgBookmarksInOutDialog.on_input_returnPressed"></a> +<h4>HgBookmarksInOutDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ID="HgBookmarksInOutDialog.on_passwordCheckBox_toggled"></a> +<h4>HgBookmarksInOutDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.on_sendButton_clicked" ID="HgBookmarksInOutDialog.on_sendButton_clicked"></a> +<h4>HgBookmarksInOutDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the subversion process. +</p><a NAME="HgBookmarksInOutDialog.start" ID="HgBookmarksInOutDialog.start"></a> +<h4>HgBookmarksInOutDialog.start</h4> +<b>start</b>(<i>path</i>) +<p> + Public slot to start the bookmarks command. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of directory to be listed (string) +</dd> +</dl><dl> +<dt>Raises <b>ValueError</b>:</dt> +<dd> +raised to indicate an invalid dialog mode +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,280 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog</h1> +<p> +Module implementing a dialog to show a list of bookmarks. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarksListDialog">HgBookmarksListDialog</a></td> +<td>Class implementing a dialog to show a list of bookmarks.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarksListDialog" ID="HgBookmarksListDialog"></a> +<h2>HgBookmarksListDialog</h2> +<p> + Class implementing a dialog to show a list of bookmarks. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarksListDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarksListDialog.__init__">HgBookmarksListDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a bookmark item in the bookmarks list.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__processOutputLine">__processOutputLine</a></td> +<td>Private method to process the lines of output.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.closeEvent">closeEvent</a></td> +<td>Private slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> +<td>Private slot called by a button of the button box clicked.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.on_input_returnPressed">on_input_returnPressed</a></td> +<td>Private slot to handle the press of the return key in the input field.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the subversion process.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.start">start</a></td> +<td>Public slot to start the bookmarks command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgBookmarksListDialog.__init__" ID="HgBookmarksListDialog.__init__"></a> +<h4>HgBookmarksListDialog (Constructor)</h4> +<b>HgBookmarksListDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="HgBookmarksListDialog.__finish" ID="HgBookmarksListDialog.__finish"></a> +<h4>HgBookmarksListDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="HgBookmarksListDialog.__generateItem" ID="HgBookmarksListDialog.__generateItem"></a> +<h4>HgBookmarksListDialog.__generateItem</h4> +<b>__generateItem</b>(<i>revision, changeset, status, name</i>) +<p> + Private method to generate a bookmark item in the bookmarks list. +</p><dl> +<dt><i>revision</i></dt> +<dd> +revision of the bookmark (string) +</dd><dt><i>changeset</i></dt> +<dd> +changeset of the bookmark (string) +</dd><dt><i>status</i></dt> +<dd> +of the bookmark (string) +</dd><dt><i>name</i></dt> +<dd> +name of the bookmark (string) +</dd> +</dl><a NAME="HgBookmarksListDialog.__procFinished" ID="HgBookmarksListDialog.__procFinished"></a> +<h4>HgBookmarksListDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="HgBookmarksListDialog.__processOutputLine" ID="HgBookmarksListDialog.__processOutputLine"></a> +<h4>HgBookmarksListDialog.__processOutputLine</h4> +<b>__processOutputLine</b>(<i>line</i>) +<p> + Private method to process the lines of output. +</p><dl> +<dt><i>line</i></dt> +<dd> +output line to be processed (string) +</dd> +</dl><a NAME="HgBookmarksListDialog.__readStderr" ID="HgBookmarksListDialog.__readStderr"></a> +<h4>HgBookmarksListDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="HgBookmarksListDialog.__readStdout" ID="HgBookmarksListDialog.__readStdout"></a> +<h4>HgBookmarksListDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="HgBookmarksListDialog.__resizeColumns" ID="HgBookmarksListDialog.__resizeColumns"></a> +<h4>HgBookmarksListDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="HgBookmarksListDialog.__resort" ID="HgBookmarksListDialog.__resort"></a> +<h4>HgBookmarksListDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="HgBookmarksListDialog.__showError" ID="HgBookmarksListDialog.__showError"></a> +<h4>HgBookmarksListDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="HgBookmarksListDialog.closeEvent" ID="HgBookmarksListDialog.closeEvent"></a> +<h4>HgBookmarksListDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Private slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="HgBookmarksListDialog.keyPressEvent" ID="HgBookmarksListDialog.keyPressEvent"></a> +<h4>HgBookmarksListDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="HgBookmarksListDialog.on_buttonBox_clicked" ID="HgBookmarksListDialog.on_buttonBox_clicked"></a> +<h4>HgBookmarksListDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="HgBookmarksListDialog.on_input_returnPressed" ID="HgBookmarksListDialog.on_input_returnPressed"></a> +<h4>HgBookmarksListDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="HgBookmarksListDialog.on_passwordCheckBox_toggled" ID="HgBookmarksListDialog.on_passwordCheckBox_toggled"></a> +<h4>HgBookmarksListDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="HgBookmarksListDialog.on_sendButton_clicked" ID="HgBookmarksListDialog.on_sendButton_clicked"></a> +<h4>HgBookmarksListDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the subversion process. +</p><a NAME="HgBookmarksListDialog.start" ID="HgBookmarksListDialog.start"></a> +<h4>HgBookmarksListDialog.start</h4> +<b>start</b>(<i>path, bookmarksList</i>) +<p> + Public slot to start the bookmarks command. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of directory to be listed (string) +</dd><dt><i>bookmarksList</i></dt> +<dd> +reference to string list receiving the bookmarks + (list of strings) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri May 09 15:53:40 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Mon May 12 18:19:22 2014 +0200 @@ -84,6 +84,33 @@ <td><a href="#HgProjectHelper.__hgBisectSkip">__hgBisectSkip</a></td> <td>Private slot used to execute the bisect --skip command.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkDefine">__hgBookmarkDefine</a></td> +<td>Private slot used to define a bookmark.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkDelete">__hgBookmarkDelete</a></td> +<td>Private slot used to delete a bookmark.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkIncoming">__hgBookmarkIncoming</a></td> +<td>Private slot used to show a list of incoming bookmarks.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkMove">__hgBookmarkMove</a></td> +<td>Private slot used to move a bookmark.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkOutgoing">__hgBookmarkOutgoing</a></td> +<td>Private slot used to show a list of outgoing bookmarks.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkPull">__hgBookmarkPull</a></td> +<td>Private slot used to pull a bookmark from a remote repository.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkPush">__hgBookmarkPush</a></td> +<td>Private slot used to push a bookmark to a remote repository.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarkRename">__hgBookmarkRename</a></td> +<td>Private slot used to rename a bookmark.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgBookmarksList">__hgBookmarksList</a></td> +<td>Private slot used to list the bookmarks.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgBranch">__hgBranch</a></td> <td>Private slot used to create a new branch for the project.</td> </tr><tr> @@ -289,6 +316,51 @@ <b>__hgBisectSkip</b>(<i></i>) <p> Private slot used to execute the bisect --skip command. +</p><a NAME="HgProjectHelper.__hgBookmarkDefine" ID="HgProjectHelper.__hgBookmarkDefine"></a> +<h4>HgProjectHelper.__hgBookmarkDefine</h4> +<b>__hgBookmarkDefine</b>(<i></i>) +<p> + Private slot used to define a bookmark. +</p><a NAME="HgProjectHelper.__hgBookmarkDelete" ID="HgProjectHelper.__hgBookmarkDelete"></a> +<h4>HgProjectHelper.__hgBookmarkDelete</h4> +<b>__hgBookmarkDelete</b>(<i></i>) +<p> + Private slot used to delete a bookmark. +</p><a NAME="HgProjectHelper.__hgBookmarkIncoming" ID="HgProjectHelper.__hgBookmarkIncoming"></a> +<h4>HgProjectHelper.__hgBookmarkIncoming</h4> +<b>__hgBookmarkIncoming</b>(<i></i>) +<p> + Private slot used to show a list of incoming bookmarks. +</p><a NAME="HgProjectHelper.__hgBookmarkMove" ID="HgProjectHelper.__hgBookmarkMove"></a> +<h4>HgProjectHelper.__hgBookmarkMove</h4> +<b>__hgBookmarkMove</b>(<i></i>) +<p> + Private slot used to move a bookmark. +</p><a NAME="HgProjectHelper.__hgBookmarkOutgoing" ID="HgProjectHelper.__hgBookmarkOutgoing"></a> +<h4>HgProjectHelper.__hgBookmarkOutgoing</h4> +<b>__hgBookmarkOutgoing</b>(<i></i>) +<p> + Private slot used to show a list of outgoing bookmarks. +</p><a NAME="HgProjectHelper.__hgBookmarkPull" ID="HgProjectHelper.__hgBookmarkPull"></a> +<h4>HgProjectHelper.__hgBookmarkPull</h4> +<b>__hgBookmarkPull</b>(<i></i>) +<p> + Private slot used to pull a bookmark from a remote repository. +</p><a NAME="HgProjectHelper.__hgBookmarkPush" ID="HgProjectHelper.__hgBookmarkPush"></a> +<h4>HgProjectHelper.__hgBookmarkPush</h4> +<b>__hgBookmarkPush</b>(<i></i>) +<p> + Private slot used to push a bookmark to a remote repository. +</p><a NAME="HgProjectHelper.__hgBookmarkRename" ID="HgProjectHelper.__hgBookmarkRename"></a> +<h4>HgProjectHelper.__hgBookmarkRename</h4> +<b>__hgBookmarkRename</b>(<i></i>) +<p> + Private slot used to rename a bookmark. +</p><a NAME="HgProjectHelper.__hgBookmarksList" ID="HgProjectHelper.__hgBookmarksList"></a> +<h4>HgProjectHelper.__hgBookmarksList</h4> +<b>__hgBookmarksList</b>(<i></i>) +<p> + Private slot used to list the bookmarks. </p><a NAME="HgProjectHelper.__hgBranch" ID="HgProjectHelper.__hgBranch"></a> <h4>HgProjectHelper.__hgBranch</h4> <b>__hgBranch</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri May 09 15:53:40 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon May 12 18:19:22 2014 +0200 @@ -80,6 +80,9 @@ <td><a href="#Hg.__getExtensionsInfo">__getExtensionsInfo</a></td> <td>Private method to get the active extensions from Mercurial.</td> </tr><tr> +<td><a href="#Hg.__getInOutBookmarks">__getInOutBookmarks</a></td> +<td>Public method to get the list of incoming or outgoing bookmarks.</td> +</tr><tr> <td><a href="#Hg.__hgGetFileForRevision">__hgGetFileForRevision</a></td> <td>Private method to get a file for a specific revision from the repository.</td> </tr><tr> @@ -140,6 +143,30 @@ <td><a href="#Hg.hgBisect">hgBisect</a></td> <td>Public method to perform bisect commands.</td> </tr><tr> +<td><a href="#Hg.hgBookmarkDefine">hgBookmarkDefine</a></td> +<td>Public method to define a bookmark.</td> +</tr><tr> +<td><a href="#Hg.hgBookmarkDelete">hgBookmarkDelete</a></td> +<td>Public method to delete a bookmark.</td> +</tr><tr> +<td><a href="#Hg.hgBookmarkIncoming">hgBookmarkIncoming</a></td> +<td>Public method to show a list of incoming bookmarks.</td> +</tr><tr> +<td><a href="#Hg.hgBookmarkMove">hgBookmarkMove</a></td> +<td>Public method to move a bookmark.</td> +</tr><tr> +<td><a href="#Hg.hgBookmarkOutgoing">hgBookmarkOutgoing</a></td> +<td>Public method to show a list of outgoing bookmarks.</td> +</tr><tr> +<td><a href="#Hg.hgBookmarkPull">hgBookmarkPull</a></td> +<td>Public method to pull a bookmark from a remote repository.</td> +</tr><tr> +<td><a href="#Hg.hgBookmarkPush">hgBookmarkPush</a></td> +<td>Public method to push a bookmark to a remote repository.</td> +</tr><tr> +<td><a href="#Hg.hgBookmarkRename">hgBookmarkRename</a></td> +<td>Public method to rename a bookmark.</td> +</tr><tr> <td><a href="#Hg.hgBranch">hgBranch</a></td> <td>Public method used to create a branch in the Mercurial repository.</td> </tr><tr> @@ -170,6 +197,9 @@ <td><a href="#Hg.hgForget">hgForget</a></td> <td>Public method used to remove a file from the Mercurial repository.</td> </tr><tr> +<td><a href="#Hg.hgGetBookmarksList">hgGetBookmarksList</a></td> +<td>Public method to get the list of bookmarks.</td> +</tr><tr> <td><a href="#Hg.hgGetBranchesList">hgGetBranchesList</a></td> <td>Public method to get the list of branches.</td> </tr><tr> @@ -194,6 +224,9 @@ <td><a href="#Hg.hgInfo">hgInfo</a></td> <td>Public method to show information about the heads of the repository.</td> </tr><tr> +<td><a href="#Hg.hgListBookmarks">hgListBookmarks</a></td> +<td>Public method used to list the available bookmarks.</td> +</tr><tr> <td><a href="#Hg.hgListTagBranch">hgListTagBranch</a></td> <td>Public method used to list the available tags or branches.</td> </tr><tr> @@ -391,7 +424,25 @@ <b>__getExtensionsInfo</b>(<i></i>) <p> Private method to get the active extensions from Mercurial. -</p><a NAME="Hg.__hgGetFileForRevision" ID="Hg.__hgGetFileForRevision"></a> +</p><a NAME="Hg.__getInOutBookmarks" ID="Hg.__getInOutBookmarks"></a> +<h4>Hg.__getInOutBookmarks</h4> +<b>__getInOutBookmarks</b>(<i>repodir, incoming</i>) +<p> + Public method to get the list of incoming or outgoing bookmarks. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>incoming</i></dt> +<dd> +flag indicating to get incoming bookmarks (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of bookmarks (list of string) +</dd> +</dl><a NAME="Hg.__hgGetFileForRevision" ID="Hg.__hgGetFileForRevision"></a> <h4>Hg.__hgGetFileForRevision</h4> <b>__hgGetFileForRevision</b>(<i>name, rev=""</i>) <p> @@ -612,6 +663,86 @@ <dd> raised to indicate an invalid bisect subcommand </dd> +</dl><a NAME="Hg.hgBookmarkDefine" ID="Hg.hgBookmarkDefine"></a> +<h4>Hg.hgBookmarkDefine</h4> +<b>hgBookmarkDefine</b>(<i>name</i>) +<p> + Public method to define a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Hg.hgBookmarkDelete" ID="Hg.hgBookmarkDelete"></a> +<h4>Hg.hgBookmarkDelete</h4> +<b>hgBookmarkDelete</b>(<i>name</i>) +<p> + Public method to delete a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Hg.hgBookmarkIncoming" ID="Hg.hgBookmarkIncoming"></a> +<h4>Hg.hgBookmarkIncoming</h4> +<b>hgBookmarkIncoming</b>(<i>name</i>) +<p> + Public method to show a list of incoming bookmarks. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Hg.hgBookmarkMove" ID="Hg.hgBookmarkMove"></a> +<h4>Hg.hgBookmarkMove</h4> +<b>hgBookmarkMove</b>(<i>name</i>) +<p> + Public method to move a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Hg.hgBookmarkOutgoing" ID="Hg.hgBookmarkOutgoing"></a> +<h4>Hg.hgBookmarkOutgoing</h4> +<b>hgBookmarkOutgoing</b>(<i>name</i>) +<p> + Public method to show a list of outgoing bookmarks. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Hg.hgBookmarkPull" ID="Hg.hgBookmarkPull"></a> +<h4>Hg.hgBookmarkPull</h4> +<b>hgBookmarkPull</b>(<i>name</i>) +<p> + Public method to pull a bookmark from a remote repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Hg.hgBookmarkPush" ID="Hg.hgBookmarkPush"></a> +<h4>Hg.hgBookmarkPush</h4> +<b>hgBookmarkPush</b>(<i>name</i>) +<p> + Public method to push a bookmark to a remote repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Hg.hgBookmarkRename" ID="Hg.hgBookmarkRename"></a> +<h4>Hg.hgBookmarkRename</h4> +<b>hgBookmarkRename</b>(<i>name</i>) +<p> + Public method to rename a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> </dl><a NAME="Hg.hgBranch" ID="Hg.hgBranch"></a> <h4>Hg.hgBranch</h4> <b>hgBranch</b>(<i>name</i>) @@ -748,6 +879,21 @@ file/directory name to be removed (string or list of strings)) </dd> +</dl><a NAME="Hg.hgGetBookmarksList" ID="Hg.hgGetBookmarksList"></a> +<h4>Hg.hgGetBookmarksList</h4> +<b>hgGetBookmarksList</b>(<i>repodir</i>) +<p> + Public method to get the list of bookmarks. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of bookmarks (list of string) +</dd> </dl><a NAME="Hg.hgGetBranchesList" ID="Hg.hgGetBranchesList"></a> <h4>Hg.hgGetBranchesList</h4> <b>hgGetBranchesList</b>(<i>repodir</i>) @@ -868,6 +1014,16 @@ mode of the operation (string, one of heads, parents, tip) </dd> +</dl><a NAME="Hg.hgListBookmarks" ID="Hg.hgListBookmarks"></a> +<h4>Hg.hgListBookmarks</h4> +<b>hgListBookmarks</b>(<i>path</i>) +<p> + Public method used to list the available bookmarks. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd> </dl><a NAME="Hg.hgListTagBranch" ID="Hg.hgListTagBranch"></a> <h4>Hg.hgListTagBranch</h4> <b>hgListTagBranch</b>(<i>path, tags=True</i>)
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body> -<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension</h1> -<p> -Package implementing the bookmarks extension support interface. -</p> - - -<h3>Modules</h3> -<table> -<tr> -<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html">HgBookmarkDialog</a></td> -<td>Module implementing the bookmark dialog.</td> -</tr><tr> -<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html">HgBookmarkRenameDialog</a></td> -<td>Module implementing a dialog to get the data to rename a bookmark.</td> -</tr><tr> -<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html">HgBookmarksInOutDialog</a></td> -<td>Module implementing a dialog to show a list of incoming or outgoing bookmarks.</td> -</tr><tr> -<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html">HgBookmarksListDialog</a></td> -<td>Module implementing a dialog to show a list of bookmarks.</td> -</tr><tr> -<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html">ProjectHelper</a></td> -<td>Module implementing the bookmarks extension project helper.</td> -</tr><tr> -<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html">bookmarks</a></td> -<td>Module implementing the bookmarks extension interface.</td> -</tr> -</table> -</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Fri May 09 15:53:40 2014 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Mon May 12 18:19:22 2014 +0200 @@ -30,9 +30,6 @@ <h3>Packages</h3> <table> <tr> -<td><a href="index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html">BookmarksExtension</a></td> -<td>Package implementing the bookmarks extension support interface.</td> -</tr><tr> <td><a href="index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html">ConfigurationPage</a></td> <td>Package implementing the the Mercurial configuration page.</td> </tr><tr> @@ -80,6 +77,18 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html">HgBackoutDialog</a></td> <td>Module implementing a dialog to enter the data for a backout operation.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkDialog.html">HgBookmarkDialog</a></td> +<td>Module implementing the bookmark dialog.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarkRenameDialog.html">HgBookmarkRenameDialog</a></td> +<td>Module implementing a dialog to get the data to rename a bookmark.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html">HgBookmarksInOutDialog</a></td> +<td>Module implementing a dialog to show a list of incoming or outgoing bookmarks.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html">HgBookmarksListDialog</a></td> +<td>Module implementing a dialog to show a list of bookmarks.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html">HgBranchInputDialog</a></td> <td>Module implementing a dialog to enter the data for a branch operation.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,212 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the bookmark dialog. -""" - -from __future__ import unicode_literals - -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox - -from .Ui_HgBookmarkDialog import Ui_HgBookmarkDialog - - -class HgBookmarkDialog(QDialog, Ui_HgBookmarkDialog): - """ - Class mplementing the bookmark dialog. - """ - DEFINE_MODE = 0 - MOVE_MODE = 1 - - def __init__(self, mode, tagsList, branchesList, bookmarksList, - parent=None): - """ - Constructor - - @param mode of the dialog (integer) - @param tagsList list of tags (list of strings) - @param branchesList list of branches (list of strings) - @param bookmarksList list of bookmarks (list of strings) - @param parent reference to the parent widget (QWidget) - """ - super(HgBookmarkDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - - self.__mode = mode - if mode == self.MOVE_MODE: - self.nameEdit.hide() - self.nameCombo.addItems([""] + sorted(bookmarksList)) - self.setWindowTitle(self.tr("Move Bookmark")) - else: - self.nameCombo.hide() - self.setWindowTitle(self.tr("Define Bookmark")) - - self.__bookmarksList = bookmarksList[:] - - self.tagCombo.addItems(sorted(tagsList)) - self.branchCombo.addItems(["default"] + sorted(branchesList)) - self.bookmarkCombo.addItems(sorted(bookmarksList)) - - msh = self.minimumSizeHint() - self.resize(max(self.width(), msh.width()), msh.height()) - - def __updateOK(self): - """ - Private slot to update the OK button. - """ - if self.__mode == self.MOVE_MODE: - enabled = self.nameCombo.currentText() != "" - else: - enabled = self.nameEdit.text() != "" - if self.idButton.isChecked(): - enabled = enabled and self.idEdit.text() != "" - elif self.tagButton.isChecked(): - enabled = enabled and self.tagCombo.currentText() != "" - elif self.branchButton.isChecked(): - enabled = enabled and self.branchCombo.currentText() != "" - elif self.bookmarkButton.isChecked(): - enabled = enabled and self.bookmarkCombo.currentText() != "" - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) - - def __updateBookmarksCombo(self): - """ - Private slot to update the bookmarks combo. - """ - if self.__mode == self.MOVE_MODE: - bookmark = self.nameCombo.currentText() - selectedBookmark = self.bookmarkCombo.currentText() - self.bookmarkCombo.clearEditText() - self.bookmarkCombo.clear() - self.bookmarkCombo.addItems(sorted(self.__bookmarksList)) - index = self.bookmarkCombo.findText(bookmark) - if index > -1: - self.bookmarkCombo.removeItem(index) - if selectedBookmark: - index = self.bookmarkCombo.findText(selectedBookmark) - if index > -1: - self.bookmarkCombo.setCurrentIndex(index) - - @pyqtSlot(str) - def on_nameCombo_activated(self, txt): - """ - Private slot to handle changes of the selected bookmark name. - - @param txt selected combo entry (string) - """ - self.__updateOK() - self.__updateBookmarksCombo() - - @pyqtSlot(str) - def on_nameEdit_textChanged(self, txt): - """ - Private slot to handle changes of the bookmark name. - - @param txt text of the edit (string) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_idButton_toggled(self, checked): - """ - Private slot to handle changes of the ID select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_tagButton_toggled(self, checked): - """ - Private slot to handle changes of the Tag select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_branchButton_toggled(self, checked): - """ - Private slot to handle changes of the Branch select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_bookmarkButton_toggled(self, checked): - """ - Private slot to handle changes of the Bookmark select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_idEdit_textChanged(self, txt): - """ - Private slot to handle changes of the ID edit. - - @param txt text of the edit (string) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_tagCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Tag combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_branchCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Branch combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_bookmarkCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Bookmark combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - def getData(self): - """ - Public method to retrieve the entered data. - - @return tuple naming the revision and the bookmark name - (string, string) - """ - if self.numberButton.isChecked(): - rev = "rev({0})".format(self.numberSpinBox.value()) - elif self.idButton.isChecked(): - rev = "id({0})".format(self.idEdit.text()) - elif self.tagButton.isChecked(): - rev = self.tagCombo.currentText() - elif self.branchButton.isChecked(): - rev = self.branchCombo.currentText() - elif self.bookmarkButton.isChecked(): - rev = self.bookmarkCombo.currentText() - else: - rev = "" - - if self.__mode == self.MOVE_MODE: - name = self.nameCombo.currentText().replace(" ", "_") - else: - name = self.nameEdit.text().replace(" ", "_") - - return rev, name
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,362 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgBookmarkDialog</class> - <widget class="QDialog" name="HgBookmarkDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>255</height> - </rect> - </property> - <property name="windowTitle"> - <string/> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Name:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="nameEdit"> - <property name="toolTip"> - <string>Enter the bookmark name</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="nameCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Select a bookmark</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Revision</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QRadioButton" name="numberButton"> - <property name="toolTip"> - <string>Select to specify a revision by number</string> - </property> - <property name="text"> - <string>Number</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="numberSpinBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter a revision number</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight</set> - </property> - <property name="maximum"> - <number>999999999</number> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="spacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>158</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QRadioButton" name="idButton"> - <property name="toolTip"> - <string>Select to specify a revision by changeset id</string> - </property> - <property name="text"> - <string>Id:</string> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="QLineEdit" name="idEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter a changeset id</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QRadioButton" name="tagButton"> - <property name="toolTip"> - <string>Select to specify a revision by a tag</string> - </property> - <property name="text"> - <string>Tag:</string> - </property> - </widget> - </item> - <item row="2" column="1" colspan="2"> - <widget class="QComboBox" name="tagCombo"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter a tag name</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QRadioButton" name="branchButton"> - <property name="toolTip"> - <string>Select to specify a revision by a branch</string> - </property> - <property name="text"> - <string>Branch:</string> - </property> - </widget> - </item> - <item row="3" column="1" colspan="2"> - <widget class="QComboBox" name="branchCombo"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter a branch name</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QRadioButton" name="bookmarkButton"> - <property name="toolTip"> - <string>Select to specify a revision by a bookmark</string> - </property> - <property name="text"> - <string>Bookmark:</string> - </property> - </widget> - </item> - <item row="4" column="1" colspan="2"> - <widget class="QComboBox" name="bookmarkCombo"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter a bookmark name</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="5" column="0" colspan="3"> - <widget class="QRadioButton" name="tipButton"> - <property name="toolTip"> - <string>Select tip revision of repository</string> - </property> - <property name="text"> - <string>Parent</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>nameEdit</tabstop> - <tabstop>nameCombo</tabstop> - <tabstop>numberButton</tabstop> - <tabstop>numberSpinBox</tabstop> - <tabstop>idButton</tabstop> - <tabstop>idEdit</tabstop> - <tabstop>tagButton</tabstop> - <tabstop>tagCombo</tabstop> - <tabstop>branchButton</tabstop> - <tabstop>branchCombo</tabstop> - <tabstop>bookmarkButton</tabstop> - <tabstop>bookmarkCombo</tabstop> - <tabstop>tipButton</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgBookmarkDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>274</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgBookmarkDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>numberButton</sender> - <signal>toggled(bool)</signal> - <receiver>numberSpinBox</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>48</x> - <y>89</y> - </hint> - <hint type="destinationlabel"> - <x>118</x> - <y>87</y> - </hint> - </hints> - </connection> - <connection> - <sender>idButton</sender> - <signal>toggled(bool)</signal> - <receiver>idEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>36</x> - <y>109</y> - </hint> - <hint type="destinationlabel"> - <x>105</x> - <y>116</y> - </hint> - </hints> - </connection> - <connection> - <sender>tagButton</sender> - <signal>toggled(bool)</signal> - <receiver>tagCombo</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>43</x> - <y>142</y> - </hint> - <hint type="destinationlabel"> - <x>102</x> - <y>141</y> - </hint> - </hints> - </connection> - <connection> - <sender>branchButton</sender> - <signal>toggled(bool)</signal> - <receiver>branchCombo</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>42</x> - <y>170</y> - </hint> - <hint type="destinationlabel"> - <x>115</x> - <y>171</y> - </hint> - </hints> - </connection> - <connection> - <sender>bookmarkButton</sender> - <signal>toggled(bool)</signal> - <receiver>bookmarkCombo</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>51</x> - <y>196</y> - </hint> - <hint type="destinationlabel"> - <x>108</x> - <y>201</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to get the data to rename a bookmark. -""" - -from __future__ import unicode_literals - -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox - -from .Ui_HgBookmarkRenameDialog import Ui_HgBookmarkRenameDialog - - -class HgBookmarkRenameDialog(QDialog, Ui_HgBookmarkRenameDialog): - """ - Class implementing a dialog to get the data to rename a bookmark. - """ - def __init__(self, bookmarksList, parent=None): - """ - Constructor - - @param bookmarksList list of bookmarks (list of strings) - @param parent reference to the parent widget (QWidget) - """ - super(HgBookmarkRenameDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - - self.bookmarkCombo.addItems(sorted(bookmarksList)) - - msh = self.minimumSizeHint() - self.resize(max(self.width(), msh.width()), msh.height()) - - def __updateUI(self): - """ - Private slot to update the UI. - """ - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( - self.nameEdit.text() != "" and - self.bookmarkCombo.currentText() != "" - ) - - @pyqtSlot(str) - def on_nameEdit_textChanged(self, txt): - """ - Private slot to handle changes of the bookmark name. - - @param txt text of the edit (string) - """ - self.__updateUI() - - @pyqtSlot(str) - def on_bookmarkCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the selected bookmark. - - @param txt name of the selected bookmark (string) - """ - self.__updateUI() - - def getData(self): - """ - Public method to retrieve the entered data. - - @return tuple naming the new and old bookmark names - (string, string) - """ - return ( - self.nameEdit.text().replace(" ", "_"), - self.bookmarkCombo.currentText().replace(" ", "_") - )
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgBookmarkRenameDialog</class> - <widget class="QDialog" name="HgBookmarkRenameDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>102</height> - </rect> - </property> - <property name="windowTitle"> - <string>Rename Bookmark</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>New Name:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="nameEdit"> - <property name="toolTip"> - <string>Enter the bookmark name</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Bookmark:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="bookmarkCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the bookmark name to be renamed</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>nameEdit</tabstop> - <tabstop>bookmarkCombo</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgBookmarkRenameDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgBookmarkRenameDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,328 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show a list of incoming or outgoing bookmarks. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit - -from E5Gui import E5MessageBox - -from .Ui_HgBookmarksInOutDialog import Ui_HgBookmarksInOutDialog - - -class HgBookmarksInOutDialog(QDialog, Ui_HgBookmarksInOutDialog): - """ - Class implementing a dialog to show a list of incoming or outgoing - bookmarks. - """ - INCOMING = 0 - OUTGOING = 1 - - def __init__(self, vcs, mode, parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param mode mode of the dialog (HgBookmarksInOutDialog.INCOMING, - HgBookmarksInOutDialog.OUTGOING) - @param parent reference to the parent widget (QWidget) - @exception ValueError raised to indicate an invalid dialog mode - """ - super(HgBookmarksInOutDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - - if mode not in [self.INCOMING, self.OUTGOING]: - raise ValueError("Bad value for mode") - if mode == self.INCOMING: - self.setWindowTitle(self.tr("Mercurial Incoming Bookmarks")) - elif mode == self.OUTGOING: - self.setWindowTitle(self.tr("Mercurial Outgoing Bookmarks")) - - self.process = QProcess() - self.vcs = vcs - self.mode = mode - self.__hgClient = vcs.getClient() - - self.bookmarksList.headerItem().setText( - self.bookmarksList.columnCount(), "") - self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - self.show() - QCoreApplication.processEvents() - - def closeEvent(self, e): - """ - Private slot implementing a close event handler. - - @param e close event (QCloseEvent) - """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - e.accept() - - def start(self, path): - """ - Public slot to start the bookmarks command. - - @param path name of directory to be listed (string) - @exception ValueError raised to indicate an invalid dialog mode - """ - self.errorGroup.hide() - - self.intercept = False - self.activateWindow() - - dname, fname = self.vcs.splitPath(path) - - # find the root of the repo - repodir = dname - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - if self.mode == self.INCOMING: - args = self.vcs.initCommand("incoming") - elif self.mode == self.OUTGOING: - args = self.vcs.initCommand("outgoing") - else: - raise ValueError("Bad value for mode") - args.append('--bookmarks') - - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() - - def __finish(self): - """ - Private slot called when the process finished or the user pressed - the button. - """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus( - Qt.OtherFocusReason) - - self.process = None - - if self.bookmarksList.topLevelItemCount() == 0: - # no bookmarks defined - self.__generateItem(self.tr("no bookmarks found"), "") - self.__resizeColumns() - self.__resort() - - def on_buttonBox_clicked(self, button): - """ - Private slot called by a button of the button box clicked. - - @param button button that was clicked (QAbstractButton) - """ - if button == self.buttonBox.button(QDialogButtonBox.Close): - self.close() - elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - - def __resort(self): - """ - Private method to resort the tree. - """ - self.bookmarksList.sortItems( - self.bookmarksList.sortColumn(), - self.bookmarksList.header().sortIndicatorOrder()) - - def __resizeColumns(self): - """ - Private method to resize the list columns. - """ - self.bookmarksList.header().resizeSections( - QHeaderView.ResizeToContents) - self.bookmarksList.header().setStretchLastSection(True) - - def __generateItem(self, changeset, name): - """ - Private method to generate a bookmark item in the bookmarks list. - - @param changeset changeset of the bookmark (string) - @param name name of the bookmark (string) - """ - QTreeWidgetItem(self.bookmarksList, [ - name, - changeset]) - - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace') - self.__processOutputLine(s) - - def __processOutputLine(self, line): - """ - Private method to process the lines of output. - - @param line output line to be processed (string) - """ - if line.startswith(" "): - li = line.strip().split() - changeset = li[-1] - del li[-1] - name = " ".join(li) - self.__generateItem(changeset, name) - - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - - def __showError(self, out): - """ - Private slot to show some error. - - @param out error to be shown (string) - """ - self.errorGroup.show() - self.errors.insertPlainText(out) - self.errors.ensureCursorVisible() - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - input = self.input.text() - input += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(input) - self.errors.ensureCursorVisible() - - self.process.write(input) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgBookmarksInOutDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgBookmarksInOutDialog</class> - <widget class="QDialog" name="HgBookmarksInOutDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>520</width> - <height>494</height> - </rect> - </property> - <property name="windowTitle"> - <string/> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTreeWidget" name="bookmarksList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>2</verstretch> - </sizepolicy> - </property> - <property name="whatsThis"> - <string><b>Bookmarks List</b> -<p>This shows a list of the bookmarks.</p></string> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Name</string> - </property> - </column> - <column> - <property name="text"> - <string>Changeset</string> - </property> - </column> - </widget> - </item> - <item> - <widget class="QGroupBox" name="errorGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Errors</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextEdit" name="errors"> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11"/> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <tabstops> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> - <tabstop>bookmarksList</tabstop> - <tabstop>errors</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections/> -</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,327 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show a list of bookmarks. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit - -from E5Gui import E5MessageBox - -from .Ui_HgBookmarksListDialog import Ui_HgBookmarksListDialog - - -class HgBookmarksListDialog(QDialog, Ui_HgBookmarksListDialog): - """ - Class implementing a dialog to show a list of bookmarks. - """ - def __init__(self, vcs, parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param parent parent widget (QWidget) - """ - super(HgBookmarksListDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - - self.process = QProcess() - self.vcs = vcs - self.__bookmarksList = None - self.__hgClient = vcs.getClient() - - self.bookmarksList.headerItem().setText( - self.bookmarksList.columnCount(), "") - self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - self.show() - QCoreApplication.processEvents() - - def closeEvent(self, e): - """ - Private slot implementing a close event handler. - - @param e close event (QCloseEvent) - """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - e.accept() - - def start(self, path, bookmarksList): - """ - Public slot to start the bookmarks command. - - @param path name of directory to be listed (string) - @param bookmarksList reference to string list receiving the bookmarks - (list of strings) - """ - self.errorGroup.hide() - - self.intercept = False - self.activateWindow() - - self.__bookmarksList = bookmarksList - dname, fname = self.vcs.splitPath(path) - - # find the root of the repo - repodir = dname - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - args = self.vcs.initCommand("bookmarks") - - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() - - def __finish(self): - """ - Private slot called when the process finished or the user pressed - the button. - """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.buttonBox.button(QDialogButtonBox.Close).setFocus( - Qt.OtherFocusReason) - - self.process = None - - if self.bookmarksList.topLevelItemCount() == 0: - # no bookmarks defined - self.__generateItem( - self.tr("no bookmarks defined"), "", "", "") - self.__resizeColumns() - self.__resort() - - def on_buttonBox_clicked(self, button): - """ - Private slot called by a button of the button box clicked. - - @param button button that was clicked (QAbstractButton) - """ - if button == self.buttonBox.button(QDialogButtonBox.Close): - self.close() - elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - - def __resort(self): - """ - Private method to resort the tree. - """ - self.bookmarksList.sortItems( - self.bookmarksList.sortColumn(), - self.bookmarksList.header().sortIndicatorOrder()) - - def __resizeColumns(self): - """ - Private method to resize the list columns. - """ - self.bookmarksList.header().resizeSections( - QHeaderView.ResizeToContents) - self.bookmarksList.header().setStretchLastSection(True) - - def __generateItem(self, revision, changeset, status, name): - """ - Private method to generate a bookmark item in the bookmarks list. - - @param revision revision of the bookmark (string) - @param changeset changeset of the bookmark (string) - @param status of the bookmark (string) - @param name name of the bookmark (string) - """ - itm = QTreeWidgetItem(self.bookmarksList) - itm.setData(0, Qt.DisplayRole, int(revision)) - itm.setData(1, Qt.DisplayRole, changeset) - itm.setData(2, Qt.DisplayRole, status) - itm.setData(3, Qt.DisplayRole, name) - itm.setTextAlignment(0, Qt.AlignRight) - itm.setTextAlignment(1, Qt.AlignRight) - itm.setTextAlignment(2, Qt.AlignHCenter) - - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace').strip() - self.__processOutputLine(s) - - def __processOutputLine(self, line): - """ - Private method to process the lines of output. - - @param line output line to be processed (string) - """ - li = line.split() - if li[-1][0] in "1234567890": - # last element is a rev:changeset - rev, changeset = li[-1].split(":", 1) - del li[-1] - if li[0] == "*": - status = "current" - del li[0] - else: - status = "" - name = " ".join(li) - self.__generateItem(rev, changeset, status, name) - if self.__bookmarksList is not None: - self.__bookmarksList.append(name) - - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - - def __showError(self, out): - """ - Private slot to show some error. - - @param out error to be shown (string) - """ - self.errorGroup.show() - self.errors.insertPlainText(out) - self.errors.ensureCursorVisible() - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - input = self.input.text() - input += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(input) - self.errors.ensureCursorVisible() - - self.process.write(input) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgBookmarksListDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgBookmarksListDialog</class> - <widget class="QDialog" name="HgBookmarksListDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>634</width> - <height>494</height> - </rect> - </property> - <property name="windowTitle"> - <string>Mercurial Bookmarks</string> - </property> - <property name="whatsThis"> - <string><b>Mercurial Bookmarks</b> -<p>This dialog shows a list of the projects bookmarks.</p></string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTreeWidget" name="bookmarksList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>2</verstretch> - </sizepolicy> - </property> - <property name="whatsThis"> - <string><b>Bookmarks List</b> -<p>This shows a list of the projects bookmarks.</p></string> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Revision</string> - </property> - </column> - <column> - <property name="text"> - <string>Changeset</string> - </property> - </column> - <column> - <property name="text"> - <string>Status</string> - </property> - </column> - <column> - <property name="text"> - <string>Name</string> - </property> - </column> - </widget> - </item> - <item> - <widget class="QGroupBox" name="errorGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Errors</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextEdit" name="errors"> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11"/> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <tabstops> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> - <tabstop>bookmarksList</tabstop> - <tabstop>errors</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections/> -</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,284 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the bookmarks extension project helper. -""" - -from __future__ import unicode_literals - -from PyQt4.QtGui import QMenu - -from E5Gui.E5Action import E5Action - -from ..HgExtensionProjectHelper import HgExtensionProjectHelper - -import UI.PixmapCache - - -class BookmarksProjectHelper(HgExtensionProjectHelper): - """ - Class implementing the bookmarks extension project helper. - """ - def __init__(self): - """ - Constructor - """ - super(BookmarksProjectHelper, self).__init__() - - def initActions(self): - """ - Public method to generate the action objects. - """ - self.hgBookmarksListAct = E5Action( - self.tr('List bookmarks'), - UI.PixmapCache.getIcon("listBookmarks.png"), - self.tr('List bookmarks...'), - 0, 0, self, 'mercurial_list_bookmarks') - self.hgBookmarksListAct.setStatusTip(self.tr( - 'List bookmarks of the project' - )) - self.hgBookmarksListAct.setWhatsThis(self.tr( - """<b>List bookmarks</b>""" - """<p>This lists the bookmarks of the project.</p>""" - )) - self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList) - self.actions.append(self.hgBookmarksListAct) - - self.hgBookmarkDefineAct = E5Action( - self.tr('Define bookmark'), - UI.PixmapCache.getIcon("addBookmark.png"), - self.tr('Define bookmark...'), - 0, 0, self, 'mercurial_define_bookmark') - self.hgBookmarkDefineAct.setStatusTip(self.tr( - 'Define a bookmark for the project' - )) - self.hgBookmarkDefineAct.setWhatsThis(self.tr( - """<b>Define bookmark</b>""" - """<p>This defines a bookmark for the project.</p>""" - )) - self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine) - self.actions.append(self.hgBookmarkDefineAct) - - self.hgBookmarkDeleteAct = E5Action( - self.tr('Delete bookmark'), - UI.PixmapCache.getIcon("deleteBookmark.png"), - self.tr('Delete bookmark...'), - 0, 0, self, 'mercurial_delete_bookmark') - self.hgBookmarkDeleteAct.setStatusTip(self.tr( - 'Delete a bookmark of the project' - )) - self.hgBookmarkDeleteAct.setWhatsThis(self.tr( - """<b>Delete bookmark</b>""" - """<p>This deletes a bookmark of the project.</p>""" - )) - self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete) - self.actions.append(self.hgBookmarkDeleteAct) - - self.hgBookmarkRenameAct = E5Action( - self.tr('Rename bookmark'), - UI.PixmapCache.getIcon("renameBookmark.png"), - self.tr('Rename bookmark...'), - 0, 0, self, 'mercurial_rename_bookmark') - self.hgBookmarkRenameAct.setStatusTip(self.tr( - 'Rename a bookmark of the project' - )) - self.hgBookmarkRenameAct.setWhatsThis(self.tr( - """<b>Rename bookmark</b>""" - """<p>This renames a bookmark of the project.</p>""" - )) - self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename) - self.actions.append(self.hgBookmarkRenameAct) - - self.hgBookmarkMoveAct = E5Action( - self.tr('Move bookmark'), - UI.PixmapCache.getIcon("moveBookmark.png"), - self.tr('Move bookmark...'), - 0, 0, self, 'mercurial_move_bookmark') - self.hgBookmarkMoveAct.setStatusTip(self.tr( - 'Move a bookmark of the project' - )) - self.hgBookmarkMoveAct.setWhatsThis(self.tr( - """<b>Move bookmark</b>""" - """<p>This moves a bookmark of the project to another""" - """ changeset.</p>""" - )) - self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove) - self.actions.append(self.hgBookmarkMoveAct) - - self.hgBookmarkIncomingAct = E5Action( - self.tr('Show incoming bookmarks'), - UI.PixmapCache.getIcon("incomingBookmark.png"), - self.tr('Show incoming bookmarks'), - 0, 0, self, 'mercurial_incoming_bookmarks') - self.hgBookmarkIncomingAct.setStatusTip(self.tr( - 'Show a list of incoming bookmarks' - )) - self.hgBookmarkIncomingAct.setWhatsThis(self.tr( - """<b>Show incoming bookmarks</b>""" - """<p>This shows a list of new bookmarks available at the remote""" - """ repository.</p>""" - )) - self.hgBookmarkIncomingAct.triggered.connect( - self.__hgBookmarkIncoming) - self.actions.append(self.hgBookmarkIncomingAct) - - self.hgBookmarkPullAct = E5Action( - self.tr('Pull bookmark'), - UI.PixmapCache.getIcon("pullBookmark.png"), - self.tr('Pull bookmark'), - 0, 0, self, 'mercurial_pull_bookmark') - self.hgBookmarkPullAct.setStatusTip(self.tr( - 'Pull a bookmark from a remote repository' - )) - self.hgBookmarkPullAct.setWhatsThis(self.tr( - """<b>Pull bookmark</b>""" - """<p>This pulls a bookmark from a remote repository into the """ - """local repository.</p>""" - )) - self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull) - self.actions.append(self.hgBookmarkPullAct) - - self.hgBookmarkOutgoingAct = E5Action( - self.tr('Show outgoing bookmarks'), - UI.PixmapCache.getIcon("outgoingBookmark.png"), - self.tr('Show outgoing bookmarks'), - 0, 0, self, 'mercurial_outgoing_bookmarks') - self.hgBookmarkOutgoingAct.setStatusTip(self.tr( - 'Show a list of outgoing bookmarks' - )) - self.hgBookmarkOutgoingAct.setWhatsThis(self.tr( - """<b>Show outgoing bookmarks</b>""" - """<p>This shows a list of new bookmarks available at the local""" - """ repository.</p>""" - )) - self.hgBookmarkOutgoingAct.triggered.connect( - self.__hgBookmarkOutgoing) - self.actions.append(self.hgBookmarkOutgoingAct) - - self.hgBookmarkPushAct = E5Action( - self.tr('Push bookmark'), - UI.PixmapCache.getIcon("pushBookmark.png"), - self.tr('Push bookmark'), - 0, 0, self, 'mercurial_push_bookmark') - self.hgBookmarkPushAct.setStatusTip(self.tr( - 'Push a bookmark to a remote repository' - )) - self.hgBookmarkPushAct.setWhatsThis(self.tr( - """<b>Push bookmark</b>""" - """<p>This pushes a bookmark from the local repository to a """ - """remote repository.</p>""" - )) - self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush) - self.actions.append(self.hgBookmarkPushAct) - - def initMenu(self, mainMenu): - """ - Public method to generate the extension menu. - - @param mainMenu reference to the main menu (QMenu) - @return populated menu (QMenu) - """ - menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("bookmark22.png")) - menu.setTearOffEnabled(True) - - menu.addAction(self.hgBookmarkDefineAct) - menu.addAction(self.hgBookmarkDeleteAct) - menu.addAction(self.hgBookmarkRenameAct) - menu.addAction(self.hgBookmarkMoveAct) - menu.addSeparator() - menu.addAction(self.hgBookmarksListAct) - menu.addSeparator() - menu.addAction(self.hgBookmarkIncomingAct) - menu.addAction(self.hgBookmarkPullAct) - menu.addSeparator() - menu.addAction(self.hgBookmarkOutgoingAct) - menu.addAction(self.hgBookmarkPushAct) - - menu.aboutToShow.connect(self.__aboutToShowMenu) - - return menu - - def __aboutToShowMenu(self): - """ - Private slot to handle the aboutToShow signal of the background menu. - """ - self.hgBookmarkPullAct.setEnabled(self.vcs.canPull()) - self.hgBookmarkIncomingAct.setEnabled(self.vcs.canPull()) - - self.hgBookmarkPushAct.setEnabled(self.vcs.canPush()) - self.hgBookmarkOutgoingAct.setEnabled(self.vcs.canPush()) - - def menuTitle(self): - """ - Public method to get the menu title. - - @return title of the menu (string) - """ - return self.tr("Bookmarks") - - def __hgBookmarksList(self): - """ - Private slot used to list the bookmarks. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgListBookmarks(self.project.getProjectPath()) - - def __hgBookmarkDefine(self): - """ - Private slot used to define a bookmark. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkDefine(self.project.getProjectPath()) - - def __hgBookmarkDelete(self): - """ - Private slot used to delete a bookmark. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkDelete(self.project.getProjectPath()) - - def __hgBookmarkRename(self): - """ - Private slot used to rename a bookmark. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkRename(self.project.getProjectPath()) - - def __hgBookmarkMove(self): - """ - Private slot used to move a bookmark. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkMove(self.project.getProjectPath()) - - def __hgBookmarkIncoming(self): - """ - Private slot used to show a list of incoming bookmarks. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkIncoming(self.project.getProjectPath()) - - def __hgBookmarkOutgoing(self): - """ - Private slot used to show a list of outgoing bookmarks. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkOutgoing(self.project.getProjectPath()) - - def __hgBookmarkPull(self): - """ - Private slot used to pull a bookmark from a remote repository. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkPull(self.project.getProjectPath()) - - def __hgBookmarkPush(self): - """ - Private slot used to push a bookmark to a remote repository. - """ - self.vcs.getExtensionObject("bookmarks")\ - .hgBookmarkPush(self.project.getProjectPath())
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/__init__.py Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Package implementing the bookmarks extension support interface. -"""
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py Fri May 09 15:53:40 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,350 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the bookmarks extension interface. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt4.QtCore import QProcess -from PyQt4.QtGui import QDialog, QInputDialog - -from ..HgExtension import HgExtension -from ..HgDialog import HgDialog - - -class Bookmarks(HgExtension): - """ - Class implementing the bookmarks extension interface. - """ - def __init__(self, vcs): - """ - Constructor - - @param vcs reference to the Mercurial vcs object - """ - super(Bookmarks, self).__init__(vcs) - - self.bookmarksListDlg = None - self.bookmarksInOutDlg = None - self.bookmarksList = [] - - def shutdown(self): - """ - Public method used to shutdown the bookmarks interface. - """ - if self.bookmarksListDlg is not None: - self.bookmarksListDlg.close() - if self.bookmarksInOutDlg is not None: - self.bookmarksInOutDlg.close() - - def hgListBookmarks(self, path): - """ - Public method used to list the available bookmarks. - - @param path directory name of the project (string) - """ - self.bookmarksList = [] - - from .HgBookmarksListDialog import HgBookmarksListDialog - self.bookmarksListDlg = HgBookmarksListDialog(self.vcs) - self.bookmarksListDlg.show() - self.bookmarksListDlg.start(path, self.bookmarksList) - - def hgGetBookmarksList(self, repodir): - """ - Public method to get the list of bookmarks. - - @param repodir directory name of the repository (string) - @return list of bookmarks (list of string) - """ - args = self.vcs.initCommand("bookmarks") - - client = self.vcs.getClient() - output = "" - if client: - output = client.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - - self.bookmarksList = [] - for line in output.splitlines(): - li = line.strip().split() - if li[-1][0] in "1234567890": - # last element is a rev:changeset - del li[-1] - if li[0] == "*": - del li[0] - name = " ".join(li) - self.bookmarksList.append(name) - - return self.bookmarksList[:] - - def hgBookmarkDefine(self, name): - """ - Public method to define a bookmark. - - @param name file/directory name (string) - """ - # find the root of the repo - repodir = self.vcs.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - from .HgBookmarkDialog import HgBookmarkDialog - dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE, - self.vcs.hgGetTagsList(repodir), - self.vcs.hgGetBranchesList(repodir), - self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: - rev, bookmark = dlg.getData() - - args = self.vcs.initCommand("bookmarks") - if rev: - args.append("--rev") - args.append(rev) - args.append(bookmark) - - dia = HgDialog(self.tr('Mercurial Bookmark'), self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - - def hgBookmarkDelete(self, name): - """ - Public method to delete a bookmark. - - @param name file/directory name (string) - """ - # find the root of the repo - repodir = self.vcs.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - bookmark, ok = QInputDialog.getItem( - None, - self.tr("Delete Bookmark"), - self.tr("Select the bookmark to be deleted:"), - [""] + sorted(self.hgGetBookmarksList(repodir)), - 0, True) - if ok and bookmark: - args = self.vcs.initCommand("bookmarks") - args.append("--delete") - args.append(bookmark) - - dia = HgDialog(self.tr('Delete Mercurial Bookmark'), self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - - def hgBookmarkRename(self, name): - """ - Public method to rename a bookmark. - - @param name file/directory name (string) - """ - # find the root of the repo - repodir = self.vcs.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - from .HgBookmarkRenameDialog import HgBookmarkRenameDialog - dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: - newName, oldName = dlg.getData() - - args = self.vcs.initCommand("bookmarks") - args.append("--rename") - args.append(oldName) - args.append(newName) - - dia = HgDialog(self.tr('Rename Mercurial Bookmark'), self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - - def hgBookmarkMove(self, name): - """ - Public method to move a bookmark. - - @param name file/directory name (string) - """ - # find the root of the repo - repodir = self.vcs.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - from .HgBookmarkDialog import HgBookmarkDialog - dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE, - self.vcs.hgGetTagsList(repodir), - self.vcs.hgGetBranchesList(repodir), - self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: - rev, bookmark = dlg.getData() - - args = self.vcs.initCommand("bookmarks") - args.append("--force") - if rev: - args.append("--rev") - args.append(rev) - args.append(bookmark) - - dia = HgDialog(self.tr('Move Mercurial Bookmark'), self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - - def hgBookmarkIncoming(self, name): - """ - Public method to show a list of incoming bookmarks. - - @param name file/directory name (string) - """ - from .HgBookmarksInOutDialog import HgBookmarksInOutDialog - self.bookmarksInOutDlg = HgBookmarksInOutDialog( - self.vcs, HgBookmarksInOutDialog.INCOMING) - self.bookmarksInOutDlg.show() - self.bookmarksInOutDlg.start(name) - - def hgBookmarkOutgoing(self, name): - """ - Public method to show a list of outgoing bookmarks. - - @param name file/directory name (string) - """ - from .HgBookmarksInOutDialog import HgBookmarksInOutDialog - self.bookmarksInOutDlg = HgBookmarksInOutDialog( - self.vcs, HgBookmarksInOutDialog.OUTGOING) - self.bookmarksInOutDlg.show() - self.bookmarksInOutDlg.start(name) - - def __getInOutBookmarks(self, repodir, incoming): - """ - Public method to get the list of incoming or outgoing bookmarks. - - @param repodir directory name of the repository (string) - @param incoming flag indicating to get incoming bookmarks (boolean) - @return list of bookmarks (list of string) - """ - bookmarksList = [] - - if incoming: - args = self.vcs.initCommand("incoming") - else: - args = self.vcs.initCommand("outgoing") - args.append('--bookmarks') - - client = self.vcs.getClient() - output = "" - if client: - output = client.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - - for line in output.splitlines(): - if line.startswith(" "): - li = line.strip().split() - del li[-1] - name = " ".join(li) - bookmarksList.append(name) - - return bookmarksList - - def hgBookmarkPull(self, name): - """ - Public method to pull a bookmark from a remote repository. - - @param name file/directory name (string) - """ - # find the root of the repo - repodir = self.vcs.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - bookmarks = self.__getInOutBookmarks(repodir, True) - - bookmark, ok = QInputDialog.getItem( - None, - self.tr("Pull Bookmark"), - self.tr("Select the bookmark to be pulled:"), - [""] + sorted(bookmarks), - 0, True) - if ok and bookmark: - args = self.vcs.initCommand("pull") - args.append('--bookmark') - args.append(bookmark) - - dia = HgDialog(self.tr( - 'Pulling bookmark from a remote Mercurial repository'), - self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - - def hgBookmarkPush(self, name): - """ - Public method to push a bookmark to a remote repository. - - @param name file/directory name (string) - """ - # find the root of the repo - repodir = self.vcs.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - bookmarks = self.__getInOutBookmarks(repodir, False) - - bookmark, ok = QInputDialog.getItem( - None, - self.tr("Push Bookmark"), - self.tr("Select the bookmark to be push:"), - [""] + sorted(bookmarks), - 0, True) - if ok and bookmark: - args = self.vcs.initCommand("push") - args.append('--bookmark') - args.append(bookmark) - - dia = HgDialog(self.tr( - 'Pushing bookmark to a remote Mercurial repository'), - self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_()
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Mon May 12 18:19:22 2014 +0200 @@ -66,16 +66,10 @@ return if rev is None: - if self.vcs.isExtensionActive("bookmarks"): - bookmarksList = \ - self.vcs.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None dlg = HgRevisionSelectionDialog( self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), - bookmarksList) + self.vcs.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() @@ -103,16 +97,10 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.vcs.isExtensionActive("bookmarks"): - bookmarksList = \ - self.vcs.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgGpgSignDialog import HgGpgSignDialog dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), - bookmarksList) + self.vcs.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: revision, noCommit, message, keyId, local, force = dlg.getData()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,212 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the bookmark dialog. +""" + +from __future__ import unicode_literals + +from PyQt4.QtCore import pyqtSlot +from PyQt4.QtGui import QDialog, QDialogButtonBox + +from .Ui_HgBookmarkDialog import Ui_HgBookmarkDialog + + +class HgBookmarkDialog(QDialog, Ui_HgBookmarkDialog): + """ + Class mplementing the bookmark dialog. + """ + DEFINE_MODE = 0 + MOVE_MODE = 1 + + def __init__(self, mode, tagsList, branchesList, bookmarksList, + parent=None): + """ + Constructor + + @param mode of the dialog (integer) + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param bookmarksList list of bookmarks (list of strings) + @param parent reference to the parent widget (QWidget) + """ + super(HgBookmarkDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.__mode = mode + if mode == self.MOVE_MODE: + self.nameEdit.hide() + self.nameCombo.addItems([""] + sorted(bookmarksList)) + self.setWindowTitle(self.tr("Move Bookmark")) + else: + self.nameCombo.hide() + self.setWindowTitle(self.tr("Define Bookmark")) + + self.__bookmarksList = bookmarksList[:] + + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) + self.bookmarkCombo.addItems(sorted(bookmarksList)) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + if self.__mode == self.MOVE_MODE: + enabled = self.nameCombo.currentText() != "" + else: + enabled = self.nameEdit.text() != "" + if self.idButton.isChecked(): + enabled = enabled and self.idEdit.text() != "" + elif self.tagButton.isChecked(): + enabled = enabled and self.tagCombo.currentText() != "" + elif self.branchButton.isChecked(): + enabled = enabled and self.branchCombo.currentText() != "" + elif self.bookmarkButton.isChecked(): + enabled = enabled and self.bookmarkCombo.currentText() != "" + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + def __updateBookmarksCombo(self): + """ + Private slot to update the bookmarks combo. + """ + if self.__mode == self.MOVE_MODE: + bookmark = self.nameCombo.currentText() + selectedBookmark = self.bookmarkCombo.currentText() + self.bookmarkCombo.clearEditText() + self.bookmarkCombo.clear() + self.bookmarkCombo.addItems(sorted(self.__bookmarksList)) + index = self.bookmarkCombo.findText(bookmark) + if index > -1: + self.bookmarkCombo.removeItem(index) + if selectedBookmark: + index = self.bookmarkCombo.findText(selectedBookmark) + if index > -1: + self.bookmarkCombo.setCurrentIndex(index) + + @pyqtSlot(str) + def on_nameCombo_activated(self, txt): + """ + Private slot to handle changes of the selected bookmark name. + + @param txt selected combo entry (string) + """ + self.__updateOK() + self.__updateBookmarksCombo() + + @pyqtSlot(str) + def on_nameEdit_textChanged(self, txt): + """ + Private slot to handle changes of the bookmark name. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_idButton_toggled(self, checked): + """ + Private slot to handle changes of the ID select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tagButton_toggled(self, checked): + """ + Private slot to handle changes of the Tag select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branchButton_toggled(self, checked): + """ + Private slot to handle changes of the Branch select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_bookmarkButton_toggled(self, checked): + """ + Private slot to handle changes of the Bookmark select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_idEdit_textChanged(self, txt): + """ + Private slot to handle changes of the ID edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_bookmarkCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Bookmark combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple naming the revision and the bookmark name + (string, string) + """ + if self.numberButton.isChecked(): + rev = "rev({0})".format(self.numberSpinBox.value()) + elif self.idButton.isChecked(): + rev = "id({0})".format(self.idEdit.text()) + elif self.tagButton.isChecked(): + rev = self.tagCombo.currentText() + elif self.branchButton.isChecked(): + rev = self.branchCombo.currentText() + elif self.bookmarkButton.isChecked(): + rev = self.bookmarkCombo.currentText() + else: + rev = "" + + if self.__mode == self.MOVE_MODE: + name = self.nameCombo.currentText().replace(" ", "_") + else: + name = self.nameEdit.text().replace(" ", "_") + + return rev, name
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.ui Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,362 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgBookmarkDialog</class> + <widget class="QDialog" name="HgBookmarkDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>255</height> + </rect> + </property> + <property name="windowTitle"> + <string/> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="nameEdit"> + <property name="toolTip"> + <string>Enter the bookmark name</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="nameCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select a bookmark</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="numberButton"> + <property name="toolTip"> + <string>Select to specify a revision by number</string> + </property> + <property name="text"> + <string>Number</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="numberSpinBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a revision number</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight</set> + </property> + <property name="maximum"> + <number>999999999</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="spacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>158</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="idButton"> + <property name="toolTip"> + <string>Select to specify a revision by changeset id</string> + </property> + <property name="text"> + <string>Id:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="idEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a changeset id</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QRadioButton" name="bookmarkButton"> + <property name="toolTip"> + <string>Select to specify a revision by a bookmark</string> + </property> + <property name="text"> + <string>Bookmark:</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="2"> + <widget class="QComboBox" name="bookmarkCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a bookmark name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="5" column="0" colspan="3"> + <widget class="QRadioButton" name="tipButton"> + <property name="toolTip"> + <string>Select tip revision of repository</string> + </property> + <property name="text"> + <string>Parent</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>nameEdit</tabstop> + <tabstop>nameCombo</tabstop> + <tabstop>numberButton</tabstop> + <tabstop>numberSpinBox</tabstop> + <tabstop>idButton</tabstop> + <tabstop>idEdit</tabstop> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>bookmarkButton</tabstop> + <tabstop>bookmarkCombo</tabstop> + <tabstop>tipButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgBookmarkDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>274</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgBookmarkDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>numberButton</sender> + <signal>toggled(bool)</signal> + <receiver>numberSpinBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>48</x> + <y>89</y> + </hint> + <hint type="destinationlabel"> + <x>118</x> + <y>87</y> + </hint> + </hints> + </connection> + <connection> + <sender>idButton</sender> + <signal>toggled(bool)</signal> + <receiver>idEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>36</x> + <y>109</y> + </hint> + <hint type="destinationlabel"> + <x>105</x> + <y>116</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>43</x> + <y>142</y> + </hint> + <hint type="destinationlabel"> + <x>102</x> + <y>141</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>42</x> + <y>170</y> + </hint> + <hint type="destinationlabel"> + <x>115</x> + <y>171</y> + </hint> + </hints> + </connection> + <connection> + <sender>bookmarkButton</sender> + <signal>toggled(bool)</signal> + <receiver>bookmarkCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>51</x> + <y>196</y> + </hint> + <hint type="destinationlabel"> + <x>108</x> + <y>201</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to get the data to rename a bookmark. +""" + +from __future__ import unicode_literals + +from PyQt4.QtCore import pyqtSlot +from PyQt4.QtGui import QDialog, QDialogButtonBox + +from .Ui_HgBookmarkRenameDialog import Ui_HgBookmarkRenameDialog + + +class HgBookmarkRenameDialog(QDialog, Ui_HgBookmarkRenameDialog): + """ + Class implementing a dialog to get the data to rename a bookmark. + """ + def __init__(self, bookmarksList, parent=None): + """ + Constructor + + @param bookmarksList list of bookmarks (list of strings) + @param parent reference to the parent widget (QWidget) + """ + super(HgBookmarkRenameDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.bookmarkCombo.addItems(sorted(bookmarksList)) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateUI(self): + """ + Private slot to update the UI. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + self.nameEdit.text() != "" and + self.bookmarkCombo.currentText() != "" + ) + + @pyqtSlot(str) + def on_nameEdit_textChanged(self, txt): + """ + Private slot to handle changes of the bookmark name. + + @param txt text of the edit (string) + """ + self.__updateUI() + + @pyqtSlot(str) + def on_bookmarkCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the selected bookmark. + + @param txt name of the selected bookmark (string) + """ + self.__updateUI() + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple naming the new and old bookmark names + (string, string) + """ + return ( + self.nameEdit.text().replace(" ", "_"), + self.bookmarkCombo.currentText().replace(" ", "_") + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.ui Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgBookmarkRenameDialog</class> + <widget class="QDialog" name="HgBookmarkRenameDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>102</height> + </rect> + </property> + <property name="windowTitle"> + <string>Rename Bookmark</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>New Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="nameEdit"> + <property name="toolTip"> + <string>Enter the bookmark name</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Bookmark:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="bookmarkCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the bookmark name to be renamed</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>nameEdit</tabstop> + <tabstop>bookmarkCombo</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgBookmarkRenameDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgBookmarkRenameDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,328 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show a list of incoming or outgoing bookmarks. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_HgBookmarksInOutDialog import Ui_HgBookmarksInOutDialog + + +class HgBookmarksInOutDialog(QDialog, Ui_HgBookmarksInOutDialog): + """ + Class implementing a dialog to show a list of incoming or outgoing + bookmarks. + """ + INCOMING = 0 + OUTGOING = 1 + + def __init__(self, vcs, mode, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param mode mode of the dialog (HgBookmarksInOutDialog.INCOMING, + HgBookmarksInOutDialog.OUTGOING) + @param parent reference to the parent widget (QWidget) + @exception ValueError raised to indicate an invalid dialog mode + """ + super(HgBookmarksInOutDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + if mode not in [self.INCOMING, self.OUTGOING]: + raise ValueError("Bad value for mode") + if mode == self.INCOMING: + self.setWindowTitle(self.tr("Mercurial Incoming Bookmarks")) + elif mode == self.OUTGOING: + self.setWindowTitle(self.tr("Mercurial Outgoing Bookmarks")) + + self.process = QProcess() + self.vcs = vcs + self.mode = mode + self.__hgClient = vcs.getClient() + + self.bookmarksList.headerItem().setText( + self.bookmarksList.columnCount(), "") + self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) + + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.show() + QCoreApplication.processEvents() + + def closeEvent(self, e): + """ + Private slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.__hgClient: + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() + else: + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + e.accept() + + def start(self, path): + """ + Public slot to start the bookmarks command. + + @param path name of directory to be listed (string) + @exception ValueError raised to indicate an invalid dialog mode + """ + self.errorGroup.hide() + + self.intercept = False + self.activateWindow() + + dname, fname = self.vcs.splitPath(path) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + if self.mode == self.INCOMING: + args = self.vcs.initCommand("incoming") + elif self.mode == self.OUTGOING: + args = self.vcs.initCommand("outgoing") + else: + raise ValueError("Bad value for mode") + args.append('--bookmarks') + + if self.__hgClient: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() + else: + self.process.kill() + self.process.setWorkingDirectory(repodir) + + self.process.start('hg', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('hg')) + else: + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + self.process = None + + if self.bookmarksList.topLevelItemCount() == 0: + # no bookmarks defined + self.__generateItem(self.tr("no bookmarks found"), "") + self.__resizeColumns() + self.__resort() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + if self.__hgClient: + self.__hgClient.cancel() + else: + self.__finish() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__finish() + + def __resort(self): + """ + Private method to resort the tree. + """ + self.bookmarksList.sortItems( + self.bookmarksList.sortColumn(), + self.bookmarksList.header().sortIndicatorOrder()) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.bookmarksList.header().resizeSections( + QHeaderView.ResizeToContents) + self.bookmarksList.header().setStretchLastSection(True) + + def __generateItem(self, changeset, name): + """ + Private method to generate a bookmark item in the bookmarks list. + + @param changeset changeset of the bookmark (string) + @param name name of the bookmark (string) + """ + QTreeWidgetItem(self.bookmarksList, [ + name, + changeset]) + + def __readStdout(self): + """ + Private slot to handle the readyReadStdout signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace') + self.__processOutputLine(s) + + def __processOutputLine(self, line): + """ + Private method to process the lines of output. + + @param line output line to be processed (string) + """ + if line.startswith(" "): + li = line.strip().split() + changeset = li[-1] + del li[-1] + name = " ".join(li) + self.__generateItem(changeset, name) + + def __readStderr(self): + """ + Private slot to handle the readyReadStderr signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + self.vcs.getEncoding(), 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the subversion process. + """ + input = self.input.text() + input += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(input) + self.errors.ensureCursorVisible() + + self.process.write(input) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(HgBookmarksInOutDialog, self).keyPressEvent(evt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgBookmarksInOutDialog</class> + <widget class="QDialog" name="HgBookmarksInOutDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>520</width> + <height>494</height> + </rect> + </property> + <property name="windowTitle"> + <string/> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTreeWidget" name="bookmarksList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Bookmarks List</b> +<p>This shows a list of the bookmarks.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Changeset</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the hg process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the hg process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>bookmarksList</tabstop> + <tabstop>errors</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,332 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show a list of bookmarks. +""" + +from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass + +import os + +from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit + +from E5Gui import E5MessageBox + +from .Ui_HgBookmarksListDialog import Ui_HgBookmarksListDialog + + +class HgBookmarksListDialog(QDialog, Ui_HgBookmarksListDialog): + """ + Class implementing a dialog to show a list of bookmarks. + """ + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(HgBookmarksListDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.process = QProcess() + self.vcs = vcs + self.__bookmarksList = None + self.__hgClient = vcs.getClient() + + self.bookmarksList.headerItem().setText( + self.bookmarksList.columnCount(), "") + self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) + + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + self.show() + QCoreApplication.processEvents() + + def closeEvent(self, e): + """ + Private slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.__hgClient: + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() + else: + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + e.accept() + + def start(self, path, bookmarksList): + """ + Public slot to start the bookmarks command. + + @param path name of directory to be listed (string) + @param bookmarksList reference to string list receiving the bookmarks + (list of strings) + """ + self.errorGroup.hide() + + self.intercept = False + self.activateWindow() + + self.__bookmarksList = bookmarksList + dname, fname = self.vcs.splitPath(path) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + args = self.vcs.initCommand("bookmarks") + + if self.__hgClient: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() + else: + self.process.kill() + self.process.setWorkingDirectory(repodir) + + self.process.start('hg', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('hg')) + else: + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus( + Qt.OtherFocusReason) + + self.process = None + + if self.bookmarksList.topLevelItemCount() == 0: + # no bookmarks defined + self.__generateItem( + self.tr("no bookmarks defined"), "", "", "") + self.__resizeColumns() + self.__resort() + + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + if self.__hgClient: + self.__hgClient.cancel() + else: + self.__finish() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__finish() + + def __resort(self): + """ + Private method to resort the tree. + """ + self.bookmarksList.sortItems( + self.bookmarksList.sortColumn(), + self.bookmarksList.header().sortIndicatorOrder()) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.bookmarksList.header().resizeSections( + QHeaderView.ResizeToContents) + self.bookmarksList.header().setStretchLastSection(True) + + def __generateItem(self, revision, changeset, status, name): + """ + Private method to generate a bookmark item in the bookmarks list. + + @param revision revision of the bookmark (string) + @param changeset changeset of the bookmark (string) + @param status of the bookmark (string) + @param name name of the bookmark (string) + """ + itm = QTreeWidgetItem(self.bookmarksList) + if revision[0].isdecimal(): + # valid bookmark entry + itm.setData(0, Qt.DisplayRole, int(revision)) + itm.setData(1, Qt.DisplayRole, changeset) + itm.setData(2, Qt.DisplayRole, status) + itm.setData(3, Qt.DisplayRole, name) + itm.setTextAlignment(0, Qt.AlignRight) + itm.setTextAlignment(1, Qt.AlignRight) + itm.setTextAlignment(2, Qt.AlignHCenter) + else: + # error message + itm.setData(0, Qt.DisplayRole, revision) + + def __readStdout(self): + """ + Private slot to handle the readyReadStdout signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + s = str(self.process.readLine(), self.vcs.getEncoding(), + 'replace').strip() + self.__processOutputLine(s) + + def __processOutputLine(self, line): + """ + Private method to process the lines of output. + + @param line output line to be processed (string) + """ + li = line.split() + if li[-1][0] in "1234567890": + # last element is a rev:changeset + rev, changeset = li[-1].split(":", 1) + del li[-1] + if li[0] == "*": + status = "current" + del li[0] + else: + status = "" + name = " ".join(li) + self.__generateItem(rev, changeset, status, name) + if self.__bookmarksList is not None: + self.__bookmarksList.append(name) + + def __readStderr(self): + """ + Private slot to handle the readyReadStderr signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + self.vcs.getEncoding(), 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the subversion process. + """ + input = self.input.text() + input += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(input) + self.errors.ensureCursorVisible() + + self.process.write(input) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(HgBookmarksListDialog, self).keyPressEvent(evt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui Mon May 12 18:19:22 2014 +0200 @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgBookmarksListDialog</class> + <widget class="QDialog" name="HgBookmarksListDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>634</width> + <height>494</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Bookmarks</string> + </property> + <property name="whatsThis"> + <string><b>Mercurial Bookmarks</b> +<p>This dialog shows a list of the projects bookmarks.</p></string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTreeWidget" name="bookmarksList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Bookmarks List</b> +<p>This shows a list of the projects bookmarks.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Revision</string> + </property> + </column> + <column> + <property name="text"> + <string>Changeset</string> + </property> + </column> + <column> + <property name="text"> + <string>Status</string> + </property> + </column> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the hg process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the hg process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>bookmarksList</tabstop> + <tabstop>errors</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon May 12 18:19:22 2014 +0200 @@ -95,29 +95,17 @@ self.initialCommandMode = "log" self.__hgClient = vcs.getClient() - if self.vcs.version >= (1, 8): - self.__detailsTemplate = self.tr( - "<table>" - "<tr><td><b>Revision</b></td><td>{0}</td></tr>" - "<tr><td><b>Date</b></td><td>{1}</td></tr>" - "<tr><td><b>Author</b></td><td>{2}</td></tr>" - "<tr><td><b>Branch</b></td><td>{3}</td></tr>" - "<tr><td><b>Tags</b></td><td>{4}</td></tr>" - "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>" - "<tr><td><b>Parents</b></td><td>{6}</td></tr>" - "</table>" - ) - else: - self.__detailsTemplate = self.tr( - "<table>" - "<tr><td><b>Revision</b></td><td>{0}</td></tr>" - "<tr><td><b>Date</b></td><td>{1}</td></tr>" - "<tr><td><b>Author</b></td><td>{2}</td></tr>" - "<tr><td><b>Branch</b></td><td>{3}</td></tr>" - "<tr><td><b>Tags</b></td><td>{4}</td></tr>" - "<tr><td><b>Parents</b></td><td>{5}</td></tr>" - "</table>" - ) + self.__detailsTemplate = self.tr( + "<table>" + "<tr><td><b>Revision</b></td><td>{0}</td></tr>" + "<tr><td><b>Date</b></td><td>{1}</td></tr>" + "<tr><td><b>Author</b></td><td>{2}</td></tr>" + "<tr><td><b>Branch</b></td><td>{3}</td></tr>" + "<tr><td><b>Tags</b></td><td>{4}</td></tr>" + "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>" + "<tr><td><b>Parents</b></td><td>{6}</td></tr>" + "</table>" + ) self.__bundle = "" self.__filename = "" @@ -155,12 +143,9 @@ self.logTree.setIconSize( QSize(100 * self.__rowHeight, self.__rowHeight)) - if self.vcs.version >= (1, 8): - self.BookmarksColumn = self.logTree.columnCount() - self.logTree.headerItem().setText( - self.BookmarksColumn, self.tr("Bookmarks")) - else: - self.BookmarksColumn = -1 + self.BookmarksColumn = self.logTree.columnCount() + self.logTree.headerItem().setText( + self.BookmarksColumn, self.tr("Bookmarks")) if self.vcs.version < (2, 1): self.logTree.setColumnHidden(self.PhaseColumn, True) @@ -759,14 +744,10 @@ args.append(os.path.join(os.path.dirname(__file__), "styles", "logBrowserBookmarkPhase.style")) - elif self.vcs.version >= (1, 8): + else: args.append(os.path.join(os.path.dirname(__file__), "styles", "logBrowserBookmark.style")) - else: - args.append(os.path.join(os.path.dirname(__file__), - "styles", - "logBrowser.style")) if self.commandMode == "incoming": if self.__bundle: args.append(self.__bundle) @@ -1231,31 +1212,18 @@ self.filesTree.clear() if itm is not None: - if self.vcs.version >= (1, 8): - self.detailsEdit.setHtml(self.__detailsTemplate.format( - itm.text(self.RevisionColumn), - itm.text(self.DateColumn), - itm.text(self.AuthorColumn), - itm.text(self.BranchColumn).replace( - self.ClosedIndicator, ""), - itm.text(self.TagsColumn), - itm.text(self.BookmarksColumn), - ", ".join( - [str(x) for x in itm.data(0, self.__parentsRole)] - ), - )) - else: - self.detailsEdit.setHtml(self.__detailsTemplate.format( - itm.text(self.RevisionColumn), - itm.text(self.DateColumn), - itm.text(self.AuthorColumn), - itm.text(self.BranchColumn).replace( - self.ClosedIndicator, ""), - itm.text(self.TagsColumn), - ", ".join( - [str(x) for x in itm.data(0, self.__parentsRole)] - ), - )) + self.detailsEdit.setHtml(self.__detailsTemplate.format( + itm.text(self.RevisionColumn), + itm.text(self.DateColumn), + itm.text(self.AuthorColumn), + itm.text(self.BranchColumn).replace( + self.ClosedIndicator, ""), + itm.text(self.TagsColumn), + itm.text(self.BookmarksColumn), + ", ".join( + [str(x) for x in itm.data(0, self.__parentsRole)] + ), + )) for line in itm.data(0, self.__messageRole): self.messageEdit.append(line.strip())
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Mon May 12 18:19:22 2014 +0200 @@ -144,12 +144,9 @@ if self.vcs.version >= (2, 1): args.append(os.path.join(os.path.dirname(__file__), "styles", "logDialogBookmarkPhase.style")) - elif self.vcs.version >= (1, 8): + else: args.append(os.path.join(os.path.dirname(__file__), "styles", "logDialogBookmark.style")) - else: - args.append(os.path.join(os.path.dirname(__file__), - "styles", "logDialog.style")) if self.mode == "incoming": if self.bundle: args.append(self.bundle)
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py Mon May 12 18:19:22 2014 +0200 @@ -25,8 +25,6 @@ super(HgUserConfigDataDialog, self).__init__(parent) self.setupUi(self) - if version >= (1, 8): - self.bookmarksCheckBox.setEnabled(False) if version >= (2, 3): self.transplantCheckBox.setEnabled(False) @@ -45,8 +43,6 @@ extensions = [] extensionsData = {} - if self.bookmarksCheckBox.isChecked(): - extensions.append("bookmarks") if self.fetchCheckBox.isChecked(): extensions.append("fetch") if self.gpgCheckBox.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui Mon May 12 18:19:22 2014 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>388</height> + <height>455</height> </rect> </property> <property name="windowTitle"> @@ -75,16 +75,6 @@ </property> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> - <widget class="QCheckBox" name="bookmarksCheckBox"> - <property name="toolTip"> - <string>Select to activate the bookmarks extension</string> - </property> - <property name="text"> - <string>Bookmarks</string> - </property> - </widget> - </item> - <item row="0" column="1"> <widget class="QCheckBox" name="fetchCheckBox"> <property name="toolTip"> <string>Select to activate the fetch extension</string> @@ -94,7 +84,7 @@ </property> </widget> </item> - <item row="1" column="0"> + <item row="0" column="1"> <widget class="QCheckBox" name="gpgCheckBox"> <property name="toolTip"> <string>Select to activate the GPG extension</string> @@ -104,7 +94,7 @@ </property> </widget> </item> - <item row="1" column="1"> + <item row="1" column="0"> <widget class="QCheckBox" name="largefilesCheckBox"> <property name="toolTip"> <string>Select to activate the largefiles extension</string> @@ -114,7 +104,7 @@ </property> </widget> </item> - <item row="2" column="0"> + <item row="1" column="1"> <widget class="QCheckBox" name="purgeCheckBox"> <property name="toolTip"> <string>Select to activate the Purge extension</string> @@ -124,7 +114,7 @@ </property> </widget> </item> - <item row="2" column="1"> + <item row="2" column="0"> <widget class="QCheckBox" name="queuesCheckBox"> <property name="toolTip"> <string>Select to activate the queues extension</string> @@ -134,7 +124,7 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="2" column="1"> <widget class="QCheckBox" name="rebaseCheckBox"> <property name="toolTip"> <string>Select to activate the rebase extension</string> @@ -144,7 +134,7 @@ </property> </widget> </item> - <item row="3" column="1"> + <item row="3" column="0"> <widget class="QCheckBox" name="shelveCheckBox"> <property name="toolTip"> <string>Select to activate the shelve extension</string> @@ -154,7 +144,7 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="3" column="1"> <widget class="QCheckBox" name="transplantCheckBox"> <property name="toolTip"> <string>Select to activate the transplant extension</string> @@ -255,7 +245,6 @@ <tabstop>firstNameEdit</tabstop> <tabstop>lastNameEdit</tabstop> <tabstop>emailEdit</tabstop> - <tabstop>bookmarksCheckBox</tabstop> <tabstop>fetchCheckBox</tabstop> <tabstop>gpgCheckBox</tabstop> <tabstop>largefilesCheckBox</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon May 12 18:19:22 2014 +0200 @@ -40,7 +40,6 @@ VcsProjectHelper.__init__(self, vcsObject, projectObject, parent, name) # instantiate the extensions - from .BookmarksExtension.ProjectHelper import BookmarksProjectHelper from .QueuesExtension.ProjectHelper import QueuesProjectHelper from .FetchExtension.ProjectHelper import FetchProjectHelper from .PurgeExtension.ProjectHelper import PurgeProjectHelper @@ -50,7 +49,6 @@ from .ShelveExtension.ProjectHelper import ShelveProjectHelper from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper self.__extensions = { - "bookmarks": BookmarksProjectHelper(), "mq": QueuesProjectHelper(), "fetch": FetchProjectHelper(), "purge": PurgeProjectHelper(), @@ -1000,6 +998,148 @@ )) self.hgArchiveAct.triggered.connect(self.__hgArchive) self.actions.append(self.hgArchiveAct) + + self.hgBookmarksListAct = E5Action( + self.tr('List bookmarks'), + UI.PixmapCache.getIcon("listBookmarks.png"), + self.tr('List bookmarks...'), + 0, 0, self, 'mercurial_list_bookmarks') + self.hgBookmarksListAct.setStatusTip(self.tr( + 'List bookmarks of the project' + )) + self.hgBookmarksListAct.setWhatsThis(self.tr( + """<b>List bookmarks</b>""" + """<p>This lists the bookmarks of the project.</p>""" + )) + self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList) + self.actions.append(self.hgBookmarksListAct) + + self.hgBookmarkDefineAct = E5Action( + self.tr('Define bookmark'), + UI.PixmapCache.getIcon("addBookmark.png"), + self.tr('Define bookmark...'), + 0, 0, self, 'mercurial_define_bookmark') + self.hgBookmarkDefineAct.setStatusTip(self.tr( + 'Define a bookmark for the project' + )) + self.hgBookmarkDefineAct.setWhatsThis(self.tr( + """<b>Define bookmark</b>""" + """<p>This defines a bookmark for the project.</p>""" + )) + self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine) + self.actions.append(self.hgBookmarkDefineAct) + + self.hgBookmarkDeleteAct = E5Action( + self.tr('Delete bookmark'), + UI.PixmapCache.getIcon("deleteBookmark.png"), + self.tr('Delete bookmark...'), + 0, 0, self, 'mercurial_delete_bookmark') + self.hgBookmarkDeleteAct.setStatusTip(self.tr( + 'Delete a bookmark of the project' + )) + self.hgBookmarkDeleteAct.setWhatsThis(self.tr( + """<b>Delete bookmark</b>""" + """<p>This deletes a bookmark of the project.</p>""" + )) + self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete) + self.actions.append(self.hgBookmarkDeleteAct) + + self.hgBookmarkRenameAct = E5Action( + self.tr('Rename bookmark'), + UI.PixmapCache.getIcon("renameBookmark.png"), + self.tr('Rename bookmark...'), + 0, 0, self, 'mercurial_rename_bookmark') + self.hgBookmarkRenameAct.setStatusTip(self.tr( + 'Rename a bookmark of the project' + )) + self.hgBookmarkRenameAct.setWhatsThis(self.tr( + """<b>Rename bookmark</b>""" + """<p>This renames a bookmark of the project.</p>""" + )) + self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename) + self.actions.append(self.hgBookmarkRenameAct) + + self.hgBookmarkMoveAct = E5Action( + self.tr('Move bookmark'), + UI.PixmapCache.getIcon("moveBookmark.png"), + self.tr('Move bookmark...'), + 0, 0, self, 'mercurial_move_bookmark') + self.hgBookmarkMoveAct.setStatusTip(self.tr( + 'Move a bookmark of the project' + )) + self.hgBookmarkMoveAct.setWhatsThis(self.tr( + """<b>Move bookmark</b>""" + """<p>This moves a bookmark of the project to another""" + """ changeset.</p>""" + )) + self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove) + self.actions.append(self.hgBookmarkMoveAct) + + self.hgBookmarkIncomingAct = E5Action( + self.tr('Show incoming bookmarks'), + UI.PixmapCache.getIcon("incomingBookmark.png"), + self.tr('Show incoming bookmarks'), + 0, 0, self, 'mercurial_incoming_bookmarks') + self.hgBookmarkIncomingAct.setStatusTip(self.tr( + 'Show a list of incoming bookmarks' + )) + self.hgBookmarkIncomingAct.setWhatsThis(self.tr( + """<b>Show incoming bookmarks</b>""" + """<p>This shows a list of new bookmarks available at the remote""" + """ repository.</p>""" + )) + self.hgBookmarkIncomingAct.triggered.connect( + self.__hgBookmarkIncoming) + self.actions.append(self.hgBookmarkIncomingAct) + + self.hgBookmarkPullAct = E5Action( + self.tr('Pull bookmark'), + UI.PixmapCache.getIcon("pullBookmark.png"), + self.tr('Pull bookmark'), + 0, 0, self, 'mercurial_pull_bookmark') + self.hgBookmarkPullAct.setStatusTip(self.tr( + 'Pull a bookmark from a remote repository' + )) + self.hgBookmarkPullAct.setWhatsThis(self.tr( + """<b>Pull bookmark</b>""" + """<p>This pulls a bookmark from a remote repository into the """ + """local repository.</p>""" + )) + self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull) + self.actions.append(self.hgBookmarkPullAct) + + self.hgBookmarkOutgoingAct = E5Action( + self.tr('Show outgoing bookmarks'), + UI.PixmapCache.getIcon("outgoingBookmark.png"), + self.tr('Show outgoing bookmarks'), + 0, 0, self, 'mercurial_outgoing_bookmarks') + self.hgBookmarkOutgoingAct.setStatusTip(self.tr( + 'Show a list of outgoing bookmarks' + )) + self.hgBookmarkOutgoingAct.setWhatsThis(self.tr( + """<b>Show outgoing bookmarks</b>""" + """<p>This shows a list of new bookmarks available at the local""" + """ repository.</p>""" + )) + self.hgBookmarkOutgoingAct.triggered.connect( + self.__hgBookmarkOutgoing) + self.actions.append(self.hgBookmarkOutgoingAct) + + self.hgBookmarkPushAct = E5Action( + self.tr('Push bookmark'), + UI.PixmapCache.getIcon("pushBookmark.png"), + self.tr('Push bookmark'), + 0, 0, self, 'mercurial_push_bookmark') + self.hgBookmarkPushAct.setStatusTip(self.tr( + 'Push a bookmark to a remote repository' + )) + self.hgBookmarkPushAct.setWhatsThis(self.tr( + """<b>Push bookmark</b>""" + """<p>This pushes a bookmark from the local repository to a """ + """remote repository.</p>""" + )) + self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush) + self.actions.append(self.hgBookmarkPushAct) def __checkActions(self): """ @@ -1007,11 +1147,15 @@ """ self.hgPullAct.setEnabled(self.vcs.canPull()) self.hgIncomingAct.setEnabled(self.vcs.canPull()) + self.hgBookmarkPullAct.setEnabled(self.vcs.canPull()) + self.hgBookmarkIncomingAct.setEnabled(self.vcs.canPull()) self.hgPushAct.setEnabled(self.vcs.canPush()) self.hgPushBranchAct.setEnabled(self.vcs.canPush()) self.hgPushForcedAct.setEnabled(self.vcs.canPush()) self.hgOutgoingAct.setEnabled(self.vcs.canPush()) + self.hgBookmarkPushAct.setEnabled(self.vcs.canPush()) + self.hgBookmarkOutgoingAct.setEnabled(self.vcs.canPush()) def initMenu(self, menu): """ @@ -1076,6 +1220,23 @@ bisectMenu.addAction(self.hgBisectResetAct) self.subMenus.append(bisectMenu) + bookmarksMenu = QMenu(self.tr("Bookmarks"), menu) + bookmarksMenu.setIcon(UI.PixmapCache.getIcon("bookmark22.png")) + bookmarksMenu.setTearOffEnabled(True) + bookmarksMenu.addAction(self.hgBookmarkDefineAct) + bookmarksMenu.addAction(self.hgBookmarkDeleteAct) + bookmarksMenu.addAction(self.hgBookmarkRenameAct) + bookmarksMenu.addAction(self.hgBookmarkMoveAct) + bookmarksMenu.addSeparator() + bookmarksMenu.addAction(self.hgBookmarksListAct) + bookmarksMenu.addSeparator() + bookmarksMenu.addAction(self.hgBookmarkIncomingAct) + bookmarksMenu.addAction(self.hgBookmarkPullAct) + bookmarksMenu.addSeparator() + bookmarksMenu.addAction(self.hgBookmarkOutgoingAct) + bookmarksMenu.addAction(self.hgBookmarkPushAct) + self.subMenus.append(bookmarksMenu) + self.__extensionsMenu = QMenu(self.tr("Extensions"), menu) self.__extensionsMenu.setTearOffEnabled(True) self.__extensionsMenu.aboutToShow.connect(self.__showExtensionMenu) @@ -1096,13 +1257,10 @@ else: graftMenu = None - if self.vcs.version >= (1, 8): - subrepoMenu = QMenu(self.tr("Sub-Repository"), menu) - subrepoMenu.setTearOffEnabled(True) - subrepoMenu.addAction(self.hgAddSubrepoAct) - subrepoMenu.addAction(self.hgRemoveSubreposAct) - else: - subrepoMenu = None + subrepoMenu = QMenu(self.tr("Sub-Repository"), menu) + subrepoMenu.setTearOffEnabled(True) + subrepoMenu.addAction(self.hgAddSubrepoAct) + subrepoMenu.addAction(self.hgRemoveSubreposAct) act = menu.addAction( UI.PixmapCache.getIcon( @@ -1136,10 +1294,10 @@ menu.addAction(self.vcsTagAct) menu.addAction(self.hgTagListAct) menu.addAction(self.hgBranchAct) - if self.vcs.version >= (1, 6): - menu.addAction(self.hgPushBranchAct) + menu.addAction(self.hgPushBranchAct) menu.addAction(self.hgCloseBranchAct) menu.addAction(self.hgBranchListAct) + menu.addMenu(bookmarksMenu) menu.addSeparator() menu.addAction(self.vcsLogAct) menu.addAction(self.hgLogBrowserAct) @@ -1160,9 +1318,8 @@ menu.addSeparator() menu.addAction(self.vcsSwitchAct) menu.addSeparator() - if subrepoMenu is not None: - menu.addMenu(subrepoMenu) - menu.addSeparator() + menu.addMenu(subrepoMenu) + menu.addSeparator() menu.addMenu(bisectMenu) menu.addSeparator() menu.addAction(self.vcsCleanupAct) @@ -1548,3 +1705,57 @@ Private slot to create an unversioned archive from the repository. """ self.vcs.hgArchive() + + def __hgBookmarksList(self): + """ + Private slot used to list the bookmarks. + """ + self.vcs.hgListBookmarks(self.project.getProjectPath()) + + def __hgBookmarkDefine(self): + """ + Private slot used to define a bookmark. + """ + self.vcs.hgBookmarkDefine(self.project.getProjectPath()) + + def __hgBookmarkDelete(self): + """ + Private slot used to delete a bookmark. + """ + self.vcs.hgBookmarkDelete(self.project.getProjectPath()) + + def __hgBookmarkRename(self): + """ + Private slot used to rename a bookmark. + """ + self.vcs.hgBookmarkRename(self.project.getProjectPath()) + + def __hgBookmarkMove(self): + """ + Private slot used to move a bookmark. + """ + self.vcs.hgBookmarkMove(self.project.getProjectPath()) + + def __hgBookmarkIncoming(self): + """ + Private slot used to show a list of incoming bookmarks. + """ + self.vcs.hgBookmarkIncoming(self.project.getProjectPath()) + + def __hgBookmarkOutgoing(self): + """ + Private slot used to show a list of outgoing bookmarks. + """ + self.vcs.hgBookmarkOutgoing(self.project.getProjectPath()) + + def __hgBookmarkPull(self): + """ + Private slot used to pull a bookmark from a remote repository. + """ + self.vcs.hgBookmarkPull(self.project.getProjectPath()) + + def __hgBookmarkPush(self): + """ + Private slot used to push a bookmark to a remote repository. + """ + self.vcs.hgBookmarkPush(self.project.getProjectPath())
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Mon May 12 18:19:22 2014 +0200 @@ -44,16 +44,10 @@ return False res = False - if self.vcs.isExtensionActive("bookmarks"): - bookmarksList = \ - self.vcs.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgRebaseDialog import HgRebaseDialog dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), - bookmarksList) + self.vcs.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: (indicator, sourceRev, destRev, collapse, keep, keepBranches, detach) = dlg.getData()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri May 09 15:53:40 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon May 12 18:19:22 2014 +0200 @@ -18,7 +18,7 @@ import re from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher -from PyQt4.QtGui import QApplication, QDialog +from PyQt4.QtGui import QApplication, QDialog, QInputDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog @@ -80,6 +80,7 @@ self.tagsList = [] self.branchesList = [] self.allTagsBranchesList = [] + self.bookmarksList = [] self.showedTags = False self.showedBranches = False @@ -108,6 +109,8 @@ self.repoEditor = None self.userEditor = None self.serveDlg = None + self.bookmarksListDlg = None + self.bookmarksInOutDlg = None self.bundleFile = None self.__lastChangeGroupPath = None @@ -136,7 +139,6 @@ self.__defaultPushConfigured = False # instantiate the extensions - from .BookmarksExtension.bookmarks import Bookmarks from .QueuesExtension.queues import Queues from .FetchExtension.fetch import Fetch from .PurgeExtension.purge import Purge @@ -146,7 +148,6 @@ from .ShelveExtension.shelve import Shelve from .LargefilesExtension.largefiles import Largefiles self.__extensions = { - "bookmarks": Bookmarks(self), "mq": Queues(self), "fetch": Fetch(self), "purge": Purge(self), @@ -200,6 +201,11 @@ if self.serveDlg is not None: self.serveDlg.close() + if self.bookmarksListDlg is not None: + self.bookmarksListDlg.close() + if self.bookmarksInOutDlg is not None: + self.bookmarksInOutDlg.close() + if self.bundleFile and os.path.exists(self.bundleFile): os.remove(self.bundleFile) @@ -821,19 +827,12 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None - from .HgMultiRevisionSelectionDialog import \ HgMultiRevisionSelectionDialog dlg = HgMultiRevisionSelectionDialog( self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList, + self.hgGetBookmarksList(repodir), emptyRevsOk=True, showLimit=True, limitDefault=self.getPlugin().getPreferences("LogLimit")) @@ -1033,16 +1032,10 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgMergeDialog import HgMergeDialog dlg = HgMergeDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList) + self.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: rev, force = dlg.getParameters() else: @@ -1082,16 +1075,10 @@ if os.path.splitdrive(repodir)[1] == os.sep: return False - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgRevisionSelectionDialog import HgRevisionSelectionDialog dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList, + self.hgGetBookmarksList(repodir), self.tr("Current branch tip")) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() @@ -1710,16 +1697,10 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList) + self.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: revisions = dlg.getRevisions() from .HgDiffDialog import HgDiffDialog @@ -1800,17 +1781,10 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None - from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList) + self.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: rev1, rev2 = dlg.getRevisions() elif revisions: @@ -2490,16 +2464,10 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgBundleDialog import HgBundleDialog dlg = HgBundleDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList) + self.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: revs, baseRevs, compression, all = dlg.getParameters() @@ -2659,16 +2627,10 @@ rev = "" if subcommand in ("good", "bad", "skip"): - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgRevisionSelectionDialog import HgRevisionSelectionDialog dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList) + self.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() else: @@ -2738,16 +2700,10 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.isExtensionActive("bookmarks"): - bookmarksList = \ - self.getExtensionObject("bookmarks")\ - .hgGetBookmarksList(repodir) - else: - bookmarksList = None from .HgBackoutDialog import HgBackoutDialog dlg = HgBackoutDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList) + self.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: rev, merge, date, user, message = dlg.getParameters() if not rev: @@ -3357,10 +3313,6 @@ line.split("=", 1)[0].strip().split(".")[-1].strip() self.__activeExtensions.append(extensionName) - if self.version >= (1, 8): - if "bookmarks" not in self.__activeExtensions: - self.__activeExtensions.append("bookmarks") - if activeExtensions != sorted(self.__activeExtensions): self.activeExtensionsChanged.emit() @@ -3441,9 +3393,7 @@ self.__projectHelper.setObjects(self, project) self.__monitorRepoIniFile(project.getProjectPath()) - if not Utilities.isMacPlatform() and \ - self.version >= (1, 9) and \ - repodir: + if repodir: from .HgClient import HgClient client = HgClient(repodir, "utf-8", self) ok, err = client.startServer() @@ -3475,3 +3425,309 @@ """ from .HgStatusMonitorThread import HgStatusMonitorThread return HgStatusMonitorThread(interval, project, self) + + ########################################################################### + ## Bookmarks methods + ########################################################################### + + def hgListBookmarks(self, path): + """ + Public method used to list the available bookmarks. + + @param path directory name of the project (string) + """ + self.bookmarksList = [] + + from .HgBookmarksListDialog import HgBookmarksListDialog + self.bookmarksListDlg = HgBookmarksListDialog(self) + self.bookmarksListDlg.show() + self.bookmarksListDlg.start(path, self.bookmarksList) + + def hgGetBookmarksList(self, repodir): + """ + Public method to get the list of bookmarks. + + @param repodir directory name of the repository (string) + @return list of bookmarks (list of string) + """ + args = self.initCommand("bookmarks") + + client = self.getClient() + output = "" + if client: + output = client.runcommand(args)[0] + else: + process = QProcess() + process.setWorkingDirectory(repodir) + process.start('hg', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + self.getEncoding(), 'replace') + + self.bookmarksList = [] + for line in output.splitlines(): + li = line.strip().split() + if li[-1][0] in "1234567890": + # last element is a rev:changeset + del li[-1] + if li[0] == "*": + del li[0] + name = " ".join(li) + self.bookmarksList.append(name) + + return self.bookmarksList[:] + + def hgBookmarkDefine(self, name): + """ + Public method to define a bookmark. + + @param name file/directory name (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + from .HgBookmarkDialog import HgBookmarkDialog + dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE, + self.hgGetTagsList(repodir), + self.hgGetBranchesList(repodir), + self.hgGetBookmarksList(repodir)) + if dlg.exec_() == QDialog.Accepted: + rev, bookmark = dlg.getData() + + args = self.initCommand("bookmarks") + if rev: + args.append("--rev") + args.append(rev) + args.append(bookmark) + + dia = HgDialog(self.tr('Mercurial Bookmark'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def hgBookmarkDelete(self, name): + """ + Public method to delete a bookmark. + + @param name file/directory name (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + bookmark, ok = QInputDialog.getItem( + None, + self.tr("Delete Bookmark"), + self.tr("Select the bookmark to be deleted:"), + [""] + sorted(self.hgGetBookmarksList(repodir)), + 0, True) + if ok and bookmark: + args = self.initCommand("bookmarks") + args.append("--delete") + args.append(bookmark) + + dia = HgDialog(self.tr('Delete Mercurial Bookmark'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def hgBookmarkRename(self, name): + """ + Public method to rename a bookmark. + + @param name file/directory name (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + from .HgBookmarkRenameDialog import HgBookmarkRenameDialog + dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList(repodir)) + if dlg.exec_() == QDialog.Accepted: + newName, oldName = dlg.getData() + + args = self.initCommand("bookmarks") + args.append("--rename") + args.append(oldName) + args.append(newName) + + dia = HgDialog(self.tr('Rename Mercurial Bookmark'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def hgBookmarkMove(self, name): + """ + Public method to move a bookmark. + + @param name file/directory name (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + from .HgBookmarkDialog import HgBookmarkDialog + dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE, + self.hgGetTagsList(repodir), + self.hgGetBranchesList(repodir), + self.hgGetBookmarksList(repodir)) + if dlg.exec_() == QDialog.Accepted: + rev, bookmark = dlg.getData() + + args = self.initCommand("bookmarks") + args.append("--force") + if rev: + args.append("--rev") + args.append(rev) + args.append(bookmark) + + dia = HgDialog(self.tr('Move Mercurial Bookmark'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + + def hgBookmarkIncoming(self, name): + """ + Public method to show a list of incoming bookmarks. + + @param name file/directory name (string) + """ + from .HgBookmarksInOutDialog import HgBookmarksInOutDialog + self.bookmarksInOutDlg = HgBookmarksInOutDialog( + self, HgBookmarksInOutDialog.INCOMING) + self.bookmarksInOutDlg.show() + self.bookmarksInOutDlg.start(name) + + def hgBookmarkOutgoing(self, name): + """ + Public method to show a list of outgoing bookmarks. + + @param name file/directory name (string) + """ + from .HgBookmarksInOutDialog import HgBookmarksInOutDialog + self.bookmarksInOutDlg = HgBookmarksInOutDialog( + self, HgBookmarksInOutDialog.OUTGOING) + self.bookmarksInOutDlg.show() + self.bookmarksInOutDlg.start(name) + + def __getInOutBookmarks(self, repodir, incoming): + """ + Public method to get the list of incoming or outgoing bookmarks. + + @param repodir directory name of the repository (string) + @param incoming flag indicating to get incoming bookmarks (boolean) + @return list of bookmarks (list of string) + """ + bookmarksList = [] + + if incoming: + args = self.initCommand("incoming") + else: + args = self.initCommand("outgoing") + args.append('--bookmarks') + + client = self.getClient() + output = "" + if client: + output = client.runcommand(args)[0] + else: + process = QProcess() + process.setWorkingDirectory(repodir) + process.start('hg', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + self.getEncoding(), 'replace') + + for line in output.splitlines(): + if line.startswith(" "): + li = line.strip().split() + del li[-1] + name = " ".join(li) + bookmarksList.append(name) + + return bookmarksList + + def hgBookmarkPull(self, name): + """ + Public method to pull a bookmark from a remote repository. + + @param name file/directory name (string) + """ + # find the root of the repo + repodir = self.splitPath(name)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: