We are currently indexing your data, so search results may be incomplete until we finish.
filedata: split FileData class into its own module
Changeset ade2ff756fd1…
Parent 1a0b97b0a711…
by
Changes to 3 files · Browse files at ade2ff756fd1 Showing diff from parent 1a0b97b0a711 Diff from another changeset...
-
tortoisehg/hgqt/chunks.py
-
tortoisehg/hgqt/filedata.py
copied from tortoisehg/hgqt/fileview.py
-
tortoisehg/hgqt/fileview.py
|
@@ -16,7 +16,7 @@ from tortoisehg.util.patchctx import patchctx
from tortoisehg.hgqt.i18n import _
from tortoisehg.hgqt import qtlib, thgrepo, qscilib, lexers
-from tortoisehg.hgqt import filelistmodel, filelistview, fileview
+from tortoisehg.hgqt import filelistmodel, filelistview, filedata
from PyQt4.QtCore import *
from PyQt4.QtGui import *
@@ -572,7 +572,7 @@ self._lastfile = filename
self.clearChunks()
- fd = fileview.FileData(self._ctx, None, filename, status)
+ fd = filedata.FileData(self._ctx, None, filename, status)
if fd.elabel:
self.extralabel.setText(fd.elabel)
|
||
|
Change 1 of 3
Show Entire File
tortoisehg/hgqt/filedata.py
Stacked
copied from tortoisehg/hgqt/fileview.py
|
||
|---|---|---|
|
|
@@ -1,557 +1,17 @@ - # Copyright (c) 2009-2010 LOGILAB S.A. (Paris, FRANCE).
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# filedata.py - generate displayable file data
#
-# 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.
+# Copyright 2011 Steve Borho <steve@borho.org>
#
-# 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 high level widgets for hg repo changelogs and filelogs
-"""
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
-import difflib
-import re
-from mercurial import hg, error, match, patch, util
-from mercurial import ui as uimod, mdiff
+from mercurial import error, match, patch, util, mdiff
+from mercurial import ui as uimod
from tortoisehg.util import hglib, patchctx
from tortoisehg.hgqt.i18n import _
-from tortoisehg.hgqt import annotate, qscilib, qtlib, blockmatcher, lexers
-from tortoisehg.hgqt import visdiff
-
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-from PyQt4 import Qsci
-
-qsci = Qsci.QsciScintilla
-
-DiffMode = 1
-FileMode = 2
-AnnMode = 3
-
-class HgFileView(QFrame):
- """file diff and content viewer"""
-
- linkActivated = pyqtSignal(QString)
- fileDisplayed = pyqtSignal(QString, QString)
- showMessage = pyqtSignal(QString)
- revisionSelected = pyqtSignal(int)
- shelveToolExited = pyqtSignal()
-
- searchRequested = pyqtSignal(unicode)
- """Emitted (pattern) when user request to search content"""
-
- grepRequested = pyqtSignal(unicode, dict)
- """Emitted (pattern, opts) when user request to search changelog"""
-
- def __init__(self, repo, parent):
- QFrame.__init__(self, parent)
- framelayout = QVBoxLayout(self)
- framelayout.setContentsMargins(0,0,0,0)
- framelayout.setSpacing(0)
-
- l = QHBoxLayout()
- l.setContentsMargins(0,0,0,0)
- l.setSpacing(0)
-
- self.repo = repo
- self.topLayout = QVBoxLayout()
-
- self.labelhbox = hbox = QHBoxLayout()
- hbox.setContentsMargins(0,0,0,0)
- hbox.setSpacing(2)
- self.topLayout.addLayout(hbox)
-
- self.diffToolbar = QToolBar(_('Diff Toolbar'))
- self.diffToolbar.setIconSize(QSize(16,16))
- hbox.addWidget(self.diffToolbar)
-
- self.filenamelabel = w = QLabel()
- w.setWordWrap(True)
- f = w.textInteractionFlags()
- w.setTextInteractionFlags(f | Qt.TextSelectableByMouse)
- w.linkActivated.connect(self.linkActivated)
- hbox.addWidget(w, 1)
-
- self.extralabel = w = QLabel()
- w.setWordWrap(True)
- w.linkActivated.connect(self.linkActivated)
- self.topLayout.addWidget(w)
- w.hide()
-
- framelayout.addLayout(self.topLayout)
- framelayout.addLayout(l, 1)
-
- hbox = QHBoxLayout()
- hbox.setContentsMargins(0, 0, 0, 0)
- hbox.setSpacing(0)
- l.addLayout(hbox)
-
- self.blk = blockmatcher.BlockList(self)
- self.sci = annotate.AnnotateView(repo, self)
- hbox.addWidget(self.blk)
- hbox.addWidget(self.sci, 1)
-
- for name in ('searchRequested', 'editSelected', 'grepRequested'):
- getattr(self.sci, name).connect(getattr(self, name))
- self.sci.revisionHint.connect(self.showMessage)
- self.sci.sourceChanged.connect(self.sourceChanged)
- self.sci.setAnnotationEnabled(False)
-
- self.blk.linkScrollBar(self.sci.verticalScrollBar())
- self.blk.setVisible(False)
-
- self.sci.setFrameStyle(0)
- self.sci.setReadOnly(True)
- self.sci.setUtf8(True)
- self.sci.installEventFilter(qscilib.KeyPressInterceptor(self))
- self.sci.setCaretLineVisible(False)
-
- # define markers for colorize zones of diff
- self.markerplus = self.sci.markerDefine(qsci.Background)
- self.markerminus = self.sci.markerDefine(qsci.Background)
- self.markertriangle = self.sci.markerDefine(qsci.Background)
- self.sci.setMarkerBackgroundColor(QColor('#B0FFA0'), self.markerplus)
- self.sci.setMarkerBackgroundColor(QColor('#A0A0FF'), self.markerminus)
- self.sci.setMarkerBackgroundColor(QColor('#FFA0A0'), self.markertriangle)
-
- # hide margin 0 (markers)
- self.sci.setMarginType(0, qsci.SymbolMargin)
- self.sci.setMarginWidth(0, 0)
-
- self.searchbar = qscilib.SearchToolBar(hidable=True)
- self.searchbar.hide()
- self.searchbar.searchRequested.connect(self.find)
- self.searchbar.conditionChanged.connect(self.highlightText)
- self.layout().addWidget(self.searchbar)
-
- self._ctx = None
- self._filename = None
- self._status = None
- self._mode = None
- self._parent = 0
- self._lostMode = None
- self._lastSearch = u'', False
-
- self.actionDiffMode = QAction(qtlib.geticon('view-diff'),
- _('View change as unified diff output'),
- self)
- self.actionDiffMode.setCheckable(True)
- self.actionDiffMode._mode = DiffMode
- self.actionFileMode = QAction(qtlib.geticon('view-file'),
- _('View change in context of file'),
- self)
- self.actionFileMode.setCheckable(True)
- self.actionFileMode._mode = FileMode
- self.actionAnnMode = QAction(qtlib.geticon('view-annotate'),
- _('annotate with revision numbers'),
- self)
- self.actionAnnMode.setCheckable(True)
- self.actionAnnMode._mode = AnnMode
-
- self.modeToggleGroup = QActionGroup(self)
- self.modeToggleGroup.addAction(self.actionDiffMode)
- self.modeToggleGroup.addAction(self.actionFileMode)
- self.modeToggleGroup.addAction(self.actionAnnMode)
- self.modeToggleGroup.triggered.connect(self.setMode)
-
- # Next/Prev diff (in full file mode)
- self.actionNextDiff = QAction(qtlib.geticon('go-down'),
- 'Next diff (alt+down)', self)
- self.actionNextDiff.setShortcut('Alt+Down')
- self.actionNextDiff.triggered.connect(self.nextDiff)
- self.actionPrevDiff = QAction(qtlib.geticon('go-up'),
- 'Previous diff (alt+up)', self)
- self.actionPrevDiff.setShortcut('Alt+Up')
- self.actionPrevDiff.triggered.connect(self.prevDiff)
- self.setMode(self.actionDiffMode)
-
- self.actionFirstParent = QAction('1', self)
- self.actionFirstParent.setCheckable(True)
- self.actionFirstParent.setChecked(True)
- self.actionFirstParent.setShortcut('CTRL+1')
- self.actionFirstParent.setToolTip(_('Show changes from first parent'))
- self.actionSecondParent = QAction('2', self)
- self.actionSecondParent.setCheckable(True)
- self.actionSecondParent.setShortcut('CTRL+2')
- self.actionSecondParent.setToolTip(_('Show changes from second parent'))
- self.parentToggleGroup = QActionGroup(self)
- self.parentToggleGroup.addAction(self.actionFirstParent)
- self.parentToggleGroup.addAction(self.actionSecondParent)
- self.parentToggleGroup.triggered.connect(self.setParent)
-
- self.actionFind = self.searchbar.toggleViewAction()
- self.actionFind.setIcon(qtlib.geticon('edit-find'))
- self.actionFind.setToolTip(_('Toggle display of text search bar'))
- self.actionFind.setShortcut(QKeySequence.Find)
-
- self.actionShelf = QAction('Shelve', self)
- self.actionShelf.setIcon(qtlib.geticon('shelve'))
- self.actionShelf.setToolTip(_('Open shelve tool'))
- self.actionShelf.triggered.connect(self.launchShelve)
-
- tb = self.diffToolbar
- tb.addAction(self.actionFirstParent)
- tb.addAction(self.actionSecondParent)
- tb.addSeparator()
- tb.addAction(self.actionDiffMode)
- tb.addAction(self.actionFileMode)
- tb.addAction(self.actionAnnMode)
- tb.addSeparator()
- tb.addAction(self.actionNextDiff)
- tb.addAction(self.actionPrevDiff)
- tb.addSeparator()
- tb.addAction(self.actionFind)
- tb.addAction(self.actionShelf)
-
- self.timer = QTimer()
- self.timer.setSingleShot(False)
- self.timer.timeout.connect(self.timerBuildDiffMarkers)
-
- def launchShelve(self):
- from tortoisehg.hgqt import shelve
- # TODO: pass self._filename
- dlg = shelve.ShelveDialog(self.repo, self)
- dlg.finished.connect(dlg.deleteLater)
- dlg.exec_()
- self.shelveToolExited.emit()
-
- def setFont(self, font):
- self.sci.setFont(font)
-
- def loadSettings(self, qs, prefix):
- self.sci.loadSettings(qs, prefix)
-
- def saveSettings(self, qs, prefix):
- self.sci.saveSettings(qs, prefix)
-
- def setRepo(self, repo):
- self.repo = repo
- self.sci.repo = repo
-
- @pyqtSlot(QAction)
- def setMode(self, action):
- 'One of the mode toolbar buttons has been toggled'
- mode = action._mode
- if mode != self._mode:
- self._mode = mode
- self.actionNextDiff.setEnabled(False)
- self.actionPrevDiff.setEnabled(False)
- self.blk.setVisible(mode == FileMode)
- self.sci.setAnnotationEnabled(mode == AnnMode)
- self.displayFile(self._filename, self._status)
-
- @pyqtSlot(QAction)
- def setParent(self, action):
- if action.text() == '1':
- parent = 0
- else:
- parent = 1
- if self._parent != parent:
- self._parent = parent
- self.displayFile(self._filename, self._status)
-
- def restrictModes(self, candiff, canfile, canann):
- 'Disable modes based on content constraints'
- self.actionDiffMode.setEnabled(candiff)
- self.actionFileMode.setEnabled(canfile)
- self.actionAnnMode.setEnabled(canann)
-
- # Switch mode if necessary
- mode = self._mode
- if not candiff and mode == DiffMode and canfile:
- mode = FileMode
- if not canfile and mode != DiffMode:
- mode = DiffMode
- if self._lostMode is None:
- self._lostMode = self._mode
- if self._mode != mode:
- self.actionNextDiff.setEnabled(False)
- self.actionPrevDiff.setEnabled(False)
- self.blk.setVisible(mode == FileMode)
- self.sci.setAnnotationEnabled(mode == AnnMode)
- self._mode = mode
-
- if self._mode == DiffMode:
- self.actionDiffMode.setChecked(True)
- elif self._mode == FileMode:
- self.actionFileMode.setChecked(True)
- else:
- self.actionAnnMode.setChecked(True)
-
- def setContext(self, ctx, ctx2=None):
- self._ctx = ctx
- self._ctx2 = ctx2
- self.sci.setTabWidth(ctx._repo.tabwidth)
- self.actionAnnMode.setVisible(ctx.rev() != None)
- self.actionShelf.setVisible(ctx.rev() == None)
- self.actionFirstParent.setVisible(len(ctx.parents()) == 2)
- self.actionSecondParent.setVisible(len(ctx.parents()) == 2)
- self.actionFirstParent.setEnabled(len(ctx.parents()) == 2)
- self.actionSecondParent.setEnabled(len(ctx.parents()) == 2)
-
- def showLine(self, line):
- if line < self.sci.lines():
- self.sci.setCursorPosition(line, 0)
-
- @pyqtSlot()
- def clearDisplay(self):
- self._filename = None
- self.restrictModes(False, False, False)
- self.sci.setMarginWidth(1, 0)
- self.clearMarkup()
-
- def clearMarkup(self):
- self.sci.clear()
- self.blk.clear()
- # Setting the label to ' ' rather than clear() keeps the label
- # from disappearing during refresh, and tool layouts bouncing
- self.filenamelabel.setText(' ')
- self.extralabel.hide()
-
- def displayFile(self, filename=None, status=None):
- if isinstance(filename, (unicode, QString)):
- filename = hglib.fromunicode(filename)
- status = hglib.fromunicode(status)
- if self._filename == filename:
- # Get the last visible line to restore it after reloading the editor
- lastScrollPosition = self.sci.firstVisibleLine()
- else:
- # Reset the scroll positions when the file is changed
- lastScrollPosition = 0
- self._filename, self._status = filename, status
-
- self.clearMarkup()
- if filename is None:
- self.restrictModes(False, False, False)
- return
-
- if self._ctx2:
- ctx2 = self._ctx2
- elif self._parent == 0 or len(self._ctx.parents()) == 1:
- ctx2 = self._ctx.p1()
- else:
- ctx2 = self._ctx.p2()
- fd = FileData(self._ctx, ctx2, filename, status)
-
- if fd.elabel:
- self.extralabel.setText(fd.elabel)
- self.extralabel.show()
- else:
- self.extralabel.hide()
- self.filenamelabel.setText(fd.flabel)
-
- if not fd.isValid():
- self.sci.setText(fd.error)
- self.restrictModes(False, False, False)
- return
-
- candiff = bool(fd.diff)
- canfile = bool(fd.contents)
- canann = canfile and type(self._ctx.rev()) is int
-
- if not candiff or not canfile:
- self.restrictModes(candiff, canfile, canann)
- else:
- self.actionDiffMode.setEnabled(True)
- self.actionFileMode.setEnabled(True)
- self.actionAnnMode.setEnabled(True)
- if self._lostMode:
- self._mode = self._lostMode
- if self._lostMode == DiffMode:
- self.actionDiffMode.trigger()
- elif self._lostMode == FileMode:
- self.actionFileMode.trigger()
- elif self._lostMode == AnnMode:
- self.actionAnnMode.trigger()
- self._lostMode = None
- self.blk.setVisible(self._mode == FileMode)
- self.sci.setAnnotationEnabled(self._mode == AnnMode)
-
- if self._mode == DiffMode:
- self.sci.setMarginWidth(1, 0)
- lexer = lexers.get_diff_lexer(self)
- self.sci.setLexer(lexer)
- if lexer is None:
- self.setFont(qtlib.getfont('fontlog').font())
- # trim first three lines, for example:
- # diff -r f6bfc41af6d7 -r c1b18806486d tortoisehg/hgqt/thgrepo.py
- # --- a/tortoisehg/hgqt/thgrepo.py
- # +++ b/tortoisehg/hgqt/thgrepo.py
- if fd.diff:
- out = fd.diff.split('\n', 3)
- if len(out) == 4:
- self.sci.setText(hglib.tounicode(out[3]))
- else:
- # there was an error or rename without diffs
- self.sci.setText(hglib.tounicode(fd.diff))
- elif fd.contents is None:
- return
- elif self._mode == AnnMode:
- self.sci.setSource(filename, self._ctx.rev())
- else:
- lexer = lexers.get_lexer(filename, fd.contents, self)
- self.sci.setLexer(lexer)
- if lexer is None:
- self.setFont(qtlib.getfont('fontlog').font())
- self.sci.setText(fd.contents)
- self.sci._updatemarginwidth()
-
- # Recover the last scroll position
- # Make sure that lastScrollPosition never exceeds the amount of
- # lines on the editor
- lastScrollPosition = min(lastScrollPosition, self.sci.lines() - 1)
- self.sci.verticalScrollBar().setValue(lastScrollPosition)
-
- self.highlightText(*self._lastSearch)
- uf = hglib.tounicode(self._filename)
- self.fileDisplayed.emit(uf, fd.contents or QString())
-
- if self._mode == FileMode and fd.contents and fd.olddata:
- # Update blk margin
- if self.timer.isActive():
- self.timer.stop()
-
- self._fd = fd
- self.actionNextDiff.setEnabled(False)
- self.actionPrevDiff.setEnabled(False)
- self.blk.syncPageStep()
- self.timer.start()
-
- #
- # These four functions are used by Shift+Cursor actions in revdetails
- #
- def nextLine(self):
- x, y = self.sci.getCursorPosition()
- self.sci.setCursorPosition(x+1, y)
-
- def prevLine(self):
- x, y = self.sci.getCursorPosition()
- self.sci.setCursorPosition(x-1, y)
-
- def nextCol(self):
- x, y = self.sci.getCursorPosition()
- self.sci.setCursorPosition(x, y+1)
-
- def prevCol(self):
- x, y = self.sci.getCursorPosition()
- self.sci.setCursorPosition(x, y-1)
-
- @pyqtSlot(unicode, object)
- @pyqtSlot(unicode, object, int)
- def sourceChanged(self, path, rev, line=None):
- if rev != self._ctx.rev() and type(rev) is int:
- self.revisionSelected.emit(rev)
-
- @pyqtSlot(unicode, object, int)
- def editSelected(self, path, rev, line):
- """Open editor to show the specified file"""
- path = hglib.fromunicode(path)
- base = visdiff.snapshot(self.repo, [path], self.repo[rev])[0]
- files = [os.path.join(base, path)]
- pattern = hglib.fromunicode(self._lastSearch[0])
- qtlib.editfiles(self.repo, files, line, pattern, self)
-
- @pyqtSlot(unicode, bool, bool, bool)
- def find(self, exp, icase=True, wrap=False, forward=True):
- self.sci.find(exp, icase, wrap, forward)
-
- @pyqtSlot(unicode, bool)
- def highlightText(self, match, icase=False):
- self._lastSearch = match, icase
- self.sci.highlightText(match, icase)
-
- def verticalScrollBar(self):
- return self.sci.verticalScrollBar()
-
- #
- # file mode diff markers
- #
- def timerBuildDiffMarkers(self):
- 'show modified and added lines in the self.blk margin'
- self.sci.setUpdatesEnabled(False)
- self.blk.setUpdatesEnabled(False)
-
- if self._fd:
- olddata = self._fd.olddata.splitlines()
- newdata = self._fd.contents.splitlines()
- diff = difflib.SequenceMatcher(None, olddata, newdata)
- self._opcodes = diff.get_opcodes()
- self._fd = None
- self._diffs = []
-
- for tag, alo, ahi, blo, bhi in self._opcodes[:30]:
- if tag == 'replace':
- self._diffs.append([blo, bhi])
- self.blk.addBlock('x', blo, bhi)
- for i in range(blo, bhi):
- self.sci.markerAdd(i, self.markertriangle)
- elif tag == 'insert':
- self._diffs.append([blo, bhi])
- self.blk.addBlock('+', blo, bhi)
- for i in range(blo, bhi):
- self.sci.markerAdd(i, self.markerplus)
- elif tag in ('equal', 'delete'):
- pass
- else:
- raise ValueError, 'unknown tag %r' % (tag,)
-
- self._opcodes = self._opcodes[30:]
- if not self._opcodes:
- self.actionNextDiff.setEnabled(bool(self._diffs))
- self.actionPrevDiff.setEnabled(False)
- self.timer.stop()
-
- self.sci.setUpdatesEnabled(True)
- self.blk.setUpdatesEnabled(True)
-
- def nextDiff(self):
- if self._mode == DiffMode or not self._diffs:
- self.actionNextDiff.setEnabled(False)
- self.actionPrevDiff.setEnabled(False)
- return
- row, column = self.sci.getCursorPosition()
- for i, (lo, hi) in enumerate(self._diffs):
- if lo > row:
- last = (i == (len(self._diffs)-1))
- self.sci.setCursorPosition(lo, 0)
- self.sci.verticalScrollBar().setValue(lo)
- break
- else:
- last = True
- self.actionNextDiff.setEnabled(not last)
- self.actionPrevDiff.setEnabled(True)
-
- def prevDiff(self):
- if self._mode == DiffMode or not self._diffs:
- self.actionNextDiff.setEnabled(False)
- self.actionPrevDiff.setEnabled(False)
- return
- row, column = self.sci.getCursorPosition()
- for i, (lo, hi) in enumerate(reversed(self._diffs)):
- if hi < row:
- first = (i == (len(self._diffs)-1))
- self.sci.setCursorPosition(lo, 0)
- self.sci.verticalScrollBar().setValue(lo)
- break
- else:
- first = True
- self.actionNextDiff.setEnabled(True)
- self.actionPrevDiff.setEnabled(not first)
-
- def nDiffs(self):
- return len(self._diffs)
-
class FileData(object):
def __init__(self, ctx, ctx2, wfile, status=None):
@@ -643,7 +103,7 @@ if status == 'S':
try:
from mercurial import subrepo, commands
-
+
def genSubrepoRevChangedDescription(sfrom, sto):
"""Generate a subrepository revision change description"""
out = []
@@ -661,7 +121,7 @@ commands.log(_ui, srepo, **opts)
out.append(hglib.tounicode(_ui.popbuffer()))
return out
-
+
srev = ctx.substate.get(wfile, subrepo.nullstate)[1]
sub = ctx.sub(wfile)
if isinstance(sub, subrepo.hgsubrepo):
|
|
|
|
@@ -19,15 +19,11 @@
import os
import difflib
-import re
-
-from mercurial import hg, error, match, patch, util
-from mercurial import ui as uimod, mdiff
from tortoisehg.util import hglib, patchctx
from tortoisehg.hgqt.i18n import _
from tortoisehg.hgqt import annotate, qscilib, qtlib, blockmatcher, lexers
-from tortoisehg.hgqt import visdiff
+from tortoisehg.hgqt import visdiff, filedata
from PyQt4.QtCore import *
from PyQt4.QtGui import *
@@ -342,7 +338,7 @@ ctx2 = self._ctx.p1()
else:
ctx2 = self._ctx.p2()
- fd = FileData(self._ctx, ctx2, filename, status)
+ fd = filedata.FileData(self._ctx, ctx2, filename, status)
if fd.elabel:
self.extralabel.setText(fd.elabel)
@@ -551,239 +547,3 @@
def nDiffs(self):
return len(self._diffs)
-
-
-class FileData(object):
- def __init__(self, ctx, ctx2, wfile, status=None):
- self.contents = None
- self.error = None
- self.olddata = None
- self.diff = None
- self.flabel = u''
- self.elabel = u''
- try:
- self.readStatus(ctx, ctx2, wfile, status)
- except (EnvironmentError, error.LookupError), e:
- self.error = hglib.tounicode(str(e))
-
- def checkMaxDiff(self, ctx, wfile):
- p = _('File or diffs not displayed: ')
- try:
- fctx = ctx.filectx(wfile)
- if ctx.rev() is None:
- size = fctx.size()
- else:
- # fctx.size() can read all data into memory in rename cases so
- # we read the size directly from the filelog, this is deeper
- # under the API than I prefer to go, but seems necessary
- size = fctx._filelog.rawsize(fctx.filerev())
- except (EnvironmentError, error.LookupError), e:
- self.error = p + hglib.tounicode(str(e))
- return None
- if size > ctx._repo.maxdiff:
- self.error = p + _('File is larger than the specified max size.\n')
- return None
- try:
- data = fctx.data()
- if '\0' in data:
- self.error = p + _('File is binary.\n')
- return None
- except EnvironmentError, e:
- self.error = p + hglib.tounicode(str(e))
- return None
- return fctx, data
-
- def isValid(self):
- return self.error is None
-
- def readStatus(self, ctx, ctx2, wfile, status):
- def getstatus(repo, n1, n2, wfile):
- m = match.exact(repo.root, repo.getcwd(), [wfile])
- modified, added, removed = repo.status(n1, n2, match=m)[:3]
- if wfile in modified:
- return 'M'
- if wfile in added:
- return 'A'
- if wfile in removed:
- return 'R'
- if wfile in ctx:
- return 'C'
- return None
-
- repo = ctx._repo
- self.flabel += u'<b>%s</b>' % hglib.tounicode(wfile)
-
- if isinstance(ctx, patchctx.patchctx):
- self.diff = ctx.thgmqpatchdata(wfile)
- flags = ctx.flags(wfile)
- if flags in ('x', '-'):
- lbl = _("exec mode has been <font color='red'>%s</font>")
- change = (flags == 'x') and _('set') or _('unset')
- self.elabel = lbl % change
- elif flags == 'l':
- self.flabel += _(' <i>(is a symlink)</i>')
- return
-
- absfile = repo.wjoin(wfile)
- if (wfile in ctx and 'l' in ctx.flags(wfile)) or \
- os.path.islink(absfile):
- if wfile in ctx:
- data = ctx[wfile].data()
- else:
- data = os.readlink(absfile)
- self.contents = hglib.tounicode(data)
- self.flabel += _(' <i>(is a symlink)</i>')
- return
-
- if status is None:
- status = getstatus(repo, ctx.p1().node(), ctx.node(), wfile)
- if ctx2 is None:
- ctx2 = ctx.p1()
-
- if status == 'S':
- try:
- from mercurial import subrepo, commands
-
- def genSubrepoRevChangedDescription(sfrom, sto):
- """Generate a subrepository revision change description"""
- out = []
- opts = {'date':None, 'user':None, 'rev':[sfrom]}
- if not sfrom:
- out.append(_('Subrepo initialized to revision:') + u'\n\n')
- else:
- out.append(_('Revision has changed from:') + u'\n\n')
- _ui.pushbuffer()
- commands.log(_ui, srepo, **opts)
- out.append(hglib.tounicode(_ui.popbuffer()))
- out.append(_('To:') + u'\n')
- opts['rev'] = [sto]
- _ui.pushbuffer()
- commands.log(_ui, srepo, **opts)
- out.append(hglib.tounicode(_ui.popbuffer()))
- return out
-
- srev = ctx.substate.get(wfile, subrepo.nullstate)[1]
- sub = ctx.sub(wfile)
- if isinstance(sub, subrepo.hgsubrepo):
- srepo = sub._repo
- sactual = srepo['.'].hex()
- else:
- self.error = _('Not a Mercurial subrepo, not previewable')
- return
- out = []
- _ui = uimod.ui()
- _ui.pushbuffer()
- commands.status(_ui, srepo)
- data = _ui.popbuffer()
- if data:
- out.append(_('File Status:') + u'\n')
- out.append(hglib.tounicode(data))
- out.append(u'\n')
- sstatedesc = 'changed'
- if ctx.rev() is not None:
- sparent = ctx.p1().substate.get(wfile, subrepo.nullstate)[1]
- out += genSubrepoRevChangedDescription(sparent, srev)
- else:
- sstatedesc = 'dirty'
- if srev == '':
- sstatedesc = 'new'
- out.append(_('New subrepository') + u'\n\n')
- elif srev != sactual:
- sstatedesc = 'changed'
- out.append(_('Revision has changed from:') + u'\n\n')
- opts = {'date':None, 'user':None, 'rev':[srev]}
- _ui.pushbuffer()
- commands.log(_ui, srepo, **opts)
- out.append(hglib.tounicode(_ui.popbuffer()))
- out.append(_('To:') + u'\n')
- opts['rev'] = [sactual]
- _ui.pushbuffer()
- commands.log(_ui, srepo, **opts)
- out.append(hglib.tounicode(_ui.popbuffer()))
- self.contents = u''.join(out)
- self.flabel += _(' <i>(is a %s sub-repository)</i>' % sstatedesc)
- lbl = u' <a href="subrepo:%s">%s...</a>'
- self.flabel += lbl % (hglib.tounicode(srepo.root), _('open'))
- except (EnvironmentError, error.RepoError, util.Abort), e:
- self.error = _('Error previewing subrepo: %s') % \
- hglib.tounicode(str(e))
- return
-
- # TODO: elif check if a subdirectory (for manifest tool)
-
- mde = _('File or diffs not displayed: ') + \
- _('File is larger than the specified max size.\n')
-
- if status in ('R', '!'):
- if wfile in ctx.p1():
- fctx = ctx.p1()[wfile]
- if fctx._filelog.rawsize(fctx.filerev()) > ctx._repo.maxdiff:
- self.error = mde
- else:
- olddata = fctx.data()
- if '\0' in olddata:
- self.error = 'binary file'
- else:
- self.contents = hglib.tounicode(olddata)
- self.flabel += _(' <i>(was deleted)</i>')
- else:
- self.flabel += _(' <i>(was added, now missing)</i>')
- return
-
- if status in ('I', '?', 'C'):
- if os.path.getsize(repo.wjoin(wfile)) > ctx._repo.maxdiff:
- self.error = mde
- else:
- data = open(repo.wjoin(wfile), 'r').read()
- if '\0' in data:
- self.error = 'binary file'
- else:
- self.contents = hglib.tounicode(data)
- if status in ('I', '?'):
- self.flabel += _(' <i>(is unversioned)</i>')
- return
-
- if status in ('M', 'A'):
- res = self.checkMaxDiff(ctx, wfile)
- if res is None:
- return
- fctx, newdata = res
- self.contents = hglib.tounicode(newdata)
- change = None
- for pfctx in fctx.parents():
- if 'x' in fctx.flags() and 'x' not in pfctx.flags():
- change = _('set')
- elif 'x' not in fctx.flags() and 'x' in pfctx.flags():
- change = _('unset')
- if change:
- lbl = _("exec mode has been <font color='red'>%s</font>")
- self.elabel = lbl % change
-
- if status == 'A':
- renamed = fctx.renamed()
- if not renamed:
- self.flabel += _(' <i>(was added)</i>')
- return
-
- oldname, node = renamed
- fr = hglib.tounicode(oldname)
- self.flabel += _(' <i>(renamed from %s)</i>') % fr
- olddata = repo.filectx(oldname, fileid=node).data()
- elif status == 'M':
- if wfile not in ctx2:
- # merge situation where file was added in other branch
- self.flabel += _(' <i>(was added)</i>')
- return
- oldname = wfile
- olddata = ctx2[wfile].data()
- else:
- return
-
- self.olddata = hglib.tounicode(olddata)
- newdate = util.datestr(ctx.date())
- olddate = util.datestr(ctx2.date())
- revs = [str(ctx), str(ctx2)]
- diffopts = patch.diffopts(repo.ui, {})
- diffopts.git = False
- self.diff = mdiff.unidiff(olddata, olddate, newdata, newdate,
- oldname, wfile, revs, diffopts)
|
|
Add a tag
Loading...