We are currently indexing your data, so search results may be incomplete until we finish.
New bookmark dialog
Changeset 40544428ee3c…
Parent df06d85c7208…
by
Changes to 4 files · Browse files at 40544428ee3c Showing diff from parent df06d85c7208 Diff from another changeset...
|
|
|
@@ -0,0 +1,259 @@ + # bookmark.py - Bookmark dialog for TortoiseHg
+#
+# Copyright 2010 Michal De Wildt <michael.dewildt@gmail.com>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
+import os
+import traceback
+
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+from mercurial import hg, ui, error
+
+from tortoisehg.util import hglib, paths, i18n
+from tortoisehg.hgqt.i18n import _
+from tortoisehg.hgqt import qtlib, thgrepo
+from hgext import bookmarks
+
+keep = i18n.keepgettext()
+
+class BookmarkDialog(QDialog):
+
+ bookmarkChanged = pyqtSignal()
+ localBookmarkChanged = pyqtSignal()
+ showMessage = pyqtSignal(unicode)
+
+ def __init__(self, repo=None, bookmark='', rev='tip', parent=None, opts={}):
+ super(BookmarkDialog, self).__init__(parent)
+ self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
+
+ self.ui = ui.ui()
+ if repo:
+ self.repo = repo
+ else:
+ root = paths.find_root()
+ if root:
+ self.repo = thgrepo.repository(self.ui, path=root)
+ else:
+ raise 'no repository found'
+
+ # base layout box
+ base = QVBoxLayout()
+ base.setSpacing(0)
+ base.setContentsMargins(*(0,)*4)
+
+ # main layout box
+ box = QVBoxLayout()
+ box.setSpacing(6)
+ box.setContentsMargins(*(6,)*4)
+ base.addLayout(box)
+
+ ## main layout grid
+ grid = QGridLayout()
+ grid.setSpacing(6)
+ box.addLayout(grid)
+
+ ### bookmark combo
+ self.bookmark_combo = QComboBox()
+ self.bookmark_combo.setEditable(True)
+ self.bookmark_combo.setMinimumWidth(180)
+ self.bookmark_combo.setEditText(bookmark)
+ grid.addWidget(QLabel(_('Bookmark:')), 0, 0)
+ grid.addWidget(self.bookmark_combo, 0, 1)
+
+ ### Rename input
+ self.new_name_text = QLineEdit()
+ self.new_name_text.setMaximumWidth(100)
+ self.new_name_text.textEdited.connect(lambda s: self.new_bookmark_changed())
+ self.new_name_label = QLabel(_('New name:'))
+ grid.addWidget(self.new_name_label, 1, 0)
+ grid.addWidget(self.new_name_text, 1, 1)
+ self.enable_new_name(False)
+
+ ### revision input
+ self.initial_rev = rev
+ self.rev_text = QLineEdit()
+ self.rev_text.setMaximumWidth(100)
+ self.rev_text.setText(rev)
+ self.rev_text.textEdited.connect(lambda s: self.update_sensitives())
+ grid.addWidget(QLabel(_('Revision:')), 2, 0)
+ grid.addWidget(self.rev_text, 2, 1)
+
+ ## bottom buttons
+ buttons = QDialogButtonBox()
+ self.close_btn = buttons.addButton(QDialogButtonBox.Close)
+ self.close_btn.clicked.connect(self.reject)
+ self.add_btn = buttons.addButton(_('&Add'),
+ QDialogButtonBox.ActionRole)
+ self.add_btn.clicked.connect(self.add_bookmark)
+ self.rename_btn = buttons.addButton(_('&Rename'),
+ QDialogButtonBox.ActionRole)
+ self.rename_btn.clicked.connect(self.rename_bookmark)
+ self.remove_btn = buttons.addButton(_('&Remove'),
+ QDialogButtonBox.ActionRole)
+ self.remove_btn.clicked.connect(self.remove_bookmark)
+ box.addWidget(buttons)
+
+ # add signals
+ self.bookmark_combo.currentIndexChanged.connect(self.toggle_new_bookmark)
+ self.bookmark_combo.editTextChanged.connect(self.update_sensitives)
+
+ ## horizontal separator
+ self.sep = QFrame()
+ self.sep.setFrameShadow(QFrame.Sunken)
+ self.sep.setFrameShape(QFrame.HLine)
+ base.addWidget(self.sep)
+
+ ## status line
+ self.status = qtlib.StatusLabel()
+ self.status.setContentsMargins(4, 2, 4, 4)
+ base.addWidget(self.status)
+
+ # dialog setting
+ self.setLayout(base)
+ self.layout().setSizeConstraint(QLayout.SetFixedSize)
+ self.setWindowTitle(_('Bookmark - %s') % self.repo.displayname)
+ self.setWindowIcon(qtlib.geticon('bookmark'))
+
+ # prepare to show
+ self.clear_status()
+ self.update_bookmark_combo(clear=False)
+ self.update_sensitives()
+ self.rename_btn.setVisible(False)
+ self.rename_btn.setEnabled(False)
+ self.enable_new_name(False)
+ self.bookmark_combo.setFocus()
+
+ ### Private Methods ###
+ def enable_new_name(self, enabled):
+ self.new_name_text.setEnabled(enabled)
+ self.new_name_label.setEnabled(enabled)
+
+ def update_bookmark_combo(self, clear=True):
+ """ update display on dialog with recent repo data """
+ bookmark_name = self.bookmark_combo.currentText()
+ self.bookmark_combo.clear()
+
+ # add bookmarks to drop-down list
+ bookmarks = list(hglib.get_repo_bookmarks(self.repo))
+ bookmarks.sort()
+ bookmarks.reverse()
+ for bookmark in bookmarks:
+ if bookmark == 'tip':
+ continue
+ self.bookmark_combo.addItem(hglib.tounicode(bookmark))
+ self.bookmark_combo.clearEditText()
+
+ # restore tag name
+ if not clear and bookmark_name:
+ self.bookmark_combo.setEditText(bookmark_name)
+
+ def toggle_new_bookmark(self):
+ bookmark = self.bookmark_combo.currentText()
+ is_new = bookmark not in hglib.get_repo_bookmarks(self.repo)
+ self.add_btn.setVisible(is_new)
+ self.add_btn.setDisabled(not is_new)
+ self.remove_btn.setVisible(not is_new)
+ self.rename_btn.setVisible(not is_new)
+ self.enable_new_name(not is_new)
+
+ def update_sensitives(self):
+ """ update bottom button sensitives based on rev and bookmark """
+ self.toggle_new_bookmark()
+
+ bookmark = self.bookmark_combo.currentText()
+ rev = self.rev_text.text()
+ if not rev or not bookmark:
+ self.add_btn.setDisabled(True)
+ return
+
+ # check if valid revision
+ try:
+ self.repo[hglib.fromunicode(rev)]
+ except (error.LookupError, error.RepoLookupError, error.RepoError):
+ self.add_btn.setDisabled(True)
+ self.remove_btn.setDisabled(True)
+ self.rename_btn.setDisabled(True)
+ return
+
+ def set_status(self, text, icon=None):
+ self.status.setShown(True)
+ self.sep.setShown(True)
+ self.status.set_status(text, icon)
+ self.showMessage.emit(text)
+
+ def clear_status(self):
+ self.status.setHidden(True)
+ self.sep.setHidden(True)
+
+ def add_bookmark(self):
+ name = str(self.bookmark_combo.currentText())
+ if name in hglib.get_repo_bookmarks(self.repo):
+ self.set_status(_('A bookmark named "%s" already exists') % name,
+ False)
+ return
+
+ bookmarks.bookmark(ui=self.ui,
+ repo=self.repo,
+ rev=self.initial_rev,
+ mark=name)
+
+ self.bookmark_combo.addItem(hglib.tounicode(name))
+ self.set_status(_("Bookmark '%s' has been added") % name, True)
+ self.toggle_new_bookmark()
+ self.bookmark_combo.clearEditText()
+
+ def remove_bookmark(self):
+ name = str(self.bookmark_combo.currentText())
+ if not name in hglib.get_repo_bookmarks(self.repo):
+ self.set_status(_("Bookmark '%s' does not exist") % name, False)
+ return
+
+ bookmarks.bookmark(ui=self.ui,
+ repo=self.repo,
+ mark=name,
+ delete=True)
+
+ self.bookmark_combo.removeItem(self.bookmark_combo.currentIndex())
+ self.new_name_text.setText("")
+ self.set_status(_("Bookmark '%s' has been removed") % name, True)
+ self.update_sensitives()
+
+ def rename_bookmark(self):
+ name = str(self.bookmark_combo.currentText())
+ new_name = str(self.new_name_text.text())
+ if not name in hglib.get_repo_bookmarks(self.repo):
+ self.set_status(_("Bookmark '%s' does not exist") % name, False)
+ return
+
+ if new_name in hglib.get_repo_bookmarks(self.repo):
+ self.set_status(_('A bookmark named "%s" already exists') % new_name,
+ False)
+ return
+
+ bookmarks.bookmark(ui=self.ui,
+ repo=self.repo,
+ mark=new_name,
+ rename=name)
+
+ self.bookmark_combo.removeItem(self.bookmark_combo.currentIndex())
+ self.bookmark_combo.addItem(new_name)
+ self.new_name_text.setText("")
+ self.set_status(_("Bookmark '%s' has been renamed to '%s'") %
+ (name, new_name), True)
+
+ def new_bookmark_changed(self):
+ self.rename_btn.setDisabled(not self.new_name_text.text())
+
+def run(ui, *pats, **opts):
+ kargs = {}
+ bookmark = len(pats) > 0 and pats[0] or None
+ if bookmark:
+ kargs['bookmark'] = bookmark
+ rev = opts.get('rev')
+ if rev:
+ kargs['rev'] = rev
+ return BookmarkDialog(opts=opts, **kargs)
|
|
|
@@ -18,7 +18,7 @@ from tortoisehg.hgqt.qtlib import CustomPrompt, SharedWidget, DemandWidget
from tortoisehg.hgqt.repomodel import HgRepoListModel
from tortoisehg.hgqt import cmdui, update, tag, backout, merge, visdiff
-from tortoisehg.hgqt import archive, thgimport, thgstrip, run, purge
+from tortoisehg.hgqt import archive, thgimport, thgstrip, run, purge, bookmark
from tortoisehg.hgqt import bisect, rebase, resolve, thgrepo, compress
from tortoisehg.hgqt.repofilter import RepoFilterBar
@@ -736,6 +736,7 @@ (None, isctx, _('Browse at rev...'), None,
self.manifestRevision),
(None, fixed, _('Tag...'), 'tag', self.tagToRevision),
+ (None, fixed, _('Bookmark...'), 'bookmark', self.bookmarkRevision),
(None, fixed, _('Backout...'), None, self.backoutToRevision),
(None, fixed, _('Push to here'), None, self.pushToRevision),
(None, isrev, _('Export patch'), None, self.exportRevisions),
@@ -916,6 +917,12 @@ dlg.showMessage.connect(self.showMessage)
dlg.exec_()
+ def bookmarkRevision(self):
+ dlg = bookmark.BookmarkDialog(self.repo, rev=str(self.rev), parent=self)
+ dlg.localBookmarkChanged.connect(self.refresh)
+ dlg.showMessage.connect(self.showMessage)
+ dlg.exec_()
+
def pushToRevision(self):
self.taskTabsWidget.setCurrentIndex(self.syncTabIndex)
self.syncDemand.pushToRevision(self.rev)
|
||
|
@@ -50,5 +50,6 @@ <file>icons/qpush.svg</file>
<file>icons/qpop.svg</file>
<file>icons/reviewboard.png</file>
+ <file>icons/bookmark.png</file>
</qresource>
</RCC>
|
||
Add a tag
Loading...