Mercurial > hg
annotate tests/test-qrecord.out @ 8590:59acb9c7d90f
url: use CONNECT for HTTPS connections through HTTP proxy (issue967)
urllib2 and httplib does not support using CONNECT proxy requests, but
only regular requests over the proxy. This does not work with HTTPS
requests as they typically require that the client issues a CONNECT to
the proxy to give a direct connection to the remote HTTPS server.
This is solved by duplicating some of the httplib functionality and
tying it together with the keepalive library such that a HTTPS
connection that need to be proxied can be proxied by letting a
connection be established to the proxy server and then subsequently
performing the normal request to the specified server through the
proxy server.
As it stands, the code also purports to support HTTPS proxies, i.e.
proxies that you connect to using SSL. These are extremely rare and
nothing is done to ensure that CONNECT requests can be made to these
as that would require multiple SSL handshakes. This use case is also
not supported by most other contemporary web tools like curl and
Firefox3.
author | Henrik Stuart <hg@hstuart.dk> |
---|---|
date | Fri, 22 May 2009 08:56:43 +0200 |
parents | c9ab8f448a9e |
children | 708938509732 |
rev | line source |
---|---|
5933 | 1 % help (no mq, so no qrecord) |
2 hg: unknown command 'qrecord' | |
3 Mercurial Distributed SCM | |
4 | |
5 basic commands: | |
6 | |
7 add add the specified files on the next commit | |
8 annotate show changeset information per file line | |
9 clone make a copy of an existing repository | |
10 commit commit the specified files or all outstanding changes | |
11 diff diff repository (or selected files) | |
12 export dump the header and diffs for one or more changesets | |
13 init create a new repository in the given directory | |
14 log show revision history of entire repository or files | |
15 merge merge working directory with another revision | |
8026
683d8ebcf434
expand "dir" to "directory" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
7910
diff
changeset
|
16 parents show the parents of the working directory or revision |
5933 | 17 pull pull changes from the specified source |
18 push push changes to the specified destination | |
19 remove remove the specified files on the next commit | |
20 serve export the repository via HTTP | |
21 status show changed files in the working directory | |
22 update update working directory | |
23 | |
24 use "hg help" for the full list of commands or "hg -v" for details | |
25 % help (mq present) | |
26 hg qrecord [OPTION]... PATCH [FILE]... | |
27 | |
28 interactively record a new patch | |
29 | |
8348
c9ab8f448a9e
record: better formatting for qrecord help
Martin Geisler <mg@lazybytes.net>
parents:
8026
diff
changeset
|
30 See 'hg help qnew' & 'hg help record' for more information and |
c9ab8f448a9e
record: better formatting for qrecord help
Martin Geisler <mg@lazybytes.net>
parents:
8026
diff
changeset
|
31 usage. |
5933 | 32 |
33 options: | |
34 | |
35 -e --edit edit commit message | |
36 -g --git use git extended diff format | |
6918
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
37 -U --currentuser add "From: <current user>" to patch |
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
38 -u --user add "From: <given user>" to patch |
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
39 -D --currentdate add "Date: <current date>" to patch |
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
40 -d --date add "Date: <given date>" to patch |
5933 | 41 -I --include include names matching the given patterns |
42 -X --exclude exclude names matching the given patterns | |
43 -m --message use <text> as commit message | |
44 -l --logfile read commit message from <file> | |
45 | |
46 use "hg -v help qrecord" to show global options | |
47 % base commit | |
48 % changing files | |
49 % whole diff | |
50 diff -r 1057167b20ef 1.txt | |
51 --- a/1.txt | |
52 +++ b/1.txt | |
53 @@ -1,5 +1,5 @@ | |
54 1 | |
55 -2 | |
56 +2 2 | |
57 3 | |
58 -4 | |
59 +4 4 | |
60 5 | |
61 diff -r 1057167b20ef 2.txt | |
62 --- a/2.txt | |
63 +++ b/2.txt | |
64 @@ -1,5 +1,5 @@ | |
65 a | |
66 -b | |
67 +b b | |
68 c | |
69 d | |
70 e | |
71 diff -r 1057167b20ef dir/a.txt | |
72 --- a/dir/a.txt | |
73 +++ b/dir/a.txt | |
74 @@ -1,4 +1,4 @@ | |
75 -hello world | |
76 +hello world! | |
77 | |
78 someone | |
79 up | |
80 % qrecord a.patch | |
81 diff --git a/1.txt b/1.txt | |
82 2 hunks, 4 lines changed | |
83 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,3 +1,3 @@ | |
84 1 | |
85 -2 | |
86 +2 2 | |
87 3 | |
7910
14ec64d41dad
record: Give user a hint about chunk selection progress
Rocco Rutte <pdmef@gmx.net>
parents:
7197
diff
changeset
|
88 record change 1/6 to '1.txt'? [Ynsfdaq?] @@ -3,3 +3,3 @@ |
5933 | 89 3 |
90 -4 | |
91 +4 4 | |
92 5 | |
7910
14ec64d41dad
record: Give user a hint about chunk selection progress
Rocco Rutte <pdmef@gmx.net>
parents:
7197
diff
changeset
|
93 record change 2/6 to '1.txt'? [Ynsfdaq?] diff --git a/2.txt b/2.txt |
5933 | 94 1 hunks, 2 lines changed |
95 examine changes to '2.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ | |
96 a | |
97 -b | |
98 +b b | |
99 c | |
100 d | |
101 e | |
7910
14ec64d41dad
record: Give user a hint about chunk selection progress
Rocco Rutte <pdmef@gmx.net>
parents:
7197
diff
changeset
|
102 record change 4/6 to '2.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt |
5933 | 103 1 hunks, 2 lines changed |
104 examine changes to 'dir/a.txt'? [Ynsfdaq?] | |
105 % after qrecord a.patch 'tip' | |
106 changeset: 1:5d1ca63427ee | |
107 tag: qtip | |
108 tag: tip | |
109 tag: a.patch | |
110 tag: qbase | |
111 user: test | |
112 date: Thu Jan 01 00:00:00 1970 +0000 | |
113 summary: aaa | |
114 | |
115 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt | |
116 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
117 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
118 @@ -1,5 +1,5 @@ | |
119 1 | |
120 -2 | |
121 +2 2 | |
122 3 | |
123 4 | |
124 5 | |
125 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt | |
126 --- a/2.txt Thu Jan 01 00:00:00 1970 +0000 | |
127 +++ b/2.txt Thu Jan 01 00:00:00 1970 +0000 | |
128 @@ -1,5 +1,5 @@ | |
129 a | |
130 -b | |
131 +b b | |
132 c | |
133 d | |
134 e | |
135 | |
136 | |
137 % after qrecord a.patch 'diff' | |
138 diff -r 5d1ca63427ee 1.txt | |
139 --- a/1.txt | |
140 +++ b/1.txt | |
141 @@ -1,5 +1,5 @@ | |
142 1 | |
143 2 2 | |
144 3 | |
145 -4 | |
146 +4 4 | |
147 5 | |
148 diff -r 5d1ca63427ee dir/a.txt | |
149 --- a/dir/a.txt | |
150 +++ b/dir/a.txt | |
151 @@ -1,4 +1,4 @@ | |
152 -hello world | |
153 +hello world! | |
154 | |
155 someone | |
156 up | |
157 % qrecord b.patch | |
158 diff --git a/1.txt b/1.txt | |
159 1 hunks, 2 lines changed | |
160 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ | |
161 1 | |
162 2 2 | |
163 3 | |
164 -4 | |
165 +4 4 | |
166 5 | |
7910
14ec64d41dad
record: Give user a hint about chunk selection progress
Rocco Rutte <pdmef@gmx.net>
parents:
7197
diff
changeset
|
167 record change 1/3 to '1.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt |
5933 | 168 1 hunks, 2 lines changed |
169 examine changes to 'dir/a.txt'? [Ynsfdaq?] @@ -1,4 +1,4 @@ | |
170 -hello world | |
171 +hello world! | |
172 | |
173 someone | |
174 up | |
7910
14ec64d41dad
record: Give user a hint about chunk selection progress
Rocco Rutte <pdmef@gmx.net>
parents:
7197
diff
changeset
|
175 record change 3/3 to 'dir/a.txt'? [Ynsfdaq?] |
5933 | 176 % after qrecord b.patch 'tip' |
177 changeset: 2:b056198bf878 | |
178 tag: qtip | |
179 tag: tip | |
180 tag: b.patch | |
181 user: test | |
182 date: Thu Jan 01 00:00:00 1970 +0000 | |
183 summary: bbb | |
184 | |
185 diff -r 5d1ca63427ee -r b056198bf878 1.txt | |
186 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
187 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
188 @@ -1,5 +1,5 @@ | |
189 1 | |
190 2 2 | |
191 3 | |
192 -4 | |
193 +4 4 | |
194 5 | |
195 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt | |
196 --- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 | |
197 +++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 | |
198 @@ -1,4 +1,4 @@ | |
199 -hello world | |
200 +hello world! | |
201 | |
202 someone | |
203 up | |
204 | |
205 | |
206 % after qrecord b.patch 'diff' | |
207 | |
208 % --- end --- |