Mercurial and Git clients can push and pull from this alias URL to interact with this repository. You can change to which repository an alias points by going to the Aliases link on the project page.
# commit.py - TortoiseHg's commit widget and standalone dialog## Copyright 2010 Steve Borho <steve@borho.org>## This software may be used and distributed according to the terms of the# GNU General Public License version 2, incorporated herein by reference.importosfrommercurialimporthg,ui,cmdutil,util,dispatch,errorfrommercurial.nodeimportshortasshort_hexfromPyQt4.QtCoreimport*fromPyQt4.QtGuiimport*fromtortoisehg.hgqt.i18nimport_fromtortoisehg.utilimporthglib,shlib,pathsfromtortoisehg.util.utilimportformat_descfromtortoisehg.hgqtimportqtlib,status,cmdui,branchop# Technical Debt for CommitWidget# qrefresh support# refresh parent changeset descriptions after refresh# 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)
# recent committers history
-# pushafterci, autoincludes list
+# pushafterci list
# qnew/shelve-patch creation dialog (in another file)
# spell check / tab completion
# in-memory patching / committing chunk selected files
classCommitWidget(QWidget):'A widget that encompasses a StatusWidget and commit extras'loadBegin=pyqtSignal()loadComplete=pyqtSignal()errorMessage=pyqtSignal(QString)commitComplete=pyqtSignal()def__init__(self,pats,opts,root=None,parent=None,hidebutton=False):QWidget.__init__(self,parent)self.opts=opts# user, dateself.stwidget=status.StatusWidget(pats,opts,root,self)self.connect(self.stwidget,SIGNAL('errorMessage'),lambdam:self.emit(SIGNAL('errorMessage'),m))self.stwidget.loadBegin.connect(lambda:self.loadBegin.emit())self.stwidget.loadComplete.connect(lambda:self.loadComplete.emit())self.msghistory=[]SP=QSizePolicylayout=QVBoxLayout()layout.setContentsMargins(0,0,0,0)layout.addWidget(self.stwidget)self.setLayout(layout)form=QFormLayout()form.setVerticalSpacing(3)form.setContentsMargins(3,0,9,0)repo=self.stwidget.repowctx=repo[None]usercombo=QComboBox()usercombo.setEditable(True)try:ifopts.get('user'):usercombo.addItem(hglib.tounicode(opts['user']))usercombo.addItem(hglib.tounicode(wctx.user()))exceptutil.Abort:passself.commitButton=b=QPushButton(_('Commit'))ifhidebutton:b.hide()w=QWidget()l=QHBoxLayout()l.setMargin(0)w.setLayout(l)l.addWidget(QLabel(_('Working Copy')))l.addStretch(1)l.addWidget(b)b.clicked.connect(self.commit)defaddrow(s,w):form.addRow("<b>%s</b>"%s,w)addrow(('Changeset:'),w)forctxinrepo.parents():desc=format_desc(ctx.description(),80)fmt="<span style='font-family:Courier'>%s(%s)</span> %s"ptext=fmt%(ctx.rev(),short_hex(ctx.node()),desc)addrow(_('Parent:'),QLabel(ptext))addrow(_('User:'),usercombo)frame=QFrame()frame.setLayout(form)frame.setFrameStyle(QFrame.NoFrame)vbox=QVBoxLayout()vbox.addWidget(frame,0)vbox.setMargin(0)hbox=QHBoxLayout()branchbutton=QPushButton(_('Branch: ')+hglib.tounicode(wctx.branch()))branchbutton.pressed.connect(self.branchOp)self.branchbutton=branchbuttonself.branchop=Nonehbox.addWidget(branchbutton)msgcombo=MessageHistoryCombo()self.connect(msgcombo,SIGNAL('activated(int)'),self.msgSelected)hbox.addWidget(msgcombo,1)hbox.addSpacing(9)vbox.addLayout(hbox,0)msgte=QPlainTextEdit()msgte.textChanged.connect(self.msgChanged)msgte.setContextMenuPolicy(Qt.CustomContextMenu)self.connect(msgte,SIGNAL('customContextMenuRequested(const QPoint &)'),self.customContextMenuRequested)vbox.addWidget(msgte,1)upperframe=QFrame()sp=SP(SP.Expanding,SP.Expanding)sp.setHorizontalStretch(1)upperframe.setSizePolicy(sp)upperframe.setLayout(vbox)self.split=QSplitter(Qt.Vertical)sp=SP(SP.Expanding,SP.Expanding)sp.setHorizontalStretch(1)sp.setVerticalStretch(0)self.split.setSizePolicy(sp)# Add our widgets to the top of our splitterself.split.addWidget(upperframe)# Add status widget document frame below our splitter# this reparents the docf from the status splitterself.split.addWidget(self.stwidget.docf)# add our splitter where the docf used to beself.stwidget.split.addWidget(self.split)msgte.setFocus()# Yuki's Mockup: http://bitbucket.org/kuy/thg-qt/wiki/Homeself.usercombo=usercomboself.msgte=msgteself.msgcombo=msgcombodefmsgChanged(self):text=self.msgte.toPlainText()self.commitButton.setEnabled(nottext.isEmpty())sumlen,maxlen=self.getLengths()ifnotsumlenandnotmaxlen:self.msgte.setExtraSelections([])returnpos,nextpos=0,0sels=[]fori,lineinenumerate(text.split('\n')):pos=nextposlength=len(line)nextpos+=length+1# include \nifi==0and(length<sumlenornotsumlen):continueelifi==1and(length==0ornotsumlen):continueelifi>1and(length<maxlenornotmaxlen):continuesel=QTextEdit.ExtraSelection()sel.bgcolor=QColor('red')sel.format.setBackground(sel.bgcolor)sel.format.setProperty(QTextFormat.FullWidthSelection,True)sel.cursor=QTextCursor(self.msgte.document())sel.cursor.setPosition(pos)sel.cursor.clearSelection()sels.append(sel)self.msgte.setExtraSelections(sels)defmsgReflow(self):'User pressed Alt-Q'ifQApplication.focusWidget()!=self.msgte:returnself.reflowBlock(self.msgte.textCursor().block())defreflowBlock(self,block):sumlen,maxlen=self.getLengths()ifnotmaxlen:return# In QtTextDocument land, a block is a sequence of text ending# in (and including) a carriage return. Aka, a line of text.whileblock.length()andblock.previous().length()>1:block=block.previous()begin=block.position()whileblock.length()andblock.next().length()>1:block=block.next()end=block.position()+block.length()-1# select the contiguous lines of text under the cursorcursor=self.msgte.textCursor()cursor.setPosition(begin,QTextCursor.MoveAnchor)cursor.setPosition(end,QTextCursor.KeepAnchor)sentence=cursor.selection().toPlainText().simplified()parts=sentence.split(' ',QString.SkipEmptyParts)lines=QStringList()line=QStringList()partslen=0forpartinparts:ifpartslen+len(line)+len(part)+1>maxlen:ifline:lines.append(line.join(' '))line,partslen=QStringList(),0line.append(part)partslen+=len(part)ifline:lines.append(line.join(' '))reflow=lines.join('\n')# Replace selection with new sentencecursor.insertText(reflow)returncursor.block()defcustomContextMenuRequested(self,point):cursor=self.msgte.cursorForPosition(point)point=self.msgte.mapToGlobal(point)defapply():sumlen,maxlen=self.getLengths()ifnotmaxlen:returnblock=self.msgte.document().firstBlock()whileblock!=self.msgte.document().end():ifblock.length()>maxlen:block=self.reflowBlock(block)block=block.next()defpaste():files=self.stwidget.getChecked()cursor.insertText(', '.join(files))defsettings():fromtortoisehg.hgqt.settingsimportSettingsDialogdlg=SettingsDialog(True,focus='tortoisehg.summarylen')returndlg.exec_()menu=self.msgte.createStandardContextMenu()forname,funcin[(_('Paste &Filenames'),paste),(_('App&ly Format'),apply),(_('C&onfigure Format'),settings)]:action=menu.addAction(name)action.wrapper=lambdaf=func:f()self.connect(action,SIGNAL('triggered()'),action.wrapper)returnmenu.exec_(point)defgetLengths(self):repo=self.stwidget.repotry:sumlen=int(repo.ui.config('tortoisehg','summarylen',0))maxlen=int(repo.ui.config('tortoisehg','messagewrap',0))except(TypeError,ValueError):sumlen,maxlen=0,0returnsumlen,maxlendefrestoreState(self,data):returnself.stwidget.restoreState(data)defsaveState(self):returnself.stwidget.saveState()defbranchOp(self):d=branchop.BranchOpDialog(self.stwidget.repo,self.branchop)ifd.exec_()==QDialog.Accepted:self.branchop=d.branchopwctx=self.stwidget.repo[None]cur=hglib.tounicode(wctx.branch())ifself.branchopisNone:title=_('Branch: ')+curelifself.branchop==False:title=_('Close Branch: ')+curelse:title=_('New Branch: ')+self.branchopself.branchbutton.setText(title)defcanUndo(self):'Returns undo description or None if not valid'repo=self.stwidget.repoifos.path.exists(repo.sjoin('undo')):try:args=repo.opener('undo.desc','r').read().splitlines()ifargs[1]!='commit':returnNonereturn_('Rollback commit to revision %d')%(int(args[0])-1)except(IOError,IndexError,ValueError):passreturnNonedefrollback(self):msg=self.canUndo()ifnotmsg:returnd=QMessageBox.question(self,_('Confirm Undo'),msg,QMessageBox.Ok|QMessageBox.Cancel)ifd!=QMessageBox.Ok:returnrepo=self.stwidget.reporepo.rollback()self.stwidget.refreshWctx()QTimer.singleShot(500,lambda:shlib.shell_notify([repo.root]))defgetMessage(self):text=self.msgte.toPlainText()try:text=hglib.fromunicode(text,'strict')exceptUnicodeEncodeError:pass# TODOreturntextdefmsgSelected(self,index):doc=self.msgte.document()ifnotdoc.isEmpty()anddoc.isModified():d=QMessageBox.question(self,_('Confirm Discard Message'),_('Discard current commit message?'),QMessageBox.Ok|QMessageBox.Cancel)ifd!=QMessageBox.Ok:returnself.msgte.setPlainText(self.msghistory[index])self.msgte.document().setModified(False)self.msgte.moveCursor(QTextCursor.End)self.msgte.setFocus()defcanExit(self):# Usually safe to exit, since we're saving messages implicitly# We'll ask the user for confirmation later, if they have any# files partially selected.returnTruedefloadConfigs(self,s):'Load history, etc, from QSettings instance'repo=self.stwidget.reporepoid=str(repo[0])# message history is stored in unicodeself.split.restoreState(s.value('commit/split').toByteArray())self.msghistory=list(s.value('commit/history-'+repoid).toStringList())self.msghistory=[sforsinself.msghistoryifs]self.msgcombo.reset(self.msghistory)try:curmsg=repo.opener('cur-message.txt').read()self.msgte.setPlainText(hglib.fromunicode(curmsg))self.msgte.document().setModified(False)self.msgte.moveCursor(QTextCursor.End)exceptEnvironmentError:passdefstoreConfigs(self,s):'Save history, etc, in QSettings instance'repo=self.stwidget.reporepoid=str(repo[0])s.setValue('commit/history-'+repoid,self.msghistory)s.setValue('commit/split',self.split.saveState())try:# current message is stored in local encodingrepo.opener('cur-message.txt','w').write(self.getMessage())exceptEnvironmentError:passdefaddMessageToHistory(self):umsg=self.msgte.toPlainText()ifnotumsg:returnifumsginself.msghistory:self.msghistory.remove(umsg)self.msghistory.insert(0,umsg)self.msghistory=self.msghistory[:10]self.msgcombo.reset(self.msghistory)defcommit(self):repo=self.stwidget.repoui=repo.uicwd=os.getcwd()try:os.chdir(repo.root)returnself._commit(repo,ui)finally:os.chdir(cwd)def_commit(self,repo,_ui):msg=self.getMessage()ifnotmsg:qtlib.WarningMsgBox(_('Nothing Commited'),_('Please enter commit message'),parent=self)self.msgte.setFocus()returnrepo=self.stwidget.repoifself.branchopisNone:brcmd=[]elifself.branchop==False:brcmd=['--close-branch']else:brcmd=[]# TODO: Need a unicode-to-UTF8 functionnewbranch=hglib.fromunicode(self.branchop)ifnewbranchinrepo.branchtags():# response: 0=Yes, 1=No, 2=Cancelpb=[p.branch()forpinrepo.parents()]ifself.nextbranchinpb:resp=0else:rev=repo[newbranch].rev()resp=qtlib.CustomPrompt(_('Confirm Branch Change'),_('Named branch "%s" already exists, ''last used in revision %d\n''Yes\t- Make commit restarting this named branch\n''No\t- Make commit without changing branch\n''Cancel\t- Cancel this commit')%(newbranch,rev),self,(_('&Yes'),_('&No'),_('&Cancel')),2,2).run()else:resp=qtlib.CustomPrompt(_('Confirm New Branch'),_('Create new named branch "%s" with this commit?\n''Yes\t- Start new branch with this commit\n''No\t- Make commit without branch change\n''Cancel\t- Cancel this commit')%newbranch,self,(_('&Yes'),_('&No'),_('&Cancel')),2,2).run()ifresp==0:repo.dirstate.setbranch(newbranch)elifresp==2:returnfiles=self.stwidget.getChecked('MAR?!S')ifnot(filesorbrcmdorrepo[None].branch()!=repo['.'].branch()):qtlib.WarningMsgBox(_('No files checked'),_('No modified files checkmarked for commit'),parent=self)self.stwidget.tv.setFocus()returnuser=self.usercombo.currentText()try:user=hglib.fromunicode(user,'strict')exceptUnicodeEncodeError:pass# TODOifnotuser:try:QMessageBox.information(self,_('Please enter a username'),_('You must identify yourself to Mercurial'),QMessageBox.Ok)fromtortoisehg.hgqt.settingsimportSettingsDialogdlg=SettingsDialog(False,focus='ui.username')dlg.exec_()user=ui.ui().username()ifuser:self.usercombo.addItem(hglib.tounicode(user))exceptutil.Abort:passifnotuser:self.usercombo.setFocus()returncheckedUnknowns=self.stwidget.getChecked('?I')ifcheckedUnknowns:res=qtlib.CustomPrompt(_('Confirm Add'),_('Add checked untracked files?'),self,(_('&Ok'),('&Cancel')),0,1,checkedUnknowns).run()ifres==0:dispatch._dispatch(_ui,['add']+checkedUnknowns)else:returncheckedMissing=self.stwidget.getChecked('!')ifcheckedMissing:res=qtlib.CustomPrompt(_('Confirm Remove'),_('Remove checked deleted files?'),self,(_('&Ok'),('&Cancel')),0,1,checkedMissing).run()ifres==0:dispatch._dispatch(_ui,['remove']+checkedMissing)else:returntry:date=self.opts.get('date')ifdate:util.parsedate(date)dcmd=['--date',date]else:dcmd=[]excepterror.Abort,e:self.emit(SIGNAL('errorMessage'),hglib.tounicode(str(e)))dcmd=[] cmdline = ['commit', '--user', user, '--message', msg]
cmdline += dcmd + brcmd + files
++ for fname in repo.ui.config('tortoisehg', 'autoinc', '').split(','):+ fname = fname.strip()+ if fname:+ cmdline.extend(['--include', fname])+ ret = dispatch._dispatch(_ui, cmdline)
if not ret:
self.addMessageToHistory()
self.msgte.clear()self.msgte.document().setModified(False)self.emit(SIGNAL('commitComplete'))returnTrueelse:returnFalseclassMessageHistoryCombo(QComboBox):def__init__(self,parent=None):QComboBox.__init__(self,parent)self.reset([])defreset(self,msgs):self.clear()self.addItem(_('Recent commit messages...'))self.loaded=Falseself.msgs=msgsdefshowPopup(self):ifnotself.loaded:self.clear()forsinself.msgs:self.addItem(s.split('\n',1)[0][:70])self.loaded=TrueQComboBox.showPopup(self)# Technical Debt for standalone tool# add a toolbar for refresh# add a statusbar and simple progressbarclassCommitDialog(QDialog):'Standalone commit tool, a wrapper for CommitWidget'def__init__(self,pats,opts,parent=None):QDialog.__init__(self,parent)self.pats=patsself.opts=optslayout=QVBoxLayout()self.setLayout(layout)commit=CommitWidget(pats,opts,None,self,hidebutton=True)layout.addWidget(commit,1)layout.setContentsMargins(0,6,0,0)bbl=QHBoxLayout()layout.addLayout(bbl)layout.addSpacing(9)BB=QDialogButtonBoxbb=QDialogButtonBox(BB.Ok|BB.Cancel|BB.Discard)self.connect(bb,SIGNAL("accepted()"),self,SLOT("accept()"))self.connect(bb,SIGNAL("rejected()"),self,SLOT("reject()"))bb.button(BB.Discard).setText('Undo')bb.button(BB.Discard).clicked.connect(commit.rollback)bb.button(BB.Ok).setText('Commit')bbl.addWidget(bb,alignment=Qt.AlignRight)bbl.addSpacing(9)self.bb=bbbb.button(BB.Cancel).setDefault(False)bb.button(BB.Discard).setDefault(False)bb.button(BB.Ok).setDefault(True)s=QSettings()commit.restoreState(s.value('commit/state').toByteArray())self.restoreGeometry(s.value('commit/geom').toByteArray())commit.loadConfigs(s)commit.errorMessage.connect(self.errorMessage)name=hglib.get_reponame(commit.stwidget.repo)self.setWindowTitle('%s - commit'%name)self.commit=commitcommit.loadComplete.connect(self.updateUndo)defupdateUndo(self):BB=QDialogButtonBoxundomsg=self.commit.canUndo()ifundomsg:self.bb.button(BB.Discard).setEnabled(True)self.bb.button(BB.Discard).setToolTip(undomsg)else:self.bb.button(BB.Discard).setEnabled(False)self.bb.button(BB.Discard).setToolTip('')deferrorMessage(self,msg):printmsgdefkeyPressEvent(self,event):ifevent.key()in(Qt.Key_Return,Qt.Key_Enter):ifevent.modifiers()==Qt.ControlModifier:self.accept()# Ctrl+Enterreturnelifevent.key()==Qt.Key_Escape:self.reject()returnelifevent.modifiers()==Qt.AltModifierandevent.key()==Qt.Key_Q:self.commit.msgReflow()elifevent.modifiers()==Qt.MetaModifierandevent.key()==Qt.Key_R:# On a Mac, CTRL-R will also reflow (until someone fixes this)self.commit.msgReflow()returnsuper(QDialog,self).keyPressEvent(event)defaccept(self):ifself.commit.commit():repo=self.commit.stwidget.repoifrepo.ui.configbool('tortoisehg','closeci'):self.reject()returnself.commit.stwidget.refreshWctx()defreject(self):ifself.commit.canExit():s=QSettings()s.setValue('commit/state',self.commit.saveState())s.setValue('commit/geom',self.saveGeometry())self.commit.storeConfigs(s)QDialog.reject(self)defrun(ui,*pats,**opts):returnCommitDialog(hglib.canonpaths(pats),opts)
Attach a Trello Card
Add a tag
Your session has expired
You are no longer logged in. Please log in and try your request again.
Filter RSS Feed
This RSS feed URL allows you to see the contents of your current filter using any feed reader.
This link includes a special authentication token. If you share the URL with anyone else, they can see this RSS feed's activity. You can disable these tokens when needed.
Your current filter is unsaved; changing it won't affect this RSS feed.