History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable protect filenames in command lines

Filenames that start with '--' cause trouble when used as positional
arguments on the command line since they are seen as a command line
flag. So

hg clone foo --foobar

fails and result in questions like this:

http://stackoverflow.com/questions/2523080/

There is a standard way to indicate that the following command line
arguments should be interpreted literally, namely by giving an
argument of '--'. So

hg clone -- foo --foobar

works as expected.

Changeset 829f55c1ae49 …

Parent 1e847daf480b …

by Martin Geisler Apr 1 10 at 11:56 AM

Changes to 10 files · Browse files at 829f55c1ae49 Showing diff from parent 1e847daf480b Diff from another changeset...

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/archive.py Stacked
226 227 228 229 230 231	226 227 228 229 230 231 232	@@ -226,6 +226,7 @@ `cmdline.append(rev)` `cmdline.append('-t')` `cmdline.append(type)`+`cmdline.append('--')` `cmdline.append(hglib.fromutf(dest))` `# start archiving`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/changeset.py Stacked
1007 1008 1009 1010 1011 1012 1013	1007 1008 1009 1010 1011 1012 1013	@@ -1007,7 +1007,7 @@ `(self.curfile, rev))` `if dialog.run() == gtk.RESPONSE_NO:` `return`-`cmdline = ['hg', 'revert', '--verbose', '--rev', str(rev), self.curfile]`+`cmdline = ['hg', 'revert', '--verbose', '--rev', str(rev), '--', self.curfile]` `dlg = hgcmd.CmdDialog(cmdline)` `dlg.run()` `dlg.hide()`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/clone.py Stacked
331 332 333 334 335 336	331 332 333 334 335 336 337	@@ -331,6 +331,7 @@ `cmdline.append('--verbose')` `cmdline.append(hglib.fromutf(src))` `if dest:`+`cmdline.append('--')` `cmdline.append(hglib.fromutf(dest))` `# start cloning`

Change 1 of 2 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/commit.py Stacked
1017 1018 1019 1020 1021 1022 1023 1146 1147 1148 1149 1150 1151	1017 1018 1019 1020 1021 1022 1023 1146 1147 1148 1149 1150 1151 1152	@@ -1017,7 +1017,7 @@ `# prompts). Problem?` `self.opts['addremove'] = True` `if self.qnew or self.qheader is not None:`-`cmdline = ['hg', 'addremove', '--verbose']`+`cmdline = ['hg', 'addremove', '--verbose', '--']` `cmdline += [self.repo.wjoin(x) for x in files]` `self.execute_command(cmdline, force=True)` `return True`@@ -1146,6 +1146,7 @@ `cmdline += ['--message', hglib.fromutf(self.opts['message'])]` `if self.qnew:` `cmdline += [hglib.fromutf(self.get_qnew_name())]`+`cmdline.append('--')` `cmdline += files` `if autopush:` `cmdline = (cmdline, ['hg', 'push'])`

