We are currently indexing your data, so search results may be incomplete until we finish.
|
|
# 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.
"""
Qt4 high level widgets for hg repo changelogs and filelogs
"""
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, wctxactions
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4 import Qsci
qsci = Qsci.QsciScintilla
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._lostMode = None
self._lastSearch = u'', False
self._lastScrollPosition = 0
self.actionDiffMode = QAction(qtlib.geticon('view-diff'),
_('View change as unified diff output'),
self)
self.actionDiffMode.setCheckable(True)
self.actionFileMode = QAction(qtlib.geticon('view-file'),
_('View change in context of file'),
self)
self.actionFileMode.setCheckable(True)
self.actionAnnMode = QAction(qtlib.geticon('view-annotate'),
_('View change in context, annotate with '
'revision number'),
self)
self.actionAnnMode.setCheckable(True)
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.forceMode('diff')
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.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 = {self.actionDiffMode.text():'diff',
self.actionFileMode.text():'file',
self.actionAnnMode.text() :'ann'}[action.text()]
self.actionNextDiff.setEnabled(mode == 'file')
self.actionPrevDiff.setEnabled(False)
self.blk.setVisible(mode == 'file')
self.sci.setAnnotationEnabled(mode == 'ann')
if mode != self._mode:
self._mode = mode
if not self._lostMode:
self.displayFile()
def forceMode(self, mode):
'Force into file or diff mode, based on content constaints'
assert mode in ('diff', 'file')
if self._lostMode is None:
self._lostMode = self._mode
self._mode = mode
if mode == 'diff':
self.actionDiffMode.setChecked(True)
else:
self.actionFileMode.setChecked(True)
self.actionDiffMode.setEnabled(False)
self.actionFileMode.setEnabled(False)
self.actionAnnMode.setEnabled(False)
self.actionNextDiff.setEnabled(False)
self.actionPrevDiff.setEnabled(False)
self.blk.setVisible(mode == 'file')
self.sci.setAnnotationEnabled(False)
def setContext(self, ctx):
self._ctx = ctx
self._p_rev = None
self.sci.setTabWidth(ctx._repo.tabwidth)
self.actionAnnMode.setVisible(ctx.rev() != None)
self.actionShelf.setVisible(ctx.rev() == None)
def displayDiff(self, rev):
if rev != self._p_rev:
self.displayFile(rev=rev)
@pyqtSlot()
def clearDisplay(self):
self._filename = None
self._lastScrollPosition = 0
self.forceMode('diff')
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, rev=None, status=None):
# Get the last visible line to restore it after reloading the editor
self._lastScrollPosition = self.sci.firstVisibleLine()
if filename is None:
filename, status = self._filename, self._status
else:
if self._filename != filename:
# Reset the scroll positions when the file is changed
self._lastScrollPosition = 0
self._filename, self._status = filename, status
if isinstance(filename, (unicode, QString)):
filename = hglib.fromunicode(filename)
if rev is not None:
self._p_rev = rev
self.clearMarkup()
if filename is None:
self.forceMode('file')
return
if self._p_rev is not None:
ctx2 = self.repo[self._p_rev]
else:
ctx2 = None
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.forceMode('file')
return
if fd.diff and not fd.contents:
self.forceMode('diff')
elif fd.contents and not fd.diff:
self.forceMode('file')
elif not fd.contents and not fd.diff:
self.forceMode('file')
else:
self.actionDiffMode.setEnabled(True)
self.actionFileMode.setEnabled(True)
self.actionAnnMode.setEnabled(True)
if self._lostMode:
if self._lostMode == 'diff':
self.actionDiffMode.trigger()
elif self._lostMode == 'file':
self.actionFileMode.trigger()
elif self._lostMode == 'ann':
self.actionAnnMode.trigger()
self._lostMode = None
if self._mode == 'diff':
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
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 == 'ann':
self.sci.setSource(filename, self._ctx.rev())
# Recover the last scroll position
# Make sure that _lastScrollPosition never exceeds the amount of
# lines on the editor
self._lastScrollPosition = min(self._lastScrollPosition, \
self.sci.lines() - 1)
self.sci.verticalScrollBar().setValue(self._lastScrollPosition)
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
self._lastScrollPosition = min(self._lastScrollPosition, \
self.sci.lines() - 1)
self.sci.verticalScrollBar().setValue(self._lastScrollPosition)
self.highlightText(*self._lastSearch)
uf = hglib.tounicode(self._filename)
self.fileDisplayed.emit(uf, fd.contents or QString())
if self._mode == 'file' 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):
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])
wctxactions.edit(self, self.repo.ui, self.repo, files, line, pattern)
@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 == 'diff' 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 == 'diff' 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):
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, util.Abort), 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'
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(subrelpath, sfrom, sto):
"""Generate a subrepository revision change description"""
out = []
opts = {'date':None, 'user':None, 'rev':[sfrom]}
subabspath = os.path.join(repo.root, subrelpath)
missingsub = not os.path.isdir(subabspath)
def isinitialrevision(rev):
return all([el == '0' for el in rev])
if isinitialrevision(sfrom):
sfrom = ''
if isinitialrevision(sto):
sto = ''
if not sfrom and not sto:
sstatedesc = 'new'
out.append(_('Subrepo created and set to initial revision.') + u'\n\n')
return out, sstatedesc
elif not sfrom:
sstatedesc = 'new'
out.append(_('Subrepo initialized to revision:') + u'\n\n')
elif not sto:
sstatedesc = 'removed'
out.append(_('Subrepo removed from repository.') + u'\n\n')
return out, sstatedesc
else:
sstatedesc = 'changed'
out.append(_('Revision has changed from:') + u'\n\n')
if missingsub:
out.append(hglib.tounicode(_('changeset: %s') % sfrom + '\n'))
else:
_ui.pushbuffer()
commands.log(_ui, srepo, **opts)
out.append(hglib.tounicode(_ui.popbuffer()))
out.append(_('To:') + u'\n')
if missingsub:
stolog = _('changeset: %s') % sto + '\n\n'
stolog += _('Subrepository not found in working directory.') + '\n'
stolog += _('Further subrepository revision information cannot be retrieved.') + '\n'
else:
opts['rev'] = [sto]
_ui.pushbuffer()
commands.log(_ui, srepo, **opts)
stolog = _ui.popbuffer()
if not stolog:
stolog = _('Initial revision')
out.append(hglib.tounicode(stolog))
return out, sstatedesc
srev = ctx.substate.get(wfile, subrepo.nullstate)[1]
srepo = None
try:
subabspath = os.path.join(repo.root, wfile)
if not os.path.isdir(subabspath):
sactual = ''
else:
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
except (util.Abort), e:
sactual = ''
out = []
_ui = uimod.ui()
if srepo is None or ctx.rev() is not None:
data = []
else:
_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]
subrepochange, sstatedesc = genSubrepoRevChangedDescription(wfile, sparent, srev)
out += subrepochange
else:
sstatedesc = 'dirty'
if srev != sactual:
subrepochange, sstatedesc = \
genSubrepoRevChangedDescription(wfile, srev, sactual)
out += subrepochange
if data:
sstatedesc += ' and dirty'
self.contents = u''.join(out)
if not sactual:
sstatedesc = 'removed'
lbl = {
'changed': _('(is a changed sub-repository)'),
'dirty': _('(is a dirty sub-repository)'),
'new': _('(is a new sub-repository)'),
'removed': _('(is a removed sub-repository)'),
'changed and dirty': _('(is a changed and dirty sub-repository)'),
'new and dirty': _('(is a new and dirty sub-repository)')
}[sstatedesc]
self.flabel += ' <i>' + lbl + '</i>'
if sactual:
lbl = _(' <a href="subrepo:%s">open...</a>')
self.flabel += lbl % hglib.tounicode(srepo.root)
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)
|
Loading...