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
Change 1 of 10 Show Entire File tortoisehg/​hgqt/​merge.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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
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
 
197
198
199
 
 
 
200
201
202
 
 
203
204
205
206
 
 
 
 
207
208
209
210
 
211
212
213
214
 
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
 
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
 
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
 
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
@@ -1,52 +1,51 @@
 # merge.py - Merge dialog for TortoiseHg  #  # Copyright 2010 Yuki KODAMA <endflow.net@gmail.com> +# Copyright 2011 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.   -from PyQt4.QtCore import * -from PyQt4.QtGui import * - -from mercurial import error -from mercurial import merge as mergemod +from mercurial import hg, error    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, commit, resolve  from tortoisehg.hgqt import qscilib, thgrepo   -keep = i18n.keepgettext() +from PyQt4.QtCore import * +from PyQt4.QtGui import *   -MERGE_PAGE = 0 -COMMIT_PAGE = 1 -RESULT_PAGE = 2 +MARGINS = (8, 0, 0, 0)    class MergeDialog(QWizard):   - def __init__(self, other, repo, parent): + def __init__(self, otherrev, repo, parent):   super(MergeDialog, self).__init__(parent)   f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)   - self.repo = repo - self.other = str(other) - self.local = str(self.repo['.'].rev()) + self.otherrev = str(otherrev) + self.localrev = str(repo['.'].rev())   - self.setWindowTitle(_('Merge - %s') % self.repo.displayname) + self.setWindowTitle(_('Merge - %s') % repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-merge')) - self.setMinimumSize(600, 528) - self.setOption(QWizard.DisabledBackButtonOnLastPage, True) - self.setOption(QWizard.HelpButtonOnRight, False) - self.setDefaultProperty('QComboBox', 'currentText', 'editTextChanged()') + self.setOption(QWizard.NoBackButtonOnStartPage, True) + self.setOption(QWizard.NoBackButtonOnLastPage, True) + self.setOption(QWizard.IndependentPages, True)     # set pages - self.setPage(MERGE_PAGE, MergePage(self)) - self.setPage(COMMIT_PAGE, CommitPage(self)) - self.setPage(RESULT_PAGE, ResultPage(self)) + self.addPage(SummaryPage(repo, self)) + self.addPage(MergePage(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) + self.repo = repo     def repositoryChanged(self):   self.currentPage().repositoryChanged() @@ -54,47 +53,32 @@
  def configChanged(self):   self.currentPage().configChanged()   + def pageChanged(self, id): + if id != -1: + self.currentPage().currentPage() +   def reject(self): - page = self.currentPage() - if hasattr(page, 'need_cleanup') and page.need_cleanup(): - main = _('Do you want to exit?') - text = _('To finish merging, you need to commit ' - 'the working directory.') - labels = ((QMessageBox.Yes, _('&Exit')), - (QMessageBox.No, _('Cancel'))) - if not qtlib.QuestionMsgBox(_('Confirm Exit'), main, text, - labels=labels, parent=self): - return - page.reject() - super(MergeDialog, self).reject() + if self.currentPage().canExit(): + super(MergeDialog, self).reject()     def done(self, ret):   self.repo.repositoryChanged.disconnect(self.repositoryChanged)   self.repo.configChanged.disconnect(self.configChanged)   super(MergeDialog, self).done(ret)   -MAIN_PANE = 0 -PERFORM_PANE = 1    class BasePage(QWizardPage): + def __init__(self, repo, parent): + super(BasePage, self).__init__(parent) + self.repo = repo   - def __init__(self, parent=None): - super(BasePage, self).__init__(parent) - self.nextEnabled = True - self.done = False + def validatePage(self): + 'user pressed NEXT button, can we proceed?' + return True   - def switch_pane(self, pane): - self.setup_buttons(pane) - self.layout().setCurrentIndex(pane) - if pane == MAIN_PANE: - self.ready() - elif pane == PERFORM_PANE: - self.cmd.core.clearOutput() - self.perform() - else: - raise 'unknown pane: %s' % pane - - ### Override Method ### + def isComplete(self): + 'should NEXT button be sensitive?' + return True     def repositoryChanged(self):   'repository has detected a change to changelog or parents' @@ -104,125 +88,39 @@
  'repository has detected a change to config files'   pass   - def reject(self): + def currentPage(self):   pass   + def canExit(self): + if len(self.repo.parents()) == 2: + main = _('Do you want to exit?') + text = _('To finish merging, you need to commit ' + 'the working directory.') + labels = ((QMessageBox.Yes, _('&Exit')), + (QMessageBox.No, _('Cancel'))) + if not qtlib.QuestionMsgBox(_('Confirm Exit'), main, text, + labels=labels, parent=self): + return False + return True + +class SummaryPage(BasePage): + + def __init__(self, repo, parent): + super(SummaryPage, self).__init__(repo, parent) + self.clean = None + self.th = None + + ### Override Methods ### +   def initializePage(self):   if self.layout():   return + self.setTitle(_('Prepare to merge')) + self.setSubTitle(_('Verify merge targets and ensure your working ' + 'directory is clean.')) + self.setLayout(QVBoxLayout())   - stack = QStackedLayout() - self.setLayout(stack) - - def wrap(layout): - widget = QWidget() - widget.setLayout(layout) - return widget - - # main pane - fpane = self.get_pane() - num = stack.addWidget(wrap(fpane)) - assert num == MAIN_PANE - - # perform pane - ppane = QVBoxLayout() - ppane.addSpacing(4) - self.cmd = cmdui.Widget(True, True, self) - self.cmd.setShowOutput(True) - self.cmd.commandFinished.connect(self.command_finished) - self.cmd.commandCanceling.connect(self.command_canceling) - ppane.addWidget(self.cmd) - num = stack.addWidget(wrap(ppane)) - assert num == PERFORM_PANE - - def setVisible(self, visible): - super(BasePage, self).setVisible(visible) - if visible: - self.switch_pane(MAIN_PANE) - - def validatePage(self): - #When the user first clicks on the "Next" button ("Merge"/"Commit") - #After any validation via overloading validatePage(), - #we switch to the perform pane - if self.layout().currentIndex() == MAIN_PANE: - self.switch_pane(PERFORM_PANE) - return False - - #When the perform pane is done, it'll call this again - return self.can_continue() - - ### Method to be overridden ### - - def get_pane(self): - return QVBoxLayout() - - def get_perform_label(self): - return None - - def setup_buttons(self, pane): - if pane == MAIN_PANE: - label = self.get_perform_label() - if label: - self.wizard().setButtonText(QWizard.NextButton, label); - self.nextEnabled = True - else: - self.nextEnabled = False - self.wizard().setOption(QWizard.HaveHelpButton, False) - self.wizard().setOption(QWizard.HaveCustomButton1, False) - self.wizard().setOption(QWizard.NoCancelButton, False) - elif pane == PERFORM_PANE: - button = QPushButton(_('Cancel')) - self.wizard().setButton(QWizard.CustomButton1, button) - self.wizard().setOption(QWizard.HaveCustomButton1, True) - button.clicked.connect(self.cancel_clicked) - self.nextEnabled = False - self.wizard().setOption(QWizard.NoCancelButton, True) - else: - raise 'unknown pane: %s' % pane - - def ready(self): - pass - - def perform(self): - pass - - def cancel(self): - self.cmd.cancel() - - def can_continue(self): - return self.done - - def need_cleanup(self): - return False - - ### Signal Handlers ### - - def cancel_clicked(self): - self.cancel() - - def command_finished(self, ret): - pass - - def command_canceling(self): - pass - -MARGINS = (8, 0, 0, 0) - -class MergePage(BasePage): - - def __init__(self, parent=None): - super(MergePage, self).__init__(parent) - - self.clean = None - self.undo = False - self.th = None - - ### Override Methods ### - - def get_pane(self): - repo = self.wizard().repo - box = QVBoxLayout() - + repo = self.repo   contents = ('ishead',) + csinfo.PANEL_DEFAULT   style = csinfo.panelstyle(contents=contents)   def markup_func(widget, item, value): @@ -235,36 +133,31 @@
    ## merge target   other_sep = qtlib.LabeledSeparator(_('Merge from (other revision)')) - box.addWidget(other_sep) + self.layout().addWidget(other_sep)   try: - other_info = create(self.wizard().other) - other_info.setContentsMargins(5, 0, 0, 0) - box.addWidget(other_info) - self.other_info = other_info + otherCsInfo = create(self.wizard().otherrev)   except error.RepoLookupError:   qtlib.InfoMsgBox(_('Unable to merge'),   _('Merge revision not specified or not found'))   QTimer.singleShot(0, self.wizard().close) + self.layout().addWidget(otherCsInfo) + self.otherCsInfo = otherCsInfo     ## current revision - box.addSpacing(6)   local_sep = qtlib.LabeledSeparator(_('Merge to (working directory)')) - box.addWidget(local_sep) - local_info = create(self.wizard().local) - local_info.setContentsMargins(5, 0, 0, 0) - box.addWidget(local_info) - self.local_info = local_info + self.layout().addWidget(local_sep) + localCsInfo = create(self.wizard().localrev) + self.layout().addWidget(localCsInfo) + self.localCsInfo = localCsInfo     ## working directory status - box.addSpacing(6)   wd_sep = qtlib.LabeledSeparator(_('Working directory status')) - box.addWidget(wd_sep) + self.layout().addWidget(wd_sep)     self.groups = qtlib.WidgetGroups()     wdbox = QHBoxLayout() - wdbox.setContentsMargins(*MARGINS) - box.addLayout(wdbox) + self.layout().addLayout(wdbox)   self.wd_status = qtlib.StatusLabel()   self.wd_status.set_status(_('Checking...'))   wdbox.addWidget(self.wd_status) @@ -273,34 +166,28 @@
  wd_prog.setTextVisible(False)   self.groups.add(wd_prog, 'prog')   wdbox.addWidget(wd_prog, 1) - wd_detail = QLabel(_('<a href="view">View changes...</a>')) - wd_detail.linkActivated.connect(self.link_activated) - self.groups.add(wd_detail, 'detail') - wdbox.addWidget(wd_detail) - wdbox.addSpacing(4)     wd_merged = QLabel(_('The working directory is already <b>merged</b>. '   '<a href="skip"><b>Continue</b></a> or '   '<a href="discard"><b>discard</b></a> existing '   'merge.')) - wd_merged.setContentsMargins(*MARGINS) - wd_merged.linkActivated.connect(self.link_activated) + wd_merged.linkActivated.connect(self.onLinkActivated) + wd_merged.setWordWrap(True)   self.groups.add(wd_merged, 'merged') - box.addWidget(wd_merged) + self.layout().addWidget(wd_merged)     text = _('Before merging, 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.setContentsMargins(*MARGINS) - wd_text.linkActivated.connect(self.link_activated) + wd_text.setWordWrap(True) + wd_text.linkActivated.connect(self.onLinkActivated)   self.wd_text = wd_text   self.groups.add(wd_text, 'dirty') - box.addWidget(wd_text) + self.layout().addWidget(wd_text)     wdbox = QHBoxLayout() - wdbox.setContentsMargins(*MARGINS) - box.addLayout(wdbox) + self.layout().addLayout(wdbox)   wd_alt = QLabel(_('Or use:'))   self.groups.add(wd_alt, 'dirty')   wdbox.addWidget(wd_alt) @@ -310,25 +197,18 @@
  self.registerField('force', force_chk)   self.groups.add(force_chk, 'dirty')   wdbox.addWidget(force_chk) - wdbox.addStretch(0) - - box.addSpacing(6)     ### options   expander = qtlib.ExpanderLabel(_('Options'), False) - expander.expanded.connect(self.show_options) - box.addWidget(expander) + expander.expanded.connect(self.toggleShowOptions) + self.layout().addWidget(expander)   self.expander = expander   - optbox = QVBoxLayout() - optbox.setSpacing(6) - box.addLayout(optbox) -   ### discard option   discard_chk = QCheckBox(_('Discard all changes from merge target '   '(other) revision'))   self.registerField('discard', discard_chk) - optbox.addWidget(discard_chk) + self.layout().addWidget(discard_chk)   self.discard_chk = discard_chk     ## auto-resolve @@ -337,129 +217,94 @@
  autoresolve_chk.setChecked(   repo.ui.configbool('tortoisehg', 'autoresolve', False))   self.registerField('autoresolve', autoresolve_chk) - optbox.addWidget(autoresolve_chk) + self.layout().addWidget(autoresolve_chk)   self.autoresolve_chk = autoresolve_chk   - box.addStretch(0) - - return box - - def get_perform_label(self): - return _('&Merge') - - def ready(self): - self.done = False - self.setTitle(_('Merge another revision to the working directory'))   self.groups.set_visible(False, 'dirty')   self.groups.set_visible(False, 'merged') - self.groups.set_visible(False, 'detail') - self.show_options(self.expander.is_expanded()) - self.check_status() + self.toggleShowOptions(self.expander.is_expanded())   - if self.undo: - self.link_activated('discard:noconfirm') - self.undo = False + def isComplete(self): + 'should Next button be sensitive?' + return self.clean or self.field('force').toBool()     def validatePage(self): - #If we haven't already done the action, pop up a confirmation for - #dummy merge. - if not self.done and self.field('discard').toBool(): + 'validate that we can continue with the merge' + if self.field('discard').toBool():   labels = [(QMessageBox.Yes, _('&Discard')),   (QMessageBox.No, _('Cancel'))]   if not qtlib.QuestionMsgBox(_('Confirm Discard Changes'),   _('The changes from revision %s and all unmerged parents '   'will be discarded.\n\n'   'Are you sure this is what you want to do?') - % (self.other_info.get_data('revid')), + % (self.otherCsInfo.get_data('revid')),   labels=labels, parent=self):   return False + return super(SummaryPage, self).validatePage();   - return super(MergePage, self).validatePage(); + ## custom methods ##   - def perform(self): - self.setTitle(_('Merging...')) - self.setSubTitle(_('All conflicting files will be marked unresolved.')) - - if self.field('discard').toBool(): - # '.' is safer than self.localrev, in case the user has - # pulled a fast one on us and updated from the CLI - cmdline = ['--repository', self.wizard().repo.root, - 'debugsetparents', '.', self.wizard().other] - else: - cmdline = ['--repository', self.wizard().repo.root, 'merge'] - if self.field('force').toBool(): - cmdline.append('--force') - tool = self.field('autoresolve').toBool() and 'merge' or 'fail' - cmdline += ['--tool=internal:' + tool] - cmdline.append(self.wizard().other) - self.cmd.run(cmdline) - - def cancel(self): - main = _('Cancel merge and discard changes?') - # Does this restart "resolved" files too? - text = _('Discard local changes and restart merge?') - labels = ((QMessageBox.Yes, _('&Discard')), - (QMessageBox.No, _('Cancel'))) - if qtlib.QuestionMsgBox(_('Confirm Clean Up'), main, text, - labels=labels, parent=self): - o = self.cmd.core.outputLog - o.appendLog(_('Canceling merge...\n'), 'control') - o.appendLog(_('(Please close any running merge tools)\n'), 'control') - self.cmd.cancel() - - def isComplete(self): - if not self.nextEnabled: - return False - if self.clean: - return True - return self.field('force').toBool() - - ### Signal Handlers ### - - def command_finished(self, ret): - repo = self.wizard().repo - if ret in (0, 1): - repo.incrementBusyCount() - repo.decrementBusyCount() - self.done = True - self.wizard().next() - else: - qtlib.InfoMsgBox(_('Merge failed'), _('Returning to first page')) - self.link_activated('discard:noconfirm') - self.switch_pane(MAIN_PANE) + def toggleShowOptions(self, visible): + self.discard_chk.setShown(visible) + self.autoresolve_chk.setShown(visible)     def repositoryChanged(self):   'repository has detected a change to changelog or parents' - pctx = self.wizard().repo['.'] - self.local_info.update(pctx) - self.wizard().local = str(pctx.rev()) + pctx = self.repo['.'] + self.localCsInfo.update(pctx) + self.wizard().localrev = str(pctx.rev())   - def reject(self): - if self.th is not None and not self.th.isFinished(): + def canExit(self): + 'can merge tool be closed?' + if self.th is not None and self.th.isRunning():   self.th.cancel()   self.th.wait() + return True   - def show_options(self, visible): - self.discard_chk.setShown(visible) - self.autoresolve_chk.setShown(visible) + def currentPage(self): + self.refresh()   - def command_canceling(self): - self.wizard().button(QWizard.CustomButton1).setDisabled(True) + 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 link_activated(self, cmd): - cmd = str(cmd) - repo = self.wizard().repo + 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(parents == 2, 'merged') + self.groups.set_visible(parents == 1, 'dirty') + self.wd_status.set_status(_('<b>Uncommitted local changes ' + 'are detected</b>'), 'thg-warning') + else: + self.groups.set_visible(False, 'dirty') + self.groups.set_visible(False, 'merged') + self.wd_status.set_status(_('Clean', 'working dir state'), True) + self.completeChanged.emit() + + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + cmd = hglib.fromunicode(cmd) + repo = self.repo   if cmd == 'commit': - dlg = commit.CommitDialog([], dict(root=repo.root), self) + dlg = commit.CommitDialog(repo, [], {}, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_() - self.check_status() + self.refresh()   elif cmd == 'shelve':   from tortoisehg.hgqt import shelve   dlg = shelve.ShelveDialog(repo, self.wizard())   dlg.finished.connect(dlg.deleteLater)   dlg.exec_() - self.check_status() + self.refresh()   elif cmd.startswith('discard'):   if cmd != 'discard:noconfirm':   labels = [(QMessageBox.Yes, _('&Discard')), @@ -470,111 +315,132 @@
  return   def finished(ret):   repo.decrementBusyCount() - if ret == 0: - self.check_status() + 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.startswith('rename:'): - patch = cmd[7:] - name, ok = QInputDialog.getText(self, _('Rename Patch'), - _('Input a new patch name:'), text=patch) - if not ok or name == patch: - return - oldpatch = hglib.fromunicode(patch) - newpatch = hglib.fromunicode(name) - def finished(ret): - repo.decrementBusyCount() - if ret == 0: - text = _('The patch <b>%(old)s</b> is renamed to <b>' - '%(new)s</b>. <a href="rename:%(new)s"><b>' - 'Rename</b></a> again?') - self.wd_text.setText(text % dict(old=patch, new=name)) - self.runner = cmdui.Runner(True, self) - self.runner.commandFinished.connect(finished) - repo.incrementBusyCount() - self.runner.run(['qrename', '--repository', repo.root, - oldpatch, newpatch])   elif cmd == 'view': - dlg = status.StatusDialog([], {}, repo.root, self) + dlg = status.StatusDialog(repo, [], {}, self)   dlg.exec_() - self.check_status() + self.refresh()   elif cmd == 'skip': - self.done = True   self.wizard().next()   else: - raise 'unknown command: %s' % str(cmd) + raise 'unknown command: %s' % cmd   - ### Private Methods ###   - def check_status(self, callback=None): - repo = self.wizard().repo - class CheckThread(QThread): - def __init__(self, parent): - QThread.__init__(self, parent) - self.results = (False, 1) - self.canceled = False +class MergePage(BasePage): + def __init__(self, repo, parent): + super(MergePage, self).__init__(repo, parent) + self.mergecomplete = False   - def run(self): - unresolved = False - for root, path, status in thgrepo.recursiveMergeStatus(repo): - if self.canceled: - return - if status == 'u': - unresolved = True - break - wctx = repo[None] - dirty = bool(wctx.dirty()) or unresolved - self.results = (dirty, len(wctx.parents())) + self.setTitle(_('Merging...')) + self.setSubTitle(_('All conflicting files will be marked unresolved.')) + self.setLayout(QVBoxLayout())   - def cancel(self): - self.canceled = True + self.cmd = cmdui.Widget(True, False, self) + self.cmd.commandFinished.connect(self.onCommandFinished) + self.cmd.setShowOutput(True) + self.layout().addWidget(self.cmd)   - def completed(): - if self.th.canceled: - return - self.th.wait() - dirty, parents = self.th.results - self.clean = not dirty - self.groups.set_visible(False, 'prog') - self.groups.set_visible(dirty, 'detail') - if dirty: - self.groups.set_visible(parents == 2, 'merged') - self.groups.set_visible(parents == 1, 'dirty') - self.wd_status.set_status(_('<b>Uncommitted local changes ' - 'are detected</b>'), 'thg-warning') + 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 merge is complete.')) + checked = QSettings().value('merge/autoadvance', False).toBool() + self.autonext.setChecked(checked) + self.autonext.toggled.connect(self.tryAutoAdvance) + self.layout().addWidget(self.autonext) + + def currentPage(self): + if self.field('discard').toBool(): + # '.' is safer than self.localrev, in case the user has + # pulled a fast one on us and updated from the CLI + cmdline = ['--repository', self.repo.root, 'debugsetparents', + '.', self.wizard().otherrev] + else: + cmdline = ['--repository', self.repo.root, 'merge', '--verbose'] + if self.field('force').toBool(): + cmdline.append('--force') + tool = self.field('autoresolve').toBool() and 'merge' or 'fail' + cmdline += ['--tool=internal:' + tool] + cmdline.append(self.wizard().otherrev) + + if len(self.repo.parents()) == 1: + self.repo.incrementBusyCount() + self.cmd.core.clearOutput() + self.cmd.run(cmdline) + else: + self.mergecomplete = True + self.completeChanged.emit() + + def isComplete(self): + 'should Next button be sensitive?' + if not self.mergecomplete: + return False + count = 0 + for root, path, status in thgrepo.recursiveMergeStatus(self.repo): + if status == 'u': + count += 1 + if count: + if self.field('autoresolve').toBool(): + # 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)   else: - self.groups.set_visible(False, 'dirty') - self.groups.set_visible(False, 'merged') - self.wd_status.set_status(_('Clean', 'working dir state'), True) + # else give a calmer indication of conflicts + self.reslabel.setText(_('%d files were modified on both ' + 'branches and 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('merge/autoadvance', self.autonext.isChecked()) + + def onCommandFinished(self, ret): + self.repo.decrementBusyCount() + if ret in (0, 1): + self.mergecomplete = True + if self.autonext.isChecked(): + self.tryAutoAdvance(True)   self.completeChanged.emit() - if callable(callback): - callback() - self.th = CheckThread(self) - self.th.finished.connect(completed) - self.th.start() + + @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, parent=None): - super(CommitPage, self).__init__(parent) + def __init__(self, repo, parent): + super(CommitPage, self).__init__(repo, parent)   - ### Override Methods ### - - def get_pane(self): - repo = self.wizard().repo - box = QVBoxLayout() - - self.reslabel = QLabel() - self.reslabel.linkActivated.connect(self.link_activated) - box.addWidget(self.reslabel) + self.setTitle(_('Commit merge results')) + self.setLayout(QVBoxLayout()) + self.setCommitPage(True)     # csinfo - def label_func(widget, item): + def label_func(widget, item, ctx):   if item == 'rev':   return _('Revision:')   elif item == 'parents': @@ -619,38 +485,29 @@
  style = csinfo.panelstyle(contents=contents, margin=6)     # merged files - box.addSpacing(12)   rev_sep = qtlib.LabeledSeparator(_('Working Directory (merged)')) - box.addWidget(rev_sep) - rev_info = csinfo.create(repo, None, style, custom=custom, - withupdate=True) - page = self.wizard().page(MERGE_PAGE) - rev_info.linkActivated.connect(page.link_activated) - box.addWidget(rev_info) + self.layout().addWidget(rev_sep) + mergeCsInfo = csinfo.create(repo, None, style, custom=custom, + withupdate=True) + mergeCsInfo.linkActivated.connect(self.onLinkActivated) + self.layout().addWidget(mergeCsInfo)     # commit message area   msg_sep = qtlib.LabeledSeparator(_('Commit message')) - box.addWidget(msg_sep) - msg_text = commit.MessageEntry(self) - msg_text.installEventFilter(qscilib.KeyPressInterceptor(self)) - msg_text.refresh(repo) - msg_text.loadSettings(QSettings(), 'merge/message') - engmsg = repo.ui.configbool('tortoisehg', 'engmsg', False) - p1branch = repo[None].p1().branch() - p2branch = repo[None].p2().branch() - if p1branch == p2branch: - msgset = keep._('Merge ') - else: - # Show a default 'Merge with OTHER_BRANCH' message when merging - # changesets from different branches - msgset = keep._('Merge with %s') - msg = engmsg and msgset['id'] or msgset['str'] - if p1branch != p2branch: - msg = unicode(msg) % hglib.tounicode(p2branch) - msg_text.setText(msg) - msg_text.textChanged.connect(self.completeChanged) - self.msg_text = msg_text - box.addWidget(msg_text) + self.layout().addWidget(msg_sep) + msgEntry = commit.MessageEntry(self) + msgEntry.installEventFilter(qscilib.KeyPressInterceptor(self)) + msgEntry.refresh(repo) + msgEntry.loadSettings(QSettings(), 'merge/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(): @@ -659,136 +516,135 @@
  actionEnter.setShortcuts([Qt.CTRL+Qt.Key_Return, Qt.CTRL+Qt.Key_Enter])   actionEnter.triggered.connect(tryperform)   self.addAction(actionEnter) - return box   - def link_activated(self, cmd): - if cmd == 'resolve': - dlg = resolve.ResolveDialog(self.wizard().repo, self) - dlg.finished.connect(dlg.deleteLater) + self.skiplast = QCheckBox(_('Skip final confirmation page, ' + 'close after commit.')) + checked = QSettings().value('merge/skiplast', False).toBool() + self.skiplast.setChecked(checked) + self.layout().addWidget(self.skiplast) + + def refresh(self): + pass + + def cleanupPage(self): + s = QSettings() + s.setValue('merge/skiplast', self.skiplast.isChecked()) + self.msgEntry.saveSettings(s, 'merge/message') + + def currentPage(self): + engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) + wctx = self.repo[None] + if wctx.p1().branch() == wctx.p2().branch(): + msgset = i18n.keepgettext()._('Merge') + text = engmsg and msgset['id'] or msgset['str'] + text = unicode(text) + else: + msgset = i18n.keepgettext()._('Merge with %s') + text = engmsg and msgset['id'] or msgset['str'] + text = unicode(text) % hglib.tounicode(wctx.p2().branch()) + self.msgEntry.setText(text) + self.msgEntry.moveCursorToEnd() + + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + if cmd == 'view': + dlg = status.StatusDialog(self.repo, [], {}, self)   dlg.exec_() - self.completeChanged.emit() + self.refresh()   - def get_perform_label(self): - return _('&Commit') + def isComplete(self): + return len(self.repo.parents()) == 2 and len(self.msgEntry.text()) > 0   - def setup_buttons(self, pane): - super(CommitPage, self).setup_buttons(pane) + def validatePage(self): + if len(self.repo.parents()) == 1: + # commit succeeded, repositoryChanged() called wizard().next() + if self.skiplast.isChecked(): + self.wizard().close() + return True + if self.cmd.core.running(): + return False   - if pane == MAIN_PANE: - undo = QPushButton(_('Undo')) - undo.clicked.connect(self.wizard().back) - self.wizard().setButton(QWizard.HelpButton, undo) - self.wizard().setOption(QWizard.HaveHelpButton, True) - elif pane == PERFORM_PANE: - self.wizard().setOption(QWizard.HaveHelpButton, False) - else: - raise 'unknown pane: %s' % pane + user = qtlib.getCurrentUsername(self, self.repo) + if not user: + return False   - def ready(self): - self.setTitle(_('Commit merged files')) - self.msg_text.moveCursorToEnd() - - def perform(self):   self.setTitle(_('Committing...'))   self.setSubTitle(_('Please wait while committing merged files.'))   - # merges must be committed without specifying file list - repo = self.wizard().repo - user = qtlib.getCurrentUsername(self, repo) - if not user: - return - - message = hglib.fromunicode(self.msg_text.text()) + message = hglib.fromunicode(self.msgEntry.text())   cmdline = ['commit', '--verbose', '--message', message, - '--repository', repo.root, '--user', user] + '--repository', self.repo.root, '--user', user]   commandlines = [cmdline] - pushafter = repo.ui.config('tortoisehg', 'cipushafter') + pushafter = self.repo.ui.config('tortoisehg', 'cipushafter')   if pushafter: - cmd = ['push', '--repository', repo.root, pushafter] + cmd = ['push', '--repository', self.repo.root, pushafter]   commandlines.append(cmd) - self.wizard().repo.incrementBusyCount() + self.repo.incrementBusyCount() + self.cmd.setShowOutput(True)   self.cmd.run(*commandlines) - - def isComplete(self): - if not self.nextEnabled: - return False - repo = self.wizard().repo - for root, path, status in thgrepo.recursiveMergeStatus(repo): - if status == 'u': - self.reslabel.setText(_('There were <b>merge conflicts</b> ' - 'that must be <a href="resolve">' - '<b>resolved</b></a>')) - return False - else: - self.reslabel.setText(_('No merge conflicts, ready to commit')) - return len(self.msg_text.text()) > 0 - - def need_cleanup(self): - return len(self.wizard().repo.parents()) == 2 + return False     def repositoryChanged(self):   'repository has detected a change to changelog or parents' - if self.done: - return - if len(self.wizard().repo.parents()) == 1: - self.wizard().restart() + if len(self.repo.parents()) == 1: + self.wizard().next()   - ### Private Method ### + def onCommandFinished(self, ret): + self.repo.decrementBusyCount() + self.completeChanged.emit()   - def undo(self): - page = self.wizard().page(MERGE_PAGE) - page.undo = True   - ### Signal Handlers ### +class ResultPage(BasePage): + def __init__(self, repo, parent): + super(ResultPage, self).__init__(repo, parent) + self.setTitle(_('Finished')) + self.setFinalPage(True)   - def command_finished(self, ret): - if ret == 0: - self.done = True - self.wizard().repo.decrementBusyCount() - self.msg_text.saveSettings(QSettings(), 'merge/message') - self.wizard().next() - else: - self.wizard().repo.decrementBusyCount() + self.setLayout(QVBoxLayout()) + merge_sep = qtlib.LabeledSeparator(_('Merge changeset')) + self.layout().addWidget(merge_sep) + mergeCsInfo = csinfo.create(self.repo, 'tip', withupdate=True) + self.layout().addWidget(mergeCsInfo) + self.mergeCsInfo = mergeCsInfo + self.layout().addStretch(1)   - def command_canceling(self): - page = self.wizard().page(MERGE_PAGE) - page.undo = True + def currentPage(self): + self.mergeCsInfo.update(self.repo['tip']) + self.wizard().setOption(QWizard.NoCancelButton, True)   -class ResultPage(QWizardPage):   - def __init__(self, parent=None): - super(ResultPage, self).__init__(parent) +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   - self.setTitle(_('Finished')) + 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()))   - ### Override Method ### - - def reject(self): - pass - - def repositoryChanged(self): - 'repository has detected a change to changelog or parents' - pass - - def initializePage(self): - box = QVBoxLayout() - self.setLayout(box) - - # merge changeset - merge_sep = qtlib.LabeledSeparator(_('Merge changeset')) - box.addWidget(merge_sep) - merge_info = csinfo.create(self.wizard().repo, 'tip', withupdate=True) - box.addWidget(merge_info) - box.addStretch(0) - - self.wizard().setOption(QWizard.HaveHelpButton, False) - self.wizard().setOption(QWizard.NoCancelButton, True) - self.wizard().setOption(QWizard.HaveCustomButton1, False) + def cancel(self): + self.canceled = True    def run(ui, *pats, **opts):   from tortoisehg.util import paths   rev = opts.get('rev') or None   if not rev and len(pats):   rev = pats[0] + if not rev: + import sys + qtlib.InfoMsgBox(_('Unable to merge'), + _('Merge revision not specified or not found')) + sys.exit()   repo = thgrepo.repository(ui, path=paths.find_root())   return MergeDialog(rev, repo, None)
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
Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
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