Change 1 of 6 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/history.py Stacked
1660 1661 1662 1663 1664 1665 1666 1856 1857 1858 1859 1860 1861 1862 1941 1942 1943 1944 1945 1946 1947 2285 2286 2287 2288 2289 2290 2526 2527 2528 2529 2530 2531 2532 2533 2534 2557 2558 2559 2560 2561 2562 2563	1660 1661 1662 1663 1664 1665 1666 1856 1857 1858 1859 1860 1861 1862 1941 1942 1943 1944 1945 1946 1947 2285 2286 2287 2288 2289 2290 2291 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2559 2560 2561 2562 2563 2564 2565	@@ -1660,7 +1660,7 @@ `# load the rebase extension explicitly` `hglib.loadextension(self.ui, 'rebase')` -`cmdline = ['hg'] + cmd + [self.bfile]`+`cmdline = ['hg'] + cmd + ['--', self.bfile]` `def callback(return_code, args):` `self.remove_overlay('--rebase' in cmd)`@@ -1856,7 +1856,7 @@ `self).run()` `self.pathentry.grab_focus()` `return`-`cmdline = ['hg'] + cmd + self.get_proxy_args() + [remote_path]`+`cmdline = ['hg'] + cmd + self.get_proxy_args() + ['--', remote_path]` `def callback(return_code, args):` `if return_code == 0:`@@ -1941,7 +1941,7 @@ `cmdline = ['hg', 'push'] + self.get_proxy_args()` `if self.forcepush:` `cmdline += ['--force']`-`cmdline += [remote_path]`+`cmdline += ['--', remote_path]` `def callback(return_code, args):` `if return_code == 0:`@@ -2285,6 +2285,7 @@ `status = _('Bundling from %(base)s to %(rev)s...') % data` `else:` `status = _('Bundling from %(base)s to tip...') % data`+`cmdline.append('--')` `cmdline.append(result)` `def callback(return_code, args):`@@ -2526,9 +2527,10 @@ `node = self.repo[self.currevid].node()` `rev = str(self.currevid)`-`cmdline = ['hg', 'push', '--rev', rev, remote_path]`+`cmdline = ['hg', 'push', '--rev', rev]` `if self.forcepush:` `cmdline += ['--force']`+`cmdline += ['--', remote_path]` `def callback(return_code, args):` `if return_code == 0:`@@ -2557,7 +2559,7 @@ `def pull_to(self, menuitem):` `rev = str(self.currevid)`-`cmdline = ['hg', 'pull', '--rev', rev, self.bfile]`+`cmdline = ['hg', 'pull', '--rev', rev, '--', self.bfile]` `def callback(return_code, args):` `if return_code == 0:`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/quickop.py Stacked
237 238 239 240 241 242 243 244 245	237 238 239 240 241 242 243 244 245 246 247	@@ -237,9 +237,11 @@ `return` `# prepare command line`-`cmdline = ['hg', self.command, '--verbose'] + list`+`cmdline = ['hg', self.command, '--verbose']` `if hasattr(self, 'nobackup') and self.nobackup.get_active():` `cmdline.append('--no-backup')`+`cmdline.append('--')`+`cmdline += list` `# execute command` `self.execute_command(cmdline, list)`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/synch.py Stacked
553 554 555 556 557 558 559	553 554 555 556 557 558 559	@@ -553,7 +553,7 @@ `cmdline += ['--verbose']` `if proxy_host and not use_proxy:` `cmdline += ["--config", "http_proxy.host="]`-`cmdline += [remote_path]`+`cmdline += ['--', remote_path]` `self.lastcmd = cmdline` `# show command to be executed`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/thgconfig.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 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369	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 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369	`# thgconfig.py - Configuration dialog for TortoiseHg and Mercurial` `#` `# Copyright 2007 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 gtk` `import os` `import sys` `import re` `import urlparse` `from mercurial import hg, ui, util, url, filemerge, error` `from tortoisehg.util.i18n import _` `from tortoisehg.util import hglib, settings, paths` `from tortoisehg.hgtk import dialog, gdialog, gtklib, hgcmd` `_unspecstr = _('<unspecified>')` `_unspeclocalstr = hglib.fromutf(_unspecstr)` `_pwfields = ('http_proxy.passwd', 'smtp.password')` `_tortoise_info = (` `(_('Three-way Merge Tool'), 'ui.merge', [],` `_('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', [],` `_('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', [],` `_('Specify the visual editor used to view files, etc')),` `(_('CLI Editor'), 'ui.editor', [],` `_('The editor to use during a commit and other instances where'` `' Mercurial needs multiline input from the user. Used by'` `' command line commands, including patch import.')),` `(_('Tab Width'), 'tortoisehg.tabwidth', [],` `_('Specify the number of spaces that tabs expand to in various'` `' TortoiseHg windows.'` `' Default: Not expanded')),` `(_('Max Diff Size'), 'tortoisehg.maxdiff', ['1024', '0'],` `_('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)')),` `(_('Bottom Diffs'), 'gtools.diffbottom', ['False', 'True'],` `_('Show the diff panel below the file list in status, shelve, and'` `' commit dialogs.'` `' Default: False (show diffs to right of file list)')),` `(_('Capture stderr'), 'tortoisehg.stderrcapt', ['True', 'False'],` `_('Redirect stderr to a buffer which is parsed at the end of'` `' the process for runtime errors. Default: True')),` `(_('Fork hgtk'), 'tortoisehg.hgtkfork', ['True', 'False'],` `_('When running hgtk from the command line, fork a background'` `' process to run graphical dialogs. Default: True')),` `(_('Full Path Title'), 'tortoisehg.fullpath', ['False', 'True'],` `_('Show a full directory path of the repository in the dialog title'` `' instead of just the root directory name. Default: False')))` `_commit_info = (` `(_('Username'), 'ui.username', [],` `_('Name associated with commits')),` `(_('Summary Line Length'), 'tortoisehg.summarylen', ['0', '70'],` `_('Maximum length of the commit message summary line.'` `' If set, TortoiseHg will issue a warning if the'` `' summary line is too long or not separated by a'` `' blank line. Default: 0 (unenforced)')),` `(_('Message Line Length'), 'tortoisehg.messagewrap', ['0', '80'],` `_('Word wrap length of the commit message. If'` `' set, the popup menu can be used to format'` `' the message and a warning will be issued'` `' if any lines are too long at commit.'` `' Default: 0 (unenforced)')),` `(_('Push After Commit'), 'tortoisehg.pushafterci', ['False', 'True'],` `_('Attempt to push to default push target after every successful'` `' commit. Default: False')),` `(_('Auto Commit List'), 'tortoisehg.autoinc', [],` `_('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', [],` `_('Comma separated list of files that are automatically unchecked'` `' when the status, commit, and shelve dialogs are opened.'` `' Default: None'))` `)` `_log_info = (` `(_('Author Coloring'), 'tortoisehg.authorcolor', ['False', 'True'],` `_('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', ['False', 'True'],` `_('If true, concatenate multiple lines of changeset summary'` `' until they reach 80 characters.'` `' Default: False')),` `(_('Log Batch Size'), 'tortoisehg.graphlimit', ['500'],` `_('The number of revisions to read and display in the'` `' changelog viewer in a single batch.'` `' Default: 500')),` `(_('Dead Branches'), 'tortoisehg.deadbranch', [],` `_('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', [],` `_('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', [],` `_('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.'` `' Default: None')),` `(_('Use Expander'), 'tortoisehg.changeset-expander', ['False', 'True'],` `_('Show changeset details with an expander')),` `(_('Toolbar Style'), 'tortoisehg.logtbarstyle',` `['small', 'large', 'theme'],` `_('Adjust the display of the main toolbar in the Repository'` `' Explorer. Values: small, large, or theme. Default: theme')),` `)` `_paths_info = (` `(_('After Pull Operation'), 'tortoisehg.postpull',` `['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')),)` `_web_info = (` `(_('Name'), 'web.name', ['unknown'],` `_('Repository name to use in the web interface.'` `' Default is the working directory.')),` `(_('Description'), 'web.description', ['unknown'],` `_("Textual description of the repository's purpose or"` `' contents.')),` `(_('Contact'), 'web.contact', ['unknown'],` `_('Name or email address of the person in charge of the'` `' repository.')),` `(_('Style'), 'web.style',` `['paper', 'monoblue', 'coal', 'spartan', 'gitweb', 'old'],` `_('Which template map style to use')),` `(_('Archive Formats'), 'web.allow_archive', ['bz2', 'gz', 'zip'],` `_('Comma separated list of archive formats allowed for'` `' downloading')),` `(_('Port'), 'web.port', ['8000'], _('Port to listen on')),` `(_('Push Requires SSL'), 'web.push_ssl', ['True', 'False'],` `_('Whether to require that inbound pushes be transported'` `' over SSL to prevent password sniffing.')),` `(_('Stripes'), 'web.stripes', ['1', '0'],` `_('How many lines a "zebra stripe" should span in multiline output.'` `' Default is 1; set to 0 to disable.')),` `(_('Max Files'), 'web.maxfiles', ['10'],` `_('Maximum number of files to list per changeset.')),` `(_('Max Changes'), 'web.maxchanges', ['10'],` `_('Maximum number of changes to list on the changelog.')),` `(_('Allow Push'), 'web.allow_push', [''],` `_('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', [''],` `_('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', ['UTF-8'],` `_('Character encoding name')))` `_proxy_info = (` `(_('Host'), 'http_proxy.host', [],` `_('Host name and (optional) port of proxy server, for'` `' example "myproxy:8000"')),` `(_('Bypass List'), 'http_proxy.no', [],` `_('Optional. Comma-separated list of host names that'` `' should bypass the proxy')),` `(_('User'), 'http_proxy.user', [],` `_('Optional. User name to authenticate with at the'` `' proxy server')),` `(_('Password'), 'http_proxy.passwd', [],` `_('Optional. Password to authenticate with at the'` `' proxy server')))` `_email_info = (` `(_('From'), 'email.from', [],` `_('Email address to use in the "From" header and for the SMTP envelope')),` `(_('To'), 'email.to', [],` `_('Comma-separated list of recipient email addresses')),` `(_('Cc'), 'email.cc', [],` `_('Comma-separated list of carbon copy recipient email'` `' addresses')),` `(_('Bcc'), 'email.bcc', [],` `_('Comma-separated list of blind carbon copy recipient'` `' email addresses')),` `(_('method'), 'email.method', ['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', [], _('Host name of mail server')),` `(_('SMTP Port'), 'smtp.port', ['25'],` `_('Port to connect to on mail server.'` `' Default: 25')),` `(_('SMTP TLS'), 'smtp.tls', ['False', 'True'],` `_('Connect to mail server using TLS.'` `' Default: False')),` `(_('SMTP Username'), 'smtp.username', [],` `_('Username to authenticate to mail server with')),` `(_('SMTP Password'), 'smtp.password', [],` `_('Password to authenticate to mail server with')),` `(_('Local Hostname'), 'smtp.local_hostname', [],` `_('Hostname the sender can use to identify itself to the mail server.')))` `_diff_info = (` `(_('Patch EOL'), 'patch.eol', ['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', ['False', 'True'],` `_('Use git extended diff header format.'` `' Default: False')),` `(_('No Dates'), 'diff.nodates', ['False', 'True'],` `_('Do not include modification dates in diff headers.'` `' Default: False')),` `(_('Show Function'), 'diff.showfunc', ['False', 'True'],` `_('Show which function each change is in.'` `' Default: False')),` `(_('Ignore White Space'), 'diff.ignorews', ['False', 'True'],` `_('Ignore white space when comparing lines.'` `' Default: False')),` `(_('Ignore WS Amount'), 'diff.ignorewsamount', ['False', 'True'],` `_('Ignore changes in the amount of white space.'` `' Default: False')),` `(_('Ignore Blank Lines'), 'diff.ignoreblanklines', ['False', 'True'],` `_('Ignore changes whose lines are all blank.'` `' Default: False')),` `(_('Coloring Style'), 'tortoisehg.diffcolorstyle',` `['none', 'foreground', 'background'],` `_('Adjust the coloring style of diff lines in the changeset viewer.'` `' Default: foreground')))` `_font_info = (` `(_('Commit Message'), 'gtools.fontcomment', [],` `_('Font used in changeset viewer and commit log text.'` `' Default: monospace 10')),` `(_('Diff Text'), 'gtools.fontdiff', [],` `_('Font used for diffs in status and commit tools.'` `' Default: monospace 10')),` `(_('File List'), 'gtools.fontlist', [],` `_('Font used in file lists in status and commit tools.'` `' Default: sans 9')),` `(_('Command Output'), 'gtools.fontlog', [],` `_('Font used in command output window.'` `' Default: monospace 10')))` `_font_presets = {` `'win-ja': (_('Japanese on Windows'), {` `'gtools.fontcomment': 'MS Gothic 11',` `'gtools.fontdiff': 'MS Gothic 10',` `'gtools.fontlist': 'MS UI Gothic 9',` `'gtools.fontlog': 'MS Gothic 10'})}` `class PathEditDialog(gtk.Dialog):` `_protocols = (('ssh', _('ssh')), ('http', _('http')),` `('https', _('https')), ('local', _('local')))` `def __init__(self, path, alias, list):` `gtk.Dialog.__init__(self, parent=None, flags=gtk.DIALOG_MODAL,` `buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,` `gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))` `gtklib.set_tortoise_keys(self)` `self.connect('response', self.response)` `self.connect('key-press-event', self.key_press)` `self.set_title(_('Edit remote repository path'))` `self.set_has_separator(False)` `self.set_resizable(False)` `self.newpath, self.newalias = None, None` `self.list = list` `self.entries = {}` `# Tuple: (internal name, translated name)` `for name in (('URL', _('URL')), ('Port', _('Port')),` `('Folder', _('Folder')), ('Host', _('Host')),` `('User', _('User')), ('Password', _('Password')),` `('Alias', _('Alias'))):` `entry = gtk.Entry()` `entry.set_alignment(0)` `label = gtk.Label(name[1])` `label.set_alignment(1, 0.5)` `self.entries[name[0]] = [entry, label, None]` `# persistent settings` `self.settings = settings.Settings('pathedit')` `# configure individual widgets` `self.entries['Alias'][0].set_width_chars(18)` `self.entries['URL'][0].set_width_chars(60)` `self.entries['Port'][0].set_width_chars(8)` `self.entries['User'][0].set_width_chars(18)` `self.entries['Password'][0].set_width_chars(24)` `self.entries['Password'][0].set_visibility(False)` `# table for main entries` `toptable = gtklib.LayoutTable()` `self.vbox.pack_start(toptable, False, False, 2)` `## alias (and 'Browse...' button)` `browse = gtk.Button(_('Browse...'))` `browse.connect('clicked', self.browse_clicked)` `ealias = self.entries['Alias']` `toptable.add_row(ealias[1], ealias[0], None, browse, expand=0)` `## final URL` `eurl = self.entries['URL']` `toptable.add_row(eurl[1], eurl[0], padding=False)` `self.expander = expander = gtk.Expander(_('URL Details'))` `self.vbox.pack_start(expander, True, True, 2)` `# table for separated entries` `entrytable = gtklib.LayoutTable()` `expander.add(entrytable)` `## path type` `self.protocolcombo = gtk.combo_box_new_text()` `for name, label in self._protocols:` `self.protocolcombo.append_text(label)` `toptable.add_row(_('Type'), self.protocolcombo)` `## host & port` `ehost, eport = self.entries['Host'], self.entries['Port']` `entrytable.add_row(ehost[1], ehost[0], 8, eport[1], eport[0])` `## folder` `efolder = self.entries['Folder']` `entrytable.add_row(efolder[1], efolder[0], padding=False)` `## username & password` `euser, epasswd = self.entries['User'], self.entries['Password']` `entrytable.add_row(euser[1], euser[0], 8, epasswd[1], epasswd[0])` `# layout group` `group = gtklib.LayoutGroup()` `group.add(toptable, entrytable)` `# prepare to show` `self.load_settings()` `self.setentries(path, alias)` `self.sethandlers()` `self.lastproto = None` `self.update_sensitive()` `self.show_all()` `def protocolindex(self, pname):` `for (i, (name, label)) in enumerate(self._protocols):` `if name == pname:` `return i` `return None` `def protocolname(self, plabel):` `for (name, label) in self._protocols:` `if label == plabel:` `return name` `return None` `def sethandlers(self, enable=True):` `# protocol combobox` `if enable:` `self.pcombo_hid = self.protocolcombo.connect('changed', self.changed)` `else:` `h = self.pcombo_hid` `if h and self.protocolcombo.handler_is_connected(h):` `self.protocolcombo.disconnect(h)` `# other entries` `for n, (e, l, h) in self.entries.iteritems():` `if enable:` `handler = (n == 'URL' and self.changedurl or self.changed)` `self.entries[n][2] = e.connect('changed', handler)` `else:` `if e.handler_is_connected(h):` `e.disconnect(h)` `def urlparse(self, path):` `m = re.match(r'^ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.))?$', path)` `if m:` `user = m.group(2)` `host = m.group(3)` `port = m.group(5)` `folder = m.group(7) or '.'` `passwd = ''` `scheme = 'ssh'` `elif path.startswith('http://') or path.startswith('https://'):` `snpaqf = urlparse.urlparse(path)` `scheme, netloc, folder, params, query, fragment = snpaqf` `host, port, user, passwd = url.netlocsplit(netloc)` `if folder.startswith('/'): folder = folder[1:]` `else:` `user, host, port, passwd = [''] 4` `folder = path` `scheme = 'local'` `return user, host, port, folder, passwd, scheme` `def setentries(self, path, alias=None):` `if alias == None:` `alias = self.entries['Alias'][0].get_text()` `user, host, port, folder, pw, scheme = self.urlparse(path)` `self.entries['Alias'][0].set_text(alias)` `if scheme == 'local':` `self.entries['URL'][0].set_text(path)` `else:` `self.entries['URL'][0].set_text(url.hidepassword(path))` `self.entries['User'][0].set_text(user or '')` `self.entries['Host'][0].set_text(host or '')` `self.entries['Port'][0].set_text(port or '')` `self.entries['Folder'][0].set_text(folder or '')` `self.entries['Password'][0].set_text(pw or '')` `self.protocolcombo.set_active(self.protocolindex(scheme) or 0)` `def update_sensitive(self):` `proto = self.protocolname(self.protocolcombo.get_active_text())` `if proto == self.lastproto:` `return` `self.lastproto = proto` `if proto == 'local':` `for n in ('User', 'Password', 'Port', 'Host'):` `self.entries[n][0].set_sensitive(False)` `self.entries[n][1].set_sensitive(False)` `elif proto == 'ssh':` `for n in ('User', 'Port', 'Host'):` `self.entries[n][0].set_sensitive(True)` `self.entries[n][1].set_sensitive(True)` `self.entries['Password'][0].set_sensitive(False)` `self.entries['Password'][1].set_sensitive(False)` `else:` `for n in ('User', 'Password', 'Port', 'Host'):` `self.entries[n][0].set_sensitive(True)` `self.entries[n][1].set_sensitive(True)` `def load_settings(self):` `expanded = self.settings.get_value('expanded', False, True)` `self.expander.set_property('expanded', expanded)` `def store_settings(self):` `expanded = self.expander.get_property('expanded')` `self.settings.set_value('expanded', expanded)` `self.settings.write()` `def browse_clicked(self, button):` `if self.protocolname(self.protocolcombo.get_active_text()) == 'local':` `initial = self.entries['URL'][0].get_text()` `else:` `initial = None` `path = gtklib.NativeFolderSelectDialog(initial=initial,` `title=_('Select Local Folder')).run()` `if path:` `self.entries['URL'][0].set_text(path)` `def changed(self, combo):` `newurl = self.buildurl()` `self.sethandlers(False)` `self.entries['URL'][0].set_text(url.hidepassword(newurl))` `self.sethandlers(True)` `self.update_sensitive()` `def changedurl(self, combo):` `self.sethandlers(False)` `self.setentries(self.entries['URL'][0].get_text())` `self.sethandlers(True)` `self.update_sensitive()` `def response(self, widget, response_id):` `if response_id != gtk.RESPONSE_OK:` `self.store_settings()` `self.destroy()` `return` `aliasinput = self.entries['Alias'][0]` `newalias = aliasinput.get_text()` `if newalias == '':` `ret = dialog.error_dialog(self, _('Alias name is empty'),` `_('Please enter alias name'))` `aliasinput.grab_focus()` `return` `if newalias in self.list:` `ret = gdialog.Confirm(_('Confirm Overwrite'), [], self,` `_("Overwrite existing '%s' path?") % newalias).run()` `if ret != gtk.RESPONSE_YES:` `return` `self.newpath = self.buildurl()` `self.newalias = newalias` `self.store_settings()` `self.destroy()` `def key_press(self, widget, event):` `if event.keyval in (gtk.keysyms.Return, gtk.keysyms.KP_Enter):` `self.response(widget, gtk.RESPONSE_OK)` `def buildurl(self):` `proto = self.protocolname(self.protocolcombo.get_active_text())` `host = self.entries['Host'][0].get_text()` `port = self.entries['Port'][0].get_text()` `folder = self.entries['Folder'][0].get_text()` `user = self.entries['User'][0].get_text()` `pwd = self.entries['Password'][0].get_text()` `if proto == 'ssh':` `ret = 'ssh://'` `if user:` `ret += user + '@'` `ret += host` `if port:` `ret += ':' + port` `ret += '/' + folder` `elif proto == 'local':` `ret = folder` `else:` `ret = proto + '://'` `netloc = url.netlocunsplit(host, port, user, pwd)` `ret += netloc + '/' + folder` `return ret` `CONF_GLOBAL = 0` `CONF_REPO = 1` `class ConfigDialog(gtk.Dialog):` `def __init__(self, configrepo=False):` `""" Initialize the Dialog. """` `gtk.Dialog.__init__(self, parent=None, flags=0,` `buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,` `gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,` `gtk.STOCK_APPLY, gtk.RESPONSE_APPLY))` `gtklib.set_tortoise_keys(self)` `self._btn_apply = self.action_area.get_children()[0]` `self.set_has_separator(False)` `self.set_default_size(-1, 500)` `self.ui = ui.ui()` `try:` `root = paths.find_root()` `if root:` `repo = hg.repository(self.ui, root)` `name = hglib.get_reponame(repo)` `self.ui = repo.ui` `else:` `repo = None` `self.root = root` `except error.RepoError:` `repo = None` `if configrepo:` `dialog.error_dialog(self, _('No repository found'),` `_('no repo at ') + root)` `self.destroy()` `return` `try:` `import iniparse` `iniparse.INIConfig` `self.readonly = False` `except ImportError:` `dialog.error_dialog(self, _('Iniparse package not found'),` `_("Can't change settings without iniparse package - "` `'view is readonly.'))` `print 'Please install http://code.google.com/p/iniparse/'` `self.readonly = True` `# Catch close events` `self.connect('response', self.should_live)` `self.connect('thg-accept', self.thgaccept)` `self.connect('delete-event', self.delete_event)` `# wrapper box for padding` `wrapbox = gtk.VBox()` `wrapbox.set_border_width(5)` `self.vbox.pack_start(wrapbox)` `# create combo to select the target` `hbox = gtk.HBox()` `wrapbox.pack_start(hbox, False, False, 1)` `combo = gtk.combo_box_new_text()` `hbox.pack_start(combo, False, False)` `combo.append_text(_('User global settings'))` `if repo:` `combo.append_text(_('%s repository settings') % hglib.toutf(name))` `combo.connect('changed', self.fileselect)` `self.confcombo = combo` `# command buttons` `edit = gtk.Button(_('Edit File'))` `hbox.pack_start(edit, False, False, 6)` `edit.connect('clicked', self.edit_clicked)` `reload = gtk.Button(_('Reload'))` `hbox.pack_start(reload, False, False)` `reload.connect('clicked', self.reload_clicked)` `# insert padding of between combo and middle pane` `wrapbox.pack_start(gtk.VBox(), False, False, 4)` `# hbox for splitting treeview and main pane (notebook + desc)` `sidebox = gtk.HBox()` `wrapbox.pack_start(sidebox)` `# create treeview for selecting configuration page` `self.confmodel = gtk.ListStore(gtk.gdk.Pixbuf, # icon` `str, # label text` `str) # page id` `self.confview = gtk.TreeView(self.confmodel)` `self.confview.set_headers_visible(False)` `self.confview.set_size_request(140, -1)` `self.confview.connect('cursor-changed', self.cursor_changed)` `tvframe = gtk.Frame()` `sidebox.pack_start(tvframe, False, False)` `tvframe.set_shadow_type(gtk.SHADOW_IN)` `tvframe.add(self.confview)` `col = gtk.TreeViewColumn()` `self.confview.append_column(col)` `cell = gtk.CellRendererPixbuf()` `col.pack_start(cell, True)` `col.add_attribute(cell, 'pixbuf', 0)` `col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=1)` `self.confview.append_column(col)` `# insert padding of between treeview and main pane` `sidebox.pack_start(gtk.HBox(), False, False, 4)` `# vbox for splitting notebook and desc frame` `mainbox = gtk.VBox()` `sidebox.pack_start(mainbox)` `# create a new notebook, place the position of the tabs` `self.notebook = notebook = gtk.Notebook()` `notebook.set_show_tabs(False)` `notebook.set_show_border(False)` `notebook.show()` `mainbox.pack_start(notebook)` `self.dirty = False` `self.pages = {}` `self.tooltips = gtk.Tooltips()` `self.history = settings.Settings('thgconfig')` `# add spell ckeck entry if spell check is supported` `tortoise_info = _tortoise_info` `if gtklib.hasspellcheck():` `tortoise_info += ((` `_('Spell Check Language'), 'tortoisehg.spellcheck', [],` `_('Default language for spell check. '` `'System language is used if not specified. '` `'Examples: en, en_GB, en_US')),)` `# create pages for each section of configuration file` `self.add_page('TortoiseHg', 'general', tortoise_info, 'thg_logo.ico')` `self.add_page(_('Commit'), 'commit', _commit_info, 'menucommit.ico')` `self.add_page(_('Repository Explorer'), 'log', _log_info,` `'menulog.ico')` `self.add_page(_('Synchronize'), 'sync', _paths_info, 'menusynch.ico',` `extra=True)` `self.add_page(_('Web Server'), 'web', _web_info, 'proxy.ico')` `self.add_page(_('Proxy'), 'proxy', _proxy_info, 'general.ico')` `self.add_page(_('Email'), 'email', _email_info, gtk.STOCK_GOTO_LAST)` `self.add_page(_('Diff'), 'diff', _diff_info, gtk.STOCK_JUSTIFY_FILL)` `self.add_page(_('Font'), 'font', _font_info, gtk.STOCK_SELECT_FONT,` `extra=True, width=20)` `# insert padding of between notebook and common desc frame` `mainbox.pack_start(gtk.VBox(), False, False, 2)` `# common description frame` `descframe = gtk.Frame(_('Description'))` `mainbox.pack_start(descframe, False, False)` `desctext = gtk.TextView()` `desctext.set_wrap_mode(gtk.WRAP_WORD)` `desctext.set_editable(False)` `desctext.set_sensitive(False)` `scrolled = gtk.ScrolledWindow()` `scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)` `scrolled.set_border_width(4)` `scrolled.add(desctext)` `descframe.add(scrolled)` `self.descbuffer = desctext.get_buffer()` `# Force dialog into clean state in the beginning` `self._btn_apply.set_sensitive(False)` `self.dirty = False` `combo.set_active(configrepo and CONF_REPO or CONF_GLOBAL)` `# activate first config page` `self.confview.set_cursor(self.confmodel[0].path)` `self.confview.grab_focus()` `def fileselect(self, combo):` `'select another hgrc file'` `if self.dirty:` `ret = gdialog.CustomPrompt(_('Confirm Switch'),` `_('Switch after saving changes?'), self,` `(_('&Save'), _('&Discard'), _('&Cancel')),` `default=2, esc=2).run()` `if ret == 2:` `combo.handler_block_by_func(self.fileselect)` `repo = combo.get_active() == CONF_GLOBAL` `combo.set_active(repo and CONF_REPO or CONF_GLOBAL)` `combo.handler_unblock_by_func(self.fileselect)` `return` `elif ret == 0:` `self.apply_changes()` `self.refresh()` `def refresh(self):` `if self.confcombo.get_active() == CONF_REPO:` `repo = hg.repository(ui.ui(), self.root)` `name = hglib.get_reponame(repo)` `self.rcpath = [os.sep.join([repo.root, '.hg', 'hgrc'])]` `self.set_title(_('TortoiseHg Configure Repository - ') + hglib.toutf(name))` `gtklib.set_tortoise_icon(self, 'settings_repo.ico')` `else:` `self.rcpath = util.user_rcpath()` `self.set_title(_('TortoiseHg Configure User-Global Settings'))` `gtklib.set_tortoise_icon(self, 'settings_user.ico')` `self.ini = self.load_config(self.rcpath)` `self.refresh_vlist()` `# refresh sync frame` `self.pathdata.clear()` `if 'paths' in self.ini:` `for name in self.ini['paths']:` `path = self.ini['paths'][name]` `safepath = hglib.toutf(url.hidepassword(path))` `self.pathdata.append([hglib.toutf(name), safepath,` `hglib.toutf(path)])` `self.refresh_path_list()` `# refresh preset fonts combo` `model = self.presetcombo.get_model()` `cpaths = [info[1] for info in _font_info]` `defaulfonts = True` `for cpath in cpaths:` `value = self.get_ini_config(cpath)` `if value is not None:` `defaulfonts = False` `if defaulfonts:` `# theme default fonts` `self.defaultradio.set_active(True)` `self.presetcombo.set_active(0)` `else:` `for name, (label, preset) in _font_presets.items():` `for cpath in cpaths:` `if self.get_ini_config(cpath) != preset[cpath]:` `break` `else:` `# preset fonts` `rows = [row for row in model if row[0] == name]` `if rows:` `self.presetcombo.set_active_iter(rows[0].iter)` `self.presetradio.set_active(True)` `break` `else:` `# custom fonts` `self.customradio.set_active(True)` `self.presetcombo.set_active(0)` `self._btn_apply.set_sensitive(False)` `self.dirty = False` `def edit_clicked(self, button):` `# reload configs, in case they have been written since opened` `if self.confcombo.get_active() == CONF_REPO:` `repo = hg.repository(ui.ui(), self.root)` `u = repo.ui` `else:` `u = ui.ui()` `# open config file with visual editor` `if not gtklib.open_with_editor(u, self.fn, self):` `self.focus_field('tortoisehg.editor')` `def reload_clicked(self, button):` `if self.dirty:` `ret = gdialog.Confirm(_('Confirm Reload'), [], self,` `_('Unsaved changes will be lost.\n'` `'Do you want to reload?')).run()` `if ret != gtk.RESPONSE_YES:` `return` `self.refresh()` `def delete_event(self, dlg, event):` `return True` `def thgaccept(self, dlg):` `self.response(gtk.RESPONSE_OK)` `def should_live(self, dialog=None, resp=None):` `if resp == gtk.RESPONSE_APPLY:` `self.apply_changes()` `self.emit_stop_by_name('response')` `return True` `elif resp == gtk.RESPONSE_CANCEL:` `return False` `if self.dirty and not self.readonly:` `if resp == gtk.RESPONSE_OK:` `ret = 0` `else:` `ret = gdialog.CustomPrompt(_('Confirm Exit'),` `_('Exit after saving changes?'), self,` `(_('&Yes'), _('&No (discard changes)'),` `_('&Cancel')), default=2, esc=2).run()` `if ret == 2:` `if resp is not None:` `self.emit_stop_by_name('response')` `return True` `elif ret == 0:` `self.apply_changes()` `return False` `def cursor_changed(self, treeview):` `path, focus = self.confview.get_cursor()` `if not path:` `return` `name = self.confmodel[path][2]` `page_num, info, vbox, widgets = self.pages[name]` `self.notebook.set_current_page(page_num)` `def show_page(self, name):` `'''Show page by activating treeview item'''` `page_num = self.pages[name][0]` `path = self.confmodel[page_num].path` `self.confview.set_cursor(path)` `def focus_field(self, focusfield):` `'''Set page and focus to requested datum'''` `for name, (page_num, info, vbox, widgets) in self.pages.items():` `for n, (label, cpath, values, tip) in enumerate(info):` `if cpath == focusfield:` `self.show_page(name)` `widgets[n].grab_focus()` `return` `def new_path(self, newpath, alias='new'):` `'''Add a new path to [paths], give default name, focus'''` `i = self.pathdata.insert_before(None, None)` `safepath = url.hidepassword(newpath)` `if alias in [row[0] for row in self.pathdata]:` `num = 0` `while len([row for row in self.pathdata if row[0] == alias]) > 0:` `num += 1` `alias = 'new_%d' % num` `self.pathdata.set_value(i, 0, alias)` `self.pathdata.set_value(i, 1, '%s' % hglib.toutf(safepath))` `self.pathdata.set_value(i, 2, '%s' % hglib.toutf(newpath))` `self.pathtree.get_selection().select_iter(i)` `self.pathtree.set_cursor(` `self.pathdata.get_path(i),` `self.pathtree.get_column(0))` `self.refresh_path_list()` `# This method may be called from hgtk.sync, so ensure page is visible` `self.show_page('sync')` `self.dirty_event()` `def dirty_event(self, args):` `if not self.dirty:` `self._btn_apply.set_sensitive(not self.readonly)` `self.dirty = True` `def _add_path(self, args):` `self.new_path('http://')` `self._edit_path(new=True)` `def _edit_path(self, args, opts):` `selection = self.pathtree.get_selection()` `if not selection.count_selected_rows():` `return` `model, path = selection.get_selected()` `dialog = PathEditDialog(model[path][2], model[path][0],` `[p[0] for p in self.pathdata if p[0] != model[path][0]])` `dialog.set_transient_for(self)` `dialog.run()` `if dialog.newpath:` `if model[path][0] != dialog.newalias:` `# remove existing path` `rows = [row for row in model if row[0] == dialog.newalias]` `if len(rows) > 0:` `del model[rows[0].iter]` `# update path info` `model[path][0] = dialog.newalias` `model[path][1] = url.hidepassword(dialog.newpath)` `model[path][2] = dialog.newpath` `self.dirty_event()` `elif opts.has_key('new') and opts['new'] == True:` `del self.pathdata[path]` `self.refresh_path_list()` `self.dirty_event()` `def _remove_path(self, args):` `selection = self.pathtree.get_selection()` `if not selection.count_selected_rows():` `return` `model, path = selection.get_selected()` `next_iter = self.pathdata.iter_next(path)` `del self.pathdata[path]` `if next_iter:` `selection.select_iter(next_iter)` `elif len(self.pathdata):` `selection.select_path(len(self.pathdata) - 1)` `self.refresh_path_list()` `self.dirty_event()` `def _test_path(self, args):` `selection = self.pathtree.get_selection()` `if not selection.count_selected_rows():` `return` `if not self.root:` `dialog.error_dialog(self, _('No Repository Found'),` `_('Path testing cannot work without a repository'))` `return` `model, path = selection.get_selected()` `testpath = hglib.fromutf(model[path][2])` `if not testpath:` `return` `if testpath[0] == '~':` `testpath = os.path.expanduser(testpath)`-`cmdline = ['hg', 'incoming', '--verbose', testpath]`+`cmdline = ['hg', 'incoming', '--verbose', '--', testpath]` `dlg = hgcmd.CmdDialog(cmdline, text='hg incoming')` `dlg.run()` `dlg.hide()` `def _default_path(self, args):` `selection = self.pathtree.get_selection()` `if not selection.count_selected_rows():` `return` `model, path = selection.get_selected()` `if model[path][0] == 'default':` `return` `# collect rows has 'default' alias` `rows = [row for row in model if row[0] == 'default']` `if len(rows) > 0:` `ret = gdialog.Confirm(_('Confirm Overwrite'), [], self,` `_("Overwrite existing '%s' path?") % 'default').run()` `if ret != gtk.RESPONSE_YES:` `return` `# remove old default path` `default_iter = rows[0].iter` `del model[default_iter]` `# set 'default' alias to selected path` `model[path][0] = 'default'` `self.refresh_path_list()` `self.dirty_event()` `def _pathtree_changed(self, sel):` `self.refresh_path_list()` `def _pathtree_pressed(self, widget, event):` `if event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS:` `x, y = int(event.x), int(event.y)` `pathinfo = self.pathtree.get_path_at_pos(x, y)` `if pathinfo is not None:` `self._edit_path()` `elif event.button == 1:` `selection = self.pathtree.get_selection()` `selection.unselect_all()` `self.refresh_path_list()` `def refresh_path_list(self):` `"""Update sensitivity of buttons"""` `selection = self.pathtree.get_selection()` `path_selected = (len(self.pathdata) > 0` `and selection.count_selected_rows() > 0)` `repo_available = self.root is not None` `if path_selected:` `model, path = selection.get_selected()` `default_path = model[path][0] == 'default'` `else:` `default_path = False` `self._editpathbutton.set_sensitive(path_selected)` `self._delpathbutton.set_sensitive(path_selected)` `self._testpathbutton.set_sensitive(repo_available and path_selected)` `self._defaultpathbutton.set_sensitive(not default_path and path_selected)` `def fill_sync_frame(self, parent, table):` `# add table` `parent.pack_start(table, False, False)` `# insert padding` `parent.pack_start(gtk.VBox(), False, False, 2)` `# paths frame` `frame = gtk.Frame(_('Remote repository paths'))` `parent.pack_start(frame, True, True, 2)` `vbox = gtk.VBox()` `vbox.set_border_width(4)` `frame.add(vbox)` `# Initialize data model for 'Paths' tab` `self.pathdata = gtk.ListStore(str, str, str)` `# Define view model for 'Paths' tab` `self.pathtree = gtk.TreeView(self.pathdata)` `self.pathtree.set_enable_search(False)` `self.pathtree.add_events(gtk.gdk.BUTTON_PRESS_MASK)` `self.pathtree.connect('cursor-changed', self._pathtree_changed)` `self.pathtree.connect('button-press-event', self._pathtree_pressed)` `renderer = gtk.CellRendererText()` `column = gtk.TreeViewColumn(_('Alias'), renderer, text=0)` `self.pathtree.append_column(column)` `renderer = gtk.CellRendererText()` `column = gtk.TreeViewColumn(_('Repository Path'), renderer, text=1)` `self.pathtree.append_column(column)` `scrolled = gtk.ScrolledWindow()` `scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)` `scrolled.add(self.pathtree)` `treeframe = gtk.Frame()` `treeframe.set_border_width(2)` `treeframe.set_shadow_type(gtk.SHADOW_IN)` `treeframe.add(scrolled)` `vbox.add(treeframe)` `# bottom command buttons` `bottombox = gtk.HBox()` `vbox.pack_start(bottombox, False, False, 4)` `self.addButton = gtk.Button(_('_Add'))` `self.addButton.set_use_underline(True)` `self.addButton.connect('clicked', self._add_path)` `bottombox.pack_start(self.addButton, True, True, 2)` `self._editpathbutton = gtk.Button(_('_Edit'))` `self._editpathbutton.set_use_underline(True)` `self._editpathbutton.connect('clicked', self._edit_path)` `bottombox.pack_start(self._editpathbutton, True, True, 2)` `self._delpathbutton = gtk.Button(_('_Remove'))` `self._delpathbutton.set_use_underline(True)` `self._delpathbutton.connect('clicked', self._remove_path)` `bottombox.pack_start(self._delpathbutton, True, True, 2)` `self._testpathbutton = gtk.Button(_('_Test'))` `self._testpathbutton.set_use_underline(True)` `self._testpathbutton.connect('clicked', self._test_path)` `bottombox.pack_start(self._testpathbutton, True, True, 2)` `self._defaultpathbutton = gtk.Button(_('Set as _default'))` `self._defaultpathbutton.set_use_underline(True)` `self._defaultpathbutton.connect('clicked', self._default_path)` `bottombox.pack_start(self._defaultpathbutton, True, True, 2)` `def fill_font_frame(self, parent, table):` `# layout table` `layout = gtklib.LayoutTable()` `parent.pack_start(layout, False, False, 2)` `parent.reorder_child(layout, 0)` `# radio buttons` `defaultradio = gtk.RadioButton(None, _('Theme default fonts'))` `presetradio = gtk.RadioButton(defaultradio, _('Preset fonts:'))` `customradio = gtk.RadioButton(defaultradio, _('Custom fonts:'))` `self.defaultradio = defaultradio` `self.presetradio = presetradio` `self.customradio = customradio` `# preset list` `presetmodel = gtk.ListStore(str, # internal name` `str) # GUI label` `presetmodel.append((None, _(' - Select Preset -')))` `for name, (label, preset) in _font_presets.items():` `presetmodel.append((name, label))` `presetcombo = gtk.ComboBox(presetmodel)` `cell = gtk.CellRendererText()` `presetcombo.pack_start(cell)` `presetcombo.add_attribute(cell, 'text', 1)` `self.presetcombo = presetcombo` `# layouting` `layout.add_row(defaultradio)` `layout.add_row(presetradio, presetcombo)` `vbox = gtk.VBox()` `vbox.pack_start(customradio, False, False, 4)` `vbox.pack_start(gtk.VBox())` `layout.add_row(vbox, table, yhopt=gtk.FILL\|gtk.EXPAND)` `# signal handlers` `def combo_changed(combo):` `# configure for each item` `model = combo.get_model()` `name = model[combo.get_active()][0] # internal name` `if name is None:` `return` `preset = _font_presets[name][1] # preset data` `pagenum, info, vbox, widgets = self.pages['font']` `for row, (label, cpath, vals, tip) in enumerate(info):` `itemcombo = widgets[row]` `itemcombo.child.set_text(preset[cpath])` `presetcombo.connect('changed', combo_changed)` `def radio_activated(radio, init=False):` `if not radio.get_active():` `return` `presetcombo.set_sensitive(presetradio.get_active())` `table.set_sensitive(customradio.get_active())` `if init:` `return` `if radio == defaultradio:` `pagenum, info, vbox, widgets = self.pages['font']` `for row, (label, cpath, vals, tip) in enumerate(info):` `itemcombo = widgets[row]` `itemcombo.set_active(0) # unspecified` `if radio != presetradio:` `presetcombo.set_active(0)` `defaultradio.connect('toggled', radio_activated)` `presetradio.connect('toggled', radio_activated)` `customradio.connect('toggled', radio_activated)` `# prepare to show` `radio_activated(defaultradio, init=True)` `def set_help(self, widget, event, tooltip):` `text = ' '.join(tooltip.splitlines())` `self.descbuffer.set_text(text)` `def fill_frame(self, frame, info, build=True, width=32):` `widgets = []` `table = gtklib.LayoutTable()` `vbox = gtk.VBox()` `if build:` `vbox.pack_start(table, False, False)` `scrolled = gtk.ScrolledWindow()` `scrolled.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)` `scrolled.add_with_viewport(vbox)` `scrolled.child.set_shadow_type(gtk.SHADOW_NONE)` `frame.pack_start(scrolled)` `for row, (label, cpath, values, tooltip) in enumerate(info):` `vlist = gtk.ListStore(str, bool)` `combo = gtk.ComboBoxEntry(vlist, 0)` `combo.connect('changed', self.dirty_event)` `combo.child.connect('focus-in-event', self.set_help, tooltip)` `combo.set_row_separator_func(lambda model, path: model[path][1])` `combo.child.set_width_chars(width)` `if cpath in _pwfields:` `combo.child.set_visibility(False)` `widgets.append(combo)` `table.add_row(label + ':', combo, padding=False)` `self.tooltips.set_tip(combo, tooltip)` `return vbox, table, widgets` `def refresh_vlist(self):` `for page_num, info, vbox, widgets in self.pages.values():` `for row, (label, cpath, values, tooltip) in enumerate(info):` `ispw = cpath in _pwfields` `combo = widgets[row]` `vlist = combo.get_model()` `vlist.clear()` `# Get currently configured value from this config file` `curvalue = self.get_ini_config(cpath)` `if cpath == 'tortoisehg.vdiff':` `tools = hglib.difftools(self.ui)` `for name in tools.keys():` `if name not in values:` `values.append(name)` `elif cpath == 'ui.merge':` `# Special case, add [merge-tools] to possible values` `hglib.mergetools(self.ui, values)` `currow = None` `if not ispw:` `vlist.append([_unspecstr, False])` `if values:` `vlist.append([_('Suggested'), True])` `for v in values:` `vlist.append([hglib.toutf(v), False])` `if v == curvalue:` `currow = len(vlist) - 1` `if cpath in self.history.get_keys() and not ispw:` `separator = False` `for v in self.history.mrul(cpath):` `if v in values: continue` `if not separator:` `vlist.append([_('History'), True])` `separator = True` `vlist.append([hglib.toutf(v), False])` `if v == curvalue:` `currow = len(vlist) - 1` `if curvalue is None and len(vlist):` `combo.set_active(0)` `elif currow is None and curvalue:` `combo.child.set_text(hglib.toutf(curvalue))` `elif currow:` `combo.set_active(currow)` `def add_page(self, label, name, info, icon=None, extra=False, width=32):` `# setup page` `frame = gtk.VBox()` `frame.show()` `vbox, table, widgets = self.fill_frame(frame, info, not extra, width)` `if extra:` `func = getattr(self, 'fill_%s_frame' % name, None)` `if func:` `func(vbox, table)` `# add to notebook` `pagenum = self.notebook.append_page(frame)` `self.pages[name] = (pagenum, info, vbox, widgets)` `# add treeview item` `pixbuf = gtklib.get_icon_pixbuf(icon, gtk.ICON_SIZE_LARGE_TOOLBAR)` `self.confmodel.append((pixbuf, label, name))` `return frame` `def get_ini_config(self, cpath):` `'''Retrieve a value from the parsed config file'''` `try:` `# Presumes single section/key level depth` `section, key = cpath.split('.', 1)` `return self.ini[section][key]` `except KeyError:` `return None` `def load_config(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:` `gdialog.Prompt(_('Unable to create a Mercurial.ini file'),` `_('Insufficient access rights, reverting to read-only'` `'mode.'), self).run()` `from mercurial import config` `self.fn = rcpath[0]` `cfg = config.config()` `self.readonly = True` `return cfg` `self.fn = fn` `try:` `import iniparse` `# Monkypatch this regex to prevent iniparse from considering` `# 'rem' as a comment` `iniparse.ini.CommentLine.regex = \` `re.compile(r'^(?P<csep>[%;#])(?P<comment>.)$')` `return iniparse.INIConfig(file(fn), optionxformvalue=None)` `except ImportError:` `from mercurial import config` `cfg = config.config()` `cfg.read(fn)` `self.readonly = True` `return cfg` `except Exception, e:` `gdialog.Prompt(_('Unable to parse a config file'),` `_('%s\nReverting to read-only mode.') % str(e), self).run()` `from mercurial import config` `cfg = config.config()` `cfg.read(fn)` `self.readonly = True` `return cfg` `def record_new_value(self, cpath, newvalue, keephistory=True):` `# 'newvalue' is converted to local encoding` `section, key = cpath.split('.', 1)` `if newvalue == _unspeclocalstr or newvalue == '':` `try:` `del self.ini[section][key]` `except KeyError:` `pass` `return` `if section not in self.ini:` `if hasattr(self.ini, '_new_namespace'):` `self.ini._new_namespace(section)` `else:` `self.ini.new_namespace(section)` `self.ini[section][key] = newvalue` `if not keephistory:` `return` `if cpath not in self.history.get_keys():` `self.history.set_value(cpath, [])` `elif newvalue in self.history.get_keys():` `self.history.get_value(cpath).remove(newvalue)` `self.history.mrul(cpath).add(newvalue)` `def apply_changes(self):` `if self.readonly:` `#dialog? Read only access, please install ...` `return` `# Reload history, since it may have been modified externally` `self.history.read()` `# flush changes on paths page` `if len(self.pathdata):` `refreshlist = []` `for row in self.pathdata:` `name = hglib.fromutf(row[0])` `path = hglib.fromutf(row[2])` `if not name:` `gdialog.Prompt(_('Invalid path'),` `_('Skipped saving path with no alias'), self).run()` `continue` `cpath = '.'.join(['paths', name])` `self.record_new_value(cpath, path, False)` `refreshlist.append(name)` `for name in self.ini.paths:` `if name not in refreshlist:` `del self.ini['paths'][name]` `elif 'paths' in list(self.ini):` `for name in list(self.ini.paths):` `del self.ini['paths'][name]` `# Flush changes on all pages` `for page_num, info, vbox, widgets in self.pages.values():` `for n, (label, cpath, values, tip) in enumerate(info):` `newvalue = hglib.fromutf(widgets[n].child.get_text())` `self.record_new_value(cpath, newvalue)` `self.history.write()` `self.refresh_vlist()` `try:` `f = open(self.fn, 'w')` `f.write(str(self.ini))` `f.close()` `self._btn_apply.set_sensitive(False)` `self.dirty = False` `except IOError, e:` `dialog.error_dialog(self, _('Unable to write configuration file'),` `str(e))` `return 0` `def run(ui, pats, **opts):` `dlg = ConfigDialog(opts.get('alias') == 'repoconfig')` `if opts.get('focus'):` `dlg.focus_field(opts['focus'])` `return dlg`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/thgimport.py Stacked
341 342 343 344 345 346 347	341 342 343 344 345 346 347	@@ -341,7 +341,7 @@ `raise _('unexpected destination name: %s') % dest` `# prepare command line`-`cmdline = ['hg', cmd, '--verbose']`+`cmdline = ['hg', cmd, '--verbose', '--']` `cmdline.extend(files)` `# start importing`

