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.
# Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).# http://www.logilab.fr/ -- mailto:contact@logilab.fr## This program is free software; you can redistribute it and/or modify it under# the terms of the GNU General Public License as published by the Free Software# Foundation; either version 2 of the License, or (at your option) any later# version.## This program is distributed in the hope that it will be useful, but WITHOUT# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.## You should have received a copy of the GNU General Public License along with# this program; if not, write to the Free Software Foundation, Inc.,# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."""Qt4 dialogs to display hg revisions of a file"""importdifflibfrommercurialimporthgfrom tortoisehg.util import hglib
from tortoisehg.hgqt.i18n import _
-from tortoisehg.hgqt.qtlib import geticon, getfont, getmenuiconfrom tortoisehg.hgqt.filerevmodel import FileRevModel
from tortoisehg.hgqt.blockmatcher import BlockList, BlockMatch
from tortoisehg.hgqt.lexers import get_lexer
from tortoisehg.hgqt.fileview import HgFileView
from tortoisehg.hgqt.repoview import HgRepoView
from tortoisehg.hgqt.revpanel import RevPanelWidget
-from tortoisehg.hgqt import visdiff
+from tortoisehg.hgqt import qtlib, visdiff
from PyQt4.QtCore import *
from PyQt4.QtGui import *
fromPyQt4.QsciimportQsciScintillasides=('left','right')otherside={'left':'right','right':'left'}class_AbstractFileDialog(QMainWindow):def__init__(self,repo,filename,repoviewer=None): QMainWindow.__init__(self)
self.repo = repo
- self._font = getfont('fontdiff').font()
+ self._font = qtlib.getfont('fontdiff').font()
self.setupUi(self)
self.setRepoViewer(repoviewer)
self._show_rev = None
ifisinstance(filename,(unicode,QString)):filename=hglib.fromunicode(filename)self.filename=filenameself.findLexer()self.createActions()self.setupToolbars()self.setupViews()self.setupModels()defsetRepoViewer(self,repoviewer=None):self.repoviewer=repoviewerifrepoviewer:repoviewer.finished.connect(lambdax:self.setRepoViewer(None))defreload(self):'Reload toolbar action handler'self.repo.thginvalidate()self.setupModels()deffindLexer(self):# try to find a lexer for our file.f=self.repo.file(self.filename)head=f.heads()[0]iff.size(f.rev(head))<1e6:data=f.read(head)else:data=''# too biglexer=get_lexer(self.filename,data,self)iflexer:lexer.setDefaultFont(self._font)lexer.setFont(self._font)self.lexer=lexerdefonRevisionActivated(self,rev):""" Callback called when a revision is double-clicked in the revisions table """ifself.repoviewerisNone:# prevent recursive importfromworkbenchimportWorkbenchself.repoviewer=Workbench()self.repoviewer.show()self.repoviewer.activateWindow()self.repoviewer.raise_()self.repoviewer.showRepo(hglib.tounicode(self.repo.root))self.repoviewer.goto(self.repo.root,rev)classFileLogDialog(_AbstractFileDialog):""" A dialog showing a revision graph for a file. """def__init__(self,repo,filename,repoviewer=None):super(FileLogDialog,self).__init__(repo,filename,repoviewer)self._readSettings()self.menu=NonedefcloseEvent(self,event):self._writeSettings()super(FileLogDialog,self).closeEvent(event)def_readSettings(self):s=QSettings()s.beginGroup('filelog')try:self.textView.loadSettings(s,'fileview')self.restoreGeometry(s.value('geom').toByteArray())self.splitter.restoreState(s.value('splitter').toByteArray())self.revpanel.set_expanded(s.value('revpanel.expanded').toBool())finally:s.endGroup()def_writeSettings(self):s=QSettings()s.beginGroup('filelog')try:self.textView.saveSettings(s,'fileview')s.setValue('revpanel.expanded',self.revpanel.is_expanded())s.setValue('geom',self.saveGeometry())s.setValue('splitter',self.splitter.saveState())finally:s.endGroup()defsetupUi(self,o):self.editToolbar=QToolBar(self)self.editToolbar.setContextMenuPolicy(Qt.PreventContextMenu)self.addToolBar(Qt.ToolBarArea(Qt.TopToolBarArea),self.editToolbar)self.actionClose=QAction(self,shortcut=QKeySequence.Close)self.actionReload=QAction(self,shortcut=QKeySequence.Refresh)self.editToolbar.addAction(self.actionReload)self.addAction(self.actionClose)self.splitter=QSplitter(Qt.Vertical)self.setCentralWidget(self.splitter)self.repoview=HgRepoView(self.repo,'fileLogDialog',self.splitter)self.contentframe=QFrame(self.splitter)vbox=QVBoxLayout()vbox.setSpacing(0)vbox.setMargin(0)self.contentframe.setLayout(vbox)self.revpanel=RevPanelWidget(self.repo)self.revpanel.linkActivated.connect(self.onLinkActivated)vbox.addWidget(self.revpanel,0)self.textView=HgFileView(self.repo,self)self.textView.revisionSelected.connect(self.goto)vbox.addWidget(self.textView,1)defsetupViews(self):self.textView.setFont(self._font)self.textView.showMessage.connect(self.statusBar().showMessage)defsetupToolbars(self):self.editToolbar.addSeparator()self.editToolbar.addAction(self.actionBack)self.editToolbar.addAction(self.actionForward)defsetupModels(self):self.filerevmodel=FileRevModel(self.repo,parent=self)self.repoview.setModel(self.filerevmodel)self.repoview.revisionSelected.connect(self.onRevisionSelected)self.repoview.revisionActivated.connect(self.onRevisionActivated)self.repoview.menuRequested.connect(self.viewMenuRequest)self.filerevmodel.showMessage.connect(self.statusBar().showMessage)self.filerevmodel.filled.connect(self.modelFilled)self.filerevmodel.setFilename(self.filename) def createActions(self):
self.actionClose.triggered.connect(self.close)
self.actionReload.triggered.connect(self.reload)
- self.actionReload.setIcon(geticon('view-refresh'))
+ self.actionReload.setIcon(qtlib.geticon('view-refresh'))
self.actionBack = QAction(_('Back'), self, enabled=False,
- icon=geticon('go-previous'))
+ icon=qtlib.geticon('go-previous'))
self.actionForward = QAction(_('Forward'), self, enabled=False,
- icon=geticon('go-next'))
+ icon=qtlib.geticon('go-next'))
self.repoview.revisionSelected.connect(self._updateHistoryActions)
self.actionBack.triggered.connect(self.repoview.back)
self.actionForward.triggered.connect(self.repoview.forward)
@pyqtSlot()def_updateHistoryActions(self):self.actionBack.setEnabled(self.repoview.canGoBack())self.actionForward.setEnabled(self.repoview.canGoForward())defmodelFilled(self):self.repoview.resizeColumns()ifself._show_revisnotNone:index=self.filerevmodel.indexFromRev(self._show_rev)self._show_rev=Noneelse:index=self.filerevmodel.index(0,0)ifindexisnotNone:self.repoview.setCurrentIndex(index)@pyqtSlot(QPoint,object)defviewMenuRequest(self,point,selection):'User requested a context menu in repo view widget'ifnotselection:return if self.menu is None:
self.menu = menu = QMenu(self)
a = menu.addAction(_('Visual diff...'))
- a.setIcon(getmenuicon('visualdiff'))
+ a.setIcon(qtlib.getmenuicon('visualdiff'))
a.triggered.connect(self.onVisualDiff)
a = menu.addAction(_('Diff to local...'))
- a.setIcon(getmenuicon('ldiff'))
+ a.setIcon(qtlib.getmenuicon('ldiff'))
a.triggered.connect(self.onVisualDiffToLocal)
menu.addSeparator()
a = menu.addAction(_('Visual diff file...'))
- a.setIcon(getmenuicon('visualdiff'))
+ a.setIcon(qtlib.getmenuicon('visualdiff'))
a.triggered.connect(self.onVisualDiffFile)
a = menu.addAction(_('Diff file to local...'))
- a.setIcon(getmenuicon('ldiff'))
+ a.setIcon(qtlib.getmenuicon('ldiff'))
a.triggered.connect(self.onVisualDiffFileToLocal)
self.selection = selection
self.menu.exec_(point)
defonVisualDiff(self):opts=dict(change=self.selection[0])dlg=visdiff.visualdiff(self.repo.ui,self.repo,[],opts)ifdlg:dlg.exec_()dlg.deleteLater()defonVisualDiffToLocal(self):opts=dict(rev=['rev(%d)'%self.selection[0]])dlg=visdiff.visualdiff(self.repo.ui,self.repo,[],opts)ifdlg:dlg.exec_()dlg.deleteLater()defonVisualDiffFile(self):rev=self.selection[0]paths=[self.filerevmodel.graph.filename(rev)]opts=dict(change=self.selection[0])dlg=visdiff.visualdiff(self.repo.ui,self.repo,paths,opts)ifdlg:dlg.exec_()dlg.deleteLater()defonVisualDiffFileToLocal(self):rev=self.selection[0]paths=[self.filerevmodel.graph.filename(rev)]opts=dict(rev=['rev(%d)'%rev])dlg=visdiff.visualdiff(self.repo.ui,self.repo,paths,opts)ifdlg:dlg.exec_()dlg.deleteLater()@pyqtSlot(QString)defonLinkActivated(self,link):link=unicode(link)if':'inlink:scheme,param=link.split(':',1)ifscheme=='cset':rev=self.repo[param].rev()returnself.goto(rev)QDesktopServices.openUrl(QUrl(link))defonRevisionSelected(self,rev):pos=self.textView.verticalScrollBar().value()ctx=self.filerevmodel.repo.changectx(rev)self.textView.setContext(ctx)self.textView.displayFile(self.filerevmodel.graph.filename(rev),None)self.textView.verticalScrollBar().setValue(pos)self.revpanel.set_revision(rev)self.revpanel.update(repo=self.repo)defgoto(self,rev):index=self.filerevmodel.indexFromRev(rev)ifindexisnotNone:self.repoview.setCurrentIndex(index)else:self._show_rev=revdefreload(self):self.repoview.saveSettings()super(FileLogDialog,self).reload()classFileDiffDialog(_AbstractFileDialog):""" Qt4 dialog to display diffs between different mercurial revisions of a file. """def__init__(self,repo,filename,repoviewer=None):super(FileDiffDialog,self).__init__(repo,filename,repoviewer)self._readSettings()defcloseEvent(self,event):self._writeSettings()super(FileDiffDialog,self).closeEvent(event)def_readSettings(self):s=QSettings()s.beginGroup('filediff')try:self.restoreGeometry(s.value('geom').toByteArray())self.splitter.restoreState(s.value('splitter').toByteArray())finally:s.endGroup()def_writeSettings(self):s=QSettings()s.beginGroup('filediff')try:s.setValue('geom',self.saveGeometry())s.setValue('splitter',self.splitter.saveState())finally:s.endGroup()defsetupUi(self,o):self.editToolbar=QToolBar(self)self.editToolbar.setContextMenuPolicy(Qt.PreventContextMenu)self.addToolBar(Qt.ToolBarArea(Qt.TopToolBarArea),self.editToolbar)self.actionClose=QAction(self,shortcut=QKeySequence.Close)self.actionReload=QAction(self,shortcut=QKeySequence.Refresh)self.editToolbar.addAction(self.actionReload)self.addAction(self.actionClose)deflayouttowidget(layout):w=QWidget()w.setLayout(layout)returnwself.splitter=QSplitter(Qt.Vertical)self.setCentralWidget(self.splitter)self.horizontalLayout=QHBoxLayout()self.tableView_revisions_left=HgRepoView(self.repo,'fileDiffDialogLeft',self)self.tableView_revisions_right=HgRepoView(self.repo,'fileDiffDialogRight',self)self.horizontalLayout.addWidget(self.tableView_revisions_left)self.horizontalLayout.addWidget(self.tableView_revisions_right)self.frame=QFrame()self.splitter.addWidget(layouttowidget(self.horizontalLayout))self.splitter.addWidget(self.frame)defsetupViews(self):self.tableViews={'left':self.tableView_revisions_left,'right':self.tableView_revisions_right}# viewers are Scintilla editorsself.viewers={}# block are diff-block displayersself.block={}self.diffblock=BlockMatch(self.frame)lay=QHBoxLayout(self.frame)lay.setSpacing(0)lay.setContentsMargins(0,0,0,0)forside,idxin(('left',0),('right',3)):sci=QsciScintilla(self.frame)sci.setFont(self._font)sci.verticalScrollBar().setFocusPolicy(Qt.StrongFocus)sci.setFocusProxy(sci.verticalScrollBar())sci.verticalScrollBar().installEventFilter(self)sci.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)sci.setFrameShape(QFrame.NoFrame)sci.setMarginLineNumbers(1,True)sci.SendScintilla(sci.SCI_SETSELEOLFILLED,True)ifself.lexer:sci.setLexer(self.lexer)sci.setReadOnly(True)sci.setUtf8(True)lay.addWidget(sci)# hide margin 0 (markers)sci.SendScintilla(sci.SCI_SETMARGINTYPEN,0,0)sci.SendScintilla(sci.SCI_SETMARGINWIDTHN,0,0)# setup margin 1 for line numbers onlysci.SendScintilla(sci.SCI_SETMARGINTYPEN,1,1)sci.SendScintilla(sci.SCI_SETMARGINWIDTHN,1,20)sci.SendScintilla(sci.SCI_SETMARGINMASKN,1,0)# define markers for colorize zones of diffself.markerplus=sci.markerDefine(QsciScintilla.Background)sci.SendScintilla(sci.SCI_MARKERSETBACK,self.markerplus,0xB0FFA0)self.markerminus=sci.markerDefine(QsciScintilla.Background)sci.SendScintilla(sci.SCI_MARKERSETBACK,self.markerminus,0xA0A0FF)self.markertriangle=sci.markerDefine(QsciScintilla.Background)sci.SendScintilla(sci.SCI_MARKERSETBACK,self.markertriangle,0xFFA0A0)self.viewers[side]=sciblk=BlockList(self.frame)blk.linkScrollBar(sci.verticalScrollBar())self.diffblock.linkScrollBar(sci.verticalScrollBar(),side)lay.insertWidget(idx,blk)self.block[side]=blklay.insertWidget(2,self.diffblock)forsideinsides:table=getattr(self,'tableView_revisions_%s'%side)table.setTabKeyNavigation(False)#table.installEventFilter(self)table.revisionSelected.connect(self.onRevisionSelected)table.revisionActivated.connect(self.onRevisionActivated)self.viewers[side].verticalScrollBar().valueChanged.connect(lambdavalue,side=side:self.vbar_changed(value,side))self.setTabOrder(table,self.viewers['left'])self.setTabOrder(self.viewers['left'],self.viewers['right'])# timer used to fill viewers with diff block markers during GUI idle timeself.timer=QTimer()self.timer.setSingleShot(False)self.timer.timeout.connect(self.idle_fill_files)defsetupModels(self):self.filedata={'left':None,'right':None}self._invbarchanged=Falseself.filerevmodel=FileRevModel(self.repo,self.filename,parent=self)self.filerevmodel.filled.connect(self.modelFilled)self.tableView_revisions_left.setModel(self.filerevmodel)self.tableView_revisions_right.setModel(self.filerevmodel) def createActions(self):
self.actionClose.triggered.connect(self.close)
self.actionReload.triggered.connect(self.reload)
- self.actionReload.setIcon(geticon('view-refresh'))
+ self.actionReload.setIcon(qtlib.geticon('view-refresh'))
- self.actionNextDiff = QAction(geticon('go-down'), 'Next diff', self)
+ self.actionNextDiff = QAction(qtlib.geticon('go-down'), 'Next diff', self)
self.actionNextDiff.setShortcut('Alt+Down')
self.actionNextDiff.triggered.connect(self.nextDiff)
- self.actionPrevDiff = QAction(geticon('go-up'), 'Previous diff', self)
+ self.actionPrevDiff = QAction(qtlib.geticon('go-up'), 'Previous diff', self)
self.actionPrevDiff.setShortcut('Alt+Up')
self.actionPrevDiff.triggered.connect(self.prevDiff)
self.actionNextDiff.setEnabled(False)self.actionPrevDiff.setEnabled(False)defsetupToolbars(self):self.editToolbar.addSeparator()self.editToolbar.addAction(self.actionNextDiff)self.editToolbar.addAction(self.actionPrevDiff)defmodelFilled(self):self.tableView_revisions_left.resizeColumns()self.tableView_revisions_right.resizeColumns()ifself._show_revisnotNone:rev=self._show_revself._show_rev=Noneelse:rev=self.filerevmodel.graph[0].revself.goto(rev)defonRevisionSelected(self,rev):ifrevisNoneorrevnotinself.filerevmodel.graph.nodesdict:returnifself.sender()isself.tableView_revisions_right:side='right'else:side='left'path=self.filerevmodel.graph.nodesdict[rev].extra[0]fc=self.repo.changectx(rev).filectx(path)data=hglib.tounicode(fc.data())self.filedata[side]=data.splitlines()self.update_diff(keeppos=otherside[side])defgoto(self,rev):index=self.filerevmodel.indexFromRev(rev)ifindexisnotNone:ifindex.row()==0:index=self.filerevmodel.index(1,0)self.tableView_revisions_left.setCurrentIndex(index)index=self.filerevmodel.index(0,0)self.tableView_revisions_right.setCurrentIndex(index)else:self._show_rev=revdefsetDiffNavActions(self,pos=0):hasdiff=(self.diffblock.nDiffs()>0)self.actionNextDiff.setEnabled(hasdiffandpos!=1)self.actionPrevDiff.setEnabled(hasdiffandpos!=-1)defnextDiff(self):self.setDiffNavActions(self.diffblock.nextDiff())defprevDiff(self):self.setDiffNavActions(self.diffblock.prevDiff())defupdate_page_steps(self,keeppos=None):forsideinsides:self.block[side].syncPageStep()self.diffblock.syncPageStep()ifkeeppos:side,pos=keepposself.viewers[side].verticalScrollBar().setValue(pos)defidle_fill_files(self):# we make a burst of diff-lines computed at once, but we# disable GUI updates for efficiency reasons, then only# refresh GUI at the end of the burstforsideinsides:self.viewers[side].setUpdatesEnabled(False)self.block[side].setUpdatesEnabled(False)self.diffblock.setUpdatesEnabled(False)forninrange(30):# burst poolifself._diffisNoneornotself._diff.get_opcodes():self._diff=Noneself.timer.stop()self.setDiffNavActions(-1)breaktag,alo,ahi,blo,bhi=self._diff.get_opcodes().pop(0)w=self.viewers['left']cposl=w.SendScintilla(w.SCI_GETENDSTYLED)w=self.viewers['right']cposr=w.SendScintilla(w.SCI_GETENDSTYLED)iftag=='replace':self.block['left'].addBlock('x',alo,ahi)self.block['right'].addBlock('x',blo,bhi)self.diffblock.addBlock('x',alo,ahi,blo,bhi)w=self.viewers['left']foriinrange(alo,ahi):w.markerAdd(i,self.markertriangle)w=self.viewers['right']foriinrange(blo,bhi):w.markerAdd(i,self.markertriangle)eliftag=='delete':self.block['left'].addBlock('-',alo,ahi)self.diffblock.addBlock('-',alo,ahi,blo,bhi)w=self.viewers['left']foriinrange(alo,ahi):w.markerAdd(i,self.markerminus)eliftag=='insert':self.block['right'].addBlock('+',blo,bhi)self.diffblock.addBlock('+',alo,ahi,blo,bhi)w=self.viewers['right']foriinrange(blo,bhi):w.markerAdd(i,self.markerplus)eliftag=='equal':passelse:raiseValueError,'unknown tag %r'%(tag,)# ok, let's enable GUI refresh for code viewers and diff-block displayersforsideinsides:self.viewers[side].setUpdatesEnabled(True)self.block[side].setUpdatesEnabled(True)self.diffblock.setUpdatesEnabled(True)defupdate_diff(self,keeppos=None):""" Recompute the diff, display files and starts the timer responsible for filling diff markers """ifkeeppos:pos=self.viewers[keeppos].verticalScrollBar().value()keeppos=(keeppos,pos)forsideinsides:self.viewers[side].clear()self.block[side].clear()self.diffblock.clear()ifNonenotinself.filedata.values():ifself.timer.isActive():self.timer.stop()forsideinsides:self.viewers[side].setMarginWidth(1,"00%s"%len(self.filedata[side]))self._diff=difflib.SequenceMatcher(None,self.filedata['left'],self.filedata['right'])blocks=self._diff.get_opcodes()[:]self._diffmatch={'left':[x[1:3]forxinblocks],'right':[x[3:5]forxinblocks]}forsideinsides:self.viewers[side].setText(u'\n'.join(self.filedata[side]))self.update_page_steps(keeppos)self.timer.start()defvbar_changed(self,value,side):""" Callback called when the vertical scrollbar of a file viewer is changed, so we can update the position of the other file viewer. """ifself._invbarchangedornothasattr(self,'_diffmatch'):# prevent loops in changes (left -> right -> left ...)returnself._invbarchanged=Trueoside=otherside[side]fori,(lo,hi)inenumerate(self._diffmatch[side]):iflo<=value<hi:breakdv=value-loblo,bhi=self._diffmatch[oside][i]vbar=self.viewers[oside].verticalScrollBar()if(dv)<(bhi-blo):bvalue=blo+dvelse:bvalue=bhivbar.setValue(bvalue)self._invbarchanged=Falsedefreload(self):self.tableView_revisions_left.saveSettings()self.tableView_revisions_right.saveSettings()super(FileDiffDialog,self).reload()
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.