We are currently indexing your data, so search results may be incomplete until we finish.
extract class RevDisplay into new changeset.py
Changeset 3f5e69db8fde…
Parent bc305895d2aa…
by
Changes to 4 files · Browse files at 3f5e69db8fde Showing diff from parent bc305895d2aa Diff from another changeset...
|
|
|
@@ -0,0 +1,180 @@ + # Copyright (c) 2009-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.
+
+from mercurial.node import short as short_hex
+
+from PyQt4 import QtCore, QtGui
+Qt = QtCore.Qt
+connect = QtCore.QObject.connect
+SIGNAL = QtCore.SIGNAL
+
+from tortoisehg.util.util import format_desc, xml_escape
+
+from tortoisehg.hgqt.config import HgConfig
+
+
+class RevDisplay(QtGui.QTextBrowser):
+ """
+ Display metadata for one revision (rev, author, description, etc.)
+ """
+ def __init__(self, parent=None):
+ QtGui.QTextBrowser.__init__(self, parent)
+ self.descwidth = 60 # number of chars displayed for parent/child descriptions
+ connect(self,
+ SIGNAL('anchorClicked(const QUrl &)'),
+ self.anchorClicked)
+
+ def anchorClicked(self, qurl):
+ """
+ Callback called when a link is clicked in the text browser
+ """
+ rev = str(qurl.toString())
+ if rev.startswith('diff_'):
+ self.diffrev = int(rev[5:])
+ self.refreshDisplay()
+ # TODO: emit a signal to recompute the diff
+ self.emit(SIGNAL('parentRevisionSelected'), self.diffrev)
+ else:
+ self.emit(SIGNAL('revisionSelected'), int(rev))
+
+ def setDiffRevision(self, rev):
+ if rev != self.diffrev:
+ self.diffrev = rev
+ self.refreshDisplay()
+
+ def displayRevision(self, ctx):
+ self.ctx = ctx
+ self.diffrev = ctx.parents()[0].rev()
+ if hasattr(self.ctx._repo, "mq"):
+ self.mqseries = self.ctx._repo.mq.series[:]
+ self.mqunapplied = [x[1] for x in self.ctx._repo.mq.unapplied(self.ctx._repo)]
+ mqpatch = set(self.ctx.tags()).intersection(self.mqseries)
+ if mqpatch:
+ self.mqpatch = mqpatch.pop()
+ else:
+ self.mqpatch = None
+ else:
+ self.mqseries = []
+ self.mqunapplied = []
+ self.mqpatch = None
+
+ self.refreshDisplay()
+
+ def selectNone(self):
+ cursor = self.textCursor()
+ cursor.clearSelection()
+ cursor.setPosition(0)
+ self.setTextCursor(cursor)
+ self.setExtraSelections([])
+
+ def searchString(self, text):
+ self.selectNone()
+ if text in unicode(self.toPlainText()):
+ clist = []
+ while self.find(text):
+ eselect = self.ExtraSelection()
+ eselect.cursor = self.textCursor()
+ eselect.format.setBackground(QtGui.QColor('#ffffbb'))
+ clist.append(eselect)
+ self.selectNone()
+ self.setExtraSelections(clist)
+ def finditer(self, text):
+ if text:
+ while True:
+ if self.find(text):
+ yield self.ctx.rev(), None
+ else:
+ break
+ return finditer(self, text)
+
+ def refreshDisplay(self):
+ ctx = self.ctx
+ rev = ctx.rev()
+ buf = "<table width=100%>\n"
+ if self.mqpatch:
+ buf += '<tr bgcolor=%s>' % HgConfig(ctx._repo.ui).getMQFGColor()
+ buf += '<td colspan=3 width=100%><b>Patch queue:</b> '
+ for p in self.mqseries:
+ if p in self.mqunapplied:
+ p = "<i>%s</i>" % p
+ elif p == self.mqpatch:
+ p = "<b>%s</b>" % p
+ buf += ' %s ' % (p)
+ buf += '</td></tr>\n'
+
+ buf += '<tr>'
+ if rev is None:
+ buf += "<td><b>Working Directory</b></td>\n"
+ else:
+ buf += '<td><b>Revision:</b> '\
+ '<span class="rev_number">%d</span>:'\
+ '<span class="rev_hash">%s</span></td>'\
+ '\n' % (ctx.rev(), short_hex(ctx.node()))
+
+ buf += '<td><b>Author:</b> '\
+ '%s</td>'\
+ '\n' % unicode(ctx.user(), 'utf-8', 'replace')
+ buf += '<td><b>Branch:</b> %s</td>' % ctx.branch()
+ buf += '</tr>'
+ buf += "</table>\n"
+ buf += "<table width=100%>\n"
+ parents = [p for p in ctx.parents() if p]
+ for p in parents:
+ if p.rev() > -1:
+ short = short_hex(p.node())
+ desc = format_desc(p.description(), self.descwidth)
+ p_rev = p.rev()
+ p_fmt = '<span class="rev_number">%s</span>:'\
+ '<a href="%s" class="rev_hash">%s</a>'
+ if p_rev == self.diffrev:
+ p_rev = '<b>%s</b>' % (p_fmt % (p_rev, p_rev, short))
+ else:
+ p_rev = p_fmt % ('<a href="diff_%s" class="rev_diff">%s</a>' % (p_rev, p_rev), p_rev, short)
+ buf += '<tr><td width=50 class="label"><b>Parent:</b></td>'\
+ '<td colspan=5>%s '\
+ '<span class="short_desc"><i>%s</i></span></td></tr>'\
+ '\n' % (p_rev, desc)
+ if len(parents) == 2:
+ p = parents[0].ancestor(parents[1])
+ short = short_hex(p.node())
+ desc = format_desc(p.description(), self.descwidth)
+ p_rev = p.rev()
+ p_fmt = '<span class="rev_number">%s</span>:'\
+ '<a href="%s" class="rev_hash">%s</a>'
+ if p_rev == self.diffrev:
+ p_rev = '<b>%s</b>' % (p_fmt % (p_rev, p_rev, short))
+ else:
+ p_rev = p_fmt % ('<a href="diff_%s" class="rev_diff">%s</a>' % (p_rev, p_rev), p_rev, short)
+ buf += '<tr><td width=50 class="label"><b>Ancestor:</b></td>'\
+ '<td colspan=5>%s '\
+ '<span class="short_desc"><i>%s</i></span></td></tr>'\
+ '\n' % (p_rev, desc)
+
+ for p in ctx.children():
+ if p.rev() > -1:
+ short = short_hex(p.node())
+ desc = format_desc(p.description(), self.descwidth)
+ buf += '<tr><td class="label"><b>Child:</b></td>'\
+ '<td colspan=5><span class="rev_number">%d</span>:'\
+ '<a href="%s" class="rev_hash">%s</a> '\
+ '<span class="short_desc"><i>%s</i></span></td></tr>'\
+ '\n' % (p.rev(), p.rev(), short, desc)
+
+ buf += "</table>\n"
+ desc = xml_escape(unicode(ctx.description(), 'utf-8', 'replace'))
+ desc = desc.replace('\n', '<br/>\n')
+ buf += '<div class="diff_desc"><p>%s</p></div>\n' % desc
+ self.setHtml(buf)
|
|
|
@@ -13,12 +13,7 @@ # 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 high level widgets for hg repo changelogs and filelogs
-"""
-import sys
-from mercurial.node import hex, short as short_hex, bin as short_bin
try:
from mercurial.error import RepoError
except ImportError: # old API
@@ -28,14 +23,8 @@Qt = QtCore.Qt
connect = QtCore.QObject.connect
SIGNAL = QtCore.SIGNAL
-nullvariant = QtCore.QVariant()
-from tortoisehg.util.util import format_desc, xml_escape
-
-from tortoisehg.hgqt.decorators import timeit
-from tortoisehg.hgqt.config import HgConfig
from tortoisehg.hgqt import icon as geticon
-from tortoisehg.hgqt.manifestdialog import ManifestDialog
from tortoisehg.hgqt.quickbar import QuickBar
class GotoQuickBar(QuickBar):
@@ -308,157 +297,3 @@ def prevRev(self):
row = self.currentIndex().row()
self.setCurrentIndex(self.model().index(max(row - 1, 0), 0))
-
-
-class RevDisplay(QtGui.QTextBrowser):
- """
- Display metadata for one revision (rev, author, description, etc.)
- """
- def __init__(self, parent=None):
- QtGui.QTextBrowser.__init__(self, parent)
- self.descwidth = 60 # number of chars displayed for parent/child descriptions
- connect(self,
- SIGNAL('anchorClicked(const QUrl &)'),
- self.anchorClicked)
-
- def anchorClicked(self, qurl):
- """
- Callback called when a link is clicked in the text browser
- """
- rev = str(qurl.toString())
- if rev.startswith('diff_'):
- self.diffrev = int(rev[5:])
- self.refreshDisplay()
- # TODO: emit a signal to recompute the diff
- self.emit(SIGNAL('parentRevisionSelected'), self.diffrev)
- else:
- self.emit(SIGNAL('revisionSelected'), int(rev))
-
- def setDiffRevision(self, rev):
- if rev != self.diffrev:
- self.diffrev = rev
- self.refreshDisplay()
-
- def displayRevision(self, ctx):
- self.ctx = ctx
- self.diffrev = ctx.parents()[0].rev()
- if hasattr(self.ctx._repo, "mq"):
- self.mqseries = self.ctx._repo.mq.series[:]
- self.mqunapplied = [x[1] for x in self.ctx._repo.mq.unapplied(self.ctx._repo)]
- mqpatch = set(self.ctx.tags()).intersection(self.mqseries)
- if mqpatch:
- self.mqpatch = mqpatch.pop()
- else:
- self.mqpatch = None
- else:
- self.mqseries = []
- self.mqunapplied = []
- self.mqpatch = None
-
- self.refreshDisplay()
-
- def selectNone(self):
- cursor = self.textCursor()
- cursor.clearSelection()
- cursor.setPosition(0)
- self.setTextCursor(cursor)
- self.setExtraSelections([])
-
- def searchString(self, text):
- self.selectNone()
- if text in unicode(self.toPlainText()):
- clist = []
- while self.find(text):
- eselect = self.ExtraSelection()
- eselect.cursor = self.textCursor()
- eselect.format.setBackground(QtGui.QColor('#ffffbb'))
- clist.append(eselect)
- self.selectNone()
- self.setExtraSelections(clist)
- def finditer(self, text):
- if text:
- while True:
- if self.find(text):
- yield self.ctx.rev(), None
- else:
- break
- return finditer(self, text)
-
- def refreshDisplay(self):
- ctx = self.ctx
- rev = ctx.rev()
- buf = "<table width=100%>\n"
- if self.mqpatch:
- buf += '<tr bgcolor=%s>' % HgConfig(ctx._repo.ui).getMQFGColor()
- buf += '<td colspan=3 width=100%><b>Patch queue:</b> '
- for p in self.mqseries:
- if p in self.mqunapplied:
- p = "<i>%s</i>" % p
- elif p == self.mqpatch:
- p = "<b>%s</b>" % p
- buf += ' %s ' % (p)
- buf += '</td></tr>\n'
-
- buf += '<tr>'
- if rev is None:
- buf += "<td><b>Working Directory</b></td>\n"
- else:
- buf += '<td><b>Revision:</b> '\
- '<span class="rev_number">%d</span>:'\
- '<span class="rev_hash">%s</span></td>'\
- '\n' % (ctx.rev(), short_hex(ctx.node()))
-
- buf += '<td><b>Author:</b> '\
- '%s</td>'\
- '\n' % unicode(ctx.user(), 'utf-8', 'replace')
- buf += '<td><b>Branch:</b> %s</td>' % ctx.branch()
- buf += '</tr>'
- buf += "</table>\n"
- buf += "<table width=100%>\n"
- parents = [p for p in ctx.parents() if p]
- for p in parents:
- if p.rev() > -1:
- short = short_hex(p.node())
- desc = format_desc(p.description(), self.descwidth)
- p_rev = p.rev()
- p_fmt = '<span class="rev_number">%s</span>:'\
- '<a href="%s" class="rev_hash">%s</a>'
- if p_rev == self.diffrev:
- p_rev = '<b>%s</b>' % (p_fmt % (p_rev, p_rev, short))
- else:
- p_rev = p_fmt % ('<a href="diff_%s" class="rev_diff">%s</a>' % (p_rev, p_rev), p_rev, short)
- buf += '<tr><td width=50 class="label"><b>Parent:</b></td>'\
- '<td colspan=5>%s '\
- '<span class="short_desc"><i>%s</i></span></td></tr>'\
- '\n' % (p_rev, desc)
- if len(parents) == 2:
- p = parents[0].ancestor(parents[1])
- short = short_hex(p.node())
- desc = format_desc(p.description(), self.descwidth)
- p_rev = p.rev()
- p_fmt = '<span class="rev_number">%s</span>:'\
- '<a href="%s" class="rev_hash">%s</a>'
- if p_rev == self.diffrev:
- p_rev = '<b>%s</b>' % (p_fmt % (p_rev, p_rev, short))
- else:
- p_rev = p_fmt % ('<a href="diff_%s" class="rev_diff">%s</a>' % (p_rev, p_rev), p_rev, short)
- buf += '<tr><td width=50 class="label"><b>Ancestor:</b></td>'\
- '<td colspan=5>%s '\
- '<span class="short_desc"><i>%s</i></span></td></tr>'\
- '\n' % (p_rev, desc)
-
- for p in ctx.children():
- if p.rev() > -1:
- short = short_hex(p.node())
- desc = format_desc(p.description(), self.descwidth)
- buf += '<tr><td class="label"><b>Child:</b></td>'\
- '<td colspan=5><span class="rev_number">%d</span>:'\
- '<a href="%s" class="rev_hash">%s</a> '\
- '<span class="short_desc"><i>%s</i></span></td></tr>'\
- '\n' % (p.rev(), p.rev(), short, desc)
-
- buf += "</table>\n"
- desc = xml_escape(unicode(ctx.description(), 'utf-8', 'replace'))
- desc = desc.replace('\n', '<br/>\n')
- buf += '<div class="diff_desc"><p>%s</p></div>\n' % desc
- self.setHtml(buf)
|
|
|
@@ -234,7 +234,7 @@ <customwidget>
<class>RevDisplay</class>
<extends>QTextBrowser</extends>
- <header>repoview.h</header>
+ <header>changeset.h</header>
</customwidget>
<customwidget>
<class>HgFileListView</class>
|
||
|
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\workbench.ui'
#
-# Created: Sun May 02 14:21:29 2010
+# Created: Sun May 02 16:24:14 2010
# by: PyQt4 UI code generator 4.7.3
#
# WARNING! All changes made in this file will be lost!
@@ -141,7 +141,8 @@ self.actionDisplayAllBranches.setText(QtGui.QApplication.translate("MainWindow", "displayAllBranches", None, QtGui.QApplication.UnicodeUTF8))
self.actionHelp.setText(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8))
+from changeset import RevDisplay
from filelistview import HgFileListView
from fileview import HgFileView
-from repoview import HgRepoView, RevDisplay
+from repoview import HgRepoView
import workbench_rc
|
||
Add a tag
Loading...