Change 1 of 4 Show Changes Only Show Entire File Loading... tortoisehg/hgtk/thgmq.py Stacked
298 299 300 301 302 303 304 358 359 360 361 362 363 364 365 366 374 375 376 377 378 379 380 448 449 450 451 452 453 454	298 299 300 301 302 303 304 358 359 360 361 362 363 364 365 366 367 368 376 377 378 379 380 381 382 450 451 452 453 454 455 456	@@ -298,7 +298,7 @@ `"""` `if not self.is_operable():` `return`-`cmdline = ['hg', 'qgoto', patch]`+`cmdline = ['hg', 'qgoto', '--', patch]` `self.cmd.execute(cmdline, self.cmd_done)` `def qpop(self, all=False):`@@ -358,9 +358,11 @@ `keep = True` `else:` `return`-`cmdline = ['hg', 'qdelete'] + unapplied`+`cmdline = ['hg', 'qdelete']` `if keep:` `cmdline.append('--keep')`+`cmdline.append('--')`+`cmdline.extned(unapplied)` `self.cmd.execute(cmdline, self.cmd_done, noemit=True)` `def qrename(self, name, patch='qtip'):`@@ -374,7 +376,7 @@ `"""` `if not name or not self.has_patch():` `return`-`cmdline = ['hg', 'qrename', patch, name]`+`cmdline = ['hg', 'qrename', '--', patch, name]` `self.cmd.execute(cmdline, self.cmd_done)` `def qrename_ui(self, patch='qtip'):`@@ -448,7 +450,7 @@ `" into the current patch '%(qtip)s'?") % data).run()` `if ret != gtk.RESPONSE_YES:` `return`-`cmdline = ['hg', 'qfold'] + unapplied`+`cmdline = ['hg', 'qfold', '--'] + unapplied` `self.cmd.execute(cmdline, self.cmd_done)` `def qreorder(self, patch, op):`

Diff Options

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

Diff to 829f55c1ae49

Attach a Trello Card

Add a tag

Your session has expired