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

repofilter: add a filter checkbutton

Toggles the display of revision sets as a filtered list or as part of the
whole revision graph. Filters and branch selections now survive reloads

Changeset f3be99f8c173 …

Parent a3d329cf076d …

by Steve Borho Oct 20 10 at 5:21 AM

Changes to 4 files · Browse files at f3be99f8c173 Showing diff from parent a3d329cf076d Diff from another changeset...

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/filerevmodel.py Stacked
36 37 38 39 40 41 42	36 37 38 39 40 41 42	@@ -36,7 +36,7 @@ `"""` `data is a HgHLRepo instance` `"""`-`HgRepoListModel.__init__(self, repo, parent=parent)`+`HgRepoListModel.__init__(self, repo, '', [], False, parent)` `self.setFilename(filename)` `def setRepo(self, repo, branch='', fromhead=None, follow=False):`

Change 1 of 3 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/repofilter.py Stacked
17 18 19 20 21 22 48 49 50 51 52 53 54 55 56 57 58 59 60 95 96 97 98 99 100	17 18 19 20 21 22 23 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 101 102 103 104 105 106 107	@@ -17,6 +17,7 @@ `revisionSet = pyqtSignal(object)` `clearSet = pyqtSignal()`+`filterToggled = pyqtSignal(bool)` `showMessage = pyqtSignal(QString)` `progress = pyqtSignal(QString, object, QString, QString, object)`@@ -48,13 +49,18 @@ `self.revsetle = le = QLineEdit()` `le.setCompleter(QCompleter(self.revsethist))` `le.returnPressed.connect(self.returnPressed)`-`# Requires Qt 4.7`-`#self.revsetle.setPlaceholderText('### revision set query ###')`+`if hasattr(self.revsetle, 'setPlaceholderText'): # Qt >= 4.7`+`self.revsetle.setPlaceholderText('### revision set query ###')` `self.addWidget(le)` `self.clear.clicked.connect(le.clear)` `self.clear.clicked.connect(self.clearSet)` +`self.filtercb = f = QCheckBox(_('filter'))`+`f.setChecked(s.value('revset-filter').toBool())`+`f.toggled.connect(self.filterToggled)`+`self.addWidget(f)`+ `self.store = store = QPushButton(_('store'))` `store.clicked.connect(self.saveQuery)` `le.textChanged.connect(lambda t: store.setEnabled(False))`@@ -95,6 +101,7 @@ `def storeConfigs(self, s):` `s.setValue('revset/geom', self.entrydlg.saveGeometry())` `s.setValue('revset-queries', self.revsethist)`+`s.setValue('revset-filter', self.filtercb.isChecked())` `def _initbranchfilter(self):` `self._branchLabel = QToolButton(`

Change 1 of 3 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/repomodel.py Stacked
85 86 87 88 89 90 91 97 98 99 100 101 102 103 126 127 128 129 130 131 132	85 86 87 88 89 90 91 97 98 99 100 101 102 103 104 127 128 129 130 131 132 133	@@ -85,7 +85,7 @@ `_columns = ('Graph', 'ID', 'Branch', 'Log', 'Author', 'Age', 'Tags',)` `_stretchs = {'Log': 1, }` -`def __init__(self, repo, branch='', parent=None):`+`def __init__(self, repo, branch, revset, rfilter, parent):` `"""` `repo is a hg repo instance` `"""`@@ -97,7 +97,8 @@ `self.rowheight = 20` `self.rowcount = 0` `self.repo = repo`-`self.revset = ()`+`self.revset = revset`+`self.filterbyrevset = rfilter` `self.reloadConfig()` `self.updateColumns()` `self.setBranch(branch)`@@ -126,7 +127,7 @@ `def setBranch(self, branch=None, allparents=True):` `self.filterbranch = branch` `self.datacache = {}`-`if self.revset: # TODO: and self.filterbyrevset`+`if self.revset and self.filterbyrevset:` `grapher = revision_grapher(self.repo, revset=self.revset)` `self.graph = Graph(self.repo, grapher, include_mq=False)` `else:`

