Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 63d3ab15979c…

Parents bb73dd8a84d6…

Parents 5a3408447e24…

by Steve Borho

Changes to 70 files · Browse files at 63d3ab15979c Showing diff from parent bb73dd8a84d6 5a3408447e24 Diff from another changeset...

Change 1 of 1 Show Entire File .hgignore Stacked
 
41
42
43
 
 
 
41
42
43
44
45
@@ -41,3 +41,5 @@
 tortoisehg/hgqt/*_rc.py  tortoisehg/hgqt/*_ui.py  thgw +hgext +mercurial
Change 1 of 1 Show Entire File ReleaseProcedure.txt Stacked
 
23
24
25
26
 
 
23
24
25
 
26
@@ -23,4 +23,4 @@
 Post Major Release:  * Increment minimum Mercurial version in tortoisehg/util/hgversion.py  * Sweep through code and remove hacks for older Mercurial releases -* Update http://bitbucket.org/tortoisehg/stable/wiki/ReleaseNotes#matching-versions +* Update http://bitbucket.org/tortoisehg/thg/wiki/ReleaseNotes#matching-versions
Change 1 of 1 Show Entire File contrib/​hg Stacked
 
30
31
32
 
 
 
 
 
 
33
34
 
35
36
 
30
31
32
33
34
35
36
37
38
39
 
40
41
42
@@ -30,7 +30,13 @@
 import mercurial.util  import mercurial.dispatch   +def _setbinary(fp): + if hasattr(mercurial.util, 'setbinary'): + return mercurial.util.setbinary(fp) # >= 1.9 + else: + return mercurial.util.set_binary(fp) +  for fp in (sys.stdin, sys.stdout, sys.stderr): - mercurial.util.set_binary(fp) + _setbinary(fp)    mercurial.dispatch.run()
Change 1 of 2 Show Entire File doc/​source/​clone.txt Stacked
 
6
7
8
9
 
10
11
12
13
14
15
 
16
17
18
 
39
40
41
 
 
42
43
44
 
 
45
46
 
 
47
48
49
 
6
7
8
 
9
10
11
12
13
14
 
15
16
17
18
 
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
@@ -6,13 +6,13 @@
   To clone a repository you have to run the clone dialog.  From the explorer context menu select :menuselection:`TortoiseHg... --> Clone a repository` -or type :command:`thg clone`. +or type :command:`thg clone`.    .. figure:: figures/clone.png   :alt: Clone dialog     Clone Dialog - +  :guilabel:`Source`   It is the path (or URL) of the repository that will be cloned. Use   the :guilabel:`Browse...` to choose a local folder. @@ -39,11 +39,17 @@
  To use uncompressed transfer (fast over LAN).  :guilabel:`Include patch queue`   To also clone an MQ patch repository along with the main repository. + It is possible to provide a patch queue name that differs from the + default one.  :guilabel:`Use proxy server`   To use the proxy server configured in :menuselection:`TortoiseHg... --> Global Settings --> Proxy`.   This is enabled only if a proxy is configured. +:guilabel:`Do not verify host certificate` + Skip checking server certificate for https:// url (ignoring web.cacerts config).  :guilabel:`Remote command`   Specify a Mercurial command to run on the remote side. +:guilabel:`Hg command` + This field displays the command that will be executed by the dialog.    From command line  -----------------
Change 1 of 1 Show Entire File doc/​source/​nonhg.txt Stacked
 
137
138
139
140
141
 
 
 
142
143
144
 
137
138
139
 
 
140
141
142
143
144
145
@@ -137,8 +137,9 @@
   *TortoiseHg Integration*   -Imported Subversion changesets will display the original Subversion -checkin number in the Repository Explorer browser. +Imported Subversion changesets will display the original Subversion checkin +number in the Changeset Info widget in the Revision Details task tab of the +Workbench.    hg-git (git)  ============
Change 1 of 1 Show Entire File icons/​scalable/​status/​thg-git-subrepo.svg 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
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="256" + id="svg2" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:version="0.48.0 r9654" + sodipodi:docname="thg-git-subrepo.svg" + sodipodi:version="0.32" + version="1.0" + width="256"> + <metadata + id="metadata3"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:title></dc:title> + <dc:description /> + <dc:subject> + <rdf:Bag> + <rdf:li>unsorted</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:publisher> + <cc:Agent + rdf:about="http://www.openclipart.org/"> + <dc:title>Open Clip Art Library, Source: Wiki Commons, Source: Wikimedia Commons</dc:title> + </cc:Agent> + </dc:publisher> + <dc:creator> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:rights> + <dc:date /> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <cc:license + rdf:resource="GPL" /> + <dc:language>en</dc:language> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs22"> + <inkscape:perspective + id="perspective26" + inkscape:persp3d-origin="35.5 : 8.6666667 : 1" + inkscape:vp_x="0 : 13 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="71 : 13 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <sodipodi:namedview + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10.0" + guidetolerance="10.0" + id="base" + inkscape:current-layer="svg2" + inkscape:cx="89.736991" + inkscape:cy="131.8906" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:window-height="738" + inkscape:window-width="1280" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:zoom="1.9683098" + objecttolerance="10.0" + pagecolor="#ffffff" + showgrid="false" + inkscape:window-maximized="1" /> + <rect + y="0.79069471" + x="0.69856781" + width="247.80269" + style="fill:#ffffff" + ry="24.249325" + id="background" + height="242.49326" /> + <g + id="g3786" + transform="translate(1.8429833,2.6771937)"> + <rect + height="19.39946" + id="minus" + style="fill:#c00000" + width="57.91848" + x="21.129864" + y="72.660362" /> + <use + height="26" + id="use8" + transform="translate(77.224633,-7.7244905e-7)" + width="71" + x="0" + xlink:href="#minus" + y="0" /> + <use + height="26" + id="use10" + transform="translate(154.44928,-7.7244905e-7)" + width="71" + x="0" + xlink:href="#minus" + y="0" /> + <path + d="m 40.436017,121.15902 0,19.39946 -19.30616,0 0,19.39946 19.30616,0 0,19.39946 19.30617,0 0,-19.39946 19.30616,0 0,-19.39946 -19.30616,0 0,-19.39946 -19.30617,0 z" + id="plus" + style="fill:#008000" + inkscape:connector-curvature="0" /> + <use + height="26" + id="use13" + transform="translate(77.224633,-7.7244905e-7)" + width="71" + x="0" + xlink:href="#plus" + y="0" /> + <use + height="26" + id="use15" + transform="translate(154.44928,-7.7244905e-7)" + width="71" + x="0" + xlink:href="#plus" + y="0" /> + </g> + <path + style="fill:#60605d" + d="m 29.516103,7.4516989 c -13.434128,0 -24.2500023,10.8158741 -24.2500023,24.2500001 l 0,193.968751 c 0,13.43413 10.8158743,24.25 24.2500023,24.25 l 199.281247,0 c 13.43413,0 24.25,-10.81587 24.25,-24.25 l 0,-193.968751 c 0,-13.434126 -10.81587,-24.2500001 -24.25,-24.2500001 l -199.281247,0 z m 1.6875,1.21875 193.968747,0 c 13.93155,0 25.15625,11.2247041 25.15625,25.1562501 l 0,181.750001 c 0,13.93155 -11.2247,25.15625 -25.15625,25.15625 l -193.968747,0 c -13.931548,0 -25.1562523,-11.2247 -25.1562523,-25.15625 l 0,-181.750001 c 0,-13.931546 11.2247043,-25.1562501 25.1562523,-25.1562501 z" + id="shadow" + inkscape:connector-curvature="0" /> +</svg>
Change 1 of 1 Show Entire File icons/​scalable/​status/​thg-subrepo.svg 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
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="256" + id="svg2" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:version="0.48.0 r9654" + sodipodi:docname="thg-subrepo.svg" + sodipodi:version="0.32" + version="1.0" + width="256"> + <metadata + id="metadata3"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:title></dc:title> + <dc:description /> + <dc:subject> + <rdf:Bag> + <rdf:li>unsorted</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:publisher> + <cc:Agent + rdf:about="http://www.openclipart.org/"> + <dc:title>Open Clip Art Library, Source: Wiki Commons, Source: Wikimedia Commons</dc:title> + </cc:Agent> + </dc:publisher> + <dc:creator> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:rights> + <dc:date /> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <cc:license + rdf:resource="GPL" /> + <dc:language>en</dc:language> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs22"> + <inkscape:perspective + id="perspective26" + inkscape:persp3d-origin="35.5 : 8.6666667 : 1" + inkscape:vp_x="0 : 13 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="71 : 13 : 1" + sodipodi:type="inkscape:persp3d" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6551" + id="linearGradient6557" + x1="55.080357" + y1="110.15236" + x2="73.14286" + y2="110.15236" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.00344154,1.2102096,-1.6263159,0.18275943,243.22716,8.6686994)" /> + <linearGradient + id="linearGradient6551"> + <stop + style="stop-color:#f2f53a;stop-opacity:1;" + offset="0" + id="stop6553" /> + <stop + style="stop-color:#fdff8e;stop-opacity:0;" + offset="1" + id="stop6555" /> + </linearGradient> + <linearGradient + y2="110.15236" + x2="73.14286" + y1="110.15236" + x1="55.080357" + gradientTransform="matrix(0.00344154,1.2102096,-1.6263159,0.18275943,309.0051,57.366183)" + gradientUnits="userSpaceOnUse" + id="linearGradient3022" + xlink:href="#linearGradient6551" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6551" + id="linearGradient3848" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.00344154,1.2102096,-1.6263159,0.18275943,309.0051,57.366183)" + x1="55.080357" + y1="110.15236" + x2="73.14286" + y2="110.15236" /> + </defs> + <sodipodi:namedview + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10.0" + guidetolerance="10.0" + id="base" + inkscape:current-layer="svg2" + inkscape:cx="89.736991" + inkscape:cy="122.43398" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:window-height="738" + inkscape:window-width="1280" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:zoom="1.9683098" + objecttolerance="10.0" + pagecolor="#ffffff" + showgrid="false" + inkscape:window-maximized="1" /> + <path + style="color:#000000;fill:#fff08b;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:6.1813693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 125.93864,98.872518 c -0.009,-0.685743 -0.68406,-1.277866 -1.42388,-1.248212 l -15.76003,0.630734 -56.285668,2.25282 -45.5914241,1.82489 c -1.0459723,0.0424 -1.9589962,0.93548 -1.9465597,1.90518 l 1.7798561,138.8014 c 0.012437,0.96977 0.947448,1.78948 1.9934245,1.74752 L 110.58138,240.70913 c 1.046,-0.0402 1.95917,-0.93553 1.94667,-1.90515 l -0.98024,-76.44525 13.78995,-0.55375 c 0.74031,-0.0302 1.39924,-0.67454 1.39041,-1.3607 l -0.78971,-61.573643 z" + id="rect2995" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#fff08b;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:6.90631437;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 126.53106,174.8151 c -0.002,-0.73164 -0.68305,-1.31092 -1.58265,-1.35089 l -18.6286,-0.81954 -0.18942,-62.78471 c -0.002,-0.674 -0.75201,-1.31432 -1.58251,-1.35078 L 7.3000652,104.2305 c -0.8291401,-0.0366 -1.5767724,0.53831 -1.5747635,1.21186 l 0.4190185,138.89489 c 0.00201,0.67395 0.7526549,1.31425 1.5825125,1.35078 l 70.7257353,3.11177 c 0.209509,0.54277 0.538841,1.0484 1.265881,1.08068 l 45.466451,2.00049 c 0.89981,0.0402 1.57713,-0.48056 1.5749,-1.21195 l -0.22887,-75.85389 z" + id="rect3043" + inkscape:connector-curvature="0" /> + <text + xml:space="preserve" + style="font-size:142.12782288px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold" + x="12.382761" + y="221.77342" + id="text3821" + sodipodi:linespacing="125%" + transform="scale(0.9640397,1.0373017)"><tspan + sodipodi:role="line" + id="tspan3823" + x="12.382761" + y="221.77342">S</tspan></text> +</svg>
Change 1 of 1 Show Entire File icons/​scalable/​status/​thg-svn-subrepo.svg 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
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="256" + id="svg2" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:version="0.48.0 r9654" + sodipodi:docname="thg-svn-subrepo.svg" + sodipodi:version="0.32" + version="1.0" + width="256"> + <metadata + id="metadata3"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:title></dc:title> + <dc:description /> + <dc:subject> + <rdf:Bag> + <rdf:li>unsorted</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:publisher> + <cc:Agent + rdf:about="http://www.openclipart.org/"> + <dc:title>Open Clip Art Library, Source: Wiki Commons, Source: Wikimedia Commons</dc:title> + </cc:Agent> + </dc:publisher> + <dc:creator> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:rights> + <dc:date /> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <cc:license + rdf:resource="GPL" /> + <dc:language>en</dc:language> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs22"> + <inkscape:perspective + id="perspective26" + inkscape:persp3d-origin="35.5 : 8.6666667 : 1" + inkscape:vp_x="0 : 13 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="71 : 13 : 1" + sodipodi:type="inkscape:persp3d" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6551" + id="linearGradient6557" + x1="55.080357" + y1="110.15236" + x2="73.14286" + y2="110.15236" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.00344154,1.2102096,-1.6263159,0.18275943,243.22716,8.6686994)" /> + <linearGradient + id="linearGradient6551"> + <stop + style="stop-color:#f2f53a;stop-opacity:1;" + offset="0" + id="stop6553" /> + <stop + style="stop-color:#fdff8e;stop-opacity:0;" + offset="1" + id="stop6555" /> + </linearGradient> + <linearGradient + y2="110.15236" + x2="73.14286" + y1="110.15236" + x1="55.080357" + gradientTransform="matrix(0.00344154,1.2102096,-1.6263159,0.18275943,309.0051,57.366183)" + gradientUnits="userSpaceOnUse" + id="linearGradient3022" + xlink:href="#linearGradient6551" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6551" + id="linearGradient3848" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.00344154,1.2102096,-1.6263159,0.18275943,309.0051,57.366183)" + x1="55.080357" + y1="110.15236" + x2="73.14286" + y2="110.15236" /> + </defs> + <sodipodi:namedview + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10.0" + guidetolerance="10.0" + id="base" + inkscape:current-layer="svg2" + inkscape:cx="51.56764" + inkscape:cy="94.638993" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:window-height="738" + inkscape:window-width="1280" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:zoom="1.9683098" + objecttolerance="10.0" + pagecolor="#ffffff" + showgrid="false" + inkscape:window-maximized="1" /> + <path + inkscape:connector-curvature="0" + d="m 0.32992046,0.20734072 0,92.68331928 C 34.848621,73.004547 80.970856,53.019612 139.01298,32.852882 176.20444,19.950325 212.14896,9.1011362 246.86753,0.20734072 l -246.53760954,0 z M 255.72733,19.969777 C 222.06985,26.89033 191.88559,35.034216 165.32117,44.235044 134.90992,54.803095 110.42768,65.487058 91.911358,76.380272 73.371352,87.078403 64.758735,95.730648 65.964787,102.39664 c 1.087803,5.88563 8.852263,8.55783 23.324794,8.00504 7.449121,-0.19508 19.510179,-1.32856 36.252869,-3.37713 16.74277,-2.04857 38.35919,-5.01103 64.82123,-8.880584 26.22939,-3.746717 47.95432,-6.280751 65.36365,-7.754879 l 0,-70.41931 z m -74.7659,117.573983 c -7.44906,0.13009 -17.70389,0.91822 -30.82849,2.25141 -13.17188,1.36574 -29.467,3.33242 -49.00015,6.12886 -30.316639,4.48734 -55.549738,7.98026 -75.579547,10.25645 -9.608021,1.12175 -17.9552499,1.81915 -25.22332254,2.3765 l 0,75.17229 C 40.111127,225.68406 76.097953,216.09183 108.18447,204.96118 c 31.52268,-10.92571 55.75044,-21.58714 72.77696,-31.89507 17.05017,-10.30789 25.01072,-19.05271 23.68642,-26.14145 -1.11149,-6.11321 -9.09564,-9.21832 -23.68642,-9.3809 z m 74.7659,26.39161 C 220.77006,182.88145 177.38199,201.46286 125.54245,219.4703 77.278383,236.21287 35.587684,248.19222 0.32992046,255.61804 l 0,0.62541 255.39740954,0 0,-92.30808 z M 10.997854,179.69528 c 0.130246,-0.0264 0.229985,-0.002 0.361618,0 0.660236,0.0308 1.364189,0.31696 1.808131,1.00063 0.678024,0.96569 0.854069,2.51386 0.452029,3.75236 -0.43723,1.42533 -1.597602,2.28493 -2.712189,2.00126 -1.2303394,-0.24712 -2.1842943,-1.92033 -2.0793372,-3.62728 0.035631,-1.60701 1.0215998,-2.92796 2.1697482,-3.12697 z m 9.040613,0 c 0.57655,0.032 1.112825,0.19372 1.536897,0.75047 0.801103,0.9107 1.116882,2.54845 0.723249,3.87744 -0.36853,1.36558 -1.378333,2.38006 -2.440955,2.25141 -0.912693,-0.0517 -1.810533,-0.83856 -2.169749,-2.00124 -0.496734,-1.51128 -0.09208,-3.55529 0.99447,-4.37776 0.405095,-0.34314 0.879931,-0.50696 1.356088,-0.50032 z m -8.678995,22.13892 c 1.077061,-0.0478 2.039357,1.00128 2.350558,2.3765 0.329631,1.52957 -0.194781,3.45414 -1.265677,4.1276 -1.075686,0.74675 -2.4885027,0.27342 -3.1642179,-1.12571 -0.687779,-1.36614 -0.5927238,-3.42703 0.361618,-4.50283 0.4677099,-0.57764 1.0894719,-0.89387 1.7177189,-0.87556 z m 8.678995,0 c 0.856618,-0.0648 1.61794,0.68525 2.079337,1.62604 0.664733,1.43462 0.386626,3.50364 -0.632838,4.50283 -1.022614,1.07599 -2.621151,0.89559 -3.435439,-0.50031 -0.841778,-1.38689 -0.786224,-3.74845 0.27122,-4.87808 0.458862,-0.52449 1.118697,-0.77677 1.71772,-0.75048 z" + id="polygon3517" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#809cc8;fill-opacity:1;fill-rule:nonzero;stroke:none" /> +</svg>
Change 1 of 2 Show Entire File thg Stacked
 
45
46
47
48
49
50
51
52
 
53
54
55
 
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
 
 
 
45
46
47
 
 
 
 
48
49
50
51
52
 
56
57
58
 
 
 
 
 
 
 
 
59
60
61
62
63
64
65
66
 
67
68
69
70
71
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
72
73
@@ -45,11 +45,8 @@
 demandimport.ignore.append('icons_rc')  demandimport.ignore.append('translations_rc')  demandimport.enable() -from mercurial import ui as uimod, util -from tortoisehg.util.hgversion import hgversion, checkhgversion -import cStringIO -import traceback   +# Verify we can reach TortoiseHg sources first  try:   import tortoisehg.hgqt.run  except ImportError, e: @@ -59,50 +56,18 @@
  sys.stderr.write("(check your install and PYTHONPATH)\n")   sys.exit(-1)   -ui = uimod.ui() -capt = ui.configbool('tortoisehg', 'stderrcapt', True) - -errors = ('Traceback', 'TypeError', 'NameError', 'AttributeError', - 'NotImplementedError') - -err = checkhgversion(hgversion) -if err: +# Verify we have an acceptable version of Mercurial +from tortoisehg.util.hgversion import hgversion, checkhgversion +errmsg = checkhgversion(hgversion) +if errmsg:   from tortoisehg.hgqt.bugreport import run   from tortoisehg.hgqt.run import qtrun   opts = {}   opts['cmd'] = ' '.join(sys.argv[1:]) - opts['error'] = '\n' + err + '\n' + opts['error'] = '\n' + errmsg + '\n'   opts['nofork'] = True   qtrun(run, ui, **opts)   sys.exit(1)   -if not capt or 'THGDEBUG' in os.environ or '--profile' in sys.argv: - sys.exit(tortoisehg.hgqt.run.dispatch(sys.argv[1:])) -else: - mystderr = cStringIO.StringIO() - origstderr = sys.stderr - sys.stderr = mystderr - ret = 0 - try: - ret = tortoisehg.hgqt.run.dispatch(sys.argv[1:]) - sys.stderr = origstderr - mystderr.seek(0) - for l in mystderr.readlines(): - if l.startswith(errors): - from tortoisehg.hgqt.bugreport import run - from tortoisehg.hgqt.run import qtrun - error = 'Recoverable runtime error (stderr):\n' - error += mystderr.getvalue() - opts = {} - opts['cmd'] = ' '.join(sys.argv[1:]) - opts['error'] = error - opts['nofork'] = True - qtrun(run, ui, **opts) - break - sys.exit(ret) - except: - if sys.exc_info()[0] not in [SystemExit, KeyboardInterrupt]: - sys.stderr = origstderr - traceback.print_exc() - else: - raise SystemExit(ret) +ret = tortoisehg.hgqt.run.dispatch(sys.argv[1:]) +sys.exit(ret)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​annotate.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
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,456 +0,0 @@
-# annotate.py - File annotation widget -# -# 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 - -from mercurial import ui, error, util - -from tortoisehg.hgqt import visdiff, qtlib, qscilib, wctxactions, thgrepo, lexers -from tortoisehg.util import paths, hglib, colormap, thread2 -from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt.grep import SearchWidget - -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from PyQt4.Qsci import QsciScintilla, QsciStyle - -# Technical Debt -# Pass search parameters to grep -# forward/backward history buttons -# menu options for viewing appropriate changesets - -class AnnotateView(qscilib.Scintilla): - revisionHint = pyqtSignal(QString) - - searchRequested = pyqtSignal(QString) - """Emitted (pattern) when user request to search content""" - - editSelected = pyqtSignal(unicode, object, int) - """Emitted (path, rev, line) when user requests to open editor""" - - grepRequested = pyqtSignal(QString, dict) - """Emitted (pattern, **opts) when user request to search changelog""" - - sourceChanged = pyqtSignal(unicode, object) - """Emitted (path, rev) when the content source changed""" - - def __init__(self, repo, parent=None, **opts): - super(AnnotateView, self).__init__(parent) - self.setReadOnly(True) - self.setMarginLineNumbers(1, True) - self.setMarginType(2, QsciScintilla.TextMarginRightJustified) - self.setMouseTracking(True) - self.setFont(qtlib.getfont('fontdiff').font()) - self.setContextMenuPolicy(Qt.CustomContextMenu) - self.customContextMenuRequested.connect(self.menuRequest) - - self.repo = repo - self.repo.configChanged.connect(self.configChanged) - self.configChanged() - self._rev = None - self.annfile = None - self._annotation_enabled = bool(opts.get('annotationEnabled', False)) - - self._links = [] # by line - self._revmarkers = {} # by rev - self._lastrev = None - - self._thread = _AnnotateThread(self) - self._thread.finished.connect(self.fillModel) - - def configChanged(self): - self.setIndentationWidth(self.repo.tabwidth) - self.setTabWidth(self.repo.tabwidth) - - def keyPressEvent(self, event): - if event.key() == Qt.Key_Escape: - self._thread.abort() - return - return super(AnnotateView, self).keyPressEvent(event) - - def mouseMoveEvent(self, event): - self._emitRevisionHintAtLine(self.lineAt(event.pos())) - super(AnnotateView, self).mouseMoveEvent(event) - - def _emitRevisionHintAtLine(self, line): - if line < 0: - return - try: - fctx = self._links[line][0] - if fctx.rev() != self._lastrev: - s = hglib.get_revision_desc(fctx, self.annfile) - self.revisionHint.emit(s) - self._lastrev = fctx.rev() - except IndexError: - pass - - @pyqtSlot(QPoint) - def menuRequest(self, point): - menu = self.createStandardContextMenu() - line = self.lineAt(point) - point = self.mapToGlobal(point) - - if not self.isAnnotationEnabled(): - return menu.exec_(point) - if line < 0 or line >= len(self._links): - return menu.exec_(point) - - fctx, line = self._links[line] - data = [hglib.tounicode(fctx.path()), fctx.rev(), line] - - if self.hasSelectedText(): - selection = self.selectedText() - def sreq(**opts): - return lambda: self.grepRequested.emit(selection, opts) - def sann(): - self.searchRequested.emit(selection) - menu.addSeparator() - for name, func in [(_('Search in original revision'), - sreq(rev=fctx.rev())), - (_('Search in working revision'), - sreq(rev='.')), - (_('Search in current annotation'), sann), - (_('Search in history'), sreq(all=True))]: - def add(name, func): - action = menu.addAction(name) - action.triggered.connect(func) - add(name, func) - - def annorig(): - self.setSource(*data) - def editorig(): - self.editSelected.emit(*data) - menu.addSeparator() - for name, func in [(_('Annotate originating revision'), annorig), - (_('View originating revision'), editorig)]: - def add(name, func): - action = menu.addAction(name) - action.triggered.connect(func) - add(name, func) - for pfctx in fctx.parents(): - pdata = [hglib.tounicode(pfctx.path()), pfctx.changectx().rev(), - line] - def annparent(data): - self.setSource(*data) - def editparent(data): - self.editSelected.emit(*data) - for name, func in [(_('Annotate parent revision %d') % pdata[1], - annparent), - (_('View parent revision %d') % pdata[1], - editparent)]: - def add(name, func): - action = menu.addAction(name) - action.data = pdata - action.run = lambda: func(action.data) - action.triggered.connect(action.run) - add(name, func) - menu.exec_(point) - - @property - def rev(self): - """Returns the current revision number""" - return self._rev - - @pyqtSlot(unicode, object, int) - def setSource(self, wfile, rev, line=None): - """Change the content to the specified file at rev [unicode] - - line is counted from 1. - """ - if isinstance(wfile, (unicode, QString)): - # setSource can be used as a slot, in which case wfile is a QString - lwfile = hglib.fromunicode(wfile) - else: - # or it can be called directly with a local encoded wfile string - lwfile = wfile - wfile = hglib.tounicode(wfile) - - if self.annfile == lwfile and self.rev == rev: - if line: - self.setCursorPosition(int(line) - 1, 0) - return - - try: - ctx = self.repo[rev] - fctx = ctx[lwfile] - except error.LookupError: - qtlib.ErrorMsgBox(_('Unable to annotate'), - _('%s is not found in revision %d') % (wfile, ctx.rev())) - return - - try: - if rev is None: - size = fctx.size() - else: - size = fctx._filelog.rawsize(fctx.filerev()) - except (EnvironmentError, error.LookupError), e: - self.setText(_('File or diffs not displayed: ') + \ - hglib.tounicode(str(e))) - self.error = p + hglib.tounicode(str(e)) - return - - if size > ctx._repo.maxdiff: - self.setText(_('File or diffs not displayed: ') + \ - _('File is larger than the specified max size.\n')) - else: - self._rev = ctx.rev() - self.clear() - self.annfile = lwfile - if util.binary(fctx.data()): - self.setText(_('File is binary.\n')) - else: - self.setText(hglib.tounicode(fctx.data())) - if line: - self.setCursorPosition(int(line) - 1, 0) - self._updatelexer(fctx) - self._updatemarginwidth() - self.sourceChanged.emit(wfile, self._rev) - self._updateannotation() - - def _updateannotation(self): - if not self.isAnnotationEnabled() or not self.annfile: - return - ctx = self.repo[self._rev] - fctx = ctx[self.annfile] - if util.binary(fctx.data()): - return - self._thread.abort() - self._thread.start(fctx) - - @pyqtSlot() - def fillModel(self): - self._thread.wait() - if self._thread.data is None: - return - - self._links = list(self._thread.data) - - self._updaterevmargin() - self._updatemarkers() - self._updatemarginwidth() - - def clear(self): - super(AnnotateView, self).clear() - self.clearMarginText() - self.markerDeleteAll() - self.annfile = None - - @pyqtSlot(bool) - def setAnnotationEnabled(self, enabled): - """Enable / disable annotation""" - enabled = bool(enabled) - if enabled == self.isAnnotationEnabled(): - return - self._annotation_enabled = enabled - self._updateannotation() - self._updatemarginwidth() - self.setMouseTracking(enabled) - if not self.isAnnotationEnabled(): - self.annfile = None - self.markerDeleteAll() - - def isAnnotationEnabled(self): - """True if annotation enabled and available""" - if self.rev is None: - return False # annotate working copy is not supported - return self._annotation_enabled - - def _updatelexer(self, fctx): - """Update the lexer according to the given file""" - lex = lexers.get_lexer(fctx.path(), hglib.tounicode(fctx.data()), self) - self.setLexer(lex) - if lex is None: - self.setFont(qtlib.getfont('fontlog').font()) - - def _updaterevmargin(self): - """Update the content of margin area showing revisions""" - s = self._margin_style - # Workaround to set style of the current sci widget. - # QsciStyle sends style data only to the first sci widget. - # See qscintilla2/Qt4/qscistyle.cpp - self.SendScintilla(QsciScintilla.SCI_STYLESETBACK, - s.style(), s.paper()) - self.SendScintilla(QsciScintilla.SCI_STYLESETFONT, - s.style(), s.font().family().toAscii().data()) - self.SendScintilla(QsciScintilla.SCI_STYLESETSIZE, - s.style(), s.font().pointSize()) - for i, (fctx, _origline) in enumerate(self._links): - self.setMarginText(i, str(fctx.rev()), s) - - def _updatemarkers(self): - """Update markers which colorizes each line""" - self._redefinemarkers() - for i, (fctx, _origline) in enumerate(self._links): - m = self._revmarkers.get(fctx.rev()) - if m is not None: - self.markerAdd(i, m) - - def _redefinemarkers(self): - """Redefine line markers according to the current revs""" - curdate = self.repo[self._rev].date()[0] - - # make sure to colorize at least 1 year - mindate = curdate - 365 * 24 * 60 * 60 - - self._revmarkers.clear() - filectxs = iter(fctx for fctx, _origline in self._links) - palette = colormap.makeannotatepalette(filectxs, curdate, - maxcolors=32, maxhues=8, - maxsaturations=16, - mindate=mindate) - for i, (color, fctxs) in enumerate(palette.iteritems()): - self.markerDefine(QsciScintilla.Background, i) - self.setMarkerBackgroundColor(QColor(color), i) - for fctx in fctxs: - self._revmarkers[fctx.rev()] = i - - @util.propertycache - def _margin_style(self): - """Style for margin area""" - s = QsciStyle() - s.setPaper(QApplication.palette().color(QPalette.Window)) - s.setFont(self.font()) - return s - - @pyqtSlot() - def _updatemarginwidth(self): - self.setMarginsFont(self.font()) - def lentext(s): - return 'M' * (len(str(s)) + 2) # 2 for margin - self.setMarginWidth(1, lentext(self.lines())) - if self.isAnnotationEnabled() and self._links: - maxrev = max(fctx.rev() for fctx, _origline in self._links) - self.setMarginWidth(2, lentext(maxrev)) - else: - self.setMarginWidth(2, 0) - -class _AnnotateThread(QThread): - 'Background thread for annotating a file at a revision' - def __init__(self, parent=None): - super(_AnnotateThread, self).__init__(parent) - self._threadid = None - - @pyqtSlot(object) - def start(self, fctx): - self._fctx = fctx - super(_AnnotateThread, self).start() - self.data = None - - @pyqtSlot() - def abort(self): - if self._threadid is None: - return - try: - thread2._async_raise(self._threadid, KeyboardInterrupt) - self.wait() - except ValueError: - pass - - def run(self): - assert self.currentThread() != qApp.thread() - self._threadid = self.currentThreadId() - try: - try: - data = [] - for (fctx, line), _text in self._fctx.annotate(True, True): - data.append((fctx, line)) - self.data = data - except KeyboardInterrupt: - pass - finally: - self._threadid = None - del self._fctx - -class AnnotateDialog(QMainWindow): - def __init__(self, *pats, **opts): - super(AnnotateDialog,self).__init__(opts.get('parent'), Qt.Window) - - root = opts.get('root') or paths.find_root() - repo = thgrepo.repository(ui.ui(), path=root) - # TODO: handle repo not found - - av = AnnotateView(repo, self, annotationEnabled=True) - self.setCentralWidget(av) - self.av = av - - status = QStatusBar() - self.setStatusBar(status) - av.revisionHint.connect(status.showMessage) - av.editSelected.connect(self.editSelected) - av.grepRequested.connect(self._openSearchWidget) - - self._searchbar = qscilib.SearchToolBar() - self.addToolBar(self._searchbar) - self._searchbar.setPattern(hglib.tounicode(opts.get('pattern', ''))) - self._searchbar.searchRequested.connect(self.av.find) - self._searchbar.conditionChanged.connect(self.av.highlightText) - av.searchRequested.connect(self._searchbar.search) - QShortcut(QKeySequence.Find, self, - lambda: self._searchbar.setFocus(Qt.OtherFocusReason)) - - self.av.sourceChanged.connect( - lambda *args: self.setWindowTitle(_('Annotate %s@%d') % args)) - - self.searchwidget = opts.get('searchwidget') - - self.opts = opts - line = opts.get('line') - if line and isinstance(line, str): - line = int(line) - - self.repo = repo - - self.restoreSettings() - - # run heavy operation after the dialog visible - path = hglib.tounicode(pats[0]) - rev = opts.get('rev') or '.' - QTimer.singleShot(0, lambda: av.setSource(path, rev, line)) - - def closeEvent(self, event): - self.storeSettings() - super(AnnotateDialog, self).closeEvent(event) - - def editSelected(self, wfile, rev, line): - pattern = hglib.fromunicode(self._searchbar._le.text()) or None - wfile = hglib.fromunicode(wfile) - repo = self.repo - try: - ctx = repo[rev] - fctx = ctx[wfile] - except Exception, e: - self.statusBar().showMessage(hglib.tounicode(str(e))) - - base, _ = visdiff.snapshot(repo, [wfile], repo[rev]) - files = [os.path.join(base, wfile)] - wctxactions.edit(self, repo.ui, repo, files, line, pattern) - - @pyqtSlot(unicode, dict) - def _openSearchWidget(self, pattern, opts): - opts = dict((str(k), str(v)) for k, v in opts.iteritems()) - if self.searchwidget is None: - self.searchwidget = SearchWidget([pattern], repo=self.repo, - **opts) - self.searchwidget.show() - else: - self.searchwidget.setSearch(pattern, **opts) - self.searchwidget.show() - self.searchwidget.raise_() - - def storeSettings(self): - s = QSettings() - s.setValue('annotate/geom', self.saveGeometry()) - self.av.saveSettings(s, 'annotate/av') - - def restoreSettings(self): - s = QSettings() - self.restoreGeometry(s.value('annotate/geom').toByteArray()) - self.av.loadSettings(s, 'annotate/av') - -def run(ui, *pats, **opts): - pats = hglib.canonpaths(pats) - return AnnotateDialog(*pats, **opts)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
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
 
 
 
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
@@ -5,281 +5,587 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -from PyQt4.QtCore import * -from PyQt4.QtGui import * - -from mercurial import merge as mergemod +from mercurial import hg, merge as mergemod    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, resolve  from tortoisehg.hgqt import commit, qscilib, thgrepo   -keep = i18n.keepgettext() +from PyQt4.QtCore import * +from PyQt4.QtGui import *   -class BackoutDialog(QDialog): +class BackoutDialog(QWizard):   - def __init__(self, repo, rev='tip', parent=None, opts={}): + def __init__(self, rev, repo, parent):   super(BackoutDialog, self).__init__(parent)   f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint) + + self.backoutrev = rev + self.parentbackout = False + + self.setWindowTitle(_('Backout - %s') % repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-revert')) + self.setOption(QWizard.NoBackButtonOnStartPage, True) + self.setOption(QWizard.NoBackButtonOnLastPage, True) + self.setOption(QWizard.IndependentPages, True) + + self.addPage(SummaryPage(repo, self)) + self.addPage(BackoutPage(repo, self)) + self.addPage(CommitPage(repo, self)) + self.addPage(ResultPage(repo, self)) + self.currentIdChanged.connect(self.pageChanged) + + self.resize(QSize(700, 489).expandedTo(self.minimumSizeHint())) + + repo.repositoryChanged.connect(self.repositoryChanged) + repo.configChanged.connect(self.configChanged) + + def repositoryChanged(self): + self.currentPage().repositoryChanged() + + def configChanged(self): + self.currentPage().configChanged() + + def pageChanged(self, id): + if id != -1: + self.currentPage().currentPage() + + def reject(self): + if self.currentPage().canExit(): + super(BackoutDialog, self).reject() + + +class BasePage(QWizardPage): + def __init__(self, repo, parent): + super(BasePage, self).__init__(parent)   self.repo = repo   - # main layout box - box = QVBoxLayout() - box.setSpacing(8) - box.setContentsMargins(*(6,)*4) + def validatePage(self): + 'user pressed NEXT button, can we proceed?' + return True   - ## target revision - target_sep = qtlib.LabeledSeparator(_('Target changeset')) - box.addWidget(target_sep) + def isComplete(self): + 'should NEXT button be sensitive?' + return True   - style = csinfo.panelstyle(selectable=True) - self.targetinfo = csinfo.create(self.repo, rev, style, withupdate=True) - box.addWidget(self.targetinfo) + def repositoryChanged(self): + 'repository has detected a change to changelog or parents' + pass   - ## backout message - msg_sep = qtlib.LabeledSeparator(_('Backout commit message')) - box.addWidget(msg_sep) + def configChanged(self): + 'repository has detected a change to config files' + pass   - revhex = self.targetinfo.get_data('revid') - self.msgset = keep._('Backed out changeset: ') - self.msgset['id'] += revhex - self.msgset['str'] += revhex + def currentPage(self): + pass   - self.msgTextEdit = commit.MessageEntry(self) - self.msgTextEdit.installEventFilter(qscilib.KeyPressInterceptor(self)) - self.msgTextEdit.refresh(repo) - self.msgTextEdit.loadSettings(QSettings(), 'backout/message') - self.msgTextEdit.setText(self.msgset['str']) - box.addWidget(self.msgTextEdit, 2) + def canExit(self): + return True   - ## options - opt_sep = qtlib.LabeledSeparator(_('Options')) - box.addWidget(opt_sep)   - obox = QVBoxLayout() - obox.setSpacing(3) - box.addLayout(obox) +class SummaryPage(BasePage): + + def __init__(self, repo, parent): + super(SummaryPage, self).__init__(repo, parent) + self.clean = False + self.th = None + + def initializePage(self): + if self.layout(): + return + self.setTitle(_('Prepare to backout')) + self.setSubTitle(_('Verify backout revision and ensure your working ' + 'directory is clean.')) + self.setLayout(QVBoxLayout()) + + repo = self.repo + try: + bctx = repo[self.wizard().backoutrev] + pctx = repo['.'] + except error.RepoLookupError: + qtlib.InfoMsgBox(_('Unable to backout'), + _('Backout revision not found')) + QTimer.singleShot(0, self.wizard().close) + + if pctx == bctx: + lbl = _('Backing out a parent revision is a single step operation') + self.layout().addWidget(QLabel(u'<b>%s</b>' % lbl)) + self.wizard().parentbackout = True + + op1, op2 = repo.dirstate.parents() + a = repo.changelog.ancestor(op1, bctx.node()) + if a != bctx.node(): + qtlib.InfoMsgBox(_('Unable to backout'), + _('Cannot backout change on a different branch')) + QTimer.singleShot(0, self.wizard().close) + + ## backout revision + style = csinfo.panelstyle(contents=csinfo.PANEL_DEFAULT) + create = csinfo.factory(repo, None, style, withupdate=True) + sep = qtlib.LabeledSeparator(_('Backout revision')) + self.layout().addWidget(sep) + backoutCsInfo = create(bctx.rev()) + self.layout().addWidget(backoutCsInfo) + + ## current revision + contents = ('ishead',) + csinfo.PANEL_DEFAULT + style = csinfo.panelstyle(contents=contents) + def markup_func(widget, item, value): + if item == 'ishead' and value is False: + text = _('Not a head, backout will create a new head!') + return qtlib.markup(text, fg='red', weight='bold') + raise csinfo.UnknownItem(item) + custom = csinfo.custom(markup=markup_func) + create = csinfo.factory(repo, custom, style, withupdate=True) + + sep = qtlib.LabeledSeparator(_('Current local revision')) + self.layout().addWidget(sep) + localCsInfo = create(pctx.rev()) + self.layout().addWidget(localCsInfo) + self.localCsInfo = localCsInfo + + ## working directory status + sep = qtlib.LabeledSeparator(_('Working directory status')) + self.layout().addWidget(sep) + + self.groups = qtlib.WidgetGroups() + + wdbox = QHBoxLayout() + self.layout().addLayout(wdbox) + self.wd_status = qtlib.StatusLabel() + self.wd_status.set_status(_('Checking...')) + wdbox.addWidget(self.wd_status) + wd_prog = QProgressBar() + wd_prog.setMaximum(0) + wd_prog.setTextVisible(False) + self.groups.add(wd_prog, 'prog') + wdbox.addWidget(wd_prog, 1) + + text = _('Before backout, you must <a href="commit"><b>commit</b></a>, ' + '<a href="shelve"><b>shelve</b></a> to patch, ' + 'or <a href="discard"><b>discard</b></a> changes.') + wd_text = QLabel(text) + wd_text.setWordWrap(True) + wd_text.linkActivated.connect(self.onLinkActivated) + self.wd_text = wd_text + self.groups.add(wd_text, 'dirty') + self.layout().addWidget(wd_text) + + ## auto-resolve + autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts ' + 'where possible')) + autoresolve_chk.setChecked( + repo.ui.configbool('tortoisehg', 'autoresolve', False)) + self.registerField('autoresolve', autoresolve_chk) + self.layout().addWidget(autoresolve_chk) + self.autoresolve_chk = autoresolve_chk + self.groups.set_visible(False, 'dirty') + + def isComplete(self): + 'should Next button be sensitive?' + return self.clean + + def repositoryChanged(self): + 'repository has detected a change to changelog or parents' + pctx = self.repo['.'] + self.localCsInfo.update(pctx) + self.wizard().localrev = str(pctx.rev()) + + def canExit(self): + 'can backout tool be closed?' + if self.th is not None and self.th.isRunning(): + self.th.cancel() + self.th.wait() + return True + + def currentPage(self): + self.refresh() + + def refresh(self): + if self.th is None: + self.th = CheckThread(self.repo, self) + self.th.finished.connect(self.threadFinished) + if self.th.isRunning(): + return + self.groups.set_visible(True, 'prog') + self.th.start() + + def threadFinished(self): + self.groups.set_visible(False, 'prog') + if self.th.canceled: + return + dirty, parents = self.th.results + self.clean = not dirty + if dirty: + self.groups.set_visible(True, 'dirty') + self.wd_status.set_status(_('<b>Uncommitted local changes ' + 'are detected</b>'), 'thg-warning') + else: + self.groups.set_visible(False, 'dirty') + self.wd_status.set_status(_('Clean'), True) + self.completeChanged.emit() + + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + cmd = hglib.fromunicode(cmd) + repo = self.repo + if cmd == 'commit': + dlg = commit.CommitDialog(repo, [], {}, self.wizard()) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + self.refresh() + elif cmd == 'shelve': + from tortoisehg.hgqt import shelve + dlg = shelve.ShelveDialog(repo, self.wizard()) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + self.refresh() + elif cmd.startswith('discard'): + if cmd != 'discard:noconfirm': + labels = [(QMessageBox.Yes, _('&Discard')), + (QMessageBox.No, _('Cancel'))] + if not qtlib.QuestionMsgBox(_('Confirm Discard'), + _('Discard outstanding changes to working directory?'), + labels=labels, parent=self): + return + def finished(ret): + repo.decrementBusyCount() + self.refresh() + cmdline = ['update', '--clean', '--repository', repo.root, + '--rev', '.'] + self.runner = cmdui.Runner(True, self) + self.runner.commandFinished.connect(finished) + repo.incrementBusyCount() + self.runner.run(cmdline) + elif cmd == 'view': + dlg = status.StatusDialog(repo, [], {}, self) + dlg.exec_() + self.refresh() + else: + raise 'unknown command: %s' % cmd + + +class BackoutPage(BasePage): + def __init__(self, repo, parent): + super(BackoutPage, self).__init__(repo, parent) + self.backoutcomplete = False + + self.setTitle(_('Backing out, then merging...')) + self.setSubTitle(_('All conflicting files will be marked unresolved.')) + self.setLayout(QVBoxLayout()) + + self.cmd = cmdui.Widget(True, False, self) + self.cmd.commandFinished.connect(self.onCommandFinished) + self.cmd.setShowOutput(True) + self.layout().addWidget(self.cmd) + + self.reslabel = QLabel() + self.reslabel.linkActivated.connect(self.onLinkActivated) + self.reslabel.setWordWrap(True) + self.layout().addWidget(self.reslabel) + + self.autonext = QCheckBox(_('Automatically advance to next page ' + 'when backout and merge are complete.')) + checked = QSettings().value('backout/autoadvance', False).toBool() + self.autonext.setChecked(checked) + self.autonext.toggled.connect(self.tryAutoAdvance) + self.layout().addWidget(self.autonext) + + def currentPage(self): + if self.wizard().parentbackout: + self.wizard().next() + return + cmdline = ['--repository', self.repo.root, 'backout'] + tool = self.field('autoresolve').toBool() and 'merge' or 'fail' + cmdline += ['--tool=internal:' + tool] + cmdline += ['--rev', str(self.wizard().backoutrev)] + self.repo.incrementBusyCount() + self.cmd.core.clearOutput() + self.cmd.run(cmdline) + + def isComplete(self): + 'should Next button be sensitive?' + if not self.backoutcomplete: + return False + count = 0 + for root, path, status in thgrepo.recursiveMergeStatus(self.repo): + if status == 'u': + count += 1 + if count: + # if autoresolve is enabled, we know these were real conflicts + self.reslabel.setText(_('%d files have <b>merge conflicts</b> ' + 'that must be <a href="resolve">' + '<b>resolved</b></a>') % count) + return False + else: + self.reslabel.setText(_('No merge conflicts, ready to commit')) + return True + + def tryAutoAdvance(self, checked): + if checked and self.isComplete(): + self.wizard().next() + + def cleanupPage(self): + QSettings().setValue('backout/autoadvance', self.autonext.isChecked()) + + def onCommandFinished(self, ret): + self.repo.decrementBusyCount() + if ret in (0, 1): + self.backoutcomplete = True + if self.autonext.isChecked(): + self.tryAutoAdvance(True) + self.completeChanged.emit() + + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + if cmd == 'resolve': + dlg = resolve.ResolveDialog(self.repo, self) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + if self.autonext.isChecked(): + self.tryAutoAdvance(True) + self.completeChanged.emit() + + +class CommitPage(BasePage): + + def __init__(self, repo, parent): + super(CommitPage, self).__init__(repo, parent) + self.commitComplete = False + + self.setTitle(_('Commit backout and merge results')) + self.setSubTitle(' ') + self.setLayout(QVBoxLayout()) + self.setCommitPage(True) + + # csinfo + def label_func(widget, item, ctx): + if item == 'rev': + return _('Revision:') + elif item == 'parents': + return _('Parents') + raise csinfo.UnknownItem() + def data_func(widget, item, ctx): + if item == 'rev': + return _('Working Directory'), str(ctx) + elif item == 'parents': + parents = [] + cbranch = ctx.branch() + for pctx in ctx.parents(): + branch = None + if hasattr(pctx, 'branch') and pctx.branch() != cbranch: + branch = pctx.branch() + parents.append((str(pctx.rev()), str(pctx), branch, pctx)) + return parents + raise csinfo.UnknownItem() + def markup_func(widget, item, value): + if item == 'rev': + text, rev = value + if self.wizard() and self.wizard().parentbackout: + return '%s (%s)' % (text, rev) + else: + return '<a href="view">%s</a> (%s)' % (text, rev) + elif item == 'parents': + def branch_markup(branch): + opts = dict(fg='black', bg='#aaffaa') + return qtlib.markup(' %s ' % branch, **opts) + csets = [] + for rnum, rid, branch, pctx in value: + line = '%s (%s)' % (rnum, rid) + if branch: + line = '%s %s' % (line, branch_markup(branch)) + msg = widget.info.get_data('summary', widget, + pctx, widget.custom) + if msg: + line = '%s %s' % (line, msg) + csets.append(line) + return csets + raise csinfo.UnknownItem() + custom = csinfo.custom(label=label_func, data=data_func, + markup=markup_func) + contents = ('rev', 'user', 'dateage', 'branch', 'parents') + style = csinfo.panelstyle(contents=contents, margin=6) + + # merged files + rev_sep = qtlib.LabeledSeparator(_('Working Directory (merged)')) + self.layout().addWidget(rev_sep) + bkCsInfo = csinfo.create(repo, None, style, custom=custom, + withupdate=True) + bkCsInfo.linkActivated.connect(self.onLinkActivated) + self.layout().addWidget(bkCsInfo) + + # commit message area + msg_sep = qtlib.LabeledSeparator(_('Commit message')) + self.layout().addWidget(msg_sep) + msgEntry = commit.MessageEntry(self) + msgEntry.installEventFilter(qscilib.KeyPressInterceptor(self)) + msgEntry.refresh(repo) + msgEntry.loadSettings(QSettings(), 'backout/message') + + msgEntry.textChanged.connect(self.completeChanged) + self.layout().addWidget(msgEntry) + self.msgEntry = msgEntry + + self.cmd = cmdui.Widget(True, False, self) + self.cmd.commandFinished.connect(self.onCommandFinished) + self.cmd.setShowOutput(False) + self.layout().addWidget(self.cmd) + + def tryperform(): + if self.isComplete(): + self.wizard().next() + actionEnter = QAction('alt-enter', self) + actionEnter.setShortcuts([Qt.CTRL+Qt.Key_Return, Qt.CTRL+Qt.Key_Enter]) + actionEnter.triggered.connect(tryperform) + self.addAction(actionEnter) + + self.skiplast = QCheckBox(_('Skip final confirmation page, ' + 'close after commit.')) + checked = QSettings().value('backout/skiplast', False).toBool() + self.skiplast.setChecked(checked) + self.layout().addWidget(self.skiplast) + + def eng_toggled(checked): + if self.isComplete(): + oldmsg = self.msgEntry.text() + msgset = i18n.keepgettext()._('Backed out changeset: ') + msg = checked and msgset['id'] or msgset['str'] + if oldmsg and oldmsg != msg: + if not qtlib.QuestionMsgBox(_('Confirm Discard Message'), + _('Discard current backout message?'), parent=self): + self.engChk.blockSignals(True) + self.engChk.setChecked(not checked) + self.engChk.blockSignals(False) + return + self.msgEntry.setText(msg + + str(self.repo[self.wizard().backoutrev])) + self.msgEntry.moveCursorToEnd()     self.engChk = QCheckBox(_('Use English backout message')) - self.engChk.toggled.connect(self.eng_toggled) + self.engChk.toggled.connect(eng_toggled)   engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False)   self.engChk.setChecked(engmsg) + self.layout().addWidget(self.engChk)   - obox.addWidget(self.engChk) - self.mergeChk = QCheckBox(_('Commit backout before merging with ' - 'current working parent')) - self.mergeChk.toggled.connect(self.merge_toggled) - self.mergeChk.setChecked(bool(opts.get('merge'))) - self.msgTextEdit.setEnabled(False) - obox.addWidget(self.mergeChk) + def refresh(self): + pass   - self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts ' - 'where possible')) - self.autoresolve_chk.setChecked( - repo.ui.configbool('tortoisehg', 'autoresolve', False)) - obox.addWidget(self.autoresolve_chk) + def cleanupPage(self): + s = QSettings() + s.setValue('backout/skiplast', self.skiplast.isChecked()) + self.msgEntry.saveSettings(s, 'backout/message')   - if repo[revhex] == repo.parents()[0]: - # backing out the working parent is a one-step process - self.msgTextEdit.setEnabled(True) - self.mergeChk.setVisible(False) - self.autoresolve_chk.setVisible(False) - self.backoutParent = True - else: - self.backoutParent = False + def currentPage(self): + engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) + msgset = i18n.keepgettext()._('Backed out changeset: ') + msg = engmsg and msgset['id'] or msgset['str'] + self.msgEntry.setText(msg + str(self.repo[self.wizard().backoutrev])) + self.msgEntry.moveCursorToEnd()   - self.reslabel = QLabel() - self.reslabel.linkActivated.connect(self.link_activated) - box.addWidget(self.reslabel) + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + if cmd == 'view': + dlg = status.StatusDialog(self.repo, [], {}, self) + dlg.exec_() + self.refresh()   - ## command widget - self.cmd = cmdui.Widget(True, False, self) - self.cmd.commandStarted.connect(self.command_started) - self.cmd.commandFinished.connect(self.command_finished) - self.cmd.commandCanceling.connect(self.command_canceling) - box.addWidget(self.cmd, 1) + def isComplete(self): + return len(self.msgEntry.text()) > 0   - ## bottom buttons - buttons = QDialogButtonBox() - self.cancelBtn = buttons.addButton(QDialogButtonBox.Cancel) - self.cancelBtn.clicked.connect(self.cancel_clicked) - self.closeBtn = buttons.addButton(QDialogButtonBox.Close) - self.closeBtn.clicked.connect(self.reject) - self.backoutBtn = buttons.addButton(_('&Backout'), - QDialogButtonBox.ActionRole) - self.backoutBtn.clicked.connect(self.backout) - self.detailBtn = buttons.addButton(_('Detail'), - QDialogButtonBox.ResetRole) - self.detailBtn.setAutoDefault(False) - self.detailBtn.setCheckable(True) - self.detailBtn.toggled.connect(self.detail_toggled) - box.addWidget(buttons) + def validatePage(self): + if self.commitComplete: + # commit succeeded, repositoryChanged() called wizard().next() + if self.skiplast.isChecked(): + self.wizard().close() + return True + if self.cmd.core.running(): + return False   - # dialog setting - self.setLayout(box) - self.setMinimumWidth(480) - self.setMaximumHeight(800) - self.resize(0, 340) - self.setWindowTitle(_("Backout '%s' - %s") % (revhex, - self.repo.displayname)) - - # prepare to show - self.cmd.setHidden(True) - self.cancelBtn.setHidden(True) - self.detailBtn.setHidden(True) - self.msgTextEdit.setFocus() - self.msgTextEdit.moveCursorToEnd() - - ### Private Methods ### - - def merge_toggled(self, checked): - self.msgTextEdit.setEnabled(checked) - - def eng_toggled(self, checked): - msg = self.msgTextEdit.text() - origmsg = (checked and self.msgset['str'] or self.msgset['id']) - if msg != origmsg: - if not qtlib.QuestionMsgBox(_('Confirm Discard Message'), - _('Discard current backout message?'), parent=self): - self.engChk.blockSignals(True) - self.engChk.setChecked(not checked) - self.engChk.blockSignals(False) - return - newmsg = (checked and self.msgset['id'] or self.msgset['str']) - self.msgTextEdit.setText(newmsg) - - def backout(self):   user = qtlib.getCurrentUsername(self, self.repo)   if not user: - return - # prepare command line - revhex = self.targetinfo.get_data('revid') - cmdline = ['backout', '--rev', revhex, '--repository', self.repo.root, - '--user', user] - cmdline += ['--tool=internal:' + - (self.autoresolve_chk.isChecked() and 'merge' or 'fail')] - if self.backoutParent: - msg = self.msgTextEdit.text() - cmdline += ['--message='+hglib.fromunicode(msg)] - commandlines = [cmdline] - pushafter = self.repo.ui.config('tortoisehg', 'cipushafter') - if pushafter: - cmd = ['push', '--repository', self.repo.root, pushafter] - commandlines.append(cmd) - elif self.mergeChk.isChecked(): - cmdline += ['--merge'] - msg = self.msgTextEdit.text() - cmdline += ['--message', hglib.fromunicode(msg)] - commandlines = [cmdline] + return False + + if self.wizard().parentbackout: + self.setTitle(_('Backing out and committing...')) + self.setSubTitle(_('Please wait while making backout.')) + message = hglib.fromunicode(self.msgEntry.text()) + cmdline = ['backout', '--verbose', '--message', message, '--rev', + str(self.wizard().backoutrev), '--user', user, + '--repository', self.repo.root]   else: - commandlines = [cmdline] - - # start backing out - self.cmdline = cmdline - self.repo.incrementBusyCount() - self.cmd.run(*commandlines) - - def commit(self): - cmdline = ['commit', '--repository', self.repo.root] - msg = self.msgTextEdit.text() - cmdline += ['--message='+hglib.fromunicode(msg)] - self.cmdline = cmdline + self.setTitle(_('Committing...')) + self.setSubTitle(_('Please wait while committing merged files.')) + message = hglib.fromunicode(self.msgEntry.text()) + cmdline = ['commit', '--verbose', '--message', message, + '--repository', self.repo.root, '--user', user]   commandlines = [cmdline]   pushafter = self.repo.ui.config('tortoisehg', 'cipushafter')   if pushafter:   cmd = ['push', '--repository', self.repo.root, pushafter]   commandlines.append(cmd) +   self.repo.incrementBusyCount() + self.cmd.setShowOutput(True)   self.cmd.run(*commandlines) + return False   - ### Signal Handlers ### + def onCommandFinished(self, ret): + self.repo.decrementBusyCount() + if ret == 0: + self.commitComplete = True + self.wizard().next()   - def cancel_clicked(self): - self.cmd.cancel()   - def detail_toggled(self, checked): - self.cmd.setShowOutput(checked) +class ResultPage(BasePage): + def __init__(self, repo, parent): + super(ResultPage, self).__init__(repo, parent) + self.setTitle(_('Finished')) + self.setFinalPage(True)   - def command_started(self): - self.cmd.setShown(True) - self.mergeChk.setVisible(False) - self.closeBtn.setHidden(True) - self.cancelBtn.setShown(True) - self.detailBtn.setShown(True) - self.backoutBtn.setEnabled(False) + self.setLayout(QVBoxLayout()) + sep = qtlib.LabeledSeparator(_('Backout changeset')) + self.layout().addWidget(sep) + bkCsInfo = csinfo.create(self.repo, 'tip', withupdate=True) + self.layout().addWidget(bkCsInfo) + self.bkCsInfo = bkCsInfo + self.layout().addStretch(1)   - def command_canceling(self): - self.cancelBtn.setDisabled(True) + def currentPage(self): + self.bkCsInfo.update(self.repo['tip']) + self.wizard().setOption(QWizard.NoCancelButton, True)   - def command_finished(self, ret): - self.repo.decrementBusyCount() - self.cancelBtn.setHidden(True)   - # If the action wasn't successful, display the output and we're done - if ret not in (0, 1): - self.detailBtn.setChecked(True) - self.closeBtn.setShown(True) - self.closeBtn.setAutoDefault(True) - self.closeBtn.setFocus() - else: - finished = True - #If we backed out our parent, there is no second commit step - if self.cmdline[0] == 'backout' and not self.backoutParent: - finished = False - self.msgTextEdit.setEnabled(True) - self.backoutBtn.setEnabled(True) - self.backoutBtn.setText(_('Commit', 'action button')) - self.backoutBtn.clicked.disconnect(self.backout) - self.backoutBtn.clicked.connect(self.commit) - self.checkResolve() +class CheckThread(QThread): + def __init__(self, repo, parent): + QThread.__init__(self, parent) + self.repo = hg.repository(repo.ui, repo.root) + self.results = (False, 1) + self.canceled = False   - if finished: - if not self.cmd.outputShown(): - self.accept() - else: - self.closeBtn.clicked.disconnect(self.reject) - self.closeBtn.clicked.connect(self.accept) - self.closeBtn.setHidden(False) + def run(self): + self.repo.dirstate.invalidate() + unresolved = False + for root, path, status in thgrepo.recursiveMergeStatus(self.repo): + if self.canceled: + return + if status == 'u': + unresolved = True + break + wctx = self.repo[None] + dirty = bool(wctx.dirty()) or unresolved + self.results = (dirty, len(wctx.parents()))   - def checkResolve(self): - for root, path, status in thgrepo.recursiveMergeStatus(self.repo): - if status == 'u': - txt = _('Backout generated merge <b>conflicts</b> that must ' - 'be <a href="resolve"><b>resolved</b></a>') - self.backoutBtn.setEnabled(False) - break - else: - self.backoutBtn.setEnabled(True) - txt = _('You may commit the backed out changes after ' - '<a href="status"><b>verifying</b></a> them') - self.reslabel.setText(txt) + def cancel(self): + self.canceled = True   - @pyqtSlot(QString) - def link_activated(self, cmd): - if cmd == 'resolve': - dlg = resolve.ResolveDialog(self.repo, self) - dlg.finished.connect(dlg.deleteLater) - dlg.exec_() - self.checkResolve() - elif cmd == 'status': - dlg = status.StatusDialog([], {}, self.repo.root, self) - dlg.finished.connect(dlg.deleteLater) - dlg.exec_() - self.checkResolve() - - def accept(self): - self.msgTextEdit.saveSettings(QSettings(), 'backout/message') - super(BackoutDialog, self).accept()    def run(ui, *pats, **opts):   from tortoisehg.util import paths   repo = thgrepo.repository(ui, path=paths.find_root()) - kargs = {'opts': opts}   if opts.get('rev'): - kargs['rev'] = opts.get('rev') + rev = opts.get('rev')   elif len(pats) == 1: - kargs['rev'] = pats[0] - return BackoutDialog(repo, **kargs) + rev = pats[0] + return BackoutDialog(rev, repo, None)
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​bugreport.py Stacked
 
8
9
10
11
 
12
13
14
 
147
148
149
 
150
151
152
 
159
160
161
162
163
164
165
166
 
 
 
 
 
 
 
 
 
 
 
 
 
167
168
169
 
8
9
10
 
11
12
13
14
 
147
148
149
150
151
152
153
 
160
161
162
 
163
 
 
 
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
@@ -8,7 +8,7 @@
 import os  import sys   -from mercurial import extensions, ui +from mercurial import extensions  from tortoisehg.util import hglib, version  from tortoisehg.hgqt.i18n import _   @@ -147,6 +147,7 @@
  self._textlabel = QLabel(text, wordWrap=True,   textInteractionFlags=labelflags)   self._textlabel.linkActivated.connect(self._openlink) + self._textlabel.setWordWrap(False)   self.layout().addWidget(self._textlabel)     bb = QDialogButtonBox(QDialogButtonBox.Close, centerButtons=True) @@ -159,11 +160,20 @@
  if ref == '#bugreport':   return BugReport(self._opts, self).exec_()   if ref.startswith('#edit:'): - from tortoisehg.hgqt import wctxactions   fname, lineno = ref[6:].rsplit(':', 1) - # A chicken-egg problem here, we need a ui to get your - # editor in order to repair your ui config file. - wctxactions.edit(self, ui.ui(), None, [fname], lineno, None) + try: + # A chicken-egg problem here, we need a ui to get your + # editor in order to repair your ui config file. + from mercurial import ui as uimod + from tortoisehg.hgqt import qtlib + class FakeRepo(object): + def __init__(self): + self.root = os.getcwd() + self.ui = uimod.ui() + fake = FakeRepo() + qtlib.editfiles(fake, [fname], lineno, parent=self) + except Exception, e: + QDesktopServices.openUrl(QUrl.fromLocalFile(fname))    def run(ui, *pats, **opts):   return BugReport(opts)
Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​clone.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​commit.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​compress.py Stacked
 
125
126
127
128
 
129
130
131
132
133
134
 
135
136
137
 
141
142
143
144
 
145
146
147
 
125
126
127
 
128
129
130
131
132
133
 
134
135
136
137
 
141
142
143
 
144
145
146
147
@@ -125,13 +125,13 @@
    def commit(self):   tip, base = self.revs - func = revset.match('%s::%s' % (base, tip)) + func = revset.match(self.repo.ui, '%s::%s' % (base, tip))   revcount = len(self.repo)   revs = [c for c in func(self.repo, range(revcount)) if c != base]   descs = [self.repo[c].description() for c in revs]   self.repo.opener('cur-message.txt', 'w').write('\n* * *\n'.join(descs))   - dlg = commit.CommitDialog([], dict(root=self.repo.root), self) + dlg = commit.CommitDialog(self.repo, [], {}, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   self.showMessage.emit(_('Compress is complete, old history untouched')) @@ -141,7 +141,7 @@
    def linkActivated(self, cmd):   if cmd == 'commit': - dlg = commit.CommitDialog([], dict(root=self.repo.root), self) + dlg = commit.CommitDialog(self.repo, [], {}, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   self.checkStatus()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​csinfo.py Stacked
 
223
224
225
226
 
227
228
229
 
223
224
225
 
226
227
228
229
@@ -223,7 +223,7 @@
  raise UnknownItem(item)   if 'label' in custom and not kargs.get('usepreset', False):   try: - return custom['label'](widget, item) + return custom['label'](widget, item, ctx)   except UnknownItem:   pass   try:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​cslist.py Stacked
 
81
82
83
84
 
85
86
 
87
88
89
 
81
82
83
 
84
85
 
86
87
88
89
@@ -81,9 +81,9 @@
  filename = os.path.basename(widget.target)   return filename, revid   raise csinfo.UnknownItem(item) - def labelfunc(widget, item): + def labelfunc(widget, item, ctx):   if item in ('item', 'item_l'): - if not isinstance(widget.ctx, patchctx): + if not isinstance(ctx, patchctx):   return _('Revision:')   return _('Patch:')   raise csinfo.UnknownItem(item)
Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
copied from tortoisehg/hgqt/fileview.py
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
27
28
29
30
31
32
33
34
35
36
37
 
38
39
40
41
42
43
44
45
46
47
48
49
 
51
52
53
54
55
56
57
58
59
60
61
 
69
70
71
72
73
74
75
 
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
 
27
28
29
 
 
30
31
 
 
 
 
32
33
 
34
35
36
37
38
39
 
40
41
42
 
44
45
46
 
 
 
 
 
47
48
49
 
57
58
59
 
60
61
62
 
75
76
77
 
 
 
 
 
 
 
 
 
 
 
 
78
79
80
@@ -27,23 +27,16 @@
  """   Model used for listing (modified) files of a given Hg revision   """ - - contextChanged = pyqtSignal(object)   showMessage = pyqtSignal(QString)   - def __init__(self, repo, parent): - """ - data is a HgHLRepo instance - """ + def __init__(self, parent):   QAbstractTableModel.__init__(self, parent) - self.repo = repo   self._boldfont = parent.font()   self._boldfont.setBold(True)   self._ctx = None   self._files = []   self._filesdict = {}   self._fulllist = False - self._secondParent = False     @pyqtSlot(bool)   def toggleFullFileList(self, value): @@ -51,11 +44,6 @@
  self.loadFiles()   self.layoutChanged.emit()   - @pyqtSlot(bool) - def toggleSecondParent(self, value): - self._secondParent = value - self.layoutChanged.emit() -   def __len__(self):   return len(self._files)   @@ -69,7 +57,6 @@
  return self._files[row]['path']     def setContext(self, ctx): - self.contextChanged.emit(ctx)   reload = False   if not self._ctx:   reload = True @@ -88,18 +75,6 @@
  row = index.row()   return self._files[row]['path']   - def revFromIndex(self, index): - 'return revision for index. index is guarunteed to be valid' - if len(self._ctx.parents()) < 2: - return None - row = index.row() - data = self._files[row] - if (data['wasmerged'] and self._secondParent) or \ - (data['parent'] == 1 and self._fulllist): - return self._ctx.p2().rev() - else: - return self._ctx.p1().rev() -   def dataFromIndex(self, index):   if not index.isValid() or index.row()>=len(self) or not self._ctx:   return None
Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filerevmodel.py Stacked
 
14
15
16
17
 
18
19
20
21
22
 
 
 
 
 
 
23
24
25
 
27
28
29
30
31
 
 
 
32
33
34
35
36
 
37
38
39
40
41
 
42
43
44
 
14
15
16
 
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
 
33
34
35
 
 
36
37
38
39
40
41
42
 
43
44
45
46
 
 
47
48
49
50
@@ -14,12 +14,18 @@
 # this program; if not, write to the Free Software Foundation, Inc.,  # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.   -from tortoisehg.hgqt.repomodel import HgRepoListModel, COLUMNNAMES +from tortoisehg.hgqt.repomodel import HgRepoListModel, COLUMNHEADERS  from tortoisehg.hgqt.graph import Graph, filelog_grapher  from tortoisehg.hgqt.i18n import _    from PyQt4.QtCore import *   +FILE_HEADERS = (('Filename', _('Filename', 'column header')),) +UNUSED_HEADERS = ('Graph', 'Changes') + +FILE_COLUMNHEADERS = tuple(c for c in COLUMNHEADERS + if c[0] not in UNUSED_HEADERS) + FILE_HEADERS +  class FileRevModel(HgRepoListModel):   """   Model used to manage the list of revisions of a file, in file @@ -27,18 +33,18 @@
  """   filled = pyqtSignal()   - _allcolumns = ('Rev', 'Branch', 'Description', 'Author', 'Age', - 'LocalTime', 'UTCTime', 'Tags', 'Filename') + _allcolumns = tuple(h[0] for h in FILE_COLUMNHEADERS) + _allcolnames = dict(FILE_COLUMNHEADERS) +   _columns = ('Rev', 'Branch', 'Description', 'Author', 'Age', 'Filename')   _stretchs = {'Description': 1, }   _getcolumns = "getFilelogColumns"   - def __init__(self, repo, filename=None, parent=None): + def __init__(self, repo, cfgname, filename=None, parent=None):   """   data is a HgHLRepo instance   """ - HgRepoListModel.__init__(self, repo, '', [], False, parent) - COLUMNNAMES['Filename'] = _('Filename', 'column header') + HgRepoListModel.__init__(self, repo, cfgname, '', [], False, parent)   self.setFilename(filename)     def setRepo(self, repo, branch='', fromhead=None, follow=False):
Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​grep.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​logcolumns.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​manifestmodel.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​merge.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​mq.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​pbranch.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​quickop.py Stacked
 
70
71
72
73
 
74
75
76
 
70
71
72
 
73
74
75
76
@@ -70,7 +70,7 @@
  opts[val.name] = s in filetypes     opts['checkall'] = True # pre-check all matching files - stwidget = status.StatusWidget(pats, opts, repo.root, self) + stwidget = status.StatusWidget(repo, pats, opts, self)   layout.addWidget(stwidget, 1)     if self.command == 'revert':
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rebase.py Stacked
 
221
222
223
224
 
225
226
227
 
221
222
223
 
224
225
226
227
@@ -221,7 +221,7 @@
  dlg.exec_()   self.checkResolve()   elif cmd == 'commit': - dlg = commit.CommitDialog([], dict(root=self.repo.root), self) + dlg = commit.CommitDialog(self.repo, [], {}, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   self.destcsinfo.update(self.repo['.'])
Show Entire File tortoisehg/​hgqt/​rename.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​repomodel.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​repotreeitem.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​repotreemodel.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​repoview.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​revert.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​revpanel.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​revset.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​run.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​rupdate.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​settings.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​status.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​sync.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​tag.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​thgimport.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​thgstrip.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​update.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgtk/​bugtraq.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgtk/​commit.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Changes Only 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
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
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
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
 # 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, extensions    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, settings, paths, i18n    from tortoisehg.hgtk import dialog, gdialog, gtklib, hgcmd    try: - from tortoisehg.hgtk import bugtraq + from tortoisehg.util import bugtraq   bugtraq.get_issue_plugins_with_names()  except ImportError:   bugtraq = None    try:   from iniparse.config import Undefined  except ImportError:   class Undefined(object):   pass    _unspecstr = _('<unspecified>')  _unspeclocalstr = hglib.fromutf(_unspecstr)    _pwfields = ('http_proxy.passwd', 'smtp.password')    # options available only on global settings  _norepofields = ('tortoisehg.ui.language',)    INFO = (  ({'name': 'general', 'label': 'TortoiseHg', 'icon': 'thg_logo.ico'}, (   (_('UI Language'), 'tortoisehg.ui.language', i18n.availablelanguages(),   _('Specify your preferred user interface language (restart needed)')),   (_('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')),   ) + (gtklib.hasspellcheck() and   ((_('Spell Check Language'), 'tortoisehg.spellcheck', [],   _('Default language for spell check. System language is '   'used if not specified. Examples: en, en_GB, en_US')),) or ())),    ({'name': 'commit', 'label': _('Commit'), 'icon': 'menucommit.ico'}, (   (_('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)')),   (_('Close After Commit'), 'tortoisehg.closeci', ['False', 'True'],   _('Close the commit tool after every successful '   'commit. Default: False')),   (_('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 (leave blank)')),   (_('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 (leave blank)')),   (_('English Messages'), 'tortoisehg.engmsg', ['False', 'True'],   _('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')),   (_('Default Tab'), 'tortoisehg.statustab', ['0', '1', '2'],   _('The tab on which the status and commit tools will open. '   '0 - TextDiff, 1 - Hunk Selection, 2 - Commit Preview. '   'Default: 0')),   )),    ({'name': 'log', 'label': _('Repository Explorer'),   'icon': 'menulog.ico'}, (   (_('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 (leave blank)')),   (_('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 (leave blank)')),   (_('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 (leave blank)')),   (_('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')),  # (_('F/S Encodings'), 'tortoisehg.fsencodings', [],  # _('Comma separated list of encodings used for filenames '  # 'on this computer. Default: none')),   )),    ({'name': 'sync', 'label': _('Synchronize'), 'icon': 'menusynch.ico',   'extra': True}, (   (_('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')),   )),    ({'name': 'web', 'label': _('Web Server'), 'icon': 'proxy.ico'}, (   (_('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')),   )),    ({'name': 'proxy', 'label': _('Proxy'), 'icon': 'general.ico'}, (   (_('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')),   )),    ({'name': 'email', 'label': _('Email'), 'icon': gtk.STOCK_GOTO_LAST}, (   (_('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.')),   )),    ({'name': 'diff', 'label': _('Diff'), 'icon': gtk.STOCK_JUSTIFY_FILL}, (   (_('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')),   )),    ({'name': 'font', 'label': _('Font'), 'icon': gtk.STOCK_SELECT_FONT,   'extra': True, 'width': 16}, (   (_('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')),   )),    ({'name': 'extensions', 'label': _('Extensions'), 'icon': gtk.STOCK_EXECUTE,   'extra': True}, ()),    ({'name': 'issue', 'label': _('Issue Tracking'), 'icon': gtk.STOCK_EDIT,   'extra': True}, (   (_('Issue Regex'), 'tortoisehg.issue.regex', [],   _('Defines the regex to match when picking up issue numbers.')),   (_('Issue Link'), 'tortoisehg.issue.link', [],   _('Defines the command to run when an issue number is recognized. '   'You may include groups in issue.regex, and corresponding {n} '   'tokens in issue.link (where n is a non-negative integer). '   '{0} refers to the entire string matched by issue.regex, '   'while {1} refers to the first group and so on. If no {n} tokens'   'are found in issue.link, the entire matched string is appended '   'instead.')),   (_('Mandatory Issue Reference'), 'tortoisehg.issue.linkmandatory',   ['False', 'True'],   _('When commiting an issue, force the user to specify a reference '   'to an issue. '   'If enabled, the regex configured in \'Issue Regex\' must find a '   'match in the commit message')),   )),  )    _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, focus=None):   """ 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 = gtklib.Tooltips()   self.history = settings.Settings('thgconfig')     # add page items to treeview   for meta, info in INFO:   if meta['name'] == 'issue' and bugtraq is None:   continue   pixbuf = gtklib.get_icon_pixbuf(meta['icon'],   gtk.ICON_SIZE_LARGE_TOOLBAR)   self.confmodel.append((pixbuf, meta['label'], meta['name']))     # 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)     # focus 'general' page or specified field   if focus:   self.focus_field(focus)   else:   self.show_page('general')   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):   # determine target config file   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')     # refresh config values   self.ini = self.load_config(self.rcpath)   self.refresh_vlist()     # clear modification status   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]   if not self.pages.has_key(name):   self.add_page(name)   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'''   for row in self.confmodel:   if name == row[2]:   path = row.path   break   else:   return   self.confview.set_cursor(path)     def focus_field(self, focusfield):   '''Set page and focus to requested datum'''   for meta, info in INFO:   for n, (label, cpath, values, tip) in enumerate(info):   if cpath == focusfield:   name = meta['name']   self.show_page(name)   widgets = self.pages[name][3]   widgets[n].grab_focus()   return     def new_path(self, newpath, alias='new'):   '''Add a new path to [paths], give default name, focus'''   # This method may be called from hgtk.sync, so ensure page is visible   self.show_page('sync')   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()   self.dirty_event()     def dirty_event(self, *args):   if not self.dirty:   self._btn_apply.set_sensitive(not self.readonly)   self.dirty = True     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.editpathbtn.set_sensitive(path_selected)   self.delpathbtn.set_sensitive(path_selected)   self.testpathbtn.set_sensitive(repo_available and path_selected)   self.defaultpathbtn.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)     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)     addpathbtn = gtk.Button(_('_Add'))   addpathbtn.set_use_underline(True)   bottombox.pack_start(addpathbtn, True, True, 2)     self.editpathbtn = gtk.Button(_('_Edit'))   self.editpathbtn.set_use_underline(True)   bottombox.pack_start(self.editpathbtn, True, True, 2)     self.delpathbtn = gtk.Button(_('_Remove'))   self.delpathbtn.set_use_underline(True)   bottombox.pack_start(self.delpathbtn, True, True, 2)     self.testpathbtn = gtk.Button(_('_Test'))   self.testpathbtn.set_use_underline(True)   bottombox.pack_start(self.testpathbtn, True, True, 2)     self.defaultpathbtn = gtk.Button(_('Set as _default'))   self.defaultpathbtn.set_use_underline(True)   bottombox.pack_start(self.defaultpathbtn, True, True, 2)     # signal handlers   def pathtree_changed(sel):   self.refresh_path_list()   def pathtree_pressed(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:   edit_path()   elif event.button == 1:   selection = self.pathtree.get_selection()   selection.unselect_all()   self.refresh_path_list()   def edit_path(*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 add_path(*args):   self.new_path('http://')   edit_path(new=True)   def remove_path(*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(*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]   dlg = hgcmd.CmdDialog(cmdline, text='hg incoming')   dlg.run()   dlg.hide()   def make_default(*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()     # connect handlers   self.pathtree.connect('cursor-changed', pathtree_changed)   self.pathtree.connect('button-press-event', pathtree_pressed)   addpathbtn.connect('clicked', add_path)   self.editpathbtn.connect('clicked', edit_path)   self.delpathbtn.connect('clicked', remove_path)   self.testpathbtn.connect('clicked', test_path)   self.defaultpathbtn.connect('clicked', make_default)     def refresh_sync_frame(self):   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()     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 refresh_font_frame(self):   model = self.presetcombo.get_model()   cpaths = [info[1] for info in self.pages['font'][1]]   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)     def fill_extensions_frame(self, parent, table):   allexts = hglib.allextensions()     MAXCOLUMNS = 3   maxrows = (len(allexts) + MAXCOLUMNS - 1) / MAXCOLUMNS   extstable = gtk.Table()   parent.pack_start(extstable, False, False)     self.extensionschecks = {}   for i, name in enumerate(sorted(allexts)):   shortdesc = allexts[name]   ck = gtk.CheckButton(name, use_underline=False)   ck.connect('toggled', self.dirty_event)   ck.connect('toggled', self._validateextensions)   ck.connect('focus-in-event', self.set_help,   hglib.toutf(shortdesc))   col, row = i / maxrows, i % maxrows   extstable.attach(ck, col, col + 1, row, row + 1)   self.extensionschecks[name] = ck     def _enabledextensions(self):   """list up to-be enabled extensions by reading fresh setting"""   from mercurial import config   cfg = config.config()   for f in util.rcpath():   if os.path.realpath(f) == os.path.realpath(self.fn):   continue # can be modified by user; read from self.ini   try:   cfg.read(f)   except IOError:   pass     if 'extensions' in self.ini:   for k in self.ini['extensions']:   cfg.set('extensions', k, self.ini['extensions'][k])     return set(name for name, path in cfg.items('extensions')   if not path.startswith('!'))     def refresh_extensions_frame(self):   enabledexts = self._enabledextensions()   for name, ck in self.extensionschecks.iteritems():   ck.set_active(name in enabledexts)     self._validateextensions()     def _validateextensions(self, *args):   enabledexts = self._enabledextensions()   selectedexts = set(name for name, ck   in self.extensionschecks.iteritems()   if ck.get_active())   invalidexts = hglib.validateextensions(selectedexts)     def getinival(name):   if 'extensions' not in self.ini:   return None   for cand in (name, 'hgext.%s' % name, 'hgext/%s' % name):   try:   v = self.ini['extensions'][cand]   if not isinstance(v, Undefined):   return v   except KeyError:   pass     def changable(name):   curval = getinival(name)   if curval not in ('', None):   # enabled or unspecified, official extensions only   return False   elif name in enabledexts and curval is None:   # re-disabling ext is not supported   return False   elif name in invalidexts and name not in selectedexts:   # disallow to enable bad exts, but allow to disable it   return False   else:   return True     allexts = hglib.allextensions()   for name, ck in self.extensionschecks.iteritems():   ck.set_sensitive(changable(name))   self.tooltips.set_tip(ck, invalidexts.get(name)   or hglib.toutf(allexts[name]))     def apply_extensions_changes(self):   enabledexts = self._enabledextensions()   for name, ck in self.extensionschecks.iteritems():   if ck.get_active() == (name in enabledexts):   continue # unchanged     if 'extensions' not in self.ini:   new_namespace = getattr(self.ini, '_new_namespace',   self.ini.new_namespace)   new_namespace('extensions')     if ck.get_active():   self.ini['extensions'][name] = ''   else:   for cand in (name, 'hgext.%s' % name, 'hgext/%s' % name):   try:   del self.ini['extensions'][cand]   except KeyError:   pass     def set_help(self, widget, event, tooltip):   text = ' '.join(tooltip.splitlines())   self.descbuffer.set_text(text)     def fill_issue_frame(self, parent, table):   parent.pack_start(table, False, False)     issuetrackmodel = gtk.ListStore(str, # internal name   str) # GUI label   issuetrackmodel.append((None, _(' - Select Issue Tracker -')))   for (guid, label) in bugtraq.get_issue_plugins_with_names():   issuetrackmodel.append((guid, label))   issuetrackcombo = gtk.ComboBox(issuetrackmodel)   cell = gtk.CellRendererText()   issuetrackcombo.pack_start(cell)   issuetrackcombo.add_attribute(cell, 'text', 1)   self.issuetrackcombo = issuetrackcombo     table.add_row('Issue plugin:', issuetrackcombo, padding=False)     tooltip = _('Select issue tracker plugin to use. '   'Links to plugins can be found at '   'http://tortoisesvn.net/issuetrackerplugins')   self.tooltips.set_tip(issuetrackcombo, tooltip)     issuetrackcombo.connect('popup', self.set_help, '', tooltip)     configurepluginbutton = gtk.Button(_('Configure Plugin'))   table.add_row('', configurepluginbutton, padding=False)   self.configurepluginbutton = configurepluginbutton     def combo_changed(combo):   model = combo.get_model()   newvalue = ""   selection = model[self.issuetrackcombo.get_active()]   if not selection[0] == None:   newvalue = selection[0] + ' ' + selection[1]   self.record_new_value("tortoisehg.issue.bugtraqplugin",   newvalue)   self.dirty_event()   self.configurepluginbutton.set_sensitive(newvalue != "")     def configure_bugtraq_plugin(button):   value = self.get_ini_config("tortoisehg.issue.bugtraqplugin")   if value == None or value == "":   return     guid = value.split(' ', 1)[0]   value = self.get_ini_config("tortoisehg.issue.bugtraqparameters")   if value == None:   value = ""     bugtr = bugtraq.BugTraq(guid)   newvalue = bugtr.show_options_dialog(value)     if value != newvalue:   self.record_new_value("tortoisehg.issue.bugtraqparameters", newvalue)   self.dirty_event()     issuetrackcombo.connect('changed', combo_changed)   configurepluginbutton.connect('clicked', configure_bugtraq_plugin)     def refresh_issue_frame(self):   value = self.get_ini_config("tortoisehg.issue.bugtraqplugin")   configuredguid = ""   if not value == None:   configuredguid = re.sub("[-{}]", "", value.split(' ', 1)[0])     model = self.issuetrackcombo.get_model()   index = 0   found = False   for (guid, label) in model:   if not guid == None:   if re.sub("[-{}]", "", guid) == configuredguid:   found = True   break   index = index + 1   if not found:   index = 0   self.issuetrackcombo.set_active(index)   self.configurepluginbutton.set_sensitive(configuredguid != "")     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, pagename=None):   # sotre modification status   prev_dirty = self.dirty     # update configured values   if pagename is None:   pages = self.pages.values()   pages = [(key,) + data for key, data in self.pages.items()]   else:   pages = ((pagename,) + self.pages[pagename],)   for name, page_num, info, vbox, widgets in pages:     # standard configs   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 key in tools.keys():   if key not in values:   values.append(key)   elif cpath == 'ui.merge':   # Special case, add [merge-tools] to possible values   hglib.mergetools(self.ui, values)     if cpath in _norepofields:   combo.set_sensitive(   self.confcombo.get_active() != CONF_REPO)     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)     # extra configs   func_name = 'refresh_%s_frame' % name   if hasattr(self, func_name):   getattr(self, func_name)()     # clear modification status forcibly if need   if self.dirty != prev_dirty:   self._btn_apply.set_sensitive(False)   self.dirty = False     def add_page(self, name):   for data in INFO:   if name == data[0]['name']:   meta, info = data   break   else:   return   extra, width = meta.get('extra', False), meta.get('width', 32)     # setup frame and content   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)     # prepare to show   self.refresh_vlist(name)   frame.show_all()     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)   if section not in self.ini:   return None   val = self.ini[section][key]   if isinstance(val, Undefined):   return None   return val   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 == '':   if section not in self.ini:   return   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 self.pages.has_key('sync'):   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]     if 'extensions' in self.pages:   self.apply_extensions_changes()     # 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 = util.atomictempfile(self.fn, 'w', createmode=None)   f.write(str(self.ini))   f.rename()   self._btn_apply.set_sensitive(False)   self.dirty = False   except IOError, e:   dialog.error_dialog(self, _('Unable to write configuration file'),   hglib.tounicode(str(e)))     return 0    def run(ui, *pats, **opts):   dlg = ConfigDialog(opts.get('alias') == 'repoconfig',   focus=opts.get('focus'))   return dlg
Show Entire File tortoisehg/​util/​bugtraq.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​util/​hglib.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​util/​hgshelve.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File win32/​mercurial.rc Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File win32/​wix/​guids.wxi Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File win32/​wix/​templates.wxs Stacked
This file's diff was not loaded because this changeset is very large. Load changes