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

removed extra white space

Changeset a6546b94f9b1 …

Parent 15ec02e7de25 …

by Johan Samyn Nov 11 10 at 11:44 AM

Changes to 2 files · Browse files at a6546b94f9b1 Showing diff from parent 15ec02e7de25 Diff from another changeset...

Change 1 of 4 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/settings.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 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820	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 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820	`# settings.py - Configuration dialog for TortoiseHg and Mercurial` `#` `# 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.` `import os` `import sys` `import re` `import urlparse` `from mercurial import hg, ui, util, url, filemerge, error, extensions` `from tortoisehg.util import hglib, settings, paths, wconfig` `from tortoisehg.hgqt.i18n import _` `from tortoisehg.hgqt import qtlib, thgrepo` `from PyQt4.QtCore import ` `from PyQt4.QtGui import ` `# Technical Debt` `# stacked widget or pages need to be scrollable` `# add extensions page after THG 1.1 is released` `# we need a consistent icon set` `# connect to thgrepo.configChanged signal and refresh` `_unspecstr = _('<unspecified>')` `ENTRY_WIDTH = 300` `class SettingsCombo(QComboBox):` `def __init__(self, parent=None, opts):` `QComboBox.__init__(self, parent)` `self.opts = opts` `self.setEditable(opts.get('canedit', False))` `self.setValidator(opts.get('validator', None))` `self.defaults = opts.get('defaults', [])` `if self.defaults and self.isEditable():` `comp = QCompleter(self.defaults)` `self.setCompleter(comp)` `self.curvalue = None` `self.loaded = False` `if 'nohist' in opts:` `self.previous = []` `else:` `settings = opts['settings']` `slist = settings.value('settings/'+opts['cpath']).toStringList()` `self.previous = [s for s in slist if s]` `self.setFixedWidth(ENTRY_WIDTH)` `def resetList(self):` `self.clear()` `ucur = hglib.tounicode(self.curvalue)` `if self.opts.get('defer') and not self.loaded:` `if self.curvalue == None: # unspecified` `self.addItem(_unspecstr)` `else:` `self.addItem(ucur or '...')` `return` `self.addItem(_unspecstr)` `curindex = None` `for s in self.defaults:` `if ucur == s:` `curindex = self.count()` `self.addItem(s)` `if self.defaults and self.previous:` `self.insertSeparator(len(self.defaults)+1)` `for m in self.previous:` `if ucur == m and not curindex:` `curindex = self.count()` `self.addItem(m)` `if curindex is not None:` `self.setCurrentIndex(curindex)` `elif self.curvalue is None:` `self.setCurrentIndex(0)` `elif self.curvalue:` `self.addItem(ucur)` `self.setCurrentIndex(self.count()-1)` `else: # empty string` `self.setEditText(ucur)` `def showPopup(self):` `if self.opts.get('defer') and not self.loaded:` `self.defaults = self.opts['defer']()` `self.loaded = True` `self.resetList()` `QComboBox.showPopup(self)` `def focusInEvent(self, e):` `self.opts['descwidget'].setHtml(self.opts['tooltip'])` `QComboBox.focusInEvent(self, e)` `## common APIs for all edit widgets` `def setValue(self, curvalue):` `self.curvalue = curvalue` `self.resetList()` `def value(self):` `utext = self.currentText()` `if utext == _unspecstr:` `return None` `if 'nohist' in self.opts or utext in self.defaults + self.previous or not utext:` `return hglib.fromunicode(utext)` `self.previous.insert(0, utext)` `self.previous = self.previous[:10]` `settings = QSettings()` `settings.setValue('settings/'+self.opts['cpath'], self.previous)` `return hglib.fromunicode(utext)` `def isDirty(self):` `return self.value() != self.curvalue` `class PasswordEntry(QLineEdit):` `def __init__(self, parent=None, opts):` `QLineEdit.__init__(self, parent)` `self.opts = opts` `self.curvalue = None` `self.setEchoMode(QLineEdit.Password)` `self.setFixedWidth(ENTRY_WIDTH)` `def focusInEvent(self, e):` `self.opts['descwidget'].setHtml(self.opts['tooltip'])` `QLineEdit.focusInEvent(self, e)` `## common APIs for all edit widgets` `def setValue(self, curvalue):` `self.curvalue = curvalue` `if curvalue:` `self.setText(hglib.tounicode(curvalue))` `else:` `self.setText('')` `def value(self):` `utext = self.text()` `return utext and hglib.fromunicode(utext) or None` `def isDirty(self):` `return self.value() != self.curvalue` `class FontEntry(QPushButton):` `def __init__(self, parent=None, opts):` `QPushButton.__init__(self, parent)` `self.opts = opts` `self.curvalue = None` `self.clicked.connect(self.on_clicked)` `cpath = self.opts['cpath']` `assert cpath.startswith('tortoisehg.')` `self.fname = cpath[11:]` `self.setFixedWidth(ENTRY_WIDTH)` `def focusInEvent(self, e):` `self.opts['descwidget'].setHtml(self.opts['tooltip'])` `QPushButton.focusInEvent(self, e)` `def on_clicked(self, checked):` `thgf = qtlib.getfont(self.fname)` `dlg = QFontDialog(self)` `dlg.setCurrentFont(self.currentFont() or thgf.font())` `if dlg.exec_() == QDialog.Accepted:` `thgf.setFont(dlg.selectedFont())` `self.setText(thgf.font().toString())` `def currentFont(self):` `"""currently selected QFont if specified"""` `if not self.value():` `return None` `f = QFont()` `f.fromString(self.value())` `return f` `## common APIs for all edit widgets` `def setValue(self, curvalue):` `self.curvalue = curvalue` `if curvalue:` `self.setText(hglib.tounicode(curvalue))` `else:` `self.setText(_unspecstr)` `def value(self):` `utext = self.text()` `if utext == _unspecstr:` `return None` `else:` `return hglib.fromunicode(utext)` `def isDirty(self):` `return self.value() != self.curvalue` `def genEditCombo(opts, defaults=[]):` `opts['canedit'] = True` `opts['defaults'] = defaults` `return SettingsCombo(opts)` `def genIntEditCombo(opts):` `'EditCombo, only allows integer values'` `opts['canedit'] = True` `opts['validator'] = QIntValidator()` `return SettingsCombo(opts)` `def genPasswordEntry(opts):` `'Generate a password entry box'` `return PasswordEntry(opts)` `def genDefaultCombo(opts, defaults=[]):` `'user must select from a list'` `opts['defaults'] = defaults` `opts['nohist'] = True` `return SettingsCombo(opts)` `def genBoolCombo(opts):` `'true, false, unspecified'` `opts['defaults'] = ['True', 'False']` `opts['nohist'] = True` `return SettingsCombo(opts)` `def genDeferredCombo(opts, func):` `'Values retrieved from a function at popup time'` `opts['defer'] = func` `opts['nohist'] = True` `return SettingsCombo(opts)` `def genFontEdit(opts):` `return FontEntry(opts)` `def findDiffTools():` `return hglib.difftools(ui.ui())` `def findMergeTools():` `return hglib.mergetools(ui.ui())` `INFO = (` `({'name': 'general', 'label': 'TortoiseHg', 'icon': 'thg_logo'}, (`-`(_('Three-way Merge Tool'), 'ui.merge',`+`(_('Three-way Merge Tool'), 'ui.merge',` `(genDeferredCombo, findMergeTools),` `_('Graphical merge program for resolving merge conflicts. If left'` `' unspecified, Mercurial will use the first applicable tool it finds'` `' on your system or use its internal merge tool that leaves conflict'` `' markers in place. Chose internal:merge to force conflict markers,'` `' internal:prompt to always select local or other, or internal:dump'` `' to leave files in the working directory for manual merging')),`-`(_('Visual Diff Tool'), 'tortoisehg.vdiff',`+`(_('Visual Diff Tool'), 'tortoisehg.vdiff',` `(genDeferredCombo, findDiffTools),` `_('Specify visual diff tool, as described in the [merge-tools]'` `' section of your Mercurial configuration files. If left'` `' unspecified, TortoiseHg will use the selected merge tool.'` `' Failing that it uses the first applicable tool it finds.')),` `(_('Visual Editor'), 'tortoisehg.editor', genEditCombo,` `_('Specify the visual editor used to view files. Format:<br>'` `'myeditor -flags [$FILE --num=$LINENUM][--search $SEARCH]<br><br>'` `'See <a href="%s">OpenAtLine</a>'` `% 'http://bitbucket.org/tortoisehg/thg/wiki/OpenAtLine')),` `(_('Shell'), 'tortoisehg.shell', genEditCombo,` `_('Specify your preferred terminal shell application')),` `(_('Immediate Operations'), 'tortoisehg.immediate', genEditCombo,` `_('Space separated list of shell operations you would like '` `'to be performed immediately, without user interaction. '` `'Commands are "add remove revert forget" Default: None')),` `(_('Poll Frequency'), 'tortoisehg.pollfreq', genIntEditCombo,` `_('The period (in milliseconds) between modification time polling of '` `'key repository files, looking for changes. Values under '` `'100ms are ignored. Default: 500')),` `(_('Visible Whitespace'), 'tortoisehg.wsvisible', (genDefaultCombo,` `['Visible', 'Invisible', 'VisibleAfterIndent']),` `_('Make whitespace visible in file and diff previews.'` `' Default: Invisible')),` `(_('Tab Width'), 'tortoisehg.tabwidth', genIntEditCombo,` `_('Specify the number of spaces that tabs expand to in various'` `' TortoiseHg windows.'` `' Default: 0, Not expanded')),` `(_('Max Diff Size'), 'tortoisehg.maxdiff', genIntEditCombo,` `_('The maximum size file (in KB) that TortoiseHg will '` `'show changes for in the changelog, status, and commit windows.'` `' A value of zero implies no limit. Default: 1024 (1MB)')),` `(_('Capture stderr'), 'tortoisehg.stderrcapt', genBoolCombo,` `_('Redirect stderr to a buffer which is parsed at the end of'` `' the process for runtime errors. Default: True')),` `(_('Fork GUI'), 'tortoisehg.guifork', genBoolCombo,` `_('When running from the command line, fork a background'` `' process to run graphical dialogs. Default: True')),` `(_('Full Path Title'), 'tortoisehg.fullpath', genBoolCombo,` `_('Show a full directory path of the repository in the dialog title'` `' instead of just the root directory name. Default: False')),` `)),` `({'name': 'log', 'label': _('Workbench'), 'icon': 'menulog'}, (` `(_('Author Coloring'), 'tortoisehg.authorcolor', genBoolCombo,` `_('Color changesets by author name. If not enabled,'` `' the changes are colored green for merge, red for'` `' non-trivial parents, black for normal.'` `' Default: False')),` `(_('Long Summary'), 'tortoisehg.longsummary', genBoolCombo,` `_('If true, concatenate multiple lines of changeset summary'` `' until they reach 80 characters.'` `' Default: False')),` `(_('Log Batch Size'), 'tortoisehg.graphlimit', genIntEditCombo,` `_('The number of revisions to read and display in the'` `' changelog viewer in a single batch.'` `' Default: 500')),` `(_('Dead Branches'), 'tortoisehg.deadbranch', genEditCombo,` `_('Comma separated list of branch names that should be ignored'` `' when building a list of branch names for a repository.'` `' Default: None')),` `(_('Branch Colors'), 'tortoisehg.branchcolors', genEditCombo,` `_('Space separated list of branch names and colors of the form'` `' branch:#XXXXXX. Spaces and colons in the branch name must be'` `' escaped using a backslash (\\). Likewise some other characters'` `' can be escaped in this way, e.g. \\u0040 will be decoded to the'` `' @ character, and \\n to a linefeed.'` `' Default: None')),` `(_('Hide Tags'), 'tortoisehg.hidetags', genEditCombo,` `_('Space separated list of tags that will not be shown.'` `' Useful example: Specify "qbase qparent qtip" to hide the'`-`' standard tags inserted by the Mercurial Queues Extension.'`+`' standard tags inserted by the Mercurial Queues Extension.'` `' Default: None')),` `(_('After Pull Operation'), 'tortoisehg.postpull', (genDefaultCombo,` `['none', 'update', 'fetch', 'rebase']),` `_('Operation which is performed directly after a successful pull.'` `' update equates to pull --update, fetch equates to the fetch'` `' extension, rebase equates to pull --rebase. Default: none')),` `)),` `({'name': 'commit', 'label': _('Commit'), 'icon': 'menucommit'}, (` `(_('Username'), 'ui.username', genEditCombo,` `_('Name associated with commits. The common format is<br>'` `'"Full Name <email@example.com>"')),` `(_('Summary Line Length'), 'tortoisehg.summarylen', genIntEditCombo,` `_('Suggested length of commit message lines. A red vertical'` `' line will mark this length. CTRL-E will reflow the current'` `' paragraph to the specified line length. Default: 80')),` `(_('Close After Commit'), 'tortoisehg.closeci', genBoolCombo,` `_('Close the commit tool after every successful'` `' commit. Default: False')),` `(_('Push After Commit'), 'tortoisehg.cipushafter', genEditCombo,` `_('Attempt to push to specified URL or alias after each successful'` `' commit. Default: No push')),` `(_('Auto Commit List'), 'tortoisehg.autoinc', genEditCombo,` `_('Comma separated list of files that are automatically included'` `' in every commit. Intended for use only as a repository setting.'` `' Default: None')),` `(_('Auto Exclude List'), 'tortoisehg.ciexclude', genEditCombo,` `_('Comma separated list of files that are automatically unchecked'` `' when the status, and commit dialogs are opened.'` `' Default: None')),` `(_('English Messages'), 'tortoisehg.engmsg', genBoolCombo,` `_('Generate English commit messages even if LANGUAGE or LANG'` `' environment variables are set to a non-English language.'` `' This setting is used by the Merge, Tag and Backout dialogs.'` `' Default: False')),` `)),` `({'name': 'web', 'label': _('Web Server'), 'icon': 'proxy'}, (` `(_('Name'), 'web.name', genEditCombo,` `_('Repository name to use in the web interface, and by TortoiseHg '` `' as a shorthand name. Default is the working directory.')),` `(_('Description'), 'web.description', genEditCombo,` `_("Textual description of the repository's purpose or"` `' contents.')),` `(_('Contact'), 'web.contact', genEditCombo,` `_('Name or email address of the person in charge of the'` `' repository.')),` `(_('Style'), 'web.style', (genDefaultCombo,` `['paper', 'monoblue', 'coal', 'spartan', 'gitweb', 'old']),` `_('Which template map style to use')),`-`(_('Archive Formats'), 'web.allow_archive',`+`(_('Archive Formats'), 'web.allow_archive',` `(genEditCombo, ['bz2', 'gz', 'zip']),` `_('Comma separated list of archive formats allowed for'` `' downloading')),` `(_('Port'), 'web.port', genIntEditCombo, _('Port to listen on')),` `(_('Push Requires SSL'), 'web.push_ssl', genBoolCombo,` `_('Whether to require that inbound pushes be transported'` `' over SSL to prevent password sniffing.')),` `(_('Stripes'), 'web.stripes', genIntEditCombo,` `_('How many lines a "zebra stripe" should span in multiline output.'` `' Default is 1; set to 0 to disable.')),` `(_('Max Files'), 'web.maxfiles', genIntEditCombo,` `_('Maximum number of files to list per changeset. Default: 10')),` `(_('Max Changes'), 'web.maxchanges', genIntEditCombo,` `_('Maximum number of changes to list on the changelog. '` `'Default: 10')),` `(_('Allow Push'), 'web.allow_push', (genEditCombo, ['']),` `_('Whether to allow pushing to the repository. If empty or not'` `' set, push is not allowed. If the special value "", any remote'` `' user can push, including unauthenticated users. Otherwise, the'` `' remote user must have been authenticated, and the authenticated'` `' user name must be present in this list (separated by whitespace'` `' or ","). The contents of the allow_push list are examined after'` `' the deny_push list.')),` `(_('Deny Push'), 'web.deny_push', (genEditCombo, ['']),` `_('Whether to deny pushing to the repository. If empty or not set,'` `' push is not denied. If the special value "", all remote users'` `' are denied push. Otherwise, unauthenticated users are all'` `' denied, and any authenticated user name present in this list'` `' (separated by whitespace or ",") is also denied. The contents'` `' of the deny_push list are examined before the allow_push list.')),` `(_('Encoding'), 'web.encoding', (genEditCombo, ['UTF-8']),` `_('Character encoding name')),` `)),` `({'name': 'proxy', 'label': _('Proxy'), 'icon': QStyle.SP_DriveNetIcon}, (` `(_('Host'), 'http_proxy.host', genEditCombo,` `_('Host name and (optional) port of proxy server, for'` `' example "myproxy:8000"')),` `(_('Bypass List'), 'http_proxy.no', genEditCombo,` `_('Optional. Comma-separated list of host names that'` `' should bypass the proxy')),` `(_('User'), 'http_proxy.user', genEditCombo,` `_('Optional. User name to authenticate with at the proxy server')),` `(_('Password'), 'http_proxy.passwd', genPasswordEntry,` `_('Optional. Password to authenticate with at the proxy server')),` `)),` `({'name': 'email', 'label': _('Email'), 'icon': QStyle.SP_ArrowForward}, (` `(_('From'), 'email.from', genEditCombo,` `_('Email address to use in the "From" header and for'` `' the SMTP envelope')),` `(_('To'), 'email.to', genEditCombo,` `_('Comma-separated list of recipient email addresses')),` `(_('Cc'), 'email.cc', genEditCombo,` `_('Comma-separated list of carbon copy recipient email addresses')),` `(_('Bcc'), 'email.bcc', genEditCombo,` `_('Comma-separated list of blind carbon copy recipient'` `' email addresses')),` `(_('method'), 'email.method', (genEditCombo, ['smtp']),` `_('Optional. Method to use to send email messages. If value is'` `' "smtp" (default), use SMTP (configured below). Otherwise, use as'` `' name of program to run that acts like sendmail (takes "-f" option'` `' for sender, list of recipients on command line, message on stdin).'` `' Normally, setting this to "sendmail" or "/usr/sbin/sendmail"'` `' is enough to use sendmail to send messages.')),` `(_('SMTP Host'), 'smtp.host', genEditCombo,` `_('Host name of mail server')),` `(_('SMTP Port'), 'smtp.port', genIntEditCombo,` `_('Port to connect to on mail server.'` `' Default: 25')),` `(_('SMTP TLS'), 'smtp.tls', genBoolCombo,` `_('Connect to mail server using TLS.'` `' Default: False')),` `(_('SMTP Username'), 'smtp.username', genEditCombo,` `_('Username to authenticate to mail server with')),` `(_('SMTP Password'), 'smtp.password', genPasswordEntry,` `_('Password to authenticate to mail server with')),` `(_('Local Hostname'), 'smtp.local_hostname', genEditCombo,` `_('Hostname the sender can use to identify itself to the'` `' mail server.')),` `)),` `({'name': 'diff', 'label': _('Diff'),` `'icon': QStyle.SP_FileDialogContentsView}, (` `(_('Patch EOL'), 'patch.eol', (genDefaultCombo,` `['auto', 'strict', 'crlf', 'lf']),` `_('Normalize file line endings during and after patch to lf or'` `' crlf. Strict does no normalization. Auto does per-file'` `' detection, and is the recommended setting.'` `' Default: strict')),` `(_('Git Format'), 'diff.git', genBoolCombo,` `_('Use git extended diff header format.'` `' Default: False')),` `(_('No Dates'), 'diff.nodates', genBoolCombo,` `_('Do not include modification dates in diff headers.'` `' Default: False')),` `(_('Show Function'), 'diff.showfunc', genBoolCombo,` `_('Show which function each change is in.'` `' Default: False')),` `(_('Ignore White Space'), 'diff.ignorews', genBoolCombo,` `_('Ignore white space when comparing lines.'` `' Default: False')),` `(_('Ignore WS Amount'), 'diff.ignorewsamount', genBoolCombo,` `_('Ignore changes in the amount of white space.'` `' Default: False')),` `(_('Ignore Blank Lines'), 'diff.ignoreblanklines', genBoolCombo,` `_('Ignore changes whose lines are all blank.'` `' Default: False')),` `)),` `({'name': 'fonts', 'label': _('Fonts'), 'icon': 'fonts'}, (` `(_('Message Font'), 'tortoisehg.fontcomment', genFontEdit,` `_('Font used to display commit messages. Default: monospace 10')),` `(_('Diff Font'), 'tortoisehg.fontdiff', genFontEdit,` `_('Font used to display text differences. Default: monospace 10')),` `(_('List Font'), 'tortoisehg.fontlist', genFontEdit,` `_('Font used to display file lists. Default: sans 9')),` `(_('Log Font'), 'tortoisehg.fontlog', genFontEdit,` `_('Font used to display changelog data. Default: monospace 10')),` `)),` `({'name': 'reviewboard', 'label': _('Review Board'), 'icon': 'reviewboard'}, (` `(_('Server'), 'reviewboard.server', genEditCombo,` `_('Path to review board'` `' example "http://demo.reviewboard.org"')),` `(_('User'), 'reviewboard.user', genEditCombo,` `_('User name to authenticate with review board')),` `(_('Password'), 'reviewboard.password', genPasswordEntry,` `_('Password to authenticate with review board')),` `(_('Target Groups'), 'reviewboard.target_groups', genEditCombo,` `_('A comma seperated list of target groups')),` `(_('Target People'), 'reviewboard.target_people', genEditCombo,` `_('A comma seperated list of target people')),` `)),` `)` `CONF_GLOBAL = 0` `CONF_REPO = 1` `class SettingsDialog(QDialog):` `'Dialog for editing Mercurial.ini or hgrc'` `def __init__(self, configrepo=False, focus=None, parent=None, root=None):` `QDialog.__init__(self, parent)` `self.setWindowTitle(_('TortoiseHg Settings'))` `self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)` `if not hasattr(wconfig.config(), 'write'):` `qtlib.ErrorMsgBox(_('Iniparse package not found'),` `_("Can't change settings without iniparse package - "` `'view is readonly.'), parent=self)` `print 'Please install http://code.google.com/p/iniparse/'` `layout = QVBoxLayout()` `self.setLayout(layout)` `s = QSettings()` `self.settings = s` `self.restoreGeometry(s.value('settings/geom').toByteArray())` `def username():` `return util.username() or os.environ.get('USERNAME') or _('User')` `self.conftabs = QTabWidget()` `layout.addWidget(self.conftabs)` `self.conftabs.addTab(SettingsForm(rcpath=util.user_rcpath(), focus=focus),` `qtlib.geticon('settings_user'),` `_("%s's global settings") % username())` `try:` `if root is None:` `root = paths.find_root()` `if root:` `repo = thgrepo.repository(ui.ui(), root)` `else:` `repo = None` `except error.RepoError:` `repo = None` `if configrepo:` `qtlib.ErrorMsgBox(_('No repository found'),` `_('no repo at ') + root, parent=self)` `if repo:` `reporcpath = os.sep.join([repo.root, '.hg', 'hgrc'])` `self.conftabs.addTab(SettingsForm(rcpath=reporcpath, focus=focus),` `qtlib.geticon('settings_repo'),` `_('%s repository settings') % repo.displayname)` `BB = QDialogButtonBox` `bb = QDialogButtonBox(BB.Ok\|BB.Cancel)` `bb.accepted.connect(self.accept)` `bb.rejected.connect(self.reject)` `layout.addWidget(bb)` `self.bb = bb` `self.conftabs.setCurrentIndex(configrepo and CONF_REPO or CONF_GLOBAL)` `def isDirty(self):` `return util.any(self.conftabs.widget(i).isDirty()` `for i in xrange(self.conftabs.count()))` `def applyChanges(self):` `for i in xrange(self.conftabs.count()):` `self.conftabs.widget(i).applyChanges()` `def canExit(self):` `if self.isDirty():` `ret = qtlib.CustomPrompt(_('Confirm Exit'),` `_('Apply changes before exit?'), self,` `(_('&Yes'), _('&No (discard changes)'),` `_ ('Cancel')), default=2, esc=2).run()` `if ret == 2:` `return False` `elif ret == 0:` `self.applyChanges()` `return True` `return True` `def accept(self):` `self.applyChanges()` `s = self.settings` `s.setValue('settings/geom', self.saveGeometry())` `s.sync()` `QDialog.accept(self)` `def reject(self):` `if not self.canExit():` `return` `s = self.settings` `s.setValue('settings/geom', self.saveGeometry())` `s.sync()` `QDialog.reject(self)` `class SettingsForm(QWidget):` `"""Widget for each settings file"""` `def __init__(self, rcpath, focus=None, parent=None):` `super(SettingsForm, self).__init__(parent)` `if isinstance(rcpath, (list, tuple)):` `self.rcpath = rcpath` `else:` `self.rcpath = [rcpath]` `layout = QVBoxLayout()` `self.setLayout(layout)` `tophbox = QHBoxLayout()` `layout.addLayout(tophbox)` `self.fnedit = QLineEdit()` `self.fnedit.setReadOnly(True)` `self.fnedit.setFrame(False)` `self.fnedit.setFocusPolicy(Qt.NoFocus)` `self.fnedit.setStyleSheet('QLineEdit { background: transparent; }')` `edit = QPushButton(_('Edit File'))` `edit.clicked.connect(self.editClicked)` `self.editbtn = edit` `reload = QPushButton(_('Reload'))` `reload.clicked.connect(self.reloadClicked)` `self.reloadbtn = reload` `tophbox.addWidget(QLabel(_('Settings File:')))` `tophbox.addWidget(self.fnedit)` `tophbox.addWidget(edit)` `tophbox.addWidget(reload)` `bothbox = QHBoxLayout()` `layout.addLayout(bothbox)` `pageList = QListWidget()` `pageList.setResizeMode(QListView.Fixed)` `stack = QStackedWidget()` `bothbox.addWidget(pageList, 0)` `bothbox.addWidget(stack, 1)` `pageList.currentRowChanged.connect(stack.setCurrentIndex)` `self.pages = {}` `self.stack = stack` `self.pageList = pageList` `desctext = QTextBrowser()` `desctext.setOpenExternalLinks(True)` `layout.addWidget(desctext)` `self.desctext = desctext` `self.settings = QSettings()` `# add page items to treeview` `for meta, info in INFO:` `if isinstance(meta['icon'], str):` `icon = qtlib.geticon(meta['icon'])` `else:` `style = QApplication.style()` `icon = QIcon()` `icon.addPixmap(style.standardPixmap(meta['icon']))` `item = QListWidgetItem(icon, meta['label'])` `pageList.addItem(item)` `self.addPage(meta['name'])` `self.refresh()` `self.focusField(focus or 'ui.merge')` `def editClicked(self):` `'Open internal editor in stacked widget'` `if self.isDirty():` `ret = qtlib.CustomPrompt(_('Confirm Save'),` `_('Save changes before edit?'), self,` `(_('&Save'), _('&Discard'), _('Cancel')),` `default=2, esc=2).run()` `if ret == 0:` `self.applyChanges()` `elif ret == 2:` `return` `if qtlib.fileEditor(self.fn, foldable=True) == QDialog.Accepted:` `self.refresh()` `def refresh(self, args):` `# refresh config values` `self.ini = self.loadIniFile(self.rcpath)` `self.readonly = not (hasattr(self.ini, 'write') and os.access(self.fn, os.W_OK))` `self.stack.setDisabled(self.readonly)` `self.fnedit.setText(hglib.tounicode(self.fn))` `for info, widgets in self.pages.values():` `for row, (label, cpath, values, tooltip) in enumerate(info):` `curvalue = self.readCPath(cpath)` `widgets[row].setValue(curvalue)` `def isDirty(self):` `if self.readonly:` `return False` `for info, widgets in self.pages.values():` `for w in widgets:` `if w.isDirty():` `return True` `return False` `def reloadClicked(self):` `if self.isDirty():` `d = QMessageBox.question(self, _('Confirm Reload'),` `_('Unsaved changes will be lost.\n'` `'Do you want to reload?'),` `QMessageBox.Ok \| QMessageBox.Cancel)` `if d != QMessageBox.Ok:` `return` `self.refresh()` `def focusField(self, focusfield):` `'Set page and focus to requested datum'` `for i, (meta, info) in enumerate(INFO):` `for n, (label, cpath, values, tip) in enumerate(info):` `if cpath == focusfield:` `self.pageList.setCurrentRow(i)` `QTimer.singleShot(0, lambda: \` `self.pages[meta['name']][1][n].setFocus())` `return` `def fillFrame(self, info):` `widgets = []` `frame = QFrame()` `form = QFormLayout()` `frame.setLayout(form)` `self.stack.addWidget(frame)` `for row, (label, cpath, values, tooltip) in enumerate(info):` `opts = {'label':label, 'cpath':cpath, 'tooltip':tooltip,` `'descwidget':self.desctext, 'settings':self.settings}` `if isinstance(values, tuple):` `func = values[0]` `w = func(opts, values[1])` `else:` `func = values` `w = func(opts)` `lbl = QLabel(label)` `lbl.installEventFilter(self)` `lbl.tooltip = tooltip` `form.addRow(lbl, w)` `widgets.append(w)` `return widgets` `def eventFilter(self, obj, event):` `if event.type() == QEvent.Enter:` `self.desctext.setHtml(obj.tooltip)` `return False` `def addPage(self, name):` `for data in INFO:` `if name == data[0]['name']:` `meta, info = data` `break` `widgets = self.fillFrame(info)` `self.pages[name] = info, widgets` `def readCPath(self, cpath):` `'Retrieve a value from the parsed config file'` `# Presumes single section/key level depth` `section, key = cpath.split('.', 1)` `return self.ini.get(section, key)` `def loadIniFile(self, rcpath):` `for fn in rcpath:` `if os.path.exists(fn):` `break` `else:` `for fn in rcpath:` `# Try to create a file from rcpath` `try:` `f = open(fn, 'w')` `f.write('# Generated by TortoiseHg setting dialog\n')` `f.close()` `break` `except (IOError, OSError):` `pass` `else:` `qtlib.WarningMsgBox(_('Unable to create a Mercurial.ini file'),` `_('Insufficient access rights, reverting to read-only'` `' mode.'), parent=self)` `from mercurial import config` `self.fn = rcpath[0]` `return config.config()` `self.fn = fn` `return wconfig.readfile(self.fn)` `def recordNewValue(self, cpath, newvalue):` `# 'newvalue' is in local encoding` `section, key = cpath.split('.', 1)` `if newvalue == self.ini.get(section, key):` `return` `if newvalue == None:` `try:` `del self.ini[section][key]` `except KeyError:` `pass` `else:` `self.ini.set(section, key, newvalue)` `def applyChanges(self):` `if self.readonly:` `return` `for info, widgets in self.pages.values():` `for row, (label, cpath, values, tip) in enumerate(info):` `newvalue = widgets[row].value()` `self.recordNewValue(cpath, newvalue)` `try:` `wconfig.writefile(self.ini, self.fn)` `except IOError, e:` `qtlib.WarningMsgBox(_('Unable to write configuration file'),` `str(e), parent=self)` `def run(ui, pats, **opts):` `return SettingsDialog(opts.get('alias') == 'repoconfig',` `focus=opts.get('focus'))`

