History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 1.9, 1.9.1, and 1.9.2

repomodel: render MQ patch tags in blue

Changeset c85bb3b74b44 …

Parent 8ee3b7de9099 …

by George Marrows Jun 21 10 at 5:37 PM

Changes to 2 files · Browse files at c85bb3b74b44 Showing diff from parent 8ee3b7de9099 Diff from another changeset...

Change 1 of 4 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/repomodel.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448	`# 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 import util, error` `from tortoisehg.util import hglib` `from tortoisehg.hgqt.graph import Graph` `from tortoisehg.hgqt.graph import revision_grapher` `from tortoisehg.hgqt.qtlib import geticon` `from tortoisehg.hgqt import qtlib` `from tortoisehg.hgqt.i18n import _` `from PyQt4.QtCore import ` `from PyQt4.QtGui import ` `connect = QObject.connect` `nullvariant = QVariant()` `# TODO: Remove these two when we adopt GTK author color scheme` `COLORS = [ "blue", "darkgreen", "red", "green", "darkblue", "purple",` `"cyan", Qt.darkYellow, "magenta", "darkred", "darkmagenta",` `"darkcyan", "gray", "yellow", ]` `COLORS = [str(QColor(x).name()) for x in COLORS]` `ALLCOLUMNS = ('Graph', 'ID', 'Branch', 'Log', 'Author', 'Date', 'Tags',` `'Node')` `def get_color(n, ignore=()):` `"""` `Return a color at index 'n' rotating in the available` `colors. 'ignore' is a list of colors not to be chosen.` `"""` `ignore = [str(QColor(x).name()) for x in ignore]` `colors = [x for x in COLORS if x not in ignore]` `if not colors: # ghh, no more available colors...` `colors = COLORS` `return colors[n % len(colors)]` `def cvrt_date(date):` `"""` `Convert a date given the hg way, ie. couple (date, tz), into a` `formatted QString` `"""` `date, tzdelay = date` `return QDateTime.fromTime_t(int(date)).toString(Qt.LocaleDate)` `def datacached(meth):` `"""` `decorator used to cache 'data' method of Qt models. It will not` `cache nullvariant return values (so costly non-null values` `can be computed and filled as a background process)` `"""` `def data(self, index, role):` `if not index.isValid():` `return nullvariant` `row = index.row()` `col = index.column()` `if (row, col, role) in self.datacache:` `return self.datacache[(row, col, role)]` `try:` `result = meth(self, index, role)` `except util.Abort:` `result = nullvariant` `if result is not nullvariant:` `self.datacache[(row, col, role)] = result` `return result` `return data` `class HgRepoListModel(QAbstractTableModel):` `"""` `Model used for displaying the revisions of a Hg local repository` `"""` `_columns = ('Graph', 'ID', 'Branch', 'Log', 'Author', 'Date', 'Tags',)` `_stretchs = {'Log': 1, }` `def __init__(self, repo, branch='', parent=None):` `"""` `repo is a hg repo instance` `"""` `QAbstractTableModel.__init__(self, parent)` `self.datacache = {}`-`self.hasmq = False` `self.mqueues = []` `self.wd_revs = []` `self.graph = None` `self.timerHandle = None` `self.rowcount = 0` `self.repo = repo` `self.reloadConfig()` `self.setRepo(repo, branch=branch)` `# To be deleted` `self._user_colors = {}` `self._branch_colors = {}` `self._columnmap = {'ID': lambda ctx, gnode: ctx.rev() is not None and str(ctx.rev()) or "",` `'Node': lambda ctx, gnode: str(ctx),` `'Graph': lambda ctx, gnode: "",` `'Log': self.getlog,` `'Author': lambda ctx, gnode: hglib.username(ctx.user()),` `'Date': lambda ctx, gnode: cvrt_date(ctx.date()),` `'Tags': self.gettags,` `'Branch': lambda ctx, gnode: ctx.branch(),` `'Filename': lambda ctx, gnode: gnode.extra[0],` `}` `def setRepo(self, repo, branch=''):` `oldroot = self.repo.root` `self.repo = repo` `self.filterbranch = branch` `if oldroot != repo.root:` `self.reloadConfig()` `self.datacache = {}` `try:` `wdctxs = self.repo.parents()` `except error.Abort:` `# might occur if reloading during a mq operation (or` `# whatever operation playing with hg history)` `return`-`self.hasmq = hasattr(self.repo, "mq")`-`if self.hasmq:`-`self.mqueues = self.repo.mq.series[:]`+`self.mqueues = hglib.getmqpatchtags(self.repo)` `self.wd_revs = [ctx.rev() for ctx in wdctxs]` `grapher = revision_grapher(self.repo, start_rev=None,` `follow=False, branch=branch)` `self.graph = Graph(self.repo, grapher, self.max_file_size)` `self.rowcount = 0` `self.emit(SIGNAL('layoutChanged()'))` `self.heads = [self.repo.changectx(x).rev() for x in self.repo.heads()]` `self.ensureBuilt(row=self.fill_step)` `QTimer.singleShot(0, lambda: self.emit(SIGNAL('filled')))` `self.timerHandle = self.startTimer(50)` `def reloadConfig(self):` `self.dot_radius = 8` `self.rowheight = 20` `self.fill_step = 500 # use hgtk logic` `self.max_file_size = 10241024 # will be removed` `self.authorcolor = self.repo.ui.configbool('tortoisehg', 'authorcolor')` `self.updateColumns()` `self.maxauthor = 'author name'` `def updateColumns(self):` `s = QSettings()` `cols = s.value('workbench/columns').toStringList()` `cols = [str(col) for col in cols]` `validcols = [col for col in cols if col in ALLCOLUMNS]` `if validcols:` `self._columns = tuple(validcols)` `self.datacache = {}` `self.emit(SIGNAL("layoutChanged()"))` `def branch(self):` `return self.filterbranch` `def ensureBuilt(self, rev=None, row=None):` `"""` `Make sure rev data is available (graph element created).` `"""` `if self.graph.isfilled():` `return` `required = 0` `buildrev = rev` `n = len(self.graph)` `if rev is not None:` `if n and self.graph[-1].rev <= rev:` `buildrev = None` `else:` `required = self.fill_step/2` `elif row is not None and row > (n - self.fill_step / 2):` `required = row - n + self.fill_step` `if required or buildrev:` `self.graph.build_nodes(nnodes=required, rev=buildrev)` `self.updateRowCount()` `elif row and row > self.rowcount:` `# asked row was already built, but views where not aware of this` `self.updateRowCount()` `elif rev is not None and rev <= self.graph[self.rowcount].rev:` `# asked rev was already built, but views where not aware of this` `self.updateRowCount()` `def timerEvent(self, event):` `if event.timerId() == self.timerHandle:` `self.emit(SIGNAL('showMessage'), 'filling (%s)'%(len(self.graph)))` `if self.graph.isfilled():` `self.killTimer(self.timerHandle)` `self.timerHandle = None` `self.emit(SIGNAL('showMessage'), '')` `self.emit(SIGNAL('loaded'))` `# we only fill the graph data strctures without telling` `# views (until we atually did the full job), to keep` `# maximal GUI reactivity` `elif not self.graph.build_nodes(nnodes=self.fill_step):` `self.killTimer(self.timerHandle)` `self.timerHandle = None` `self.updateRowCount()` `self.emit(SIGNAL('showMessage'), '')` `self.emit(SIGNAL('loaded'))` `def updateRowCount(self):` `currentlen = self.rowcount` `newlen = len(self.graph)` `# This is not fast; the graph walker should do this, or only do` `# it when the user asks for a resize.` `authors = set()` `for i in xrange(currentlen, newlen):` `authors.add(self.repo[self.graph.nodes[i].rev].user())` `sauthors = [hglib.username(user) for user in list(authors)]` `sauthors.append(self.maxauthor)` `self.maxauthor = sorted(sauthors, key=lambda x: len(x))[-1]` `if newlen > self.rowcount:` `self.beginInsertRows(QModelIndex(), currentlen, newlen-1)` `self.rowcount = newlen` `self.endInsertRows()` `def rowCount(self, parent=None):` `return self.rowcount` `def columnCount(self, parent=None):` `return len(self._columns)` `def maxWidthValueForColumn(self, col):` `column = self._columns[col]` `if column == 'ID':` `return str(len(self.repo))` `if column == 'Node':` `return str(self.repo['.'])` `if column == 'Date':` `return cvrt_date(self.repo[None].date())` `if column == 'Tags':` `try:` `return sorted(self.repo.tags().keys(), key=lambda x: len(x))[-1][:10]` `except IndexError:` `pass` `if column == 'Branch':` `try:` `return sorted(self.repo.branchtags().keys(), key=lambda x: len(x))[-1]` `except IndexError:` `pass` `if column == 'Author':` `return self.maxauthor` `if column == 'Filename':` `return self.filename` `if column == 'Graph':` `res = self.col2x(self.graph.max_cols)` `return min(res, 150)` `# Fall through for Log` `return None` `def user_color(self, user):` `'deprecated, please replace with hgtk color scheme'` `if user not in self._user_colors:` `self._user_colors[user] = get_color(len(self._user_colors),` `self._user_colors.values())` `return self._user_colors[user]` `def namedbranch_color(self, branch):` `'deprecated, please replace with hgtk color scheme'` `if branch not in self._branch_colors:` `self._branch_colors[branch] = get_color(len(self._branch_colors))` `return self._branch_colors[branch]` `def col2x(self, col):` `return 2 self.dot_radius * col + self.dot_radius/2 + 8` `def graphctx(self, ctx, gnode):` `w = self.col2x(gnode.cols) + 10` `h = self.rowheight` `dot_y = h / 2` `pix = QPixmap(w, h)` `pix.fill(QColor(0,0,0,0))` `painter = QPainter(pix)` `painter.setRenderHint(QPainter.Antialiasing)` `pen = QPen(Qt.blue)` `pen.setWidth(2)` `painter.setPen(pen)` `lpen = QPen(pen)` `lpen.setColor(Qt.black)` `painter.setPen(lpen)` `for y1, y4, lines in ((dot_y, dot_y + h, gnode.bottomlines),` `(dot_y - h, dot_y, gnode.toplines)):` `y2 = y1 + 1 * (y4 - y1)/4` `ymid = (y1 + y4)/2` `y3 = y1 + 3 * (y4 - y1)/4` `for start, end, color in lines:` `lpen = QPen(pen)` `lpen.setColor(QColor(get_color(color)))` `lpen.setWidth(2)` `painter.setPen(lpen)` `x1 = self.col2x(start)` `x2 = self.col2x(end)` `path = QPainterPath()` `path.moveTo(x1, y1)` `path.cubicTo(x1, y2,` `x1, y2,` `(x1 + x2)/2, ymid)` `path.cubicTo(x2, y3,` `x2, y3,` `x2, y4)` `painter.drawPath(path)` `# Draw node` `dot_color = QColor(self.namedbranch_color(ctx.branch()))` `dotcolor = dot_color.lighter()` `pencolor = dot_color.darker()` `white = QColor("white")` `fillcolor = gnode.rev is None and white or dotcolor` `pen = QPen(pencolor)` `pen.setWidthF(1.5)` `painter.setPen(pen)` `radius = self.dot_radius` `centre_x = self.col2x(gnode.x)` `centre_y = h/2` `def circle(r):` `rect = QRectF(centre_x - r,` `centre_y - r,` `2 * r, 2 * r)` `painter.drawEllipse(rect)` `def diamond(r):` `poly = QPolygonF([QPointF(centre_x - r, centre_y),` `QPointF(centre_x, centre_y - r),` `QPointF(centre_x + r, centre_y),` `QPointF(centre_x, centre_y + r),` `QPointF(centre_x - r, centre_y),])` `painter.drawPolygon(poly)` `tags = set(ctx.tags())` `if tags.intersection(self.mqueues): # diamonds for patches` `if gnode.rev in self.wd_revs:` `painter.setBrush(white)` `diamond(2 * 0.9 * radius / 1.5)` `painter.setBrush(fillcolor)` `diamond(radius / 1.5)` `else: # circles for normal revisions` `if gnode.rev in self.wd_revs:` `painter.setBrush(white)` `circle(0.9 * radius)` `painter.setBrush(fillcolor)` `circle(0.5 * radius)` `painter.end()` `return QVariant(pix)` `@datacached` `def data(self, index, role):` `if not index.isValid():` `return nullvariant` `row = index.row()` `self.ensureBuilt(row=row)` `column = self._columns[index.column()]` `gnode = self.graph[row]` `ctx = self.repo.changectx(gnode.rev)` `if role == Qt.DisplayRole:` `text = self._columnmap[column](ctx, gnode)` `if not isinstance(text, (QString, unicode)):` `text = hglib.tounicode(text)` `return QVariant(text)` `elif role == Qt.ForegroundRole:` `if column == 'Author':` `if self.authorcolor:` `return QVariant(QColor(self.user_color(ctx.user())))` `return nullvariant` `if column == 'Branch':` `return QVariant(QColor(self.namedbranch_color(ctx.branch())))` `elif role == Qt.DecorationRole:` `if column == 'Graph':` `return self.graphctx(ctx, gnode)` `return nullvariant` `def headerData(self, section, orientation, role):` `if orientation == Qt.Horizontal:` `if role == Qt.DisplayRole:` `return QVariant(self._columns[section])` `if role == Qt.TextAlignmentRole:` `return QVariant(Qt.AlignLeft)` `return nullvariant` `def rowFromRev(self, rev):` `row = self.graph.index(rev)` `if row == -1:` `row = None` `return row` `def indexFromRev(self, rev):` `self.ensureBuilt(rev=rev)` `row = self.rowFromRev(rev)` `if row is not None:` `return self.index(row, 0)` `return None` `def clear(self):` `'empty the list'` `self.graph = None` `self.datacache = {}` `self.emit(SIGNAL("layoutChanged()"))` `def gettags(self, ctx, gnode):` `if ctx.rev() is None:` `return ""` `mqtags = ['qbase', 'qtip', 'qparent']` `tags = ctx.tags()` `tags = [t for t in tags if t not in mqtags]` `return hglib.tounicode(",".join(tags))` `def getlog(self, ctx, gnode):`-`# TODO: add branch name / bookmark / patches /`-`# wd parent markups`+`# TODO: add branch name / bookmark / wd parent markups` `if ctx.rev() is None:` `return ' ' + _('Working copy changes') + ' '` `msg = hglib.tounicode(ctx.description())` `if msg:` `msg = msg.splitlines()[0]` `tstr = ''` `for tag in (hglib.getctxtags(ctx) or []):`-`style = {'fg': "black", 'bg': '#ffffaa'}`+`bg = '#ffffaa'`+`if tag in self.mqueues:`+`bg = '#aaddff'`+`style = {'fg': "black", 'bg': bg}`+ `tstr += qtlib.markup(' %s ' % tag, **style) + ' '` `return tstr + msg`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/util/hglib.py Stacked
191 192 193 194 195 196	191 192 193 194 195 196 197 198 199 200 201 202 203	@@ -191,6 +191,13 @@ `return tags` `return None` +`def getmqpatchtags(repo):`+`'''Returns all tag names used by MQ patches, or []'''`+`if hasattr(repo, 'mq'):`+`repo.mq.parse_series()`+`return repo.mq.series[:]`+`else:`+`return []` `def diffexpand(line):` `'Expand tabs in a line of diff/patch text'`

Diff Options

repomodel: render MQ patch tags in blue

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

repomodel: render MQ patch tags in blue

Diff to c85bb3b74b44

Attach a Trello Card

Add a tag

Your session has expired