We are currently indexing your data, so search results may be incomplete until we finish.
status: introduce a Qt working copy browser (status)
This widget could serve as the basis for a commit tool "pane"
or a quick-op style application. With a few documented caveats.
Changeset 0383783f5e75…
Parent 36da6057988a…
by
Changes to 2 files · Browse files at 0383783f5e75 Showing diff from parent 36da6057988a Diff from another changeset...
|
@@ -336,8 +336,8 @@ qtrun(run, ui, *pats, **opts)
def test(ui, *pats, **opts):
- """bug report dialog"""
- from tortoisehg.hgqt.chunkselect import run
+ """test arbitrary widgets"""
+ from tortoisehg.hgqt.status import run
qtrun(run, ui, *pats, **opts)
def bug(ui, *pats, **opts):
|
||
|
|
|
@@ -0,0 +1,175 @@ + # status.py - working copy browser
+#
+# 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.
+
+from mercurial import ui, hg, util, patch, cmdutil, error, mdiff
+from tortoisehg.hgqt import qtlib, htmlui
+from tortoisehg.util import paths, hglib
+from tortoisehg.util.i18n import _
+
+from PyQt4.QtCore import Qt, QAbstractTableModel, QVariant, SIGNAL
+from PyQt4.QtGui import QWidget, QVBoxLayout, QSplitter, QTableView, QTextEdit, QFont
+
+# This widget can be used as the basis of the commit tool or any other
+# working copy browser.
+
+# A QuickOp style dialog will need to create the workingctx instance by
+# hand, not using repo[None], in order to pass in the results from its
+# own call to localrepo.status(), else it will not be able to see clean
+# or ignored files.
+
+# Technical Debt
+# use proper 'fromunicode'
+# filter using pats
+# show example of wctx manual creation
+# wctx.ignored() does not exist, need a back-door
+# Handle large files, binary files, subrepos better
+# Thread refreshWctx, connect to an external progress bar
+# Thread rowSelected, connect to an external progress bar
+# Need a mechanism to clear pats
+# Save splitter position, use parent's QSetting
+# Show merge status column, when appropriate
+# Context menu, toolbar
+# Sorting, filtering of working files
+# Chunk selection
+# tri-state checkboxes for commit
+# Select entire table row when clicked
+# File type (unknown/deleted) toggles
+
+class StatusWidget(QWidget):
+ def __init__(self, pats, parent=None):
+ QWidget.__init__(self, parent)
+
+ root = paths.find_root()
+ assert(root)
+ self.repo = hg.repository(ui.ui(), path=root)
+ self.wctx = self.repo[None]
+
+ self.tv = QTableView()
+ vh = self.tv.verticalHeader()
+ vh.setVisible(False)
+ self.connect(self.tv, SIGNAL('clicked(QModelIndex)'), self.rowSelected)
+
+ self.te = QTextEdit()
+ self.te.document().setDefaultStyleSheet(qtlib.thgstylesheet)
+ self.te.setReadOnly(True)
+ self.te.setLineWrapMode(QTextEdit.NoWrap)
+ # it is not clear why I had to set this QFont to get monospace
+ f = QFont("Monospace")
+ f.setStyleHint(QFont.TypeWriter)
+ f.setPointSize(9)
+ self.te.setFont(f)
+
+ split = QSplitter(Qt.Horizontal)
+ split.addWidget(self.tv)
+ split.addWidget(self.te)
+
+ layout = QVBoxLayout()
+ layout.addWidget(split)
+ self.setLayout(layout)
+ if not parent:
+ self.setWindowTitle(_('TortoiseHg Status'))
+ self.resize(650, 400)
+ # 60% for diff pane
+ split.setStretchFactor(0, 2)
+ split.setStretchFactor(1, 5)
+
+ self.refreshWctx()
+ self.updateModel()
+
+ def refreshWctx(self):
+ hglib.invalidaterepo(self.repo)
+ wctx = self.repo[None]
+ try:
+ # Force wctx to load _status property
+ wctx.unknown()
+ except (OSError, IOError, util.Abort), e:
+ self.status_error = str(e)
+ self.wctx = wctx
+
+ def isMerge(self):
+ return bool(self.wctx.p2())
+
+ def updateModel(self):
+ tm = WctxModel(self.wctx)
+ self.tv.setModel(tm)
+ self.tv.resizeColumnsToContents()
+ self.tv.resizeRowsToContents()
+ hh = self.tv.horizontalHeader()
+ hh.setStretchLastSection(True)
+
+ def rowSelected(self, index):
+ pfile = index.sibling(index.row(), 1).data().toString()
+ pfile = str(pfile) # TODO: use proper 'fromunicode'
+ wfile = util.pconvert(pfile)
+ hu = htmlui.htmlui()
+ try:
+ m = cmdutil.matchfiles(self.repo, [wfile])
+ opts = mdiff.diffopts(git=True, nodates=True)
+ n2, n1 = None, self.wctx.p1().node()
+ for s, l in patch.difflabel(patch.diff, self.repo, n1, n2, match=m, opts=opts):
+ hu.write(s, label=l)
+ except (IOError, error.RepoError, error.LookupError, util.Abort), e:
+ self.status_error = str(e)
+ o, e = hu.getdata()
+ self.te.setHtml(o)
+
+
+class WctxModel(QAbstractTableModel):
+ def __init__(self, wctx):
+ QAbstractTableModel.__init__(self)
+ data = []
+ for m in wctx.modified():
+ data.append(('M', m))
+ for a in wctx.added():
+ data.append(('A', a))
+ for r in wctx.removed():
+ data.append(('R', r))
+ for d in wctx.deleted():
+ data.append(('!', d))
+ for u in wctx.unknown():
+ data.append(('?', u))
+ # TODO: wctx.ignored() does not exist
+ #for i in wctx.ignored():
+ # data.append(('I', i))
+ for c in wctx.clean():
+ data.append(('C', c))
+ try:
+ for s in wctx.substate:
+ if wctx.sub(s).dirty():
+ data.append(('S', s))
+ except (OSError, IOError, error.ConfigError), e:
+ self.status_error = str(e)
+ self.data = data
+ self.headers = (_('Stat'), _('Filename'))
+
+ def rowCount(self, parent):
+ return len(self.data)
+
+ def columnCount(self, parent):
+ return 2
+
+ def data(self, index, role):
+ if not index.isValid() or role != Qt.DisplayRole:
+ return QVariant()
+ if index.row() < 0 or index.row() >= len(self.data):
+ return QVariant()
+ return QVariant(self.data[index.row()][index.column()])
+
+ def headerData(self, col, orientation, role):
+ if role != Qt.DisplayRole or orientation != Qt.Horizontal:
+ return QVariant()
+ elif col >= len(self.headers):
+ return QVariant()
+ else:
+ return QVariant(self.headers[col])
+
+ def flags(self, index):
+ return Qt.ItemIsSelectable | Qt.ItemIsEnabled
+
+
+def run(ui, *pats, **opts):
+ return StatusWidget(pats, None)
|
Add a tag
Loading...