Change 1 of 5 Show Changes Only Show Entire File Loading... tortoisehg/util/hglib.py Stacked
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 540 541 542 543 544 545 546 547 548 549 550 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633	186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 540 541 542 543 544 545 546 547 548 549 550 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633	@@ -186,15 +186,15 @@ `filtered.append(tag)` `return filtered` -`def getrawctxtags(changectx):`-`'''Returns the tags for changectx, converted to UTF-8 but`+`def getrawctxtags(changectx):`+`'''Returns the tags for changectx, converted to UTF-8 but` `unfiltered for hidden tags'''` `value = [toutf(tag) for tag in changectx.tags()]` `if len(value) == 0:` `return None` `return value` -`def getctxtags(changectx):`+`def getctxtags(changectx):` `'''Returns all unhidden tags for changectx, converted to UTF-8'''` `value = getrawctxtags(changectx)` `if value:`@@ -540,11 +540,11 @@ `"""` `Will return the bookmarks for the given repo if the` `bookmarks extension is loaded.`-+ `By default, returns a list of bookmark names; if`-`values is True, returns a dict mapping names to`+`values is True, returns a dict mapping names to` `nodes.`-+ `If the extension is not loaded, returns an empty` `list/dict.` `"""`@@ -562,18 +562,18 @@ `marks = {}` `else:` `marks = {}`-+ `if values:` `return marks` `else:` `return marks.keys()`-+ `def get_repo_bookmarkcurrent(repo):` `"""` `Will return the current bookmark for the given repo` `if the bookmarks extension is loaded, and the` `track.current option is on.`-+ `If the extension is not loaded, or track.current` `is not set, returns None` `"""`@@ -593,17 +593,17 @@ `'''` `Returns True if the revision indicated by 'rev' is the current` `working directory parent.`-+ `If rev is '' or None, it is assumed to mean 'tip'.` `'''` `if rev in ('', None):` `rev = 'tip'` `rev = repo.lookup(rev)` `parents = repo.parents()`-+ `if len(parents) > 1:` `return False`-+ `return rev == parents[0].node()` `def is_descriptor(obj, attr):`@@ -619,15 +619,15 @@ `if attr in cls.__dict__:` `return hasattr(cls.__dict__[attr], '__get__')` `return None`-+ `def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,` `opts=None):` `'''` `export changesets as hg patches.`-+ `Mercurial moved patch.export to cmdutil.export after version 1.5` `(change e764f24a45ee in mercurial).`-`'''`+`'''` `try:` `return cmdutil.export(repo, revs, template, fp, switch_parent, opts)`

Diff Options

removed extra white space

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

removed extra white space

Diff to a6546b94f9b1

Attach a Trello Card

Add a tag

Your session has expired