History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 1.9.2, 1.9.3, and 2.0

fileview: remove two obsolete methods

Changeset 7e2d3593a33d …

Parent 40e99f06d3ae …

by Steve Borho Jan 30 11 at 9:28 PM

Changes to one file · Browse files at 7e2d3593a33d Showing diff from parent 40e99f06d3ae Diff from another changeset...

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/fileview.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 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800	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 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795	`# 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, subrepo, commands, util` `from mercurial import ui as uimod, mdiff` `from PyQt4.QtCore import ` `from PyQt4.QtGui import ` `from PyQt4 import Qsci` `from tortoisehg.util import hglib, patchctx` `from tortoisehg.hgqt.i18n import _` `from tortoisehg.hgqt.lexers import get_lexer, get_diff_lexer` `from tortoisehg.hgqt.blockmatcher import BlockList` `from tortoisehg.hgqt import qscilib, qtlib` `qsci = Qsci.QsciScintilla` `chunkhdrre = re.compile('^@@ -(\d+).@@$')` `class Annotator(qsci):` `# we use a QScintilla for the annotater cause it makes` `# it much easier to keep the text area and the annotater sync` `# (same font rendering etc). However, it have the drawback of making much` `# more difficult to implement things like QTextBrowser.anchorClicked, which` `# would have been nice to directly go to the annotated revision...` `def __init__(self, textarea, parent=None):` `qsci.__init__(self, parent)` `self.setFrameStyle(0)` `self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)` `self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)` `self.setReadOnly(True)` `self.sizePolicy().setControlType(QSizePolicy.Slider)` `self.setMinimumWidth(20)` `self.setMaximumWidth(40) # XXX TODO make this computed` `self.setFont(textarea.font())` `self.setMarginWidth(0, '')` `self.setMarginWidth(1, '')` `self.SendScintilla(qsci.SCI_SETCURSOR, 2)` `self.SendScintilla(qsci.SCI_SETCARETSTYLE, 0)` `# used to set a background color for every annotating rev` `N = 32` `self.markers = []` `for i in range(N):` `marker = self.markerDefine(qsci.Background)` `color = 0x7FFF00 + (i-N/2)256/N256256 - i256/N256 + i256/N` `self.SendScintilla(qsci.SCI_MARKERSETBACK, marker, color)` `self.markers.append(marker)` `textarea.verticalScrollBar().valueChanged.connect(` `self.verticalScrollBar().setValue)` `def setFilectx(self, fctx):` `self.fctx = fctx` `if fctx.rev() is None:` `# the working context does not support annotate yet. I need to` `# add that to Mercurial at some point.` `self.setText('')` `self.fctxann = []` `return` `self.fctxann = [f for f, line in fctx.annotate(follow=True)]` `revlist = [str(f.rev()) for f in self.fctxann]` `self.setText('\n'.join(revlist))` `uniqrevs = list(sorted(set(revlist)))` `for i, rev in enumerate(revlist):` `idx = uniqrevs.index(rev)` `self.markerAdd(i, self.markers[idx % len(self.markers)])` `class HgFileView(QFrame):` `"""file diff and content viewer"""` `showDescSignal = pyqtSignal(QString)` `linkActivated = pyqtSignal(QString)` `fileDisplayed = pyqtSignal(QString, QString)` `showMessage = pyqtSignal(unicode)` `revForDiffChanged = pyqtSignal(int)` `filled = pyqtSignal()` `def __init__(self, parent=None):` `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.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)` `self.sci = qscilib.Scintilla(self)` `self.sci.setFrameStyle(0)` `l.addWidget(self.sci, 1)` `#self.sci.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOn)` `self.sci.setReadOnly(True)` `self.sci.setUtf8(True)` `self.sci.installEventFilter(qscilib.KeyPressInterceptor(self))` `self.sci.setContextMenuPolicy(Qt.CustomContextMenu)` `self.sci.customContextMenuRequested.connect(self.menuRequested)` `self.sci.setCaretLineVisible(False)` `if hasattr(self.sci, 'indicatorDefine'):` `self.sci.indicatorDefine(qsci.RoundBoxIndicator, 8)` `self.sci.setIndicatorDrawUnder(8)` `self.sci.setIndicatorForegroundColor(QColor('#BBFFFF'), 8)` `self.sci.indicatorDefine(qsci.RoundBoxIndicator, 9)` `self.sci.setIndicatorDrawUnder(9)` `self.sci.setIndicatorForegroundColor(QColor('#58A8FF'), 9)` `else:` `self.sci.SendScintilla(qsci.SCI_INDICSETSTYLE, 8, qsci.INDIC_ROUNDBOX)` `self.sci.SendScintilla(qsci.SCI_INDICSETUNDER, 8, True)` `self.sci.SendScintilla(qsci.SCI_INDICSETFORE, 8, 0xBBFFFF)` `self.sci.SendScintilla(qsci.SCI_INDICSETSTYLE, 9, qsci.INDIC_ROUNDBOX)` `self.sci.SendScintilla(qsci.SCI_INDICSETUNDER, 9, True)` `self.sci.SendScintilla(qsci.SCI_INDICSETFORE, 9, 0x58A8FF)` `# hide margin 0 (markers)` `self.sci.SendScintilla(qsci.SCI_SETMARGINTYPEN, 0, 0)` `self.sci.SendScintilla(qsci.SCI_SETMARGINWIDTHN, 0, 0)` `# define markers for colorize zones of diff` `self.markerplus = self.sci.markerDefine(qsci.Background)` `self.sci.SendScintilla(qsci.SCI_MARKERSETBACK, self.markerplus,` `0xB0FFA0)` `self.markerminus = self.sci.markerDefine(qsci.Background)` `self.sci.SendScintilla(qsci.SCI_MARKERSETBACK, self.markerminus,` `0xA0A0FF)` `self.markertriangle = self.sci.markerDefine(qsci.Background)` `self.sci.SendScintilla(qsci.SCI_MARKERSETBACK, self.markertriangle,` `0xFFA0A0)` `self.lastrev = None` `self.sci.mouseMoveEvent = self.mouseMoveEvent` `ll = QVBoxLayout()` `ll.setContentsMargins(0, 0, 0, 0)` `ll.setSpacing(0)` `l.insertLayout(0, ll)` `ll2 = QHBoxLayout()` `ll2.setContentsMargins(0, 0, 0, 0)` `ll2.setSpacing(0)` `ll.addLayout(ll2)` `# used to fill height of the horizontal scroll bar` `w = QWidget(self)` `ll.addWidget(w)` `self._spacer = w` `self.blk = BlockList(self)` `self.blk.linkScrollBar(self.sci.verticalScrollBar())` `ll2.addWidget(self.blk)` `self.blk.setVisible(False)` `self.ann = Annotator(self.sci, self)` `ll2.addWidget(self.ann)` `self.ann.setVisible(False)` `self._ctx = None` `self._filename = None` `self._status = None` `self._find_text = None` `self._mode = None` `self._lostMode = None` `self.actionDiffMode = QAction('Diff', self)` `self.actionDiffMode.setCheckable(True)` `self.actionFileMode = QAction('File', self)` `self.actionFileMode.setCheckable(True)` `self.actionAnnMode = QAction('Ann', 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('down'), 'Next diff', self)` `self.actionNextDiff.setShortcut('Alt+Down')` `self.actionNextDiff.triggered.connect(self.nextDiff)` `self.actionPrevDiff = QAction(qtlib.geticon('up'), 'Previous diff', self)` `self.actionPrevDiff.setShortcut('Alt+Up')` `self.actionPrevDiff.triggered.connect(self.prevDiff)` `self.forceMode('diff')` `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)` `self.actionNextLine = QAction('Next line', self)` `self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)` `self.actionNextLine.triggered.connect(self.nextLine)` `self.addAction(self.actionNextLine)` `self.actionPrevLine = QAction('Prev line', self)` `self.actionPrevLine.setShortcut(Qt.SHIFT + Qt.Key_Up)` `self.actionPrevLine.triggered.connect(self.prevLine)` `self.addAction(self.actionPrevLine)` `self.actionNextCol = QAction('Next column', self)` `self.actionNextCol.setShortcut(Qt.SHIFT + Qt.Key_Right)` `self.actionNextCol.triggered.connect(self.nextCol)` `self.addAction(self.actionNextCol)` `self.actionPrevCol = QAction('Prev column', self)` `self.actionPrevCol.setShortcut(Qt.SHIFT + Qt.Key_Left)` `self.actionPrevCol.triggered.connect(self.prevCol)` `self.addAction(self.actionPrevCol)` `self.timer = QTimer()` `self.timer.setSingleShot(False)` `self.timer.timeout.connect(self.idle_fill_files)` `def menuRequested(self, point):` `point = self.sci.mapToGlobal(point)` `return self.sci.createStandardContextMenu().exec_(point)` `def loadSettings(self, qs, prefix):` `self.sci.loadSettings(qs, prefix)` `def saveSettings(self, qs, prefix):` `self.sci.saveSettings(qs, prefix)` `def resizeEvent(self, event):` `QFrame.resizeEvent(self, event)` `h = self.sci.horizontalScrollBar().height()` `self._spacer.setMinimumHeight(h)` `self._spacer.setMaximumHeight(h)` `@pyqtSlot(QAction)` `def setMode(self, action):` `'One of the mode toolbar buttons has been toggled'` `mode = {'Diff':'diff', 'File':'file', 'Ann':'ann'}[str(action.text())]` `self.actionNextDiff.setEnabled(mode != 'diff')` `self.actionPrevDiff.setEnabled(False)` `self.blk.setVisible(mode != 'diff')` `self.ann.setVisible(mode == 'ann')` `if mode != self._mode:` `self._mode = mode` `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.ann.setVisible(False)` `def setContext(self, ctx):` `self._ctx = ctx` `self._p_rev = None` `self.sci.setTabWidth(ctx._repo.tabwidth)` `self.actionAnnMode.setVisible(ctx.rev() != None)` `def rev(self):` `return self._ctx.rev()` `def filename(self):` `return self._filename` `def displayDiff(self, rev):` `if rev != self._p_rev:` `self.displayFile(rev=rev)` `def mouseMoveEvent(self, event):` `if self._mode == 'ann' and self.ann.fctxann:` `# Calculate row index from the scroll offset and mouse position` `scroll_offset = self.sci.verticalScrollBar().value()` `idx = scroll_offset + event.pos().y() / self.sci.textHeight(0)` `# It's possible to scroll below the bottom line` `if idx >= len(self.ann.fctxann):` `idx = len(self.ann.fctxann) - 1` `ctx = self.ann.fctxann[idx]` `rev = ctx.rev()` `desc = hglib.get_revision_desc(ctx, self.filename())` `if rev != self.lastrev:` `self.showDescSignal.emit(desc)` `self.lastrev = rev` `qsci.mouseMoveEvent(self.sci, event)` `def leaveEvent(self, event):` `if self._mode == 'ann':` `self.lastrev = None` `self.showDescSignal.emit('')` `def clearDisplay(self):` `self.sci.clear()` `self.ann.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()` `self.sci.setMarginLineNumbers(1, False)` `self.sci.setMarginWidth(1, '')` `def displayFile(self, filename=None, rev=None, status=None):` `if filename is None:` `filename, status = self._filename, self._status` `else:` `self._filename, self._status = filename, status` `if rev is not None:` `self._p_rev = rev` `self.revForDiffChanged.emit(rev)` `self.clearDisplay()` `if filename is None:` `self.forceMode('file')` `return` `ctx = self._ctx` `repo = ctx._repo` `if self._p_rev is not None:` `ctx2 = repo[self._p_rev]` `else:` `ctx2 = None` `fd = FileData(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')` `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':` `lexer = get_diff_lexer(self)` `self.sci.setLexer(lexer)` `# 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` `noheader = fd.diff.split('\n', 3)[3]` `self.sci.setText(hglib.tounicode(noheader))` `elif fd.contents is None:` `return` `else:` `lexer = get_lexer(filename, fd.contents, self)` `self.sci.setLexer(lexer)` `nlines = fd.contents.count('\n')` `# margin 1 is used for line numbers` `self.sci.setMarginLineNumbers(1, True)` `self.sci.setMarginWidth(1, str(nlines)+'0')` `self.sci.setText(fd.contents)` `if self._find_text:` `self.highlightSearchString(self._find_text)` `uf = hglib.tounicode(self._filename)` `self.fileDisplayed.emit(uf, fd.contents or QString())` `if self._mode == 'diff':` `return` `if self._mode == 'ann':` `if lexer is not None:` `self.ann.setFont(lexer.font(0))` `else:` `self.ann.setFont(self.sci.font())` `self.ann.setFilectx(self._ctx[filename])` `# Update diff margin` `if fd.contents and fd.olddata:` `if self.timer.isActive():` `self.timer.stop()` `olddata = fd.olddata.splitlines()` `newdata = fd.contents.splitlines()` `self._diff = difflib.SequenceMatcher(None, olddata, newdata)` `self._diffs = []` `self.blk.syncPageStep()` `self.timer.start()` `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` `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` `self.actionNextDiff.setEnabled(True)` `self.actionPrevDiff.setEnabled(not first)` `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)` `def nDiffs(self):` `return len(self._diffs)` -`def diffMode(self):`-`return self._mode == 'diff'`-`def fileMode(self):`-`return self._mode == 'file'`- `def searchString(self, text):` `self._find_text = text` `self.clearHighlights()` `findpos = self.highlightSearchString(self._find_text)` `if findpos:` `def finditer(self, findpos):` `if self._find_text:` `for pos in findpos:` `self.highlightCurrentSearchString(pos, self._find_text)` `yield self._ctx.rev(), self._filename, pos` `return finditer(self, findpos)` `def clearHighlights(self):` `n = self.sci.length()` `# highlight` `self.sci.SendScintilla(qsci.SCI_SETINDICATORCURRENT, 8)` `self.sci.SendScintilla(qsci.SCI_INDICATORCLEARRANGE, 0, n)` `# current found occurrence` `self.sci.SendScintilla(qsci.SCI_SETINDICATORCURRENT, 9)` `self.sci.SendScintilla(qsci.SCI_INDICATORCLEARRANGE, 0, n)` `def highlightSearchString(self, text):` `data = unicode(self.sci.text())` `self.sci.SendScintilla(qsci.SCI_SETINDICATORCURRENT, 8)` `pos = [data.find(text)]` `n = len(text)` `while pos[-1] > -1:` `self.sci.SendScintilla(qsci.SCI_INDICATORFILLRANGE, pos[-1], n)` `pos.append(data.find(text, pos[-1]+1))` `pos = [x for x in pos if x > -1]` `self.showMessage.emit(` `_("Found %d occurrences of '%s' in current file or diff") % (` `len(pos), text))` `return pos` `def highlightCurrentSearchString(self, pos, text):` `line = self.sci.SendScintilla(qsci.SCI_LINEFROMPOSITION, pos)` `#line, idx = w.lineIndexFromPosition(nextpos)` `self.sci.ensureLineVisible(line)` `self.sci.SendScintilla(qsci.SCI_SETINDICATORCURRENT, 9)` `self.sci.SendScintilla(qsci.SCI_INDICATORCLEARRANGE, 0, pos)` `self.sci.SendScintilla(qsci.SCI_INDICATORFILLRANGE, pos, len(text))` `@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.sci.highlightText(match, icase)` `def verticalScrollBar(self):` `return self.sci.verticalScrollBar()` `def idle_fill_files(self):` `# we make a burst of diff-lines computed at once, but we` `# disable GUI updates for efficiency reasons, then only` `# refresh GUI at the end of the burst` `self.sci.setUpdatesEnabled(False)` `self.blk.setUpdatesEnabled(False)` `for n in range(30): # burst pool` `if self._diff is None or not self._diff.get_opcodes():` `self.actionNextDiff.setEnabled(bool(self._diffs))` `self.actionPrevDiff.setEnabled(False)` `self._diff = None` `self.timer.stop()` `self.filled.emit()` `break` `tag, alo, ahi, blo, bhi = self._diff.get_opcodes().pop(0)` `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 == 'delete':` `# You cannot effectively show deleted lines in a single` `# pane display. They do not exist.` `pass` `# self._diffs.append([blo, bhi])` `# self.blk.addBlock('-', blo, bhi)` `# for i in range(alo, ahi):` `# self.sci.markerAdd(i, self.markerminus)` `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 == 'equal':` `pass` `else:` `raise ValueError, 'unknown tag %r' % (tag,)` `# ok, enable GUI refresh for code viewers and diff-block displayers` `self.sci.setUpdatesEnabled(True)` `self.blk.setUpdatesEnabled(True)` `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''` `self.readStatus(ctx, ctx2, wfile, status)` `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'` `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:` `assert(ctx.rev() is None)` `out = []` `_ui = uimod.ui()` `sroot = repo.wjoin(wfile)` `srepo = hg.repository(_ui, path=sroot)` `srev = ctx.substate.get(wfile, subrepo.nullstate)[1]` `sactual = srepo['.'].hex()` `_ui.pushbuffer()` `commands.status(_ui, srepo)` `data = _ui.popbuffer()` `if data:` `out.append(_('File Status:\n'))` `out.append(data)` `out.append('\n')` `if srev == '':` `out.append(_('New subrepository\n\n'))` `elif srev != sactual:` `out.append(_('Revision has changed from:\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:\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 dirty sub-repository)</i>')` `lbl = u' <a href="subrepo:%s">%s...</a>'` `self.flabel += lbl % (hglib.tounicode(sroot), _('open'))` `except (error.RepoError, util.Abort), e:` `self.error = _('Not a Mercurial subrepo, not previewable')` `return` `# TODO: elif check if a subdirectory (for manifest tool)` `if status in ('R', '!'):` `if wfile in ctx.p1():` `newdata = ctx.p1()[wfile].data()` `self.contents = hglib.tounicode(newdata)` `self.flabel += _(' <i>(was deleted)</i>')` `else:` `self.flabel += _(' <i>(was added, now missing)</i>')` `return` `if status in ('I', '?'):` `try:` `data = open(repo.wjoin(wfile), 'r').read()` `if '\0' in data:` `self.error = 'binary file'` `else:` `self.contents = hglib.tounicode(data)` `self.flabel += _(' <i>(is unversioned)</i>')` `except EnvironmentError, e:` `self.error = hglib.tounicode(str(e))` `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 = 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)`

Diff Options

fileview: remove two obsolete methods

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

fileview: remove two obsolete methods

Diff to 7e2d3593a33d

Attach a Trello Card

Add a tag

Your session has expired