Changeset f5037a529712…
Parent 6367f4a79ee8…
by
Changes to 2 files · Browse files at f5037a529712 Showing diff from parent 6367f4a79ee8 Diff from another changeset...
@@ -42,7 +42,7 @@ self.cmd = cmdui.Runner(True, self)
self.cmd.output.connect(self.output)
self.cmd.makeLogVisible.connect(self.makeLogVisible)
- self.cmd.commandFinished.connect(self.reject)
+ self.cmd.commandFinished.connect(self.onCommandFinished)
BB = QDialogButtonBox
bbox = QDialogButtonBox(BB.Ok|BB.Cancel)
@@ -53,6 +53,11 @@
self.focus = self.le
+ @pyqtSlot(int)
+ def onCommandFinished(self, ret):
+ self.repo.decrementBusyCount()
+ self.reject()
+
def accept(self):
self.newpatchname = hglib.fromunicode(self.le.text())
if self.newpatchname != self.oldpatchname:
@@ -62,6 +67,7 @@ return
cmdline = ['qrename', '--repository', self.repo.root, '--',
self.oldpatchname, self.newpatchname]
+ self.repo.incrementBusyCount()
self.cmd.run(cmdline)
else:
self.close()
|
@@ -21,7 +21,7 @@ from tortoisehg.hgqt import cmdui, update, tag, backout, merge, visdiff
from tortoisehg.hgqt import archive, thgimport, thgstrip, run, purge, bookmark
from tortoisehg.hgqt import bisect, rebase, resolve, thgrepo, compress, mq
-from tortoisehg.hgqt import qdelete, qreorder, qfold, shelve
+from tortoisehg.hgqt import qdelete, qreorder, qfold, qrename, shelve
from tortoisehg.hgqt.repofilter import RepoFilterBar
from tortoisehg.hgqt.repoview import HgRepoView
@@ -1250,6 +1250,12 @@ dlg.output.connect(self.output)
dlg.makeLogVisible.connect(self.makeLogVisible)
dlg.exec_()
+ def qrenameact():
+ dlg = qrename.QRenameDialog(self.repo, self.menuselection[0], self)
+ dlg.finished.connect(dlg.deleteLater)
+ dlg.output.connect(self.output)
+ dlg.makeLogVisible.connect(self.makeLogVisible)
+ dlg.exec_()
menu = QMenu(self)
acts = []
@@ -1258,7 +1264,8 @@ (_('QPush --move'), self.qpushMoveRevision, 'hg-qpush'),
(_('Fold patches...'), qfoldact, 'hg-qfold'),
(_('Delete patches...'), qdeleteact, 'hg-qdelete'),
- (_('Reorder patches...'), qreorderact, 'hg-qreorder')):
+ (_('Reorder patches...'), qreorderact, 'hg-qreorder'),
+ (_('Rename patch...'), qrenameact, None)):
act = QAction(name, self)
act.triggered.connect(cb)
if icon:
|
Loading...