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.
# rebase.py - Rebase dialog for TortoiseHg## 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.fromPyQt4.QtCoreimport*fromPyQt4.QtGuiimport*importosfrommercurialimportutil,mergeasmergemodfromtortoisehg.utilimporthglibfromtortoisehg.hgqt.i18nimport_fromtortoisehg.hgqtimportqtlib,csinfo,cmdui,resolve,commit,thgrepoBB=QDialogButtonBoxclassRebaseDialog(QDialog):showMessage=pyqtSignal(QString)def__init__(self,repo,parent,**opts):super(RebaseDialog,self).__init__(parent)self.setWindowIcon(qtlib.geticon('hg-rebase'))f=self.windowFlags()self.setWindowFlags(f&~Qt.WindowContextHelpButtonHint)self.repo=repoself.opts=optsself.aborted=Falsebox=QVBoxLayout()box.setSpacing(8)box.setContentsMargins(*(6,)*4)self.setLayout(box)style=csinfo.panelstyle(selectable=True)srcb=QGroupBox(_('Rebase changeset and descendants'))srcb.setLayout(QVBoxLayout())srcb.layout().setContentsMargins(*(2,)*4)s=opts.get('source','.')source=csinfo.create(self.repo,s,style,withupdate=True)srcb.layout().addWidget(source)self.layout().addWidget(srcb)destb=QGroupBox(_('To rebase destination'))destb.setLayout(QVBoxLayout())destb.layout().setContentsMargins(*(2,)*4)d=opts.get('dest','.')dest=csinfo.create(self.repo,d,style,withupdate=True)destb.layout().addWidget(dest)self.destcsinfo=destself.layout().addWidget(destb)sep=qtlib.LabeledSeparator(_('Options'))self.layout().addWidget(sep)self.keepchk=QCheckBox(_('Keep original changesets'))self.keepchk.setChecked(opts.get('keep',False))self.layout().addWidget(self.keepchk)self.keepbrancheschk=QCheckBox(_('Keep original branch names'))self.keepbrancheschk.setChecked(opts.get('keepbranches',False))self.layout().addWidget(self.keepbrancheschk)self.detachchk=QCheckBox(_('Force detach of rebased changesets ''from their original branch'))self.detachchk.setChecked(opts.get('detach',True))self.layout().addWidget(self.detachchk)self.autoresolvechk=QCheckBox(_('Automatically resolve merge conflicts ''where possible'))self.autoresolvechk.setChecked(repo.ui.configbool('tortoisehg','autoresolve',False))self.layout().addWidget(self.autoresolvechk)if'hgsubversion'inrepo.extensions():self.svnchk=QCheckBox(_('Rebase unpublished onto Subversion head ''(override source, destination)'))self.layout().addWidget(self.svnchk)else:self.svnchk=Noneself.cmd=cmdui.Widget(True,True,self)self.cmd.commandFinished.connect(self.commandFinished)self.showMessage.connect(self.cmd.stbar.showMessage)self.cmd.stbar.linkActivated.connect(self.linkActivated)self.layout().addWidget(self.cmd,2)bbox=QDialogButtonBox()self.cancelbtn=bbox.addButton(QDialogButtonBox.Cancel)self.cancelbtn.clicked.connect(self.reject)self.rebasebtn=bbox.addButton(_('Rebase'),QDialogButtonBox.ActionRole)self.rebasebtn.clicked.connect(self.rebase)self.abortbtn=bbox.addButton(_('Abort'),QDialogButtonBox.ActionRole)self.abortbtn.clicked.connect(self.abort)self.layout().addWidget(bbox)self.bbox=bboxifself.checkResolve()ornot(sord):forwin(srcb,destb,sep,self.keepchk,self.detachchk,self.keepbrancheschk):w.setHidden(True) self.cmd.setShowOutput(True)
else:
self.showMessage.emit(_('Checking...'))
+ self.abortbtn.setEnabled(False)+ self.rebasebtn.setEnabled(False) QTimer.singleShot(0, self.checkStatus)
self.setMinimumWidth(480)
self.setMaximumHeight(800)self.resize(0,340)self.setWindowTitle(_('Rebase - %s')%self.repo.displayname)defcheckStatus(self):repo=self.repoclassCheckThread(QThread):def__init__(self,parent):QThread.__init__(self,parent)self.dirty=Falsedefrun(self):wctx=repo[None]iflen(wctx.parents())>1:self.dirty=Trueelifwctx.dirty():self.dirty=Trueelse:forr,p,statusinthgrepo.recursiveMergeStatus(repo):ifstatus=='u':self.dirty=Truebreakdefcompleted():self.th.wait()ifself.th.dirty:self.rebasebtn.setEnabled(False)txt=_('Before rebase, you must <a href="commit">''<b>commit</b></a> or <a href="discard">''<b>discard</b></a> changes.')else:self.rebasebtn.setEnabled(True)txt=_('You may continue the rebase')self.showMessage.emit(txt)self.th=CheckThread(self)self.th.finished.connect(completed)self.th.start()defrebase(self):self.rebasebtn.setEnabled(False)self.cancelbtn.setShown(False)self.keepchk.setEnabled(False)self.keepbrancheschk.setEnabled(False)self.detachchk.setEnabled(False)cmdline=['rebase','--repository',self.repo.root]cmdline+=['--config','ui.merge=internal:'+(self.autoresolvechk.isChecked()and'merge'or'fail')]ifos.path.exists(self.repo.join('rebasestate')):cmdline+=['--continue']else:ifself.keepchk.isChecked():cmdline+=['--keep']ifself.keepbrancheschk.isChecked():cmdline+=['--keepbranches']ifself.detachchk.isChecked():cmdline+=['--detach']ifself.svnchkisnotNoneandself.svnchk.isChecked():cmdline+=['--svn']else:source=self.opts.get('source')dest=self.opts.get('dest')cmdline+=['--source',str(source),'--dest',str(dest)]self.repo.incrementBusyCount()self.cmd.run(cmdline)defabort(self):cmdline=['rebase','--repository',self.repo.root,'--abort']self.repo.incrementBusyCount()self.aborted=Trueself.cmd.run(cmdline)defcommandFinished(self,ret):self.repo.decrementBusyCount()ifself.checkResolve()isFalse:msg=_('Rebase is complete')ifself.aborted:msg=_('Rebase aborted')self.showMessage.emit(msg)self.rebasebtn.setEnabled(True)self.rebasebtn.setText(_('Close'))self.rebasebtn.clicked.disconnect(self.rebase)self.rebasebtn.clicked.connect(self.accept)defcheckResolve(self):forroot,path,statusinthgrepo.recursiveMergeStatus(self.repo):ifstatus=='u':txt=_('Rebase generated merge <b>conflicts</b> that must ''be <a href="resolve"><b>resolved</b></a>')self.rebasebtn.setEnabled(False)breakelse:self.rebasebtn.setEnabled(True)txt=_('You may continue the rebase')self.showMessage.emit(txt)ifos.path.exists(self.repo.join('rebasestate')):self.abortbtn.setEnabled(True)self.rebasebtn.setText('Continue')returnTrueelse:self.abortbtn.setEnabled(False)returnFalsedeflinkActivated(self,cmd):ifcmd=='resolve':dlg=resolve.ResolveDialog(self.repo,self)dlg.exec_()self.checkResolve()elifcmd=='commit':dlg=commit.CommitDialog([],dict(root=self.repo.root),self)dlg.finished.connect(dlg.deleteLater)dlg.exec_()self.destcsinfo.update(self.repo['.'])self.checkStatus()elifcmd=='discard':labels=[(QMessageBox.Yes,_('&Discard')),(QMessageBox.No,_('Cancel'))]ifnotqtlib.QuestionMsgBox(_('Confirm Discard'),_('Discard outstanding changes to working directory?'),labels=labels,parent=self):returndeffinished(ret):self.repo.decrementBusyCount()ifret==0:self.checkStatus()cmdline=['update','--clean','--repository',self.repo.root,'--rev','.']self.runner=cmdui.Runner(True,self)self.runner.commandFinished.connect(finished)self.repo.incrementBusyCount()self.runner.run(cmdline)defreject(self):ifos.path.exists(self.repo.join('rebasestate')):main=_('Exiting with an unfinished rebase is not recommended.')text=_('Consider aborting the rebase first.')labels=((QMessageBox.Yes,_('&Exit')),(QMessageBox.No,_('Cancel')))ifnotqtlib.QuestionMsgBox(_('Confirm Exit'),main,text,labels=labels,parent=self):returnsuper(RebaseDialog,self).reject()defrun(ui,*pats,**opts):fromtortoisehg.utilimportpathsrepo=thgrepo.repository(ui,path=paths.find_root())ifos.path.exists(repo.join('rebasestate')):qtlib.InfoMsgBox(_('Rebase already in progress'),_('Resuming rebase already in progress'))elifnotopts['source']ornotopts['dest']:qtlib.ErrorMsgBox(_('Abort'),_('You must provide source and dest arguments'))importsys;sys.exit()returnRebaseDialog(repo,None,**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.