Change 1 of 8 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/repowidget.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	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	`# -- coding: iso-8859-1 --` `#!/usr/bin/env python` `# repowidget.py - TortoiseHg repository widget` `#` `# Copyright (C) 2007-2010 Logilab. All rights reserved.` `# Copyright (C) 2010 Adrian Buehlmann <adrian@cadifra.com>` `#` `# This software may be used and distributed according to the terms` `# of the GNU General Public License, incorporated herein by reference.` `import binascii` `import os` `from mercurial import util` `from tortoisehg.util import shlib, hglib` `from tortoisehg.hgqt.i18n import _` `from tortoisehg.hgqt.qtlib import geticon, getfont, QuestionMsgBox, InfoMsgBox` `from tortoisehg.hgqt.qtlib import CustomPrompt, SharedWidget, DemandWidget` `from tortoisehg.hgqt.repomodel import HgRepoListModel` `from tortoisehg.hgqt import cmdui, update, tag, backout, merge, visdiff` `from tortoisehg.hgqt import archive, thgimport, thgstrip, run, thgrepo, purge` `from tortoisehg.hgqt import bisect` `from tortoisehg.hgqt.repofilter import RepoFilterBar` `from tortoisehg.hgqt.repoview import HgRepoView` `from tortoisehg.hgqt.revdetails import RevDetailsWidget` `from tortoisehg.hgqt.commit import CommitWidget` `from tortoisehg.hgqt.manifestdialog import ManifestTaskWidget` `from tortoisehg.hgqt.sync import SyncWidget` `from tortoisehg.hgqt.grep import SearchWidget` `from PyQt4.QtCore import ` `from PyQt4.QtGui import ` `class RepoWidget(QWidget):` `showMessageSignal = pyqtSignal(str)` `closeSelfSignal = pyqtSignal(QWidget)` `output = pyqtSignal(QString, QString)` `progress = pyqtSignal(QString, object, QString, QString, object)` `makeLogVisible = pyqtSignal(bool)` `titleChanged = pyqtSignal(unicode)` `"""Emitted when changed the expected title for the RepoWidget tab"""` `def __init__(self, repo, workbench):` `QWidget.__init__(self, acceptDrops=True)` `self.repo = repo` `repo.repositoryChanged.connect(self.repositoryChanged)` `repo.repositoryDestroyed.connect(self.repositoryDestroyed)` `repo.configChanged.connect(self.configChanged)` `self.workbench = workbench`+`self.revsetfilter = False`+`self.branch = ''`+`self.revset = set()` `self._reload_rev = '.' # select working parent at startup` `self.currentMessage = ''` `self.runner = None` `self.dirty = False` `self.setupUi()` `self.createActions()` `self.setupModels()` `self.restoreSettings()` `def setupUi(self):` `SP = QSizePolicy` `self.repotabs_splitter = QSplitter(orientation=Qt.Vertical)` `self.setLayout(QVBoxLayout())` `self.layout().setContentsMargins(0, 0, 0, 0)` `self.filterbar = RepoFilterBar(self.repo)` `self.filterbar.branchChanged.connect(self.setBranch)` `self.filterbar.progress.connect(self.progress)` `self.filterbar.showMessage.connect(self.showMessage)` `self.filterbar.revisionSet.connect(self.setRevisionSet)` `self.filterbar.clearSet.connect(self.clearSet)`+`self.filterbar.filterToggled.connect(self.filterToggled)` `self.layout().addWidget(self.filterbar)` +`self.revsetfilter = self.filterbar.filtercb.isChecked()`+ `self.layout().addWidget(self.repotabs_splitter)` `self.repoview = view = HgRepoView(self.workbench, self.repo)` `view.revisionSelected.connect(self.revision_selected)` `view.revisionClicked.connect(self.revision_clicked)` `view.revisionActivated.connect(self.revision_activated)` `view.showMessage.connect(self.showMessage)` `view.menuRequested.connect(self.viewMenuRequest)` `sp = SP(SP.Expanding, SP.Expanding)` `sp.setHorizontalStretch(0)` `sp.setVerticalStretch(1)` `sp.setHeightForWidth(self.repoview.sizePolicy().hasHeightForWidth())` `view.setSizePolicy(sp)` `view.setFrameShape(QFrame.StyledPanel)` `self.repotabs_splitter.addWidget(self.repoview)` `self.repotabs_splitter.setCollapsible(0, False)` `self.taskTabsWidget = tt = QTabWidget()` `tt.setDocumentMode(True)` `tt.setTabPosition(QTabWidget.East)` `self.repotabs_splitter.addWidget(self.taskTabsWidget)` `self.revDetailsWidget = w = RevDetailsWidget(self.repo, self.repoview)` `w.revisionLinkClicked.connect(self.goto)` `w.fileview.showDescSignal.connect(self.showMessage)` `self.logTabIndex = idx = tt.addTab(w, geticon('log'), '')` `tt.setTabToolTip(idx, _("Revision details"))` `self.commitDemand = w = DemandWidget(self.createCommitWidget)` `self.commitTabIndex = idx = tt.addTab(w, geticon('commit'), '')` `tt.setTabToolTip(idx, _("Commit"))` `self.manifestDemand = w = DemandWidget(self.createManifestWidget)` `self.manifestTabIndex = idx = tt.addTab(w, geticon('annotate'), '')` `tt.setTabToolTip(idx, _('Manifest'))` `self.grepDemand = w = DemandWidget(self.createGrepWidget)` `self.grepTabIndex = idx = tt.addTab(w, geticon('repobrowse'), '')` `tt.setTabToolTip(idx, _("Search"))` `self.syncDemand = w = DemandWidget(self.createSyncWidget)` `self.syncTabIndex = idx = tt.addTab(w, geticon('sync'), '')` `tt.setTabToolTip(idx, _("Synchronize"))` `def title(self):` `"""Returns the expected title for this widget [unicode]"""` `branch = self.repomodel.branch()` `if branch:` `return '%s [%s]' % (self.repo.shortname, branch)` `else:` `return self.repo.shortname` `@pyqtSlot()` `def showSearchBar(self):` `"""Show tasktab-specific search bar if available"""` `curtt = self.taskTabsWidget.currentWidget()` `show = getattr(curtt, 'showSearchBar', None)` `if show:` `show()` `def getCommitWidget(self):` `return getattr(self.repo, '_commitwidget', None) # TODO: ugly` `def createCommitWidget(self):` `cw = self.getCommitWidget()` `if cw:`-`cw.commitComplete.connect(self.reload)`+`cw.commitComplete.connect(self.reload) # todo: redundant?` `return SharedWidget(cw)` `pats = {}` `opts = {}` `b = QPushButton('Commit')` `cw = CommitWidget(pats, opts, self.repo.root, True, self)` `# Shared widgets must be connected directly to workbench` `cw.output.connect(self.workbench.log.output)` `cw.progress.connect(lambda tp, p, i, u, tl:` `self.workbench.statusbar.progress(tp, p, i, u, tl, self.repo.root))` `cw.makeLogVisible.connect(self.workbench.log.setShown)` `def openlink(link):` `if unicode(link).startswith('subrepo:'):` `self.workbench.showRepo(link[8:])` `cw.linkActivated.connect(openlink)` `cw.showMessage.connect(self.showMessage)` `cw.buttonHBox.addWidget(b)` `cw.commitButtonName.connect(lambda n: b.setText(n))` `cw.loadConfigs(QSettings())` `cw.reload()` `b.clicked.connect(cw.commit)` `self.repo._commitwidget = cw` `return SharedWidget(cw)` `def createManifestWidget(self):` `def filterrev(rev):` `if isinstance(rev, basestring): # unapplied patch` `return None # TODO` `else:` `return rev` `w = ManifestTaskWidget(self.repo.ui, self.repo, rev=filterrev(self.rev),` `parent=self)` `self.repoview.revisionClicked.connect(lambda rev:` `w.setRev(filterrev(rev)))` `w.revChanged.connect(self.repoview.goto)` `w.revisionHint.connect(self.showMessage)` `w.grepRequested.connect(self.grep)` `return w` `def createSyncWidget(self):` `sw = getattr(self.repo, '_syncwidget', None) # TODO: ugly` `if not sw:` `sw = SyncWidget(self.repo.root, True, self)` `# Shared widgets must be connected directly to workbench` `sw.output.connect(self.workbench.log.output)` `sw.progress.connect(lambda tp, p, i, u, tl:` `self.workbench.statusbar.progress(tp, p, i, u, tl,` `self.repo.root))` `sw.makeLogVisible.connect(self.workbench.log.setShown)` `self.repo._syncwidget = sw` `sw.outgoingNodes.connect(self.setOutgoingNodes)` `sw.showMessage.connect(self.showMessage)` `return SharedWidget(sw)` `def clearSet(self):`-`self.repomodel.revset = set()`-`self.refresh()`+`self.revset = []`+`if self.revsetfilter:`+`self.reload()`+`else:`+`self.repomodel.revset = []`+`self.refresh()` `def setRevisionSet(self, nodes):`-`self.repomodel.revset = [self.repo[n].node() for n in nodes]`-`self.refresh()`+`self.revset = [self.repo[n].node() for n in nodes]`+`if self.revsetfilter:`+`self.reload()`+`else:`+`self.repomodel.revset = self.revset`+`self.refresh()`++`@pyqtSlot(bool)`+`def filterToggled(self, checked):`+`self.revsetfilter = checked`+`if self.revset:`+`self.repomodel.filterbyrevset = checked`+`self.reload()` `def setOutgoingNodes(self, nodes):` `self.filterbar.revsetle.setText('outgoing()')` `self.setRevisionSet(nodes)` `def createGrepWidget(self):` `upats = {}` `gw = SearchWidget(upats, self.repo, self)` `gw.setRevision(self.repoview.current_rev)` `gw.showMessage.connect(self.showMessage)` `return gw` `def reponame(self):` `return self.repo.shortname` `@property` `def rev(self):` `"""Returns the current active revision"""` `return self.repoview.current_rev` `def showMessage(self, msg):` `self.currentMessage = msg` `if self.isVisible():` `self.showMessageSignal.emit(msg)` `def showEvent(self, event):` `QWidget.showEvent(self, event)` `self.showMessageSignal.emit(self.currentMessage)` `if self.dirty:` `print 'page was dirty, reloading...'` `self.reload()` `self.dirty = False` `def createActions(self):` `self.actionActivateRev = QAction('Activate rev.', self)` `self.actionActivateRev.setShortcuts([Qt.SHIFT+Qt.Key_Return,` `Qt.SHIFT+Qt.Key_Enter])` `self.actionActivateRev.triggered.connect(self.revision_activated)` `self.addAction(self.actionActivateRev)` `allactions = [` `('manifest', _('Browse at rev...'), None,` `_('Show the manifest at selected revision'), None, self.manifestRevision),` `('update', _('Update...'), 'update', None, None, self.updateToRevision),` `('merge', _('Merge with...'), 'merge', None, None, self.mergeWithRevision),` `('tag', _('Tag...'), 'tag', None, None, self.tagToRevision),` `('backout', _('Backout...'), None, None, None, self.backoutToRevision),` `('email', _('Email patch...'), None, None, None, self.emailRevision),` `('archive', _('Archive...'), None, None, None, self.archiveRevision),` `('copyhash', _('Copy hash'), None, None, None, self.copyHash),` `('rebase', _('Rebase...'), None, None, None, self.rebaseRevision),` `('qimport', _('Import to MQ'), None, None, None,` `self.qimportRevision),` `('qfinish', _('Finish patch'), None, None, None, self.qfinishRevision),` `('qdelete', _('Delete patch'), None, None, None, self.qdeleteRevision),` `('strip', _('Strip...'), None, None, None, self.stripRevision),` `('qpop-all', _('Pop all patches'), None, None, None, self.qpopAllRevision),` `('qgoto', _('Goto patch'), None, None, None, self.qgotoRevision)` `]` `self._actions = {}` `for name, desc, icon, tip, key, cb in allactions:` `self._actions[name] = act = QAction(desc, self)` `if icon:` `act.setIcon(geticon(icon))` `if tip:` `act.setStatusTip(tip)` `if key:` `act.setShortcut(key)` `if cb:` `act.triggered.connect(cb)` `self.addAction(act)` `def dragEnterEvent(self, event):` `paths = [unicode(u.toLocalFile()) for u in event.mimeData().urls()]` `if util.any(os.path.isfile(p) for p in paths):` `event.setDropAction(Qt.CopyAction)` `event.accept()` `def dropEvent(self, event):` `paths = [unicode(u.toLocalFile()) for u in event.mimeData().urls()]` `filepaths = [p for p in paths if os.path.isfile(p)]` `if filepaths:` `self.thgimport(filepaths)` `event.setDropAction(Qt.CopyAction)` `event.accept()` `def back(self):` `self.repoview.back()` `def forward(self):` `self.repoview.forward()` `def bisect(self, paths=None):` `dlg = bisect.BisectDialog(self.repo, {}, self)` `dlg.exec_()` `def thgimport(self, paths=None):` `dlg = thgimport.ImportDialog(repo=self.repo, parent=self)`-`dlg.repoInvalidated.connect(self.reload)` `dlg.finished.connect(dlg.deleteLater)` `if paths:` `dlg.setfilepaths(paths)` `dlg.exec_()` `def verify(self):` `cmdline = ['--repository', self.repo.root, 'verify']` `dlg = cmdui.Dialog(cmdline, self)` `dlg.exec_()` `def recover(self):` `cmdline = ['--repository', self.repo.root, 'recover']` `dlg = cmdui.Dialog(cmdline, self)` `dlg.exec_()` `def rollback(self):` `def read_undo():` `if os.path.exists(self.repo.sjoin('undo')):` `try:` `args = self.repo.opener('undo.desc', 'r').read().splitlines()` `if args[1] != 'commit':` `return None` `return args[1], int(args[0])` `except (IOError, IndexError, ValueError):` `pass` `return None` `data = read_undo()` `if data is None:` `InfoMsgBox(_('No transaction available'),` `_('There is no rollback transaction available'))` `return` `elif data[0] == 'commit':` `if not QuestionMsgBox(_('Undo last commit?'),` `_('Undo most recent commit (%d), preserving file changes?') %` `data[1]):` `return` `else:` `if not QuestionMsgBox(_('Undo last transaction?'),` `_('Rollback to revision %d (undo %s)?') %` `(data[1]-1, data[0])):` `return` `try:` `rev = self.repo['.'].rev()` `except Exception, e:` `InfoMsgBox(_('Repository Error'),` `_('Unable to determine working copy revision\n') +` `hglib.tounicode(e))` `return` `if rev >= data[1] and not QuestionMsgBox(` `_('Remove current working revision?'),` `_('Your current working revision (%d) will be removed '` `'by this rollback, leaving uncommitted changes.\n '` `'Continue?' % rev)):` `return`-`saved = self.repo.ui.quiet`-`self.repo.ui.quiet = True`-`self.repo.rollback()`-`self.repo.ui.quiet = saved`-`self.reload()`+`self.repo.incrementBusyCount()`+`try:`+`saved = self.repo.ui.quiet`+`self.repo.ui.quiet = True`+`self.repo.rollback()`+`self.repo.ui.quiet = saved`+`finally:`+`self.repo.decrementBusyCount()` `QTimer.singleShot(500, lambda: shlib.shell_notify([self.repo.root]))` `def purge(self):` `try:` `wctx = self.repo[None]` `wctx.status(ignored=True, unknown=True)` `except Exception, e:` `InfoMsgBox(_('Repository Error'),` `_('Unable to query unrevisioned files\n') +` `hglib.tounicode(str(e)))` `return` `U, I = wctx.unknown(), wctx.ignored()` `if not U and not I:` `InfoMsgBox(_('No unrevisioned files'),` `_('There are no purgable unrevisioned files'))` `return` `dlg = purge.PurgeDialog(self.repo, U, I, self)` `dlg.setWindowFlags(Qt.Sheet)` `dlg.setWindowModality(Qt.WindowModal)` `dlg.exec_()` `@pyqtSlot(unicode, dict)` `def grep(self, pattern='', opts={}):` `"""Open grep task tab"""` `opts = dict((str(k), str(v)) for k, v in opts.iteritems())` `self.taskTabsWidget.setCurrentIndex(self.grepTabIndex)` `self.grepDemand.setSearch(pattern, **opts)` -`def create_models(self):`-`self.repomodel = HgRepoListModel(self.repo, parent=self)`+`def setupModels(self):`+`self.repomodel = HgRepoListModel(self.repo, self.branch, self.revset,`+`self.revsetfilter, self)` `self.repomodel.filled.connect(self.modelFilled)` `self.repomodel.loaded.connect(self.modelLoaded)` `self.repomodel.showMessage.connect(self.showMessage)`--`def setupModels(self):`-`self.create_models()` `self.repoview.setModel(self.repomodel)` `self.revDetailsWidget.setupModels(self.repomodel)` `def modelFilled(self):` `'initial batch of revisions loaded'` `self.repoview.resizeColumns()` `self.repoview.goto(self._reload_rev) # emits revision_selected` `self.revDetailsWidget.finishReload()` `def modelLoaded(self):` `'all revisions loaded (graph generator completed)'` `# Perhaps we can update a GUI element later, to indicate full load` `pass` `def revision_clicked(self, rev):` `'User clicked on a repoview row'` `tw = self.taskTabsWidget` `if type(rev) == str: # unapplied patch` `tw.setCurrentIndex(self.logTabIndex)` `elif rev is None:` `tw.setCurrentIndex(self.commitTabIndex)` `elif tw.currentWidget() in (self.commitDemand, self.syncDemand):` `tw.setCurrentIndex(self.logTabIndex)` `def revision_selected(self, rev):` `'View selection changed, could be a reload'` `if self.repomodel.graph is None:` `return` `if type(rev) == str: # unapplied patch` `# FIXME remove unapplied patch branch when` `# patches fully handled downstream` `self.revDetailsWidget.revision_selected(rev)` `# grep and manifest are unlikely to ever be able to use a` `# patch ctx` `else:` `self.revDetailsWidget.revision_selected(rev)` `self.manifestDemand.forward('setRev', rev)` `self.grepDemand.forward('setRevision', rev)` `def goto(self, rev):` `if rev is not None:` `rev = str(rev)` `self._reload_rev = rev` `if len(self.repoview.model().graph):` `self.repoview.goto(rev)` `def revision_activated(self, rev=None):` `rev = rev or self.rev` `if isinstance(rev, basestring): # unapplied patch` `return` `visdiff.visualdiff(self.repo.ui, self.repo, [], {'change':rev})` `def reload(self):` `'Initiate a refresh of the repo model, rebuild graph'` `self.repo.thginvalidate()` `self.rebuildGraph()` `self.commitDemand.forward('reload')` `self.filterbar.refresh()` `def rebuildGraph(self):` `self.showMessage('')` `if self.rev is not None and len(self.repo) >= self.rev:` `self._reload_rev = self.rev` `else:` `self._reload_rev = '.'` `self.setupModels()` `self.revDetailsWidget.record()` `def reloadTaskTab(self):` `tti = self.taskTabsWidget.currentIndex()` `if tti == self.logTabIndex:` `ttw = self.revDetailsWidget` `elif tti == self.commitTabIndex:` `ttw = self.commitDemand.get()` `elif tti == self.manifestTabIndex:` `ttw = self.manifestDemand.get()` `elif tti == self.syncTabIndex:` `ttw = self.syncDemand.get()` `elif tti == self.grepTabIndex:` `ttw = self.grepDemand.get()` `if ttw:` `ttw.reload()` `def refresh(self):` `'Refresh the repo model view, clear cached data'` `self.repo.thginvalidate()` `self.repomodel.invalidate()` `self.revDetailsWidget.reload()` `self.filterbar.refresh()` `def repositoryDestroyed(self):` `'Repository has detected itself to be deleted'` `self.closeSelfSignal.emit(self)` `def repositoryChanged(self):` `'Repository has detected a changelog / dirstate change'` `if self.isVisible():` `self.rebuildGraph()` `else:` `self.dirty = True` `def configChanged(self):` `'Repository is reporting its config files have changed'` `self.repomodel.invalidate()` `self.revDetailsWidget.reload()` `self.titleChanged.emit(self.title())` `# TODO: emit only if actually changed` `@pyqtSlot(unicode, bool)` `def setBranch(self, branch, allparents=True):` `'Change the branch filter'`+`self.branch = branch` `self.repomodel.setBranch(branch=branch, allparents=allparents)` `self.titleChanged.emit(self.title())` `##` `## Workbench methods` `##` `def switchedTo(self):` `'Update back / forward actions'` `self.repoview.updateActions()` `def storeSettings(self):` `self.revDetailsWidget.storeSettings()` `s = QSettings()` `repoid = str(self.repo[0])` `s.setValue('repowidget/splitter-'+repoid,` `self.repotabs_splitter.saveState())` `def restoreSettings(self):` `self.revDetailsWidget.restoreSettings()` `s = QSettings()` `repoid = str(self.repo[0])` `self.repotabs_splitter.restoreState(` `s.value('repowidget/splitter-'+repoid).toByteArray())` `def okToContinue(self):` `return self.commitDemand.forward('canExit', default=True) and \` `self.syncDemand.forward('canExit', default=True)` `def closeRepoWidget(self):` `'''returns False if close should be aborted'''` `if not self.okToContinue():` `return False` `if self.isVisible():` `# assuming here that there is at most one RepoWidget visible` `self.storeSettings()` `self.revDetailsWidget.storeSettings()` `s = QSettings()` `self.commitDemand.forward('storeConfigs', s)` `self.filterbar.storeConfigs(s)` `return True` `def incoming(self):` `self.syncDemand.get().incoming()` `def pull(self):` `self.syncDemand.get().pull()` `def outgoing(self):` `self.syncDemand.get().outgoing()` `def push(self):` `self.syncDemand.get().push()` `def qpush(self):` `"""QPush a patch from MQ"""` `cmdline = ['qpush',` `'--repository', self.repo.root]` `self.runCommand(_('QPush - TortoiseHg'), cmdline)` `def qpop(self):` `"""QPop a patch from MQ"""` `cmdline = ['qpop',` `'--repository', self.repo.root]` `self.runCommand(_('QPop - TortoiseHg'), cmdline)` `##` `## Repoview context menu` `##` `def viewMenuRequest(self, point, selection):` `'User requested a context menu in repo view widget'` `# TODO: selection is ignored at the moment` `# It is a list of the currently selected revisions. Integers` `# for changelog revisions, None for the working copy, or strings` `# for unapplied patches.` `menu = QMenu(self)` `allactions = [['all', ['update', 'manifest', 'merge', 'tag',` `'backout', 'email', 'archive', 'copyhash']],` `['rebase', ['rebase']],` `['mq', ['qgoto', 'qpop-all', 'qimport', 'qfinish', 'qdelete', 'strip']]]` `exs = self.repo.extensions()` `for ext, actions in allactions:` `if ext == 'all' or ext in exs:` `for act in actions:` `menu.addAction(self._actions[act])` `menu.addSeparator()` `ctx = self.repo.changectx(self.rev)` `workingdir = self.rev is None` `appliedpatch = ctx.thgmqappliedpatch()` `unappliedpatch = ctx.thgmqunappliedpatch()` `qparent = 'qparent' in ctx.tags()` `patch = appliedpatch or unappliedpatch` `realrev = not unappliedpatch and not workingdir` `normalrev = not patch and not workingdir` `enabled = {'update': not unappliedpatch,` `'manifest': not unappliedpatch,` `'merge': normalrev,` `'tag': normalrev,` `'backout': normalrev,` `'email': not workingdir,` `'archive': realrev,` `'copyhash': realrev,` `'rebase': not unappliedpatch,` `'qgoto': patch,` `'qpop-all': qparent,` `'qimport': normalrev,` `'qfinish': appliedpatch,` `'qdelete': unappliedpatch,` `'strip': normalrev}` `for action, enabled in enabled.iteritems():` `self._actions[action].setEnabled(enabled)` `menu.exec_(point)` `def updateToRevision(self):` `dlg = update.UpdateDialog(self.rev, self.repo, self)` `dlg.output.connect(self.output)` `dlg.makeLogVisible.connect(self.makeLogVisible)` `dlg.progress.connect(self.progress)` `dlg.finished.connect(dlg.deleteLater)` `dlg.exec_()` `def manifestRevision(self):` `run.manifest(self.repo.ui, repo=self.repo, rev=self.rev)` `def mergeWithRevision(self):` `dlg = merge.MergeDialog(self.rev, self.repo, self)` `dlg.exec_()` `def tagToRevision(self):` `dlg = tag.TagDialog(self.repo, rev=str(self.rev), parent=self)` `dlg.localTagChanged.connect(self.refresh)` `dlg.showMessage.connect(self.showMessage)` `dlg.exec_()` `def backoutToRevision(self):` `dlg = backout.BackoutDialog(self.repo, str(self.rev), self)` `dlg.exec_()` `def stripRevision(self):` `'Strip the selected revision and all descendants'` `dlg = thgstrip.StripDialog(self.repo, rev=str(self.rev), parent=self)` `dlg.exec_()` `def emailRevision(self):` `run.email(self.repo.ui, rev=self.repoview.selectedRevisions(),` `repo=self.repo)` `def archiveRevision(self):` `dlg = archive.ArchiveDialog(self.repo.ui, self.repo, self.rev, self)` `dlg.makeLogVisible.connect(self.makeLogVisible)` `dlg.output.connect(self.output)` `dlg.progress.connect(self.progress)` `dlg.exec_()` `def copyHash(self):` `clip = QApplication.clipboard()` `clip.setText(binascii.hexlify(self.repo[self.rev].node()))` `def rebaseRevision(self):` `"""Rebase selected revision on top of working directory parent"""` `srcrev = self.rev` `dstrev = self.repo['.'].rev()` `main = _("Confirm Rebase Revision")` `text = _("Rebase revision %d on top of %d?") % (srcrev, dstrev)` `labels = ((QMessageBox.Yes, _('&Yes')),` `(QMessageBox.No, _('&No')))` `cmdline = ['rebase', '--source', str(srcrev), '--dest', str(dstrev),` `'--repository', self.repo.root]` `if QuestionMsgBox(_('Confirm Rebase'), main, text, labels=labels,` `parent=self):` `self.runCommand(_('Rebase - TortoiseHg'), cmdline)` `def qimportRevision(self):` `"""QImport revision and all descendents to MQ"""` `if 'qparent' in self.repo.tags():` `endrev = 'qparent'` `else:` `endrev = ''` `cmdline = ['qimport', '--rev', '%s::%s' % (self.rev, endrev),` `'--repository', self.repo.root]` `self.runCommand(_('QImport - TortoiseHg'), cmdline)` `def qfinishRevision(self):` `"""Finish applied patches up to and including selected revision"""` `cmdline = ['qfinish', 'qbase::%s' % self.rev,` `'--repository', self.repo.root]` `self.runCommand(_('QFinish - TortoiseHg'), cmdline)` `def qdeleteRevision(self):` `"""Delete unapplied patch"""` `patchname = self.repo.changectx(self.rev).thgmqpatchname()` `cmdline = ['qdelete', str(patchname),` `'--repository', self.repo.root]` `self.runCommand(_('QDelete - TortoiseHg'), cmdline)` `def qpopAllRevision(self):` `"""Unapply all patches"""` `cmdline = ['qpop', '--all',` `'--repository', self.repo.root]` `self.runCommand(_('QPop All - TortoiseHg'), cmdline)` `def qgotoRevision(self):` `"""Make REV the top applied patch"""` `patchname = self.repo.changectx(self.rev).thgmqpatchname()` `cmdline = ['qgoto', str(patchname), # FIXME force option` `'--repository', self.repo.root]` `self.runCommand(_('QGoto - TortoiseHg'), cmdline)` `def runCommand(self, title, cmdline):` `if self.runner:` `InfoMsgBox(_('Unable to start'),` `_('Previous command is still running'))` `return` `def finished(ret):` `self.repo.decrementBusyCount()` `self.runner = None` `self.runner = cmdui.Runner(title, False, self)` `self.runner.output.connect(self.output)` `self.runner.progress.connect(self.progress)` `self.runner.makeLogVisible.connect(self.makeLogVisible)` `self.runner.commandFinished.connect(finished)` `self.repo.incrementBusyCount()` `self.runner.run(cmdline)`

Diff Options

repofilter: add a filter checkbutton

Toggles the display of revision sets as a filtered list or as part of the
whole revision graph. Filters and branch selections now survive reloads

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

repofilter: add a filter checkbutton Toggles the display of revision sets as a filtered list or as part of thewhole revision graph. Filters and branch selections now survive reloads

Diff to f3be99f8c173

Attach a Trello Card

Add a tag

Your session has expired

repofilter: add a filter checkbutton

Toggles the display of revision sets as a filtered list or as part of the
whole revision graph. Filters and branch selections now survive reloads