We are currently indexing your data, so search results may be incomplete until we finish.
commit: introduce 'push after commit' setting
Instead of a bool, ala hgtk ci, the configuration is now an alias or
URL. The setting is currently ignored - I plan to switch the commit
tool to use a cmdui.Runner that is optionally connected to the workbench
log widget.
Changeset 0b422a275a2f…
Parent f1a171ba9fea…
by
Changes to 2 files · Browse files at 0b422a275a2f Showing diff from parent f1a171ba9fea Diff from another changeset...
|
|
@@ -14,18 +14,17 @@ from PyQt4.QtGui import *
from tortoisehg.hgqt.i18n import _
-from tortoisehg.util import hglib, shlib, paths
+from tortoisehg.util import hglib, shlib, paths, wconfig
from tortoisehg.util.util import format_desc
from tortoisehg.hgqt import qtlib, status, cmdui, branchop
+from tortoisehg.hgqt.sync import loadIniFile
# Technical Debt for CommitWidget
# threaded / wrapped commit (need a CmdRunner equivalent)
# qtlib decode failure dialog (ask for retry locale, suggest HGENCODING)
# Need a unicode-to-UTF8 function
# +1 / -1 head indication (not as important with workbench integration)
-# pushafterci list
-# qnew/shelve-patch creation dialog (in another file)
# spell check / tab completion
# in-memory patching / committing chunk selected files
@@ -47,6 +46,8 @@ self.stwidget.loadComplete.connect(lambda: self.loadComplete.emit())
self.msghistory = []
self.qref = False
+ self.opts['pushafter'] = self.stwidget.repo.ui.config('tortoisehg',
+ 'cipushafter', '')
layout = QVBoxLayout()
layout.setContentsMargins(0, 0, 0, 0)
@@ -557,6 +558,7 @@ if fname:
cmdline.extend(['--include', fname])
+ # TODO: self.opts['pushafter']
ret = dispatch._dispatch(_ui, cmdline)
if not ret:
self.addMessageToHistory()
@@ -669,7 +671,30 @@ hbox.addWidget(curdate)
layout.addLayout(hbox)
+ # pushafterci
+ hbox = QHBoxLayout()
+ self.pushaftercb = QCheckBox(_('Push After Commit:'))
+ self.pushafterle = QLineEdit()
+ self.pushafterle.setEnabled(False)
+ self.pushaftercb.toggled.connect(self.pushafterle.setEnabled)
+
+ pushaftersave = QPushButton(_('Save in Repo'))
+ pushaftersave.clicked.connect(self.savePushAfter)
+ pushaftersave.setEnabled(False)
+ self.pushaftercb.toggled.connect(pushaftersave.setEnabled)
+
+ if opts.get('pushafter'):
+ val = hglib.tounicode(opts['pushafter'])
+ self.pushafterle.setText(val)
+ self.pushaftercb.setChecked(True)
+
+ hbox.addWidget(self.pushaftercb)
+ hbox.addWidget(self.pushafterle)
+ hbox.addWidget(pushaftersave)
+ layout.addLayout(hbox)
+
if 'mq' in self.repo.extensions():
+ # qnew/shelve-patch creation dialog (in another file)
hbox = QHBoxLayout()
BB = QDialogButtonBox
@@ -690,10 +715,9 @@ self.saveToPath(util.user_rcpath())
def saveToPath(self, path):
- from tortoisehg.hgqt.sync import loadIniFile
fn, cfg = loadIniFile(path, self)
if not hasattr(cfg, 'write'):
- qtlib.WarningMsgBox(_('Unable to save post pull operation'),
+ qtlib.WarningMsgBox(_('Unable to save username'),
_('Iniparse must be installed.'), parent=self)
return
if fn is None:
@@ -712,6 +736,29 @@ qtlib.WarningMsgBox(_('Unable to write configuration file'),
hglib.tounicode(e), parent=self)
+ def savePushAfter(self):
+ path = os.path.join(self.repo.root, '.hg', 'hgrc')
+ fn, cfg = loadIniFile([path], self)
+ if not hasattr(cfg, 'write'):
+ qtlib.WarningMsgBox(_('Unable to save after commit push'),
+ _('Iniparse must be installed.'), parent=self)
+ return
+ if fn is None:
+ return
+ try:
+ remote = hglib.fromunicode(self.pushafterle.text())
+ if remote:
+ cfg.set('tortoisehg', 'cipushafter', remote)
+ else:
+ try:
+ del cfg['tortoisehg']['cipushafter']
+ except KeyError:
+ pass
+ wconfig.writefile(cfg, fn)
+ except IOError, e:
+ qtlib.WarningMsgBox(_('Unable to write configuration file'),
+ hglib.tounicode(e), parent=self)
+
def accept(self):
outopts = {}
if self.datecb.isChecked():
@@ -730,7 +777,6 @@ user = hglib.fromunicode(self.usercombo.currentText())
else:
user = ''
-
outopts['user'] = user
if not user:
try:
@@ -740,6 +786,12 @@ hglib.tounicode(e), parent=self)
return
+ if self.pushaftercb.isChecked():
+ remote = hglib.fromunicode(self.pushafterle.text())
+ outopts['pushafter'] = remote
+ else:
+ outopts['pushafter'] = ''
+
self.outopts = outopts
QDialog.accept(self)
|
|
|
@@ -327,9 +327,9 @@ (_('Close After Commit'), 'tortoisehg.closeci', genBoolCombo,
_('Close the commit tool after every successful'
' commit. Default: False')),
- (_('Push After Commit'), 'tortoisehg.pushafterci', genBoolCombo,
- _('Attempt to push to default push target after every successful'
- ' commit. Default: False')),
+ (_('Push After Commit'), 'tortoisehg.cipushafter', genEditCombo,
+ _('Attempt to push to specified URL or alias after each successful'
+ ' commit. Default: No push')),
(_('Auto Commit List'), 'tortoisehg.autoinc', genEditCombo,
_('Comma separated list of files that are automatically included'
' in every commit. Intended for use only as a repository setting.'
|
||
Add a tag
Loading...