Show More
@@ -0,0 +1,353 b'' | |||||
|
1 | ||||
|
2 | body { | |||
|
3 | font-family: sans-serif; | |||
|
4 | /* adjustment for tt padding */ | |||
|
5 | line-height: 140%; | |||
|
6 | } | |||
|
7 | ||||
|
8 | tt, pre { | |||
|
9 | background-color: #EEE; | |||
|
10 | border: thin solid #CCC; | |||
|
11 | padding: 1px; | |||
|
12 | } | |||
|
13 | ||||
|
14 | pre { | |||
|
15 | padding: 0.25em; | |||
|
16 | } | |||
|
17 | ||||
|
18 | #contents tt, h2 tt { | |||
|
19 | background-color: inherit; | |||
|
20 | border: inherit; | |||
|
21 | } | |||
|
22 | ||||
|
23 | /* styles taken from html4css1.css from Docutils, which is in the | |||
|
24 | public domain */ | |||
|
25 | ||||
|
26 | /* used to remove borders from tables and images */ | |||
|
27 | .borderless, table.borderless td, table.borderless th { | |||
|
28 | border: 0; | |||
|
29 | } | |||
|
30 | ||||
|
31 | table.borderless td, table.borderless th { | |||
|
32 | /* Override padding for "table.docutils td" with "! important". | |||
|
33 | The right padding separates the table cells. */ | |||
|
34 | padding: 0 0.5em 0 0 ! important; | |||
|
35 | } | |||
|
36 | ||||
|
37 | .first { | |||
|
38 | /* Override more specific margin styles with "! important". */ | |||
|
39 | margin-top: 0 ! important; | |||
|
40 | } | |||
|
41 | ||||
|
42 | .last, .with-subtitle { | |||
|
43 | margin-bottom: 0 ! important; | |||
|
44 | } | |||
|
45 | ||||
|
46 | .hidden { | |||
|
47 | display: none; | |||
|
48 | } | |||
|
49 | ||||
|
50 | a.toc-backref { | |||
|
51 | text-decoration: none; | |||
|
52 | color: black; | |||
|
53 | } | |||
|
54 | ||||
|
55 | blockquote.epigraph { | |||
|
56 | margin: 2em 5em;; | |||
|
57 | } | |||
|
58 | ||||
|
59 | dl.docutils dd { | |||
|
60 | margin-bottom: 0.5em; | |||
|
61 | } | |||
|
62 | ||||
|
63 | /* Uncomment (and remove this text!) to get bold-faced definition list terms | |||
|
64 | dl.docutils dt { | |||
|
65 | font-weight: bold; | |||
|
66 | } | |||
|
67 | */ | |||
|
68 | ||||
|
69 | div.abstract { | |||
|
70 | margin: 2em 5em; | |||
|
71 | } | |||
|
72 | ||||
|
73 | div.abstract p.topic-title { | |||
|
74 | font-weight: bold; | |||
|
75 | text-align: center; | |||
|
76 | } | |||
|
77 | ||||
|
78 | div.admonition, div.attention, div.caution, div.danger, div.error, | |||
|
79 | div.hint, div.important, div.note, div.tip, div.warning { | |||
|
80 | margin: 2em; | |||
|
81 | border: medium outset; | |||
|
82 | padding: 1em; | |||
|
83 | } | |||
|
84 | ||||
|
85 | div.admonition p.admonition-title, div.hint p.admonition-title, | |||
|
86 | div.important p.admonition-title, div.note p.admonition-title, | |||
|
87 | div.tip p.admonition-title { | |||
|
88 | font-weight: bold; | |||
|
89 | font-family: sans-serif; | |||
|
90 | } | |||
|
91 | ||||
|
92 | div.attention p.admonition-title, div.caution p.admonition-title, | |||
|
93 | div.danger p.admonition-title, div.error p.admonition-title, | |||
|
94 | div.warning p.admonition-title { | |||
|
95 | color: red; | |||
|
96 | font-weight: bold; | |||
|
97 | font-family: sans-serif; | |||
|
98 | } | |||
|
99 | ||||
|
100 | /* Uncomment (and remove this text!) to get reduced vertical space in | |||
|
101 | compound paragraphs. | |||
|
102 | div.compound .compound-first, div.compound .compound-middle { | |||
|
103 | margin-bottom: 0.5em; | |||
|
104 | } | |||
|
105 | ||||
|
106 | div.compound .compound-last, div.compound .compound-middle { | |||
|
107 | margin-top: 0.5em; | |||
|
108 | } | |||
|
109 | */ | |||
|
110 | ||||
|
111 | div.dedication { | |||
|
112 | margin: 2em 5em; | |||
|
113 | text-align: center; | |||
|
114 | font-style: italic; | |||
|
115 | } | |||
|
116 | ||||
|
117 | div.dedication p.topic-title { | |||
|
118 | font-weight: bold; | |||
|
119 | font-style: normal; | |||
|
120 | } | |||
|
121 | ||||
|
122 | div.figure { | |||
|
123 | margin-left: 2em; | |||
|
124 | margin-right: 2em; | |||
|
125 | } | |||
|
126 | ||||
|
127 | div.footer, div.header { | |||
|
128 | clear: both; | |||
|
129 | font-size: smaller; | |||
|
130 | } | |||
|
131 | ||||
|
132 | div.line-block { | |||
|
133 | display: block; | |||
|
134 | margin-top: 1em; | |||
|
135 | margin-bottom: 1em; | |||
|
136 | } | |||
|
137 | ||||
|
138 | div.line-block div.line-block { | |||
|
139 | margin-top: 0; | |||
|
140 | margin-bottom: 0; | |||
|
141 | margin-left: 1.5em; | |||
|
142 | } | |||
|
143 | ||||
|
144 | div.sidebar { | |||
|
145 | margin: 0 0 0.5em 1em; | |||
|
146 | border: medium outset; | |||
|
147 | padding: 1em; | |||
|
148 | background-color: #ffffee; | |||
|
149 | width: 40%; | |||
|
150 | float: right; | |||
|
151 | clear: right; | |||
|
152 | } | |||
|
153 | ||||
|
154 | div.sidebar p.rubric { | |||
|
155 | font-family: sans-serif; | |||
|
156 | font-size: medium; | |||
|
157 | } | |||
|
158 | ||||
|
159 | div.system-messages { | |||
|
160 | margin: 5em; | |||
|
161 | } | |||
|
162 | ||||
|
163 | div.system-messages h1 { | |||
|
164 | color: red; | |||
|
165 | } | |||
|
166 | ||||
|
167 | div.system-message { | |||
|
168 | border: medium outset; | |||
|
169 | padding: 1em; | |||
|
170 | } | |||
|
171 | ||||
|
172 | div.system-message p.system-message-title { | |||
|
173 | color: red; | |||
|
174 | font-weight: bold; | |||
|
175 | } | |||
|
176 | ||||
|
177 | div.topic { | |||
|
178 | margin: 2em; | |||
|
179 | } | |||
|
180 | ||||
|
181 | h1.section-subtitle, h2.section-subtitle, h3.section-subtitle, | |||
|
182 | h4.section-subtitle, h5.section-subtitle, h6.section-subtitle { | |||
|
183 | margin-top: 0.4em; | |||
|
184 | } | |||
|
185 | ||||
|
186 | h1.title { | |||
|
187 | text-align: center; | |||
|
188 | } | |||
|
189 | ||||
|
190 | h2.subtitle { | |||
|
191 | text-align: center; | |||
|
192 | } | |||
|
193 | ||||
|
194 | hr.docutils { | |||
|
195 | width: 75%; | |||
|
196 | } | |||
|
197 | ||||
|
198 | img.align-left { | |||
|
199 | clear: left; | |||
|
200 | } | |||
|
201 | ||||
|
202 | img.align-right { | |||
|
203 | clear: right; | |||
|
204 | } | |||
|
205 | ||||
|
206 | ol.simple, ul.simple { | |||
|
207 | margin-bottom: 1em; | |||
|
208 | } | |||
|
209 | ||||
|
210 | ol.arabic { | |||
|
211 | list-style: decimal; | |||
|
212 | } | |||
|
213 | ||||
|
214 | ol.loweralpha { | |||
|
215 | list-style: lower-alpha; | |||
|
216 | } | |||
|
217 | ||||
|
218 | ol.upperalpha { | |||
|
219 | list-style: upper-alpha; | |||
|
220 | } | |||
|
221 | ||||
|
222 | ol.lowerroman { | |||
|
223 | list-style: lower-roman; | |||
|
224 | } | |||
|
225 | ||||
|
226 | ol.upperroman { | |||
|
227 | list-style: upper-roman; | |||
|
228 | } | |||
|
229 | ||||
|
230 | p.attribution { | |||
|
231 | text-align: right; | |||
|
232 | margin-left: 50%; | |||
|
233 | } | |||
|
234 | ||||
|
235 | p.caption { | |||
|
236 | font-style: italic; | |||
|
237 | } | |||
|
238 | ||||
|
239 | p.credits { | |||
|
240 | font-style: italic; | |||
|
241 | font-size: smaller; | |||
|
242 | } | |||
|
243 | ||||
|
244 | p.label { | |||
|
245 | white-space: nowrap; | |||
|
246 | } | |||
|
247 | ||||
|
248 | p.rubric { | |||
|
249 | font-weight: bold; | |||
|
250 | font-size: larger; | |||
|
251 | color: maroon; | |||
|
252 | text-align: center; | |||
|
253 | } | |||
|
254 | ||||
|
255 | p.sidebar-title { | |||
|
256 | font-family: sans-serif; | |||
|
257 | font-weight: bold; | |||
|
258 | font-size: larger; | |||
|
259 | } | |||
|
260 | ||||
|
261 | p.sidebar-subtitle { | |||
|
262 | font-family: sans-serif; | |||
|
263 | font-weight: bold; | |||
|
264 | } | |||
|
265 | ||||
|
266 | p.topic-title { | |||
|
267 | font-weight: bold; | |||
|
268 | } | |||
|
269 | ||||
|
270 | pre.address { | |||
|
271 | margin-bottom: 0; | |||
|
272 | margin-top: 0; | |||
|
273 | font-family: serif; | |||
|
274 | font-size: 100%; | |||
|
275 | } | |||
|
276 | ||||
|
277 | pre.literal-block, pre.doctest-block { | |||
|
278 | margin-left: 2em; | |||
|
279 | margin-right: 2em; | |||
|
280 | } | |||
|
281 | ||||
|
282 | span.classifier { | |||
|
283 | font-family: sans-serif; | |||
|
284 | font-style: oblique; | |||
|
285 | } | |||
|
286 | ||||
|
287 | span.classifier-delimiter { | |||
|
288 | font-family: sans-serif; | |||
|
289 | font-weight: bold; | |||
|
290 | } | |||
|
291 | ||||
|
292 | span.interpreted { | |||
|
293 | font-family: sans-serif; | |||
|
294 | } | |||
|
295 | ||||
|
296 | span.option { | |||
|
297 | white-space: nowrap; | |||
|
298 | } | |||
|
299 | ||||
|
300 | span.pre { | |||
|
301 | white-space: pre; | |||
|
302 | } | |||
|
303 | ||||
|
304 | span.problematic { | |||
|
305 | color: red; | |||
|
306 | } | |||
|
307 | ||||
|
308 | span.section-subtitle { | |||
|
309 | /* font-size relative to parent (h1..h6 element) */ | |||
|
310 | font-size: 80%; | |||
|
311 | } | |||
|
312 | ||||
|
313 | table.citation { | |||
|
314 | border-left: solid 1px gray; | |||
|
315 | margin-left: 1px; | |||
|
316 | } | |||
|
317 | ||||
|
318 | table.docinfo { | |||
|
319 | margin: 2em 4em; | |||
|
320 | } | |||
|
321 | ||||
|
322 | table.docutils { | |||
|
323 | margin-top: 0.5em; | |||
|
324 | margin-bottom: 0.5em; | |||
|
325 | } | |||
|
326 | ||||
|
327 | table.footnote { | |||
|
328 | border-left: solid 1px black; | |||
|
329 | margin-left: 1px; | |||
|
330 | } | |||
|
331 | ||||
|
332 | table.docutils td, table.docutils th, | |||
|
333 | table.docinfo td, table.docinfo th { | |||
|
334 | padding-left: 0.5em; | |||
|
335 | padding-right: 0.5em; | |||
|
336 | vertical-align: top; | |||
|
337 | } | |||
|
338 | ||||
|
339 | table.docutils th.field-name, table.docinfo th.docinfo-name { | |||
|
340 | font-weight: bold; | |||
|
341 | text-align: left; | |||
|
342 | white-space: nowrap; | |||
|
343 | padding-left: 0; | |||
|
344 | } | |||
|
345 | ||||
|
346 | h1 tt.docutils, h2 tt.docutils, h3 tt.docutils, | |||
|
347 | h4 tt.docutils, h5 tt.docutils, h6 tt.docutils { | |||
|
348 | font-size: 100%; | |||
|
349 | } | |||
|
350 | ||||
|
351 | ul.auto-toc { | |||
|
352 | list-style-type: none; | |||
|
353 | } |
@@ -25,7 +25,8 b' hg.1.gendoc.txt: gendoc.py ../mercurial/' | |||||
25 | --strip-elements-with-class htmlonly $*.txt $* |
|
25 | --strip-elements-with-class htmlonly $*.txt $* | |
26 |
|
26 | |||
27 | %.html: %.txt common.txt |
|
27 | %.html: %.txt common.txt | |
28 |
$(RST2HTML) --halt warning |
|
28 | $(RST2HTML) --halt warning \ | |
|
29 | --link-stylesheet --stylesheet-path style.css $*.txt $*.html | |||
29 |
|
30 | |||
30 | MANIFEST: man html |
|
31 | MANIFEST: man html | |
31 | # tracked files are already in the main MANIFEST |
|
32 | # tracked files are already in the main MANIFEST |
@@ -50,7 +50,7 b' def get_cmd(cmd):' | |||||
50 | s += ' ' + attr[2] |
|
50 | s += ' ' + attr[2] | |
51 | else: |
|
51 | else: | |
52 | s = attr[2] |
|
52 | s = attr[2] | |
53 | d['synopsis'] = s |
|
53 | d['synopsis'] = s.strip() | |
54 |
|
54 | |||
55 | return d |
|
55 | return d | |
56 |
|
56 |
@@ -43,14 +43,14 b' of how to configure these files. Look fo' | |||||
43 | "ui" section. |
|
43 | "ui" section. | |
44 |
|
44 | |||
45 | To control Mercurial's handling of files that it manages, see the |
|
45 | To control Mercurial's handling of files that it manages, see the | |
46 |
|hg(1)|_ man page. Look for the |
|
46 | |hg(1)|_ man page. Look for the ``-I`` and ``-X`` options. | |
47 |
|
47 | |||
48 | SYNTAX |
|
48 | SYNTAX | |
49 | ------ |
|
49 | ------ | |
50 |
|
50 | |||
51 | An ignore file is a plain text file consisting of a list of patterns, |
|
51 | An ignore file is a plain text file consisting of a list of patterns, | |
52 |
with one pattern per line. Empty lines are skipped. The |
|
52 | with one pattern per line. Empty lines are skipped. The ``#`` | |
53 |
character is treated as a comment character, and the |
|
53 | character is treated as a comment character, and the ``\`` character | |
54 | is treated as an escape character. |
|
54 | is treated as an escape character. | |
55 |
|
55 | |||
56 | Mercurial supports several pattern syntaxes. The default syntax used |
|
56 | Mercurial supports several pattern syntaxes. The default syntax used | |
@@ -71,9 +71,9 b' The chosen syntax stays in effect when p' | |||||
71 | follow, until another syntax is selected. |
|
71 | follow, until another syntax is selected. | |
72 |
|
72 | |||
73 | Neither glob nor regexp patterns are rooted. A glob-syntax pattern of |
|
73 | Neither glob nor regexp patterns are rooted. A glob-syntax pattern of | |
74 |
the form |
|
74 | the form ``*.c`` will match a file ending in ``.c`` in any directory, | |
75 |
and a regexp pattern of the form |
|
75 | and a regexp pattern of the form ``\.c$`` will do the same. To root a | |
76 |
regexp pattern, start it with |
|
76 | regexp pattern, start it with ``^``. | |
77 |
|
77 | |||
78 | EXAMPLE |
|
78 | EXAMPLE | |
79 | ------- |
|
79 | ------- |
@@ -86,8 +86,8 b' ones.' | |||||
86 | SYNTAX |
|
86 | SYNTAX | |
87 | ------ |
|
87 | ------ | |
88 |
|
88 | |||
89 |
A configuration file consists of sections, led by a |
|
89 | A configuration file consists of sections, led by a ``[section]`` header | |
90 |
and followed by |
|
90 | and followed by ``name: value`` entries; ``name=value`` is also accepted. | |
91 |
|
91 | |||
92 | :: |
|
92 | :: | |
93 |
|
93 | |||
@@ -101,15 +101,15 b' they are treated as continuations of tha' | |||||
101 |
|
101 | |||
102 | Leading whitespace is removed from values. Empty lines are skipped. |
|
102 | Leading whitespace is removed from values. Empty lines are skipped. | |
103 |
|
103 | |||
104 |
Lines beginning with |
|
104 | Lines beginning with ``#`` or ``;`` are ignored and may be used to provide | |
105 | comments. |
|
105 | comments. | |
106 |
|
106 | |||
107 |
A line of the form |
|
107 | A line of the form ``%include file`` will include ``file`` into the | |
108 | current configuration file. The inclusion is recursive, which means |
|
108 | current configuration file. The inclusion is recursive, which means | |
109 | that included files can include other files. Filenames are relative to |
|
109 | that included files can include other files. Filenames are relative to | |
110 | the configuration file in which the ``%include`` directive is found. |
|
110 | the configuration file in which the ``%include`` directive is found. | |
111 |
|
111 | |||
112 |
A line with |
|
112 | A line with ``%unset name`` will remove ``name`` from the current | |
113 | section, if it has been set previously. |
|
113 | section, if it has been set previously. | |
114 |
|
114 | |||
115 |
|
115 | |||
@@ -167,9 +167,9 b' Example::' | |||||
167 | Supported arguments: |
|
167 | Supported arguments: | |
168 |
|
168 | |||
169 | ``prefix`` |
|
169 | ``prefix`` | |
170 |
Either |
|
170 | Either ``*`` or a URI prefix with or without the scheme part. | |
171 | The authentication entry with the longest matching prefix is used |
|
171 | The authentication entry with the longest matching prefix is used | |
172 |
(where |
|
172 | (where ``*`` matches everything and counts as a match of length | |
173 | 1). If the prefix doesn't include a scheme, the match is performed |
|
173 | 1). If the prefix doesn't include a scheme, the match is performed | |
174 | against the URI with its scheme stripped as well, and the schemes |
|
174 | against the URI with its scheme stripped as well, and the schemes | |
175 | argument, q.v., is then subsequently consulted. |
|
175 | argument, q.v., is then subsequently consulted. | |
@@ -204,9 +204,9 b' localization/canonicalization of files.' | |||||
204 |
|
204 | |||
205 | Filters consist of a filter pattern followed by a filter command. |
|
205 | Filters consist of a filter pattern followed by a filter command. | |
206 | Filter patterns are globs by default, rooted at the repository root. |
|
206 | Filter patterns are globs by default, rooted at the repository root. | |
207 |
For example, to match any file ending in |
|
207 | For example, to match any file ending in ``.txt`` in the root | |
208 |
directory only, use the pattern |
|
208 | directory only, use the pattern ``*.txt``. To match any file ending | |
209 |
in |
|
209 | in ``.c`` anywhere in the repository, use the pattern ``**.c``. | |
210 |
|
210 | |||
211 | The filter command can start with a specifier, either "pipe:" or |
|
211 | The filter command can start with a specifier, either "pipe:" or | |
212 | "tempfile:". If no specifier is given, "pipe:" is used by default. |
|
212 | "tempfile:". If no specifier is given, "pipe:" is used by default. | |
@@ -259,6 +259,8 b' or if you only want to translate certain' | |||||
259 | ``defaults`` |
|
259 | ``defaults`` | |
260 | """""""""""" |
|
260 | """""""""""" | |
261 |
|
261 | |||
|
262 | (defaults are deprecated. Don't use them. Use aliases instead) | |||
|
263 | ||||
262 | Use the [defaults] section to define command defaults, i.e. the |
|
264 | Use the [defaults] section to define command defaults, i.e. the | |
263 | default options/arguments to pass to the specified commands. |
|
265 | default options/arguments to pass to the specified commands. | |
264 |
|
266 | |||
@@ -349,16 +351,16 b' Mercurial has an extension mechanism for' | |||||
349 | enable an extension, create an entry for it in this section. |
|
351 | enable an extension, create an entry for it in this section. | |
350 |
|
352 | |||
351 | If you know that the extension is already in Python's search path, |
|
353 | If you know that the extension is already in Python's search path, | |
352 |
you can give the name of the module, followed by |
|
354 | you can give the name of the module, followed by ``=``, with nothing | |
353 |
after the |
|
355 | after the ``=``. | |
354 |
|
356 | |||
355 |
Otherwise, give a name that you choose, followed by |
|
357 | Otherwise, give a name that you choose, followed by ``=``, followed by | |
356 |
the path to the |
|
358 | the path to the ``.py`` file (including the file name extension) that | |
357 | defines the extension. |
|
359 | defines the extension. | |
358 |
|
360 | |||
359 | To explicitly disable an extension that is enabled in an hgrc of |
|
361 | To explicitly disable an extension that is enabled in an hgrc of | |
360 |
broader scope, prepend its path with |
|
362 | broader scope, prepend its path with ``!``, as in | |
361 |
|
|
363 | ``hgext.foo = !/ext/path`` or ``hgext.foo = !`` when path is not | |
362 | supplied. |
|
364 | supplied. | |
363 |
|
365 | |||
364 | Example for ``~/.hgrc``:: |
|
366 | Example for ``~/.hgrc``:: | |
@@ -594,7 +596,7 b' called with at least three keyword argum' | |||||
594 | "ui"), a repository object (keyword "repo"), and a "hooktype" |
|
596 | "ui"), a repository object (keyword "repo"), and a "hooktype" | |
595 | keyword that tells what kind of hook is used. Arguments listed as |
|
597 | keyword that tells what kind of hook is used. Arguments listed as | |
596 | environment variables above are passed as keyword arguments, with no |
|
598 | environment variables above are passed as keyword arguments, with no | |
597 |
|
|
599 | ``HG_`` prefix, and names in lower case. | |
598 |
|
600 | |||
599 | If a Python hook returns a "true" value or raises an exception, this |
|
601 | If a Python hook returns a "true" value or raises an exception, this | |
600 | is treated as a failure. |
|
602 | is treated as a failure. | |
@@ -719,7 +721,7 b' serve repositories from different users.' | |||||
719 |
|
721 | |||
720 | This section specifies what users and groups are trusted. The |
|
722 | This section specifies what users and groups are trusted. The | |
721 | current user is always trusted. To trust everybody, list a user or a |
|
723 | current user is always trusted. To trust everybody, list a user or a | |
722 |
group with name |
|
724 | group with name ``*``. | |
723 |
|
725 | |||
724 | ``users`` |
|
726 | ``users`` | |
725 | Comma-separated list of trusted users. |
|
727 | Comma-separated list of trusted users. | |
@@ -755,7 +757,7 b' User interface controls.' | |||||
755 | in the same format as a repository-wide .hgignore file. This |
|
757 | in the same format as a repository-wide .hgignore file. This | |
756 | option supports hook syntax, so if you want to specify multiple |
|
758 | option supports hook syntax, so if you want to specify multiple | |
757 | ignore files, you can do so by setting something like |
|
759 | ignore files, you can do so by setting something like | |
758 |
|
|
760 | ``ignore.other = ~/.hgignore2``. For details of the ignore file | |
759 | format, see the |hgignore(5)|_ man page. |
|
761 | format, see the |hgignore(5)|_ man page. | |
760 | ``interactive`` |
|
762 | ``interactive`` | |
761 | Allow to prompt the user. True or False. Default is True. |
|
763 | Allow to prompt the user. True or False. Default is True. | |
@@ -788,10 +790,10 b' merge-tools section.' | |||||
788 | Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a |
|
790 | Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a | |
789 | trusted user or group. True or False. Default is True. |
|
791 | trusted user or group. True or False. Default is True. | |
790 | ``slash`` |
|
792 | ``slash`` | |
791 |
Display paths using a slash ( |
|
793 | Display paths using a slash (``/``) as the path separator. This | |
792 | only makes a difference on systems where the default path |
|
794 | only makes a difference on systems where the default path | |
793 | separator is not the slash character (e.g. Windows uses the |
|
795 | separator is not the slash character (e.g. Windows uses the | |
794 |
backslash character ( |
|
796 | backslash character (``\``)). | |
795 | Default is False. |
|
797 | Default is False. | |
796 | ``ssh`` |
|
798 | ``ssh`` | |
797 | command to use for SSH connections. Default is 'ssh'. |
|
799 | command to use for SSH connections. Default is 'ssh'. | |
@@ -837,7 +839,7 b' Web interface configuration.' | |||||
837 | Whether to allow pulling from the repository. Default is true. |
|
839 | Whether to allow pulling from the repository. Default is true. | |
838 | ``allow_push`` |
|
840 | ``allow_push`` | |
839 | Whether to allow pushing to the repository. If empty or not set, |
|
841 | Whether to allow pushing to the repository. If empty or not set, | |
840 |
push is not allowed. If the special value |
|
842 | push is not allowed. If the special value ``*``, any remote user can | |
841 | push, including unauthenticated users. Otherwise, the remote user |
|
843 | push, including unauthenticated users. Otherwise, the remote user | |
842 | must have been authenticated, and the authenticated user name must |
|
844 | must have been authenticated, and the authenticated user name must | |
843 | be present in this list (separated by whitespace or ","). The |
|
845 | be present in this list (separated by whitespace or ","). The | |
@@ -850,7 +852,7 b' Web interface configuration.' | |||||
850 | user is unauthenticated or not present in the list (separated by |
|
852 | user is unauthenticated or not present in the list (separated by | |
851 | whitespace or ","), then access is denied for the user. If the |
|
853 | whitespace or ","), then access is denied for the user. If the | |
852 | list is empty or not set, then access is permitted to all users by |
|
854 | list is empty or not set, then access is permitted to all users by | |
853 |
default. Setting allow_read to the special value |
|
855 | default. Setting allow_read to the special value ``*`` is equivalent | |
854 | to it not being set (i.e. access is permitted to all users). The |
|
856 | to it not being set (i.e. access is permitted to all users). The | |
855 | contents of the allow_read list are examined after the deny_read |
|
857 | contents of the allow_read list are examined after the deny_read | |
856 | list. |
|
858 | list. | |
@@ -866,7 +868,7 b' Web interface configuration.' | |||||
866 | Defaults to ui.username or ``$EMAIL`` or "unknown" if unset or empty. |
|
868 | Defaults to ui.username or ``$EMAIL`` or "unknown" if unset or empty. | |
867 | ``deny_push`` |
|
869 | ``deny_push`` | |
868 | Whether to deny pushing to the repository. If empty or not set, |
|
870 | Whether to deny pushing to the repository. If empty or not set, | |
869 |
push is not denied. If the special value |
|
871 | push is not denied. If the special value ``*``, all remote users are | |
870 | denied push. Otherwise, unauthenticated users are all denied, and |
|
872 | denied push. Otherwise, unauthenticated users are all denied, and | |
871 | any authenticated user name present in this list (separated by |
|
873 | any authenticated user name present in this list (separated by | |
872 | whitespace or ",") is also denied. The contents of the deny_push |
|
874 | whitespace or ",") is also denied. The contents of the deny_push | |
@@ -876,7 +878,7 b' Web interface configuration.' | |||||
876 | not empty, unauthenticated users are all denied, and any |
|
878 | not empty, unauthenticated users are all denied, and any | |
877 | authenticated user name present in this list (separated by |
|
879 | authenticated user name present in this list (separated by | |
878 | whitespace or ",") is also denied access to the repository. If set |
|
880 | whitespace or ",") is also denied access to the repository. If set | |
879 |
to the special value |
|
881 | to the special value ``*``, all remote users are denied access | |
880 | (rarely needed ;). If deny_read is empty or not set, the |
|
882 | (rarely needed ;). If deny_read is empty or not set, the | |
881 | determination of repository access depends on the presence and |
|
883 | determination of repository access depends on the presence and | |
882 | content of the allow_read list (see description). If both |
|
884 | content of the allow_read list (see description). If both |
@@ -212,12 +212,12 b' class Translator(nodes.NodeVisitor):' | |||||
212 | 'indent' : ('.INDENT %.1f\n', '.UNINDENT\n'), |
|
212 | 'indent' : ('.INDENT %.1f\n', '.UNINDENT\n'), | |
213 | 'definition_list_item' : ('.TP', ''), |
|
213 | 'definition_list_item' : ('.TP', ''), | |
214 | 'field_name' : ('.TP\n.B ', '\n'), |
|
214 | 'field_name' : ('.TP\n.B ', '\n'), | |
215 |
'literal' : ('\\f |
|
215 | 'literal' : ('\\fB', '\\fP'), | |
216 | 'literal_block' : ('.sp\n.nf\n.ft C\n', '\n.ft P\n.fi\n'), |
|
216 | 'literal_block' : ('.sp\n.nf\n.ft C\n', '\n.ft P\n.fi\n'), | |
217 |
|
217 | |||
218 | 'option_list_item' : ('.TP\n', ''), |
|
218 | 'option_list_item' : ('.TP\n', ''), | |
219 |
|
219 | |||
220 |
'reference' : (r'\ |
|
220 | 'reference' : (r'\%', r'\:'), | |
221 | 'emphasis': ('\\fI', '\\fP'), |
|
221 | 'emphasis': ('\\fI', '\\fP'), | |
222 | 'strong' : ('\\fB', '\\fP'), |
|
222 | 'strong' : ('\\fB', '\\fP'), | |
223 | 'term' : ('\n.B ', '\n'), |
|
223 | 'term' : ('\n.B ', '\n'), |
@@ -7,17 +7,17 b' patterns.' | |||||
7 | Alternate pattern notations must be specified explicitly. |
|
7 | Alternate pattern notations must be specified explicitly. | |
8 |
|
8 | |||
9 | To use a plain path name without any pattern matching, start it with |
|
9 | To use a plain path name without any pattern matching, start it with | |
10 |
|
|
10 | ``path:``. These path names must completely match starting at the | |
11 | current repository root. |
|
11 | current repository root. | |
12 |
|
12 | |||
13 |
To use an extended glob, start a name with |
|
13 | To use an extended glob, start a name with ``glob:``. Globs are rooted | |
14 |
at the current directory; a glob such as |
|
14 | at the current directory; a glob such as ``*.c`` will only match files | |
15 |
|
|
15 | in the current directory ending with ``.c``. | |
16 |
|
16 | |||
17 |
The supported glob syntax extensions are |
|
17 | The supported glob syntax extensions are ``**`` to match any string | |
18 |
across path separators and |
|
18 | across path separators and ``{a,b}`` to mean "a or b". | |
19 |
|
19 | |||
20 |
To use a Perl/Python regular expression, start a name with |
|
20 | To use a Perl/Python regular expression, start a name with ``re:``. | |
21 | Regexp pattern matching is anchored at the root of the repository. |
|
21 | Regexp pattern matching is anchored at the root of the repository. | |
22 |
|
22 | |||
23 | Plain examples:: |
|
23 | Plain examples:: |
@@ -100,13 +100,17 b' def get_padding_line(ni, n_columns, edge' | |||||
100 | line.extend(["|", " "] * (n_columns - ni - 1)) |
|
100 | line.extend(["|", " "] * (n_columns - ni - 1)) | |
101 | return line |
|
101 | return line | |
102 |
|
102 | |||
103 | def ascii(ui, base, type, char, text, coldata): |
|
103 | def asciistate(): | |
|
104 | """returns the initial value for the "state" argument to ascii()""" | |||
|
105 | return [0, 0] | |||
|
106 | ||||
|
107 | def ascii(ui, state, type, char, text, coldata): | |||
104 | """prints an ASCII graph of the DAG |
|
108 | """prints an ASCII graph of the DAG | |
105 |
|
109 | |||
106 | takes the following arguments (one call per node in the graph): |
|
110 | takes the following arguments (one call per node in the graph): | |
107 |
|
111 | |||
108 | - ui to write to |
|
112 | - ui to write to | |
109 |
- |
|
113 | - Somewhere to keep the needed state in (init to asciistate()) | |
110 | - Column of the current node in the set of ongoing edges. |
|
114 | - Column of the current node in the set of ongoing edges. | |
111 | - Type indicator of node data == ASCIIDATA. |
|
115 | - Type indicator of node data == ASCIIDATA. | |
112 | - Payload: (char, lines): |
|
116 | - Payload: (char, lines): | |
@@ -156,8 +160,8 b' def ascii(ui, base, type, char, text, co' | |||||
156 | nodeline.extend([char, " "]) |
|
160 | nodeline.extend([char, " "]) | |
157 |
|
161 | |||
158 | nodeline.extend( |
|
162 | nodeline.extend( | |
159 |
get_nodeline_edges_tail(idx, |
|
163 | get_nodeline_edges_tail(idx, state[1], ncols, coldiff, | |
160 |
|
|
164 | state[0], fix_nodeline_tail)) | |
161 |
|
165 | |||
162 | # shift_interline is the line containing the non-vertical |
|
166 | # shift_interline is the line containing the non-vertical | |
163 | # edges between this entry and the next |
|
167 | # edges between this entry and the next | |
@@ -199,8 +203,8 b' def ascii(ui, base, type, char, text, co' | |||||
199 | ui.write(ln.rstrip() + '\n') |
|
203 | ui.write(ln.rstrip() + '\n') | |
200 |
|
204 | |||
201 | # ... and start over |
|
205 | # ... and start over | |
202 |
|
|
206 | state[0] = coldiff | |
203 |
|
|
207 | state[1] = idx | |
204 |
|
208 | |||
205 | def get_revs(repo, rev_opt): |
|
209 | def get_revs(repo, rev_opt): | |
206 | if rev_opt: |
|
210 | if rev_opt: | |
@@ -217,12 +221,12 b' def check_unsupported_flags(opts):' | |||||
217 | raise util.Abort(_("--graph option is incompatible with --%s") % op) |
|
221 | raise util.Abort(_("--graph option is incompatible with --%s") % op) | |
218 |
|
222 | |||
219 | def generate(ui, dag, displayer, showparents, edgefn): |
|
223 | def generate(ui, dag, displayer, showparents, edgefn): | |
220 |
seen, |
|
224 | seen, state = [], asciistate() | |
221 | for rev, type, ctx, parents in dag: |
|
225 | for rev, type, ctx, parents in dag: | |
222 | char = ctx.node() in showparents and '@' or 'o' |
|
226 | char = ctx.node() in showparents and '@' or 'o' | |
223 | displayer.show(ctx) |
|
227 | displayer.show(ctx) | |
224 | lines = displayer.hunk.pop(rev).split('\n')[:-1] |
|
228 | lines = displayer.hunk.pop(rev).split('\n')[:-1] | |
225 |
ascii(ui, |
|
229 | ascii(ui, state, type, char, lines, edgefn(seen, rev, parents)) | |
226 |
|
230 | |||
227 | def graphlog(ui, repo, path=None, **opts): |
|
231 | def graphlog(ui, repo, path=None, **opts): | |
228 | """show revision history alongside an ASCII revision graph |
|
232 | """show revision history alongside an ASCII revision graph |
@@ -76,9 +76,11 b' from mercurial import cmdutil, commands,' | |||||
76 | from mercurial.i18n import _ |
|
76 | from mercurial.i18n import _ | |
77 | from mercurial.node import bin |
|
77 | from mercurial.node import bin | |
78 |
|
78 | |||
79 |
def prompt(ui, prompt, default= |
|
79 | def prompt(ui, prompt, default='', rest=': ', empty_ok=False): | |
80 | if not ui.interactive(): |
|
80 | if not ui.interactive(): | |
81 |
|
|
81 | if default or empty_ok: | |
|
82 | return default | |||
|
83 | raise util.Abort(_("%sPlease enter a valid value" % (prompt+rest))) | |||
82 | if default: |
|
84 | if default: | |
83 | prompt += ' [%s]' % default |
|
85 | prompt += ' [%s]' % default | |
84 | prompt += rest |
|
86 | prompt += rest | |
@@ -331,8 +333,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
331 | subj = '[PATCH %0*d of %d %s] ' % (tlen, 0, len(patches), flag) |
|
333 | subj = '[PATCH %0*d of %d %s] ' % (tlen, 0, len(patches), flag) | |
332 | else: |
|
334 | else: | |
333 | subj = '[PATCH %0*d of %d] ' % (tlen, 0, len(patches)) |
|
335 | subj = '[PATCH %0*d of %d] ' % (tlen, 0, len(patches)) | |
334 |
subj += opts.get('subject') or prompt(ui, 'Subject:', rest=subj |
|
336 | subj += opts.get('subject') or prompt(ui, 'Subject:', rest=subj) | |
335 | default='None') |
|
|||
336 |
|
337 | |||
337 | body = '' |
|
338 | body = '' | |
338 | if opts.get('diffstat'): |
|
339 | if opts.get('diffstat'): |
@@ -7,6 +7,7 b'' | |||||
7 |
|
7 | |||
8 | from i18n import _ |
|
8 | from i18n import _ | |
9 | from node import hex |
|
9 | from node import hex | |
|
10 | import cmdutil | |||
10 | import util |
|
11 | import util | |
11 | import cStringIO, os, stat, tarfile, time, zipfile |
|
12 | import cStringIO, os, stat, tarfile, time, zipfile | |
12 | import zlib, gzip |
|
13 | import zlib, gzip | |
@@ -217,9 +218,25 b' def archive(repo, dest, node, kind, deco' | |||||
217 | archiver = archivers[kind](dest, prefix, mtime or ctx.date()[0]) |
|
218 | archiver = archivers[kind](dest, prefix, mtime or ctx.date()[0]) | |
218 |
|
219 | |||
219 | if repo.ui.configbool("ui", "archivemeta", True): |
|
220 | if repo.ui.configbool("ui", "archivemeta", True): | |
220 | write('.hg_archival.txt', 0644, False, |
|
221 | def metadata(): | |
221 |
|
|
222 | base = 'repo: %s\nnode: %s\nbranch: %s\n' % ( | |
222 |
|
|
223 | hex(repo.changelog.node(0)), hex(node), ctx.branch()) | |
|
224 | ||||
|
225 | tags = ''.join('tag: %s\n' % t for t in ctx.tags() | |||
|
226 | if repo.tagtype(t) == 'global') | |||
|
227 | if not tags: | |||
|
228 | repo.ui.pushbuffer() | |||
|
229 | opts = {'template': '{latesttag}\n{latesttagdistance}', | |||
|
230 | 'style': '', 'patch': None, 'git': None} | |||
|
231 | cmdutil.show_changeset(repo.ui, repo, opts).show(ctx) | |||
|
232 | ltags, dist = repo.ui.popbuffer().split('\n') | |||
|
233 | tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':')) | |||
|
234 | tags += 'latesttagdistance: %s\n' % dist | |||
|
235 | ||||
|
236 | return base + tags | |||
|
237 | ||||
|
238 | write('.hg_archival.txt', 0644, False, metadata) | |||
|
239 | ||||
223 | for f in ctx: |
|
240 | for f in ctx: | |
224 | ff = ctx.flags(f) |
|
241 | ff = ctx.flags(f) | |
225 | write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data) |
|
242 | write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data) |
@@ -2877,11 +2877,14 b' def status(ui, repo, *pats, **opts):' | |||||
2877 | if f in copy: |
|
2877 | if f in copy: | |
2878 | ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end)) |
|
2878 | ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end)) | |
2879 |
|
2879 | |||
2880 | def summary(ui, repo): |
|
2880 | def summary(ui, repo, **opts): | |
2881 | """summarize working directory state |
|
2881 | """summarize working directory state | |
2882 |
|
2882 | |||
2883 | This generates a brief summary of the working directory state, |
|
2883 | This generates a brief summary of the working directory state, | |
2884 | including parents, branch, commit status, and available updates. |
|
2884 | including parents, branch, commit status, and available updates. | |
|
2885 | ||||
|
2886 | With the --remote option, this will check the default paths for | |||
|
2887 | incoming and outgoing changes. This can be time-consuming. | |||
2885 | """ |
|
2888 | """ | |
2886 |
|
2889 | |||
2887 | ctx = repo[None] |
|
2890 | ctx = repo[None] | |
@@ -2891,8 +2894,14 b' def summary(ui, repo):' | |||||
2891 |
|
2894 | |||
2892 | for p in parents: |
|
2895 | for p in parents: | |
2893 | t = ' '.join([t for t in tags if tags[t] == p.node()]) |
|
2896 | t = ' '.join([t for t in tags if tags[t] == p.node()]) | |
|
2897 | if p.rev() == -1: | |||
|
2898 | if not len(repo): | |||
|
2899 | t += _(' (empty repository)') | |||
|
2900 | else: | |||
|
2901 | t += _(' (no revision checked out)') | |||
2894 | ui.write(_('parent: %d:%s %s\n') % (p.rev(), str(p), t)) |
|
2902 | ui.write(_('parent: %d:%s %s\n') % (p.rev(), str(p), t)) | |
2895 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n') |
|
2903 | if p.description(): | |
|
2904 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n') | |||
2896 |
|
2905 | |||
2897 | branch = ctx.branch() |
|
2906 | branch = ctx.branch() | |
2898 | bheads = repo.branchheads(branch) |
|
2907 | bheads = repo.branchheads(branch) | |
@@ -2901,11 +2910,13 b' def summary(ui, repo):' | |||||
2901 | st = list(repo.status(unknown=True))[:7] |
|
2910 | st = list(repo.status(unknown=True))[:7] | |
2902 | ms = merge_.mergestate(repo) |
|
2911 | ms = merge_.mergestate(repo) | |
2903 | st.append([f for f in ms if f == 'u']) |
|
2912 | st.append([f for f in ms if f == 'u']) | |
2904 | labels = _('modified added removed deleted unknown ignored unresolved') |
|
2913 | labels = [_('%d modified'), _('%d added'), _('%d removed'), | |
|
2914 | _('%d deleted'), _('%d unknown'), _('%d ignored'), | |||
|
2915 | _('%d unresolved')] | |||
2905 | t = [] |
|
2916 | t = [] | |
2906 |
for |
|
2917 | for s,l in zip(st, labels): | |
2907 |
if s |
|
2918 | if s: | |
2908 |
t.append( |
|
2919 | t.append(l % len(s)) | |
2909 |
|
2920 | |||
2910 | t = ', '.join(t) |
|
2921 | t = ', '.join(t) | |
2911 |
|
2922 | |||
@@ -2918,7 +2929,10 b' def summary(ui, repo):' | |||||
2918 | elif pnode not in bheads: |
|
2929 | elif pnode not in bheads: | |
2919 | t += _(' (new branch head)') |
|
2930 | t += _(' (new branch head)') | |
2920 |
|
2931 | |||
2921 | ui.write(_('commit: %s\n') % t.strip()) |
|
2932 | if 'clean' in t: | |
|
2933 | ui.status(_('commit: %s\n') % t.strip()) | |||
|
2934 | else: | |||
|
2935 | ui.write(_('commit: %s\n') % t.strip()) | |||
2922 |
|
2936 | |||
2923 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
2937 | # all ancestors of branch heads - all ancestors of parent = new csets | |
2924 | new = [0] * len(repo) |
|
2938 | new = [0] * len(repo) | |
@@ -2930,13 +2944,41 b' def summary(ui, repo):' | |||||
2930 | new = sum(new) |
|
2944 | new = sum(new) | |
2931 |
|
2945 | |||
2932 | if new == 0: |
|
2946 | if new == 0: | |
2933 |
ui. |
|
2947 | ui.status(_('update: (current)\n')) | |
2934 | elif pnode not in bheads: |
|
2948 | elif pnode not in bheads: | |
2935 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
2949 | ui.write(_('update: %d new changesets (update)\n') % new) | |
2936 | else: |
|
2950 | else: | |
2937 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
2951 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
2938 | (new, len(bheads))) |
|
2952 | (new, len(bheads))) | |
2939 |
|
2953 | |||
|
2954 | if opts.get('remote'): | |||
|
2955 | t = [] | |||
|
2956 | source, revs, checkout = hg.parseurl(ui.expandpath('default'), | |||
|
2957 | opts.get('rev')) | |||
|
2958 | other = hg.repository(cmdutil.remoteui(repo, {}), source) | |||
|
2959 | ui.debug('comparing with %s\n' % url.hidepassword(source)) | |||
|
2960 | repo.ui.pushbuffer() | |||
|
2961 | common, incoming, rheads = repo.findcommonincoming(other) | |||
|
2962 | repo.ui.popbuffer() | |||
|
2963 | if incoming: | |||
|
2964 | t.append(_('1 or more incoming')) | |||
|
2965 | ||||
|
2966 | dest, revs, checkout = hg.parseurl( | |||
|
2967 | ui.expandpath('default-push', 'default')) | |||
|
2968 | other = hg.repository(cmdutil.remoteui(repo, {}), dest) | |||
|
2969 | ui.debug('comparing with %s\n' % url.hidepassword(dest)) | |||
|
2970 | repo.ui.pushbuffer() | |||
|
2971 | o = repo.findoutgoing(other) | |||
|
2972 | repo.ui.popbuffer() | |||
|
2973 | o = repo.changelog.nodesbetween(o, revs)[0] | |||
|
2974 | if o: | |||
|
2975 | t.append(_('%d outgoing') % len(o)) | |||
|
2976 | ||||
|
2977 | if t: | |||
|
2978 | ui.write(_('remote: %s\n') % (', '.join(t))) | |||
|
2979 | else: | |||
|
2980 | ui.status(_('remote: (synced)\n')) | |||
|
2981 | ||||
2940 | def tag(ui, repo, name1, *names, **opts): |
|
2982 | def tag(ui, repo, name1, *names, **opts): | |
2941 | """add one or more tags for the current or given revision |
|
2983 | """add one or more tags for the current or given revision | |
2942 |
|
2984 | |||
@@ -3328,7 +3370,7 b' table = {' | |||||
3328 | ] + walkopts + dryrunopts, |
|
3370 | ] + walkopts + dryrunopts, | |
3329 | _('[OPTION]... [SOURCE]... DEST')), |
|
3371 | _('[OPTION]... [SOURCE]... DEST')), | |
3330 | "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')), |
|
3372 | "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')), | |
3331 | "debugcheckstate": (debugcheckstate, []), |
|
3373 | "debugcheckstate": (debugcheckstate, [], ''), | |
3332 | "debugcommands": (debugcommands, [], _('[COMMAND]')), |
|
3374 | "debugcommands": (debugcommands, [], _('[COMMAND]')), | |
3333 | "debugcomplete": |
|
3375 | "debugcomplete": | |
3334 | (debugcomplete, |
|
3376 | (debugcomplete, | |
@@ -3342,7 +3384,7 b' table = {' | |||||
3342 | "debugfsinfo": (debugfsinfo, [], _('[PATH]')), |
|
3384 | "debugfsinfo": (debugfsinfo, [], _('[PATH]')), | |
3343 | "debugindex": (debugindex, [], _('FILE')), |
|
3385 | "debugindex": (debugindex, [], _('FILE')), | |
3344 | "debugindexdot": (debugindexdot, [], _('FILE')), |
|
3386 | "debugindexdot": (debugindexdot, [], _('FILE')), | |
3345 | "debuginstall": (debuginstall, []), |
|
3387 | "debuginstall": (debuginstall, [], ''), | |
3346 | "debugrebuildstate": |
|
3388 | "debugrebuildstate": | |
3347 | (debugrebuildstate, |
|
3389 | (debugrebuildstate, | |
3348 | [('r', 'rev', '', _('revision to rebuild to'))], |
|
3390 | [('r', 'rev', '', _('revision to rebuild to'))], | |
@@ -3488,7 +3530,7 b' table = {' | |||||
3488 | ('n', 'newest-first', None, _('show newest record first')), |
|
3530 | ('n', 'newest-first', None, _('show newest record first')), | |
3489 | ] + logopts + remoteopts, |
|
3531 | ] + logopts + remoteopts, | |
3490 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), |
|
3532 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), | |
3491 |
" |
|
3533 | "parents": | |
3492 | (parents, |
|
3534 | (parents, | |
3493 | [('r', 'rev', '', _('show parents from the specified revision')), |
|
3535 | [('r', 'rev', '', _('show parents from the specified revision')), | |
3494 | ] + templateopts, |
|
3536 | ] + templateopts, | |
@@ -3569,7 +3611,8 b' table = {' | |||||
3569 | [('u', 'untrusted', None, _('show untrusted configuration options'))], |
|
3611 | [('u', 'untrusted', None, _('show untrusted configuration options'))], | |
3570 | _('[-u] [NAME]...')), |
|
3612 | _('[-u] [NAME]...')), | |
3571 | "^summary|sum": |
|
3613 | "^summary|sum": | |
3572 |
(summary, |
|
3614 | (summary, | |
|
3615 | [('', 'remote', None, _('check for push and pull'))], '[--remote]'), | |||
3573 | "^status|st": |
|
3616 | "^status|st": | |
3574 | (status, |
|
3617 | (status, | |
3575 | [('A', 'all', None, _('show status of all files')), |
|
3618 | [('A', 'all', None, _('show status of all files')), | |
@@ -3597,7 +3640,7 b' table = {' | |||||
3597 | ('m', 'message', '', _('use <text> as commit message')), |
|
3640 | ('m', 'message', '', _('use <text> as commit message')), | |
3598 | ] + commitopts2, |
|
3641 | ] + commitopts2, | |
3599 | _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), |
|
3642 | _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), | |
3600 | "tags": (tags, []), |
|
3643 | "tags": (tags, [], ''), | |
3601 | "tip": |
|
3644 | "tip": | |
3602 | (tip, |
|
3645 | (tip, | |
3603 | [('p', 'patch', None, _('show patch')), |
|
3646 | [('p', 'patch', None, _('show patch')), |
@@ -100,7 +100,7 b' class dirstate(object):' | |||||
100 | files = [self._join('.hgignore')] |
|
100 | files = [self._join('.hgignore')] | |
101 | for name, path in self._ui.configitems("ui"): |
|
101 | for name, path in self._ui.configitems("ui"): | |
102 | if name == 'ignore' or name.startswith('ignore.'): |
|
102 | if name == 'ignore' or name.startswith('ignore.'): | |
103 |
files.append( |
|
103 | files.append(util.expandpath(path)) | |
104 | return ignore.ignore(self._root, files, self._ui.warn) |
|
104 | return ignore.ignore(self._root, files, self._ui.warn) | |
105 |
|
105 | |||
106 | @propertycache |
|
106 | @propertycache |
@@ -248,7 +248,7 b' def _parse(ui, args):' | |||||
248 | args = aliasargs(i[0]) + args |
|
248 | args = aliasargs(i[0]) + args | |
249 | defaults = ui.config("defaults", cmd) |
|
249 | defaults = ui.config("defaults", cmd) | |
250 | if defaults: |
|
250 | if defaults: | |
251 | args = shlex.split(defaults) + args |
|
251 | args = map(util.expandpath, shlex.split(defaults)) + args | |
252 | c = list(i[1]) |
|
252 | c = list(i[1]) | |
253 | else: |
|
253 | else: | |
254 | cmd = None |
|
254 | cmd = None | |
@@ -477,8 +477,7 b' def _runcommand(ui, options, cmd, cmdfun' | |||||
477 | output = ui.config('profiling', 'output') |
|
477 | output = ui.config('profiling', 'output') | |
478 |
|
478 | |||
479 | if output: |
|
479 | if output: | |
480 |
path = |
|
480 | path = ui.expandpath(output) | |
481 | path = ui.expandpath(path) |
|
|||
482 | ostream = open(path, 'wb') |
|
481 | ostream = open(path, 'wb') | |
483 | else: |
|
482 | else: | |
484 | ostream = sys.stderr |
|
483 | ostream = sys.stderr |
@@ -30,7 +30,7 b' def find(name):' | |||||
30 |
|
30 | |||
31 | def loadpath(path, module_name): |
|
31 | def loadpath(path, module_name): | |
32 | module_name = module_name.replace('.', '_') |
|
32 | module_name = module_name.replace('.', '_') | |
33 |
path = |
|
33 | path = util.expandpath(path) | |
34 | if os.path.isdir(path): |
|
34 | if os.path.isdir(path): | |
35 | # module/__init__.py style |
|
35 | # module/__init__.py style | |
36 | d, f = os.path.split(path.rstrip('/')) |
|
36 | d, f = os.path.split(path.rstrip('/')) |
@@ -307,7 +307,6 b' def clone(ui, source, dest=None, pull=Fa' | |||||
307 | dest_repo.ui.setconfig('paths', 'default', abspath) |
|
307 | dest_repo.ui.setconfig('paths', 'default', abspath) | |
308 |
|
308 | |||
309 | if update: |
|
309 | if update: | |
310 | dest_repo.ui.status(_("updating working directory\n")) |
|
|||
311 | if update is not True: |
|
310 | if update is not True: | |
312 | checkout = update |
|
311 | checkout = update | |
313 | for test in (checkout, 'default', 'tip'): |
|
312 | for test in (checkout, 'default', 'tip'): | |
@@ -318,6 +317,8 b' def clone(ui, source, dest=None, pull=Fa' | |||||
318 | break |
|
317 | break | |
319 | except error.RepoLookupError: |
|
318 | except error.RepoLookupError: | |
320 | continue |
|
319 | continue | |
|
320 | bn = dest_repo[uprev].branch() | |||
|
321 | dest_repo.ui.status(_("updating to branch %s\n") % bn) | |||
321 | _update(dest_repo, uprev) |
|
322 | _update(dest_repo, uprev) | |
322 |
|
323 | |||
323 | return src_repo, dest_repo |
|
324 | return src_repo, dest_repo |
@@ -260,6 +260,13 b' def finddefinitionlists(blocks):' | |||||
260 | return blocks |
|
260 | return blocks | |
261 |
|
261 | |||
262 |
|
262 | |||
|
263 | def inlineliterals(blocks): | |||
|
264 | for b in blocks: | |||
|
265 | if b['type'] == 'paragraph': | |||
|
266 | b['lines'] = [l.replace('``', '"') for l in b['lines']] | |||
|
267 | return blocks | |||
|
268 | ||||
|
269 | ||||
263 | def addmargins(blocks): |
|
270 | def addmargins(blocks): | |
264 | """Adds empty blocks for vertical spacing. |
|
271 | """Adds empty blocks for vertical spacing. | |
265 |
|
272 | |||
@@ -316,6 +323,7 b' def format(text, width, indent=0):' | |||||
316 | for b in blocks: |
|
323 | for b in blocks: | |
317 | b['indent'] += indent |
|
324 | b['indent'] += indent | |
318 | blocks = findliteralblocks(blocks) |
|
325 | blocks = findliteralblocks(blocks) | |
|
326 | blocks = inlineliterals(blocks) | |||
319 | blocks = findsections(blocks) |
|
327 | blocks = findsections(blocks) | |
320 | blocks = findbulletlists(blocks) |
|
328 | blocks = findbulletlists(blocks) | |
321 | blocks = findoptionlists(blocks) |
|
329 | blocks = findoptionlists(blocks) |
@@ -179,7 +179,7 b' class ui(object):' | |||||
179 | user = os.environ.get("EMAIL") |
|
179 | user = os.environ.get("EMAIL") | |
180 | if user is None and self.configbool("ui", "askusername"): |
|
180 | if user is None and self.configbool("ui", "askusername"): | |
181 | user = self.prompt(_("enter a commit username:"), default=None) |
|
181 | user = self.prompt(_("enter a commit username:"), default=None) | |
182 | if user is None: |
|
182 | if user is None and not self.interactive(): | |
183 | try: |
|
183 | try: | |
184 | user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
|
184 | user = '%s@%s' % (util.getuser(), socket.getfqdn()) | |
185 | self.warn(_("No username found, using '%s' instead\n") % user) |
|
185 | self.warn(_("No username found, using '%s' instead\n") % user) | |
@@ -198,10 +198,12 b' class ui(object):' | |||||
198 |
|
198 | |||
199 | def _path(self, loc): |
|
199 | def _path(self, loc): | |
200 | p = self.config('paths', loc) |
|
200 | p = self.config('paths', loc) | |
201 |
if p |
|
201 | if p: | |
202 | self.warn("(deprecated '%%' in path %s=%s from %s)\n" % |
|
202 | if '%%' in p: | |
203 | (loc, p, self.configsource('paths', loc))) |
|
203 | self.warn("(deprecated '%%' in path %s=%s from %s)\n" % | |
204 | p = p.replace('%%', '%') |
|
204 | (loc, p, self.configsource('paths', loc))) | |
|
205 | p = p.replace('%%', '%') | |||
|
206 | p = util.expandpath(p) | |||
205 | return p |
|
207 | return p | |
206 |
|
208 | |||
207 | def expandpath(self, loc, default=None): |
|
209 | def expandpath(self, loc, default=None): |
@@ -335,7 +335,8 b' def hgexecutable():' | |||||
335 | elif main_is_frozen(): |
|
335 | elif main_is_frozen(): | |
336 | set_hgexecutable(sys.executable) |
|
336 | set_hgexecutable(sys.executable) | |
337 | else: |
|
337 | else: | |
338 |
|
|
338 | exe = find_exe('hg') or os.path.basename(sys.argv[0]) | |
|
339 | set_hgexecutable(exe) | |||
339 | return _hgexecutable |
|
340 | return _hgexecutable | |
340 |
|
341 | |||
341 | def set_hgexecutable(path): |
|
342 | def set_hgexecutable(path): | |
@@ -1158,6 +1159,7 b' def rcpath():' | |||||
1158 | _rcpath = [] |
|
1159 | _rcpath = [] | |
1159 | for p in os.environ['HGRCPATH'].split(os.pathsep): |
|
1160 | for p in os.environ['HGRCPATH'].split(os.pathsep): | |
1160 | if not p: continue |
|
1161 | if not p: continue | |
|
1162 | p = expandpath(p) | |||
1161 | if os.path.isdir(p): |
|
1163 | if os.path.isdir(p): | |
1162 | for f, kind in osutil.listdir(p): |
|
1164 | for f, kind in osutil.listdir(p): | |
1163 | if f.endswith('.rc'): |
|
1165 | if f.endswith('.rc'): | |
@@ -1250,3 +1252,6 b' def iterlines(iterator):' | |||||
1250 | for chunk in iterator: |
|
1252 | for chunk in iterator: | |
1251 | for line in chunk.splitlines(): |
|
1253 | for line in chunk.splitlines(): | |
1252 | yield line |
|
1254 | yield line | |
|
1255 | ||||
|
1256 | def expandpath(path): | |||
|
1257 | return os.path.expanduser(os.path.expandvars(path)) |
@@ -97,7 +97,21 b' try:' | |||||
97 | except ImportError: |
|
97 | except ImportError: | |
98 | pass |
|
98 | pass | |
99 |
|
99 | |||
100 | version = None |
|
100 | def runcmd(cmd): | |
|
101 | p = subprocess.Popen(cmd, stdout=subprocess.PIPE, | |||
|
102 | stderr=subprocess.PIPE, env=env) | |||
|
103 | out, err = p.communicate() | |||
|
104 | # If root is executing setup.py, but the repository is owned by | |||
|
105 | # another user (as in "sudo python setup.py install") we will get | |||
|
106 | # trust warnings since the .hg/hgrc file is untrusted. That is | |||
|
107 | # fine, we don't want to load it anyway. | |||
|
108 | err = [e for e in err.splitlines() | |||
|
109 | if not e.startswith('Not trusting file')] | |||
|
110 | if err: | |||
|
111 | return '' | |||
|
112 | return out | |||
|
113 | ||||
|
114 | version = '' | |||
101 |
|
115 | |||
102 | if os.path.isdir('.hg'): |
|
116 | if os.path.isdir('.hg'): | |
103 | # Execute hg out of this directory with a custom environment which |
|
117 | # Execute hg out of this directory with a custom environment which | |
@@ -113,34 +127,28 b" if os.path.isdir('.hg'):" | |||||
113 | # error 0xc0150004. See: http://bugs.python.org/issue3440 |
|
127 | # error 0xc0150004. See: http://bugs.python.org/issue3440 | |
114 | env['SystemRoot'] = os.environ['SystemRoot'] |
|
128 | env['SystemRoot'] = os.environ['SystemRoot'] | |
115 | cmd = [sys.executable, 'hg', 'id', '-i', '-t'] |
|
129 | cmd = [sys.executable, 'hg', 'id', '-i', '-t'] | |
116 |
|
130 | l = runcmd(cmd).split() | ||
117 | p = subprocess.Popen(cmd, stdout=subprocess.PIPE, |
|
131 | while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags | |
118 | stderr=subprocess.PIPE, env=env) |
|
132 | l.pop() | |
119 | out, err = p.communicate() |
|
133 | if len(l) > 1: # tag found | |
120 |
|
134 | version = l[-1] | ||
121 | # If root is executing setup.py, but the repository is owned by |
|
135 | if l[0].endswith('+'): # propagate the dirty status to the tag | |
122 | # another user (as in "sudo python setup.py install") we will get |
|
136 | version += '+' | |
123 | # trust warnings since the .hg/hgrc file is untrusted. That is |
|
137 | elif len(l) == 1: # no tag found | |
124 | # fine, we don't want to load it anyway. |
|
138 | cmd = [sys.executable, 'hg', 'parents', '--template', | |
125 | err = [e for e in err.splitlines() |
|
139 | '{latesttag}+{latesttagdistance}-'] | |
126 | if not e.startswith('Not trusting file')] |
|
140 | version = runcmd(cmd) + l[0] | |
127 | if err: |
|
141 | if version.endswith('+'): | |
128 | sys.stderr.write('warning: could not establish Mercurial ' |
|
142 | version += time.strftime('%Y%m%d') | |
129 | 'version:\n%s\n' % '\n'.join(err)) |
|
143 | elif os.path.exists('.hg_archival.txt'): | |
|
144 | kw = dict([t.strip() for t in l.split(':', 1)] | |||
|
145 | for l in open('.hg_archival.txt')) | |||
|
146 | if 'tag' in kw: | |||
|
147 | version = kw['tag'] | |||
|
148 | elif 'latesttag' in kw: | |||
|
149 | version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw | |||
130 | else: |
|
150 | else: | |
131 | l = out.split() |
|
151 | version = kw.get('node', '')[:12] | |
132 | while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags |
|
|||
133 | l.pop() |
|
|||
134 | if l: |
|
|||
135 | version = l[-1] # latest tag or revision number |
|
|||
136 | if version.endswith('+'): |
|
|||
137 | version += time.strftime('%Y%m%d') |
|
|||
138 | elif os.path.exists('.hg_archival.txt'): |
|
|||
139 | hgarchival = open('.hg_archival.txt') |
|
|||
140 | for line in hgarchival: |
|
|||
141 | if line.startswith('node:'): |
|
|||
142 | version = line.split(':')[1].strip()[:12] |
|
|||
143 | break |
|
|||
144 |
|
152 | |||
145 | if version: |
|
153 | if version: | |
146 | f = open("mercurial/__version__.py", "w") |
|
154 | f = open("mercurial/__version__.py", "w") |
@@ -4,7 +4,7 b' adding changesets' | |||||
4 | adding manifests |
|
4 | adding manifests | |
5 | adding file changes |
|
5 | adding file changes | |
6 | added 1 changesets with 3 changes to 3 files |
|
6 | added 1 changesets with 3 changes to 3 files | |
7 |
updating |
|
7 | updating to branch default | |
8 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 |
|
9 | |||
10 | Extension disabled for lack of a hook |
|
10 | Extension disabled for lack of a hook |
@@ -108,6 +108,14 b' if [ -f rev-0.tar ]; then' | |||||
108 | echo 'rev-0.tar created' |
|
108 | echo 'rev-0.tar created' | |
109 | fi |
|
109 | fi | |
110 |
|
110 | |||
|
111 | echo '% test .hg_archival.txt' | |||
|
112 | hg archive ../test-tags | |||
|
113 | cat ../test-tags/.hg_archival.txt | |||
|
114 | hg tag -r 2 mytag | |||
|
115 | hg tag -r 2 anothertag | |||
|
116 | hg archive -r 2 ../test-lasttag | |||
|
117 | cat ../test-lasttag/.hg_archival.txt | |||
|
118 | ||||
111 | hg archive -t bogus test.bogus |
|
119 | hg archive -t bogus test.bogus | |
112 |
|
120 | |||
113 | echo % server errors |
|
121 | echo % server errors |
@@ -57,6 +57,17 b' test-TIP/bar' | |||||
57 | test-TIP/baz/bletch |
|
57 | test-TIP/baz/bletch | |
58 | test-TIP/foo |
|
58 | test-TIP/foo | |
59 | rev-0.tar created |
|
59 | rev-0.tar created | |
|
60 | % test .hg_archival.txt | |||
|
61 | repo: daa7f7c60e0a224faa4ff77ca41b2760562af264 | |||
|
62 | node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e | |||
|
63 | branch: default | |||
|
64 | latesttag: null | |||
|
65 | latesttagdistance: 3 | |||
|
66 | repo: daa7f7c60e0a224faa4ff77ca41b2760562af264 | |||
|
67 | node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e | |||
|
68 | branch: default | |||
|
69 | tag: anothertag | |||
|
70 | tag: mytag | |||
60 | abort: unknown archive type 'bogus' |
|
71 | abort: unknown archive type 'bogus' | |
61 | % server errors |
|
72 | % server errors | |
62 | % empty repo |
|
73 | % empty repo |
@@ -163,7 +163,7 b' 4 changesets found' | |||||
163 | 6 changesets found |
|
163 | 6 changesets found | |
164 | 1 changesets found |
|
164 | 1 changesets found | |
165 | 1 changesets found |
|
165 | 1 changesets found | |
166 |
updating |
|
166 | updating to branch default | |
167 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
167 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
168 | % 2 |
|
168 | % 2 | |
169 | 2:d62976ca1e50 |
|
169 | 2:d62976ca1e50 | |
@@ -219,7 +219,7 b' warning: detected divergent renames of a' | |||||
219 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
219 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
220 | (branch merge, don't forget to commit) |
|
220 | (branch merge, don't forget to commit) | |
221 | 7 changesets found |
|
221 | 7 changesets found | |
222 |
updating |
|
222 | updating to branch default | |
223 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
223 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
224 | adding changesets |
|
224 | adding changesets | |
225 | adding manifests |
|
225 | adding manifests |
@@ -146,9 +146,9 b' adding changesets' | |||||
146 | adding manifests |
|
146 | adding manifests | |
147 | adding file changes |
|
147 | adding file changes | |
148 | added 4 changesets with 4 changes to 1 files |
|
148 | added 4 changesets with 4 changes to 1 files | |
149 |
updating |
|
149 | updating to branch default | |
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
151 |
updating |
|
151 | updating to branch default | |
152 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
152 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
153 | ====== Log -R full.hg in partial |
|
153 | ====== Log -R full.hg in partial | |
154 | changeset: 8:836ac62537ab |
|
154 | changeset: 8:836ac62537ab | |
@@ -269,7 +269,7 b' adding changesets' | |||||
269 | adding manifests |
|
269 | adding manifests | |
270 | adding file changes |
|
270 | adding file changes | |
271 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
271 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
272 |
updating |
|
272 | updating to branch default | |
273 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
273 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
274 | changeset: 8:836ac62537ab |
|
274 | changeset: 8:836ac62537ab | |
275 | tag: tip |
|
275 | tag: tip | |
@@ -296,7 +296,7 b' adding file changes' | |||||
296 | added 1 changesets with 1 changes to 1 files |
|
296 | added 1 changesets with 1 changes to 1 files | |
297 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
297 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
298 | ====== test for 540d1059c802 |
|
298 | ====== test for 540d1059c802 | |
299 |
updating |
|
299 | updating to branch default | |
300 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
300 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
301 | searching for changes |
|
301 | searching for changes | |
302 | 1 changesets found |
|
302 | 1 changesets found |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | pulling from ../source |
|
3 | pulling from ../source | |
4 | transaction abort! |
|
4 | transaction abort! |
@@ -30,7 +30,7 b' adding changesets' | |||||
30 | adding manifests |
|
30 | adding manifests | |
31 | adding file changes |
|
31 | adding file changes | |
32 | added 1 changesets with 1 changes to 1 files |
|
32 | added 1 changesets with 1 changes to 1 files | |
33 |
updating |
|
33 | updating to branch default | |
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
35 | checking changesets |
|
35 | checking changesets | |
36 | checking manifests |
|
36 | checking manifests | |
@@ -42,7 +42,7 b' adding changesets' | |||||
42 | adding manifests |
|
42 | adding manifests | |
43 | adding file changes |
|
43 | adding file changes | |
44 | added 2 changesets with 2 changes to 1 files |
|
44 | added 2 changesets with 2 changes to 1 files | |
45 |
updating |
|
45 | updating to branch default | |
46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
47 | checking changesets |
|
47 | checking changesets | |
48 | checking manifests |
|
48 | checking manifests | |
@@ -54,7 +54,7 b' adding changesets' | |||||
54 | adding manifests |
|
54 | adding manifests | |
55 | adding file changes |
|
55 | adding file changes | |
56 | added 3 changesets with 3 changes to 1 files |
|
56 | added 3 changesets with 3 changes to 1 files | |
57 |
updating |
|
57 | updating to branch default | |
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
59 | checking changesets |
|
59 | checking changesets | |
60 | checking manifests |
|
60 | checking manifests | |
@@ -66,7 +66,7 b' adding changesets' | |||||
66 | adding manifests |
|
66 | adding manifests | |
67 | adding file changes |
|
67 | adding file changes | |
68 | added 4 changesets with 4 changes to 1 files |
|
68 | added 4 changesets with 4 changes to 1 files | |
69 |
updating |
|
69 | updating to branch default | |
70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
71 | checking changesets |
|
71 | checking changesets | |
72 | checking manifests |
|
72 | checking manifests | |
@@ -78,7 +78,7 b' adding changesets' | |||||
78 | adding manifests |
|
78 | adding manifests | |
79 | adding file changes |
|
79 | adding file changes | |
80 | added 2 changesets with 2 changes to 1 files |
|
80 | added 2 changesets with 2 changes to 1 files | |
81 |
updating |
|
81 | updating to branch default | |
82 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
83 | checking changesets |
|
83 | checking changesets | |
84 | checking manifests |
|
84 | checking manifests | |
@@ -90,7 +90,7 b' adding changesets' | |||||
90 | adding manifests |
|
90 | adding manifests | |
91 | adding file changes |
|
91 | adding file changes | |
92 | added 3 changesets with 3 changes to 1 files |
|
92 | added 3 changesets with 3 changes to 1 files | |
93 |
updating |
|
93 | updating to branch default | |
94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
95 | checking changesets |
|
95 | checking changesets | |
96 | checking manifests |
|
96 | checking manifests | |
@@ -102,7 +102,7 b' adding changesets' | |||||
102 | adding manifests |
|
102 | adding manifests | |
103 | adding file changes |
|
103 | adding file changes | |
104 | added 4 changesets with 5 changes to 2 files |
|
104 | added 4 changesets with 5 changes to 2 files | |
105 |
updating |
|
105 | updating to branch default | |
106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 | checking changesets |
|
107 | checking changesets | |
108 | checking manifests |
|
108 | checking manifests | |
@@ -114,7 +114,7 b' adding changesets' | |||||
114 | adding manifests |
|
114 | adding manifests | |
115 | adding file changes |
|
115 | adding file changes | |
116 | added 5 changesets with 6 changes to 3 files |
|
116 | added 5 changesets with 6 changes to 3 files | |
117 |
updating |
|
117 | updating to branch default | |
118 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
118 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
119 | checking changesets |
|
119 | checking changesets | |
120 | checking manifests |
|
120 | checking manifests | |
@@ -126,7 +126,7 b' adding changesets' | |||||
126 | adding manifests |
|
126 | adding manifests | |
127 | adding file changes |
|
127 | adding file changes | |
128 | added 5 changesets with 5 changes to 2 files |
|
128 | added 5 changesets with 5 changes to 2 files | |
129 |
updating |
|
129 | updating to branch default | |
130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
131 | checking changesets |
|
131 | checking changesets | |
132 | checking manifests |
|
132 | checking manifests |
@@ -6,7 +6,7 b'' | |||||
6 | .hg/store/data/b.i |
|
6 | .hg/store/data/b.i | |
7 |
|
7 | |||
8 | % default operation |
|
8 | % default operation | |
9 |
updating |
|
9 | updating to branch default | |
10 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | a |
|
11 | a | |
12 | checking changesets |
|
12 | checking changesets | |
@@ -25,13 +25,13 b' 2 files, 11 changesets, 11 total revisio' | |||||
25 |
|
25 | |||
26 | % default destination |
|
26 | % default destination | |
27 | destination directory: a |
|
27 | destination directory: a | |
28 |
updating |
|
28 | updating to branch default | |
29 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 | a |
|
30 | a | |
31 |
|
31 | |||
32 | % check that we drop the file:// from the path before |
|
32 | % check that we drop the file:// from the path before | |
33 | % writing the .hgrc |
|
33 | % writing the .hgrc | |
34 |
updating |
|
34 | updating to branch default | |
35 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 |
|
36 | |||
37 | % check that path aliases are expanded |
|
37 | % check that path aliases are expanded | |
@@ -43,7 +43,7 b' adding changesets' | |||||
43 | adding manifests |
|
43 | adding manifests | |
44 | adding file changes |
|
44 | adding file changes | |
45 | added 11 changesets with 11 changes to 2 files |
|
45 | added 11 changesets with 11 changes to 2 files | |
46 |
updating |
|
46 | updating to branch default | |
47 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
47 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 | checking changesets |
|
48 | checking changesets | |
49 | checking manifests |
|
49 | checking manifests | |
@@ -52,5 +52,5 b' checking files' | |||||
52 | 2 files, 11 changesets, 11 total revisions |
|
52 | 2 files, 11 changesets, 11 total revisions | |
53 |
|
53 | |||
54 | % clone to . |
|
54 | % clone to . | |
55 |
updating |
|
55 | updating to branch default | |
56 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
56 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -7,7 +7,7 b' adding e' | |||||
7 | % test invalid splicemap |
|
7 | % test invalid splicemap | |
8 | abort: syntax error in splicemap(1): key/value pair expected |
|
8 | abort: syntax error in splicemap(1): key/value pair expected | |
9 | % splice repo2 on repo1 |
|
9 | % splice repo2 on repo1 | |
10 |
updating |
|
10 | updating to branch default | |
11 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 | scanning source... |
|
12 | scanning source... | |
13 | sorting... |
|
13 | sorting... |
@@ -173,13 +173,12 b' forget: include, exclude' | |||||
173 | init: ssh, remotecmd |
|
173 | init: ssh, remotecmd | |
174 | log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude |
|
174 | log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude | |
175 | merge: force, rev, preview |
|
175 | merge: force, rev, preview | |
176 | parents: rev, style, template |
|
|||
177 | pull: update, force, rev, ssh, remotecmd |
|
176 | pull: update, force, rev, ssh, remotecmd | |
178 | push: force, rev, ssh, remotecmd |
|
177 | push: force, rev, ssh, remotecmd | |
179 | remove: after, force, include, exclude |
|
178 | remove: after, force, include, exclude | |
180 | serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, webdir-conf, pid-file, stdio, templates, style, ipv6, certificate |
|
179 | serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, webdir-conf, pid-file, stdio, templates, style, ipv6, certificate | |
181 | status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, include, exclude |
|
180 | status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, include, exclude | |
182 | summary: |
|
181 | summary: remote | |
183 | update: clean, check, date, rev |
|
182 | update: clean, check, date, rev | |
184 | addremove: similarity, include, exclude, dry-run |
|
183 | addremove: similarity, include, exclude, dry-run | |
185 | archive: no-decode, prefix, rev, type, include, exclude |
|
184 | archive: no-decode, prefix, rev, type, include, exclude | |
@@ -215,6 +214,7 b' incoming: force, newest-first, bundle, r' | |||||
215 | locate: rev, print0, fullpath, include, exclude |
|
214 | locate: rev, print0, fullpath, include, exclude | |
216 | manifest: rev |
|
215 | manifest: rev | |
217 | outgoing: force, rev, newest-first, patch, git, limit, no-merges, style, template, ssh, remotecmd |
|
216 | outgoing: force, rev, newest-first, patch, git, limit, no-merges, style, template, ssh, remotecmd | |
|
217 | parents: rev, style, template | |||
218 | paths: |
|
218 | paths: | |
219 | recover: |
|
219 | recover: | |
220 | rename: after, force, include, exclude, dry-run |
|
220 | rename: after, force, include, exclude, dry-run |
@@ -1,7 +1,7 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 |
updating |
|
4 | updating to branch default | |
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 | % push should push to default when default-push not set |
|
6 | % push should push to default when default-push not set | |
7 | pushing |
|
7 | pushing |
@@ -16,14 +16,14 b' adding changesets' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 4 changesets with 3 changes to 3 files |
|
18 | added 4 changesets with 3 changes to 3 files | |
19 |
updating |
|
19 | updating to branch default | |
20 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 | requesting all changes |
|
21 | requesting all changes | |
22 | adding changesets |
|
22 | adding changesets | |
23 | adding manifests |
|
23 | adding manifests | |
24 | adding file changes |
|
24 | adding file changes | |
25 | added 4 changesets with 3 changes to 3 files |
|
25 | added 4 changesets with 3 changes to 3 files | |
26 |
updating |
|
26 | updating to branch default | |
27 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 | comparing with b |
|
28 | comparing with b | |
29 | searching for changes |
|
29 | searching for changes |
@@ -6,7 +6,7 b' 0 files, 0 changesets, 0 total revisions' | |||||
6 | 00changelog.i |
|
6 | 00changelog.i | |
7 | requires |
|
7 | requires | |
8 | store |
|
8 | store | |
9 |
updating |
|
9 | updating to branch default | |
10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | checking changesets |
|
11 | checking changesets | |
12 | checking manifests |
|
12 | checking manifests |
@@ -7,7 +7,7 b' reposetup called for a' | |||||
7 | ui == repo.ui |
|
7 | ui == repo.ui | |
8 | reposetup called for b |
|
8 | reposetup called for b | |
9 | ui == repo.ui |
|
9 | ui == repo.ui | |
10 |
updating |
|
10 | updating to branch default | |
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 | uisetup called |
|
12 | uisetup called | |
13 | Bar |
|
13 | Bar |
@@ -1,8 +1,8 b'' | |||||
1 | % test fetch with default branches only |
|
1 | % test fetch with default branches only | |
2 | adding a |
|
2 | adding a | |
3 |
updating |
|
3 | updating to branch default | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 |
updating |
|
5 | updating to branch default | |
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | adding b |
|
7 | adding b | |
8 | 1:97d72e5f12c7 |
|
8 | 1:97d72e5f12c7 | |
@@ -16,9 +16,9 b' added 1 changesets with 1 changes to 1 f' | |||||
16 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 | 1:97d72e5f12c7 |
|
17 | 1:97d72e5f12c7 | |
18 | adding c |
|
18 | adding c | |
19 |
updating |
|
19 | updating to branch default | |
20 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 |
updating |
|
21 | updating to branch default | |
22 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | % should merge c into a |
|
23 | % should merge c into a | |
24 | pulling from ../a |
|
24 | pulling from ../a | |
@@ -61,9 +61,9 b' merging with 1:5e056962225c' | |||||
61 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
62 | new changeset 3:... merges remote changes with local |
|
62 | new changeset 3:... merges remote changes with local | |
63 | Automated merge with http://localhost:20059/ |
|
63 | Automated merge with http://localhost:20059/ | |
64 |
updating |
|
64 | updating to branch default | |
65 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
65 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
66 |
updating |
|
66 | updating to branch default | |
67 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
68 | adding f |
|
68 | adding f | |
69 | adding g |
|
69 | adding g | |
@@ -89,9 +89,9 b' adding b' | |||||
89 | created new head |
|
89 | created new head | |
90 |
|
90 | |||
91 | % pull in change on foreign branch |
|
91 | % pull in change on foreign branch | |
92 |
updating |
|
92 | updating to branch default | |
93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 |
updating |
|
94 | updating to branch default | |
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -105,9 +105,9 b' added 1 changesets with 1 changes to 1 f' | |||||
105 | 2 |
|
105 | 2 | |
106 |
|
106 | |||
107 | % pull in changes on both foreign and local branches |
|
107 | % pull in changes on both foreign and local branches | |
108 |
updating |
|
108 | updating to branch default | |
109 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 |
updating |
|
110 | updating to branch default | |
111 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
111 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
112 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -124,9 +124,9 b' 4' | |||||
124 |
|
124 | |||
125 | % pull changes on foreign (2 new heads) and local (1 new head) branches |
|
125 | % pull changes on foreign (2 new heads) and local (1 new head) branches | |
126 | % with a local change |
|
126 | % with a local change | |
127 |
updating |
|
127 | updating to branch default | |
128 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
128 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
129 |
updating |
|
129 | updating to branch default | |
130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
131 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
131 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
132 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -149,9 +149,9 b' new changeset 7:48f1a33f52af merges remo' | |||||
149 | 7 |
|
149 | 7 | |
150 | % pull in changes on foreign (merge of local branch) and local (2 new |
|
150 | % pull in changes on foreign (merge of local branch) and local (2 new | |
151 | % heads) with a local change |
|
151 | % heads) with a local change | |
152 |
updating |
|
152 | updating to branch default | |
153 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
153 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
154 |
updating |
|
154 | updating to branch default | |
155 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
155 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
156 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
156 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
157 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
157 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -172,7 +172,7 b' not merging with 1 other new branch head' | |||||
172 | 3 |
|
172 | 3 | |
173 | % pull in change on different branch than dirstate |
|
173 | % pull in change on different branch than dirstate | |
174 | adding a |
|
174 | adding a | |
175 |
updating |
|
175 | updating to branch default | |
176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
177 | marked working directory as branch topic |
|
177 | marked working directory as branch topic | |
178 | abort: working dir not at branch tip (use "hg update" to check out branch tip) |
|
178 | abort: working dir not at branch tip (use "hg update" to check out branch tip) | |
@@ -184,7 +184,7 b' marked working directory as branch secon' | |||||
184 | adding b |
|
184 | adding b | |
185 | marked working directory as branch default |
|
185 | marked working directory as branch default | |
186 | adding c |
|
186 | adding c | |
187 |
updating |
|
187 | updating to branch default | |
188 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
188 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
189 | % fetch should succeed |
|
189 | % fetch should succeed | |
190 | pulling from ../ib1 |
|
190 | pulling from ../ib1 | |
@@ -192,7 +192,7 b' searching for changes' | |||||
192 | no changes found |
|
192 | no changes found | |
193 | % test issue1726 |
|
193 | % test issue1726 | |
194 | adding a |
|
194 | adding a | |
195 |
updating |
|
195 | updating to branch default | |
196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
197 | pulling from ../i1726r1 |
|
197 | pulling from ../i1726r1 | |
198 | searching for changes |
|
198 | searching for changes |
@@ -1,5 +1,5 b'' | |||||
1 | creating base |
|
1 | creating base | |
2 |
updating |
|
2 | updating to branch default | |
3 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | creating branch a |
|
4 | creating branch a | |
5 | creating branch b |
|
5 | creating branch b |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | pulling from ../test1 |
|
3 | pulling from ../test1 | |
4 | requesting all changes |
|
4 | requesting all changes |
@@ -1,6 +1,6 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | adding b |
|
2 | adding b | |
3 |
updating |
|
3 | updating to branch default | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | pulling from ../b |
|
5 | pulling from ../b | |
6 | searching for changes |
|
6 | searching for changes |
@@ -12,7 +12,6 b' basic commands:' | |||||
12 | init create a new repository in the given directory |
|
12 | init create a new repository in the given directory | |
13 | log show revision history of entire repository or files |
|
13 | log show revision history of entire repository or files | |
14 | merge merge working directory with another revision |
|
14 | merge merge working directory with another revision | |
15 | parents show the parents of the working directory or revision |
|
|||
16 | pull pull changes from the specified source |
|
15 | pull pull changes from the specified source | |
17 | push push changes to the specified destination |
|
16 | push push changes to the specified destination | |
18 | remove remove the specified files on the next commit |
|
17 | remove remove the specified files on the next commit | |
@@ -32,7 +31,6 b' use "hg help" for the full list of comma' | |||||
32 | init create a new repository in the given directory |
|
31 | init create a new repository in the given directory | |
33 | log show revision history of entire repository or files |
|
32 | log show revision history of entire repository or files | |
34 | merge merge working directory with another revision |
|
33 | merge merge working directory with another revision | |
35 | parents show the parents of the working directory or revision |
|
|||
36 | pull pull changes from the specified source |
|
34 | pull pull changes from the specified source | |
37 | push push changes to the specified destination |
|
35 | push push changes to the specified destination | |
38 | remove remove the specified files on the next commit |
|
36 | remove remove the specified files on the next commit | |
@@ -317,7 +315,6 b' basic commands:' | |||||
317 | init create a new repository in the given directory |
|
315 | init create a new repository in the given directory | |
318 | log show revision history of entire repository or files |
|
316 | log show revision history of entire repository or files | |
319 | merge merge working directory with another revision |
|
317 | merge merge working directory with another revision | |
320 | parents show the parents of the working directory or revision |
|
|||
321 | pull pull changes from the specified source |
|
318 | pull pull changes from the specified source | |
322 | push push changes to the specified destination |
|
319 | push push changes to the specified destination | |
323 | remove remove the specified files on the next commit |
|
320 | remove remove the specified files on the next commit | |
@@ -342,7 +339,6 b' basic commands:' | |||||
342 | init create a new repository in the given directory |
|
339 | init create a new repository in the given directory | |
343 | log show revision history of entire repository or files |
|
340 | log show revision history of entire repository or files | |
344 | merge merge working directory with another revision |
|
341 | merge merge working directory with another revision | |
345 | parents show the parents of the working directory or revision |
|
|||
346 | pull pull changes from the specified source |
|
342 | pull pull changes from the specified source | |
347 | push push changes to the specified destination |
|
343 | push push changes to the specified destination | |
348 | remove remove the specified files on the next commit |
|
344 | remove remove the specified files on the next commit |
@@ -1,5 +1,5 b'' | |||||
1 | hg: config error at .../t/.hg/hgrc:1: 'invalid' |
|
1 | hg: config error at .../t/.hg/hgrc:1: 'invalid' | |
2 |
updating |
|
2 | updating to branch default | |
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | [paths] |
|
4 | [paths] | |
5 | default = .../foo%bar |
|
5 | default = .../foo%bar |
@@ -3,7 +3,7 b' pretxncommit hook: HG_NODE=29b62aeb769fd' | |||||
3 | 0:29b62aeb769f |
|
3 | 0:29b62aeb769f | |
4 | commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 |
|
4 | commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 | |
5 | commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 |
|
5 | commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 | |
6 |
updating |
|
6 | updating to branch default | |
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 | precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
8 | precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b | |
9 | pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a |
|
9 | pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a | |
@@ -109,7 +109,7 b' searching for changes' | |||||
109 | abort: preoutgoing.forbid hook exited with status 1 |
|
109 | abort: preoutgoing.forbid hook exited with status 1 | |
110 | preoutgoing hook: HG_SOURCE=clone |
|
110 | preoutgoing hook: HG_SOURCE=clone | |
111 | outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone |
|
111 | outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone | |
112 |
updating |
|
112 | updating to branch default | |
113 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
114 | preoutgoing hook: HG_SOURCE=clone |
|
114 | preoutgoing hook: HG_SOURCE=clone | |
115 | preoutgoing.forbid hook: HG_SOURCE=clone |
|
115 | preoutgoing.forbid hook: HG_SOURCE=clone |
@@ -33,7 +33,7 b' adding changesets' | |||||
33 | adding manifests |
|
33 | adding manifests | |
34 | adding file changes |
|
34 | adding file changes | |
35 | added 1 changesets with 1 changes to 1 files |
|
35 | added 1 changesets with 1 changes to 1 files | |
36 |
updating |
|
36 | updating to branch default | |
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
38 | checking changesets |
|
38 | checking changesets | |
39 | checking manifests |
|
39 | checking manifests | |
@@ -45,7 +45,7 b' adding changesets' | |||||
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 2 changesets with 2 changes to 1 files |
|
47 | added 2 changesets with 2 changes to 1 files | |
48 |
updating |
|
48 | updating to branch default | |
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 | checking changesets |
|
50 | checking changesets | |
51 | checking manifests |
|
51 | checking manifests | |
@@ -57,7 +57,7 b' adding changesets' | |||||
57 | adding manifests |
|
57 | adding manifests | |
58 | adding file changes |
|
58 | adding file changes | |
59 | added 3 changesets with 3 changes to 1 files |
|
59 | added 3 changesets with 3 changes to 1 files | |
60 |
updating |
|
60 | updating to branch default | |
61 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
62 | checking changesets |
|
62 | checking changesets | |
63 | checking manifests |
|
63 | checking manifests | |
@@ -69,7 +69,7 b' adding changesets' | |||||
69 | adding manifests |
|
69 | adding manifests | |
70 | adding file changes |
|
70 | adding file changes | |
71 | added 4 changesets with 4 changes to 1 files |
|
71 | added 4 changesets with 4 changes to 1 files | |
72 |
updating |
|
72 | updating to branch default | |
73 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
73 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
74 | checking changesets |
|
74 | checking changesets | |
75 | checking manifests |
|
75 | checking manifests | |
@@ -81,7 +81,7 b' adding changesets' | |||||
81 | adding manifests |
|
81 | adding manifests | |
82 | adding file changes |
|
82 | adding file changes | |
83 | added 2 changesets with 2 changes to 1 files |
|
83 | added 2 changesets with 2 changes to 1 files | |
84 |
updating |
|
84 | updating to branch default | |
85 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
85 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
86 | checking changesets |
|
86 | checking changesets | |
87 | checking manifests |
|
87 | checking manifests | |
@@ -93,7 +93,7 b' adding changesets' | |||||
93 | adding manifests |
|
93 | adding manifests | |
94 | adding file changes |
|
94 | adding file changes | |
95 | added 3 changesets with 3 changes to 1 files |
|
95 | added 3 changesets with 3 changes to 1 files | |
96 |
updating |
|
96 | updating to branch default | |
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 | checking changesets |
|
98 | checking changesets | |
99 | checking manifests |
|
99 | checking manifests | |
@@ -105,7 +105,7 b' adding changesets' | |||||
105 | adding manifests |
|
105 | adding manifests | |
106 | adding file changes |
|
106 | adding file changes | |
107 | added 4 changesets with 5 changes to 2 files |
|
107 | added 4 changesets with 5 changes to 2 files | |
108 |
updating |
|
108 | updating to branch default | |
109 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 | checking changesets |
|
110 | checking changesets | |
111 | checking manifests |
|
111 | checking manifests | |
@@ -117,7 +117,7 b' adding changesets' | |||||
117 | adding manifests |
|
117 | adding manifests | |
118 | adding file changes |
|
118 | adding file changes | |
119 | added 5 changesets with 6 changes to 3 files |
|
119 | added 5 changesets with 6 changes to 3 files | |
120 |
updating |
|
120 | updating to branch default | |
121 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
121 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 | checking changesets |
|
122 | checking changesets | |
123 | checking manifests |
|
123 | checking manifests | |
@@ -129,7 +129,7 b' adding changesets' | |||||
129 | adding manifests |
|
129 | adding manifests | |
130 | adding file changes |
|
130 | adding file changes | |
131 | added 5 changesets with 5 changes to 2 files |
|
131 | added 5 changesets with 5 changes to 2 files | |
132 |
updating |
|
132 | updating to branch default | |
133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
134 | checking changesets |
|
134 | checking changesets | |
135 | checking manifests |
|
135 | checking manifests |
@@ -3,7 +3,7 b' adding a' | |||||
3 | streaming all changes |
|
3 | streaming all changes | |
4 | XXX files to transfer, XXX bytes of data |
|
4 | XXX files to transfer, XXX bytes of data | |
5 | transferred XXX bytes in XXX seconds (XXX XB/sec) |
|
5 | transferred XXX bytes in XXX seconds (XXX XB/sec) | |
6 |
updating |
|
6 | updating to branch default | |
7 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
|
7 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved | |
8 | checking changesets |
|
8 | checking changesets | |
9 | checking manifests |
|
9 | checking manifests | |
@@ -16,7 +16,7 b' adding changesets' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 1 changesets with 1 changes to 1 files |
|
18 | added 1 changesets with 1 changes to 1 files | |
19 |
updating |
|
19 | updating to branch default | |
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 | checking changesets |
|
21 | checking changesets | |
22 | checking manifests |
|
22 | checking manifests | |
@@ -29,7 +29,7 b' adding changesets' | |||||
29 | adding manifests |
|
29 | adding manifests | |
30 | adding file changes |
|
30 | adding file changes | |
31 | added 1 changesets with 1 changes to 1 files |
|
31 | added 1 changesets with 1 changes to 1 files | |
32 |
updating |
|
32 | updating to branch default | |
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
34 | %% proxy url with user name and password |
|
34 | %% proxy url with user name and password | |
35 | requesting all changes |
|
35 | requesting all changes | |
@@ -37,7 +37,7 b' adding changesets' | |||||
37 | adding manifests |
|
37 | adding manifests | |
38 | adding file changes |
|
38 | adding file changes | |
39 | added 1 changesets with 1 changes to 1 files |
|
39 | added 1 changesets with 1 changes to 1 files | |
40 |
updating |
|
40 | updating to branch default | |
41 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
42 | %% url with user name and password |
|
42 | %% url with user name and password | |
43 | requesting all changes |
|
43 | requesting all changes | |
@@ -45,7 +45,7 b' adding changesets' | |||||
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 1 changesets with 1 changes to 1 files |
|
47 | added 1 changesets with 1 changes to 1 files | |
48 |
updating |
|
48 | updating to branch default | |
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 | %% bad host:port for proxy |
|
50 | %% bad host:port for proxy | |
51 | abort: error: Connection refused |
|
51 | abort: error: Connection refused | |
@@ -55,7 +55,7 b' adding changesets' | |||||
55 | adding manifests |
|
55 | adding manifests | |
56 | adding file changes |
|
56 | adding file changes | |
57 | added 1 changesets with 1 changes to 1 files |
|
57 | added 1 changesets with 1 changes to 1 files | |
58 |
updating |
|
58 | updating to branch default | |
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
60 | XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - |
|
60 | XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - | |
61 | XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - |
|
61 | XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - |
@@ -7,7 +7,7 b" abort: cannot start server at ':20060':" | |||||
7 | streaming all changes |
|
7 | streaming all changes | |
8 | XXX files to transfer, XXX bytes of data |
|
8 | XXX files to transfer, XXX bytes of data | |
9 | transferred XXX bytes in XXX seconds (XXX XB/sec) |
|
9 | transferred XXX bytes in XXX seconds (XXX XB/sec) | |
10 |
updating |
|
10 | updating to branch default | |
11 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
|
11 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved | |
12 | checking changesets |
|
12 | checking changesets | |
13 | checking manifests |
|
13 | checking manifests | |
@@ -20,7 +20,7 b' adding changesets' | |||||
20 | adding manifests |
|
20 | adding manifests | |
21 | adding file changes |
|
21 | adding file changes | |
22 | added 1 changesets with 4 changes to 4 files |
|
22 | added 1 changesets with 4 changes to 4 files | |
23 |
updating |
|
23 | updating to branch default | |
24 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 | % clone via pull |
|
25 | % clone via pull | |
26 | requesting all changes |
|
26 | requesting all changes | |
@@ -28,7 +28,7 b' adding changesets' | |||||
28 | adding manifests |
|
28 | adding manifests | |
29 | adding file changes |
|
29 | adding file changes | |
30 | added 1 changesets with 4 changes to 4 files |
|
30 | added 1 changesets with 4 changes to 4 files | |
31 |
updating |
|
31 | updating to branch default | |
32 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
33 | checking changesets |
|
33 | checking changesets | |
34 | checking manifests |
|
34 | checking manifests |
@@ -6,7 +6,7 b' adding changesets' | |||||
6 | adding manifests |
|
6 | adding manifests | |
7 | adding file changes |
|
7 | adding file changes | |
8 | added 1 changesets with 2 changes to 2 files |
|
8 | added 1 changesets with 2 changes to 2 files | |
9 |
updating |
|
9 | updating to branch default | |
10 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | applying ../tip.patch |
|
11 | applying ../tip.patch | |
12 | % message should be same |
|
12 | % message should be same | |
@@ -19,7 +19,7 b' adding changesets' | |||||
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 1 changesets with 2 changes to 2 files |
|
21 | added 1 changesets with 2 changes to 2 files | |
22 |
updating |
|
22 | updating to branch default | |
23 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 | applying ../tip.patch |
|
24 | applying ../tip.patch | |
25 | line2 |
|
25 | line2 | |
@@ -29,7 +29,7 b' adding changesets' | |||||
29 | adding manifests |
|
29 | adding manifests | |
30 | adding file changes |
|
30 | adding file changes | |
31 | added 1 changesets with 2 changes to 2 files |
|
31 | added 1 changesets with 2 changes to 2 files | |
32 |
updating |
|
32 | updating to branch default | |
33 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
33 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
34 | applying ../tip.patch |
|
34 | applying ../tip.patch | |
35 | abort: empty commit message |
|
35 | abort: empty commit message | |
@@ -39,7 +39,7 b' adding changesets' | |||||
39 | adding manifests |
|
39 | adding manifests | |
40 | adding file changes |
|
40 | adding file changes | |
41 | added 1 changesets with 2 changes to 2 files |
|
41 | added 1 changesets with 2 changes to 2 files | |
42 |
updating |
|
42 | updating to branch default | |
43 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
43 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
44 | applying ../tip.patch |
|
44 | applying ../tip.patch | |
45 | % import of plain diff with specific date and user |
|
45 | % import of plain diff with specific date and user | |
@@ -48,7 +48,7 b' adding changesets' | |||||
48 | adding manifests |
|
48 | adding manifests | |
49 | adding file changes |
|
49 | adding file changes | |
50 | added 1 changesets with 2 changes to 2 files |
|
50 | added 1 changesets with 2 changes to 2 files | |
51 |
updating |
|
51 | updating to branch default | |
52 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
53 | applying ../tip.patch |
|
53 | applying ../tip.patch | |
54 | changeset: 1:ca68f19f3a40 |
|
54 | changeset: 1:ca68f19f3a40 | |
@@ -73,7 +73,7 b' adding changesets' | |||||
73 | adding manifests |
|
73 | adding manifests | |
74 | adding file changes |
|
74 | adding file changes | |
75 | added 1 changesets with 2 changes to 2 files |
|
75 | added 1 changesets with 2 changes to 2 files | |
76 |
updating |
|
76 | updating to branch default | |
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
78 | applying ../tip.patch |
|
78 | applying ../tip.patch | |
79 | diff -r 80971e65b431 a |
|
79 | diff -r 80971e65b431 a | |
@@ -88,7 +88,7 b' adding changesets' | |||||
88 | adding manifests |
|
88 | adding manifests | |
89 | adding file changes |
|
89 | adding file changes | |
90 | added 1 changesets with 2 changes to 2 files |
|
90 | added 1 changesets with 2 changes to 2 files | |
91 |
updating |
|
91 | updating to branch default | |
92 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
92 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
93 | applying tip.patch |
|
93 | applying tip.patch | |
94 | % import from stdin |
|
94 | % import from stdin | |
@@ -97,7 +97,7 b' adding changesets' | |||||
97 | adding manifests |
|
97 | adding manifests | |
98 | adding file changes |
|
98 | adding file changes | |
99 | added 1 changesets with 2 changes to 2 files |
|
99 | added 1 changesets with 2 changes to 2 files | |
100 |
updating |
|
100 | updating to branch default | |
101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
102 | applying patch from stdin |
|
102 | applying patch from stdin | |
103 | % override commit message |
|
103 | % override commit message | |
@@ -106,7 +106,7 b' adding changesets' | |||||
106 | adding manifests |
|
106 | adding manifests | |
107 | adding file changes |
|
107 | adding file changes | |
108 | added 1 changesets with 2 changes to 2 files |
|
108 | added 1 changesets with 2 changes to 2 files | |
109 |
updating |
|
109 | updating to branch default | |
110 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
110 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
111 | applying patch from stdin |
|
111 | applying patch from stdin | |
112 | summary: override |
|
112 | summary: override | |
@@ -116,7 +116,7 b' adding changesets' | |||||
116 | adding manifests |
|
116 | adding manifests | |
117 | adding file changes |
|
117 | adding file changes | |
118 | added 1 changesets with 2 changes to 2 files |
|
118 | added 1 changesets with 2 changes to 2 files | |
119 |
updating |
|
119 | updating to branch default | |
120 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
120 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
121 | applying ../msg.patch |
|
121 | applying ../msg.patch | |
122 | user: email patcher |
|
122 | user: email patcher | |
@@ -127,7 +127,7 b' adding changesets' | |||||
127 | adding manifests |
|
127 | adding manifests | |
128 | adding file changes |
|
128 | adding file changes | |
129 | added 1 changesets with 2 changes to 2 files |
|
129 | added 1 changesets with 2 changes to 2 files | |
130 |
updating |
|
130 | updating to branch default | |
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
132 | applying patch from stdin |
|
132 | applying patch from stdin | |
133 | % plain diff in email, subject, no message body |
|
133 | % plain diff in email, subject, no message body | |
@@ -136,7 +136,7 b' adding changesets' | |||||
136 | adding manifests |
|
136 | adding manifests | |
137 | adding file changes |
|
137 | adding file changes | |
138 | added 1 changesets with 2 changes to 2 files |
|
138 | added 1 changesets with 2 changes to 2 files | |
139 |
updating |
|
139 | updating to branch default | |
140 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
140 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
141 | applying patch from stdin |
|
141 | applying patch from stdin | |
142 | % plain diff in email, no subject, no message body, should fail |
|
142 | % plain diff in email, no subject, no message body, should fail | |
@@ -145,7 +145,7 b' adding changesets' | |||||
145 | adding manifests |
|
145 | adding manifests | |
146 | adding file changes |
|
146 | adding file changes | |
147 | added 1 changesets with 2 changes to 2 files |
|
147 | added 1 changesets with 2 changes to 2 files | |
148 |
updating |
|
148 | updating to branch default | |
149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
150 | applying patch from stdin |
|
150 | applying patch from stdin | |
151 | abort: empty commit message |
|
151 | abort: empty commit message | |
@@ -155,7 +155,7 b' adding changesets' | |||||
155 | adding manifests |
|
155 | adding manifests | |
156 | adding file changes |
|
156 | adding file changes | |
157 | added 1 changesets with 2 changes to 2 files |
|
157 | added 1 changesets with 2 changes to 2 files | |
158 |
updating |
|
158 | updating to branch default | |
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
160 | applying patch from stdin |
|
160 | applying patch from stdin | |
161 | summary: second change |
|
161 | summary: second change | |
@@ -165,7 +165,7 b' adding changesets' | |||||
165 | adding manifests |
|
165 | adding manifests | |
166 | adding file changes |
|
166 | adding file changes | |
167 | added 1 changesets with 2 changes to 2 files |
|
167 | added 1 changesets with 2 changes to 2 files | |
168 |
updating |
|
168 | updating to branch default | |
169 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
170 | applying patch from stdin |
|
170 | applying patch from stdin | |
171 | email patch |
|
171 | email patch | |
@@ -184,7 +184,7 b' adding changesets' | |||||
184 | adding manifests |
|
184 | adding manifests | |
185 | adding file changes |
|
185 | adding file changes | |
186 | added 1 changesets with 2 changes to 2 files |
|
186 | added 1 changesets with 2 changes to 2 files | |
187 |
updating |
|
187 | updating to branch default | |
188 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
188 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
189 | applying ../../../tip.patch |
|
189 | applying ../../../tip.patch | |
190 | % message should be 'subdir change' |
|
190 | % message should be 'subdir change' |
@@ -305,7 +305,7 b' user: test' | |||||
305 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
305 | date: Mon Jan 12 13:46:40 1970 +0000 | |
306 | summary: 8 |
|
306 | summary: 8 | |
307 |
|
307 | |||
308 |
updating |
|
308 | updating to branch default | |
309 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
309 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
310 | checking changesets |
|
310 | checking changesets | |
311 | checking manifests |
|
311 | checking manifests |
@@ -26,7 +26,7 b' adding changesets' | |||||
26 | adding manifests |
|
26 | adding manifests | |
27 | adding file changes |
|
27 | adding file changes | |
28 | added 3 changesets with 2 changes to 2 files |
|
28 | added 3 changesets with 2 changes to 2 files | |
29 | updating working directory |
|
29 | updating to branch br | |
30 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
30 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
31 | changeset: 2:1630aed6ed2b |
|
31 | changeset: 2:1630aed6ed2b | |
32 | branch: br |
|
32 | branch: br | |
@@ -41,7 +41,7 b' adding changesets' | |||||
41 | adding manifests |
|
41 | adding manifests | |
42 | adding file changes |
|
42 | adding file changes | |
43 | added 3 changesets with 2 changes to 2 files |
|
43 | added 3 changesets with 2 changes to 2 files | |
44 |
updating |
|
44 | updating to branch default | |
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
46 | changeset: 0:cb9a9f314b8b |
|
46 | changeset: 0:cb9a9f314b8b | |
47 | user: test |
|
47 | user: test | |
@@ -54,7 +54,7 b' adding changesets' | |||||
54 | adding manifests |
|
54 | adding manifests | |
55 | adding file changes |
|
55 | adding file changes | |
56 | added 3 changesets with 2 changes to 2 files |
|
56 | added 3 changesets with 2 changes to 2 files | |
57 | updating working directory |
|
57 | updating to branch br | |
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
59 | changeset: 1:234f53e6c5ff |
|
59 | changeset: 1:234f53e6c5ff | |
60 | branch: br |
|
60 | branch: br |
@@ -280,7 +280,7 b' adding changesets' | |||||
280 | adding manifests |
|
280 | adding manifests | |
281 | adding file changes |
|
281 | adding file changes | |
282 | added 2 changesets with 3 changes to 3 files |
|
282 | added 2 changesets with 3 changes to 3 files | |
283 |
updating |
|
283 | updating to branch default | |
284 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
284 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
285 | % incoming |
|
285 | % incoming | |
286 | comparing with test-keyword/Test |
|
286 | comparing with test-keyword/Test |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | adding b |
|
4 | adding b | |
5 | pushing to ../a |
|
5 | pushing to ../a |
@@ -2,7 +2,7 b'' | |||||
2 | % create alpha in first repo |
|
2 | % create alpha in first repo | |
3 | adding alpha |
|
3 | adding alpha | |
4 | % clone foo-base to foo-work |
|
4 | % clone foo-base to foo-work | |
5 |
updating |
|
5 | updating to branch default | |
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | % create beta in second repo |
|
7 | % create beta in second repo | |
8 | adding beta |
|
8 | adding beta |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | pulling from ../a |
|
3 | pulling from ../a | |
4 | searching for changes |
|
4 | searching for changes |
@@ -1,8 +1,8 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 |
updating |
|
3 | updating to branch default | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 |
updating |
|
5 | updating to branch default | |
6 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | pulling from ../B1 |
|
7 | pulling from ../B1 | |
8 | searching for changes |
|
8 | searching for changes |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | pulling from ../test-a |
|
3 | pulling from ../test-a | |
4 | searching for changes |
|
4 | searching for changes |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | pulling from ../a |
|
3 | pulling from ../a | |
4 | searching for changes |
|
4 | searching for changes |
@@ -18,7 +18,7 b' patch queue now empty' | |||||
18 | ====== Bundle queue |
|
18 | ====== Bundle queue | |
19 | 1 changesets found |
|
19 | 1 changesets found | |
20 | ====== Clone base |
|
20 | ====== Clone base | |
21 |
updating |
|
21 | updating to branch default | |
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | ====== Incoming queue bundle |
|
23 | ====== Incoming queue bundle | |
24 | >> hg -R .hg/patches incoming ../queue.hgq |
|
24 | >> hg -R .hg/patches incoming ../queue.hgq | |
@@ -41,7 +41,7 b' 0: queue: two.patch added.' | |||||
41 | >> hg qseries |
|
41 | >> hg qseries | |
42 | two.patch |
|
42 | two.patch | |
43 | ====== Clone base again |
|
43 | ====== Clone base again | |
44 |
updating |
|
44 | updating to branch default | |
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
46 | ====== Unbundle queue bundle |
|
46 | ====== Unbundle queue bundle | |
47 | >> hg -R .hg/patches unbundle --update ../queue.hgq |
|
47 | >> hg -R .hg/patches unbundle --update ../queue.hgq |
@@ -20,7 +20,7 b' adding changesets' | |||||
20 | adding manifests |
|
20 | adding manifests | |
21 | adding file changes |
|
21 | adding file changes | |
22 | added 1 changesets with 3 changes to 3 files |
|
22 | added 1 changesets with 3 changes to 3 files | |
23 |
updating |
|
23 | updating to branch default | |
24 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
26 | a |
|
26 | a | |
@@ -45,7 +45,7 b' adding changesets' | |||||
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 1 changesets with 3 changes to 3 files |
|
47 | added 1 changesets with 3 changes to 3 files | |
48 |
updating |
|
48 | updating to branch default | |
49 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
51 | a |
|
51 | a | |
@@ -70,7 +70,7 b' adding changesets' | |||||
70 | adding manifests |
|
70 | adding manifests | |
71 | adding file changes |
|
71 | adding file changes | |
72 | added 1 changesets with 3 changes to 3 files |
|
72 | added 1 changesets with 3 changes to 3 files | |
73 |
updating |
|
73 | updating to branch default | |
74 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 | a |
|
76 | a |
@@ -56,7 +56,7 b' enabled extensions:' | |||||
56 |
|
56 | |||
57 | use "hg -v help mq" to show aliases and global options |
|
57 | use "hg -v help mq" to show aliases and global options | |
58 | adding a |
|
58 | adding a | |
59 |
updating |
|
59 | updating to branch default | |
60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
61 | adding b/z |
|
61 | adding b/z | |
62 | % qinit |
|
62 | % qinit | |
@@ -520,7 +520,7 b' main repo:' | |||||
520 | rev 0: add foo |
|
520 | rev 0: add foo | |
521 | patch repo: |
|
521 | patch repo: | |
522 | rev 0: checkpoint |
|
522 | rev 0: checkpoint | |
523 |
updating |
|
523 | updating to branch default | |
524 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
524 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
525 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
525 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
526 | main repo: |
|
526 | main repo: | |
@@ -533,7 +533,7 b' main repo:' | |||||
533 | rev 0: add foo |
|
533 | rev 0: add foo | |
534 | patch repo: |
|
534 | patch repo: | |
535 | rev 0: checkpoint |
|
535 | rev 0: checkpoint | |
536 |
updating |
|
536 | updating to branch default | |
537 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
537 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
538 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
538 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
539 | main repo: |
|
539 | main repo: |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | created new head |
|
3 | created new head | |
4 | ** rename in working dir ** |
|
4 | ** rename in working dir ** | |
@@ -120,7 +120,7 b' new file mode 100644' | |||||
120 | +y1 |
|
120 | +y1 | |
121 |
|
121 | |||
122 |
|
122 | |||
123 |
updating |
|
123 | updating to branch default | |
124 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
124 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
125 | created new head |
|
125 | created new head | |
126 | ** copy in working dir ** |
|
126 | ** copy in working dir ** | |
@@ -259,7 +259,7 b' new file mode 100644' | |||||
259 | +y1 |
|
259 | +y1 | |
260 |
|
260 | |||
261 |
|
261 | |||
262 |
updating |
|
262 | updating to branch default | |
263 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
263 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
264 | created new head |
|
264 | created new head | |
265 | ** single rename ** |
|
265 | ** single rename ** | |
@@ -396,7 +396,7 b' new file mode 100644' | |||||
396 | +y1 |
|
396 | +y1 | |
397 |
|
397 | |||
398 |
|
398 | |||
399 |
updating |
|
399 | updating to branch default | |
400 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
400 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
401 | created new head |
|
401 | created new head | |
402 | ** single copy ** |
|
402 | ** single copy ** | |
@@ -568,7 +568,7 b' new file mode 100644' | |||||
568 | +y1 |
|
568 | +y1 | |
569 |
|
569 | |||
570 |
|
570 | |||
571 |
updating |
|
571 | updating to branch default | |
572 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
572 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
573 | created new head |
|
573 | created new head | |
574 | ** rename chain ** |
|
574 | ** rename chain ** | |
@@ -694,7 +694,7 b' new file mode 100644' | |||||
694 | +y1 |
|
694 | +y1 | |
695 |
|
695 | |||
696 |
|
696 | |||
697 |
updating |
|
697 | updating to branch default | |
698 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
698 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
699 | created new head |
|
699 | created new head | |
700 | ** copy chain ** |
|
700 | ** copy chain ** | |
@@ -937,7 +937,7 b' new file mode 100644' | |||||
937 | +y1 |
|
937 | +y1 | |
938 |
|
938 | |||
939 |
|
939 | |||
940 |
updating |
|
940 | updating to branch default | |
941 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
941 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
942 | created new head |
|
942 | created new head | |
943 | ** circular rename ** |
|
943 | ** circular rename ** | |
@@ -1061,7 +1061,7 b' new file mode 100644' | |||||
1061 | +y1 |
|
1061 | +y1 | |
1062 |
|
1062 | |||
1063 |
|
1063 | |||
1064 |
updating |
|
1064 | updating to branch default | |
1065 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1065 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1066 | created new head |
|
1066 | created new head | |
1067 | moving x/x to y/x |
|
1067 | moving x/x to y/x |
@@ -1,5 +1,5 b'' | |||||
1 | % clone |
|
1 | % clone | |
2 |
updating |
|
2 | updating to branch default | |
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | % commit |
|
4 | % commit | |
5 | adding a |
|
5 | adding a |
@@ -61,7 +61,7 b' no commands defined' | |||||
61 | % commit |
|
61 | % commit | |
62 | adding a |
|
62 | adding a | |
63 | % clone |
|
63 | % clone | |
64 |
updating |
|
64 | updating to branch default | |
65 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
65 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
66 | % commit |
|
66 | % commit | |
67 | % pull (minimal config) |
|
67 | % pull (minimal config) |
@@ -5,7 +5,7 b' adding changesets' | |||||
5 | adding manifests |
|
5 | adding manifests | |
6 | adding file changes |
|
6 | adding file changes | |
7 | added 1 changesets with 1 changes to 1 files |
|
7 | added 1 changesets with 1 changes to 1 files | |
8 |
updating |
|
8 | updating to branch default | |
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | applying ../a.diff |
|
10 | applying ../a.diff | |
11 | Using custom patch |
|
11 | Using custom patch |
@@ -152,6 +152,9 b" hg email --date '1970-1-1 0:1' -n -f quu" | |||||
152 | hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \ |
|
152 | hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \ | |
153 | -r 0:1 | fixheaders |
|
153 | -r 0:1 | fixheaders | |
154 |
|
154 | |||
|
155 | hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \ | |||
|
156 | -s test -r 0:1 | fixheaders | |||
|
157 | ||||
155 | echo "% test single flag for single patch" |
|
158 | echo "% test single flag for single patch" | |
156 | hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \ |
|
159 | hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \ | |
157 | -r 2 | fixheaders |
|
160 | -r 2 | fixheaders |
@@ -1177,17 +1177,20 b' diff -r eae5fcf795ee -r e317db6a6f28 .hg' | |||||
1177 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two |
|
1177 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two | |
1178 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff |
|
1178 | +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff | |
1179 |
|
1179 | |||
|
1180 | abort: Subject:[PATCH 0 of 2] Please enter a valid value | |||
|
1181 | This patch series consists of 2 patches. | |||
|
1182 | ||||
1180 | This patch series consists of 2 patches. |
|
1183 | This patch series consists of 2 patches. | |
1181 |
|
1184 | |||
1182 |
|
1185 | |||
1183 | Write the introductory message for the patch series. |
|
1186 | Write the introductory message for the patch series. | |
1184 |
|
1187 | |||
1185 |
|
1188 | |||
1186 |
Displaying [PATCH 0 of 2] |
|
1189 | Displaying [PATCH 0 of 2] test ... | |
1187 | Content-Type: text/plain; charset="us-ascii" |
|
1190 | Content-Type: text/plain; charset="us-ascii" | |
1188 | MIME-Version: 1.0 |
|
1191 | MIME-Version: 1.0 | |
1189 | Content-Transfer-Encoding: 7bit |
|
1192 | Content-Transfer-Encoding: 7bit | |
1190 |
Subject: [PATCH 0 of 2] |
|
1193 | Subject: [PATCH 0 of 2] test | |
1191 | Message-Id: <patchbomb.60@ |
|
1194 | Message-Id: <patchbomb.60@ | |
1192 | In-Reply-To: <baz> |
|
1195 | In-Reply-To: <baz> | |
1193 | References: <baz> |
|
1196 | References: <baz> |
@@ -1,2 +1,2 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | % expect error, cloning not allowed |
|
4 | % expect error, cloning not allowed | |
5 | abort: authorization failed |
|
5 | abort: authorization failed |
@@ -3,7 +3,7 b' adding changesets' | |||||
3 | adding manifests |
|
3 | adding manifests | |
4 | adding file changes |
|
4 | adding file changes | |
5 | added 1 changesets with 1 changes to 1 files |
|
5 | added 1 changesets with 1 changes to 1 files | |
6 |
updating |
|
6 | updating to branch default | |
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 | checking changesets |
|
8 | checking changesets | |
9 | checking manifests |
|
9 | checking manifests |
@@ -3,7 +3,7 b' adding changesets' | |||||
3 | adding manifests |
|
3 | adding manifests | |
4 | adding file changes |
|
4 | adding file changes | |
5 | added 1 changesets with 1 changes to 1 files |
|
5 | added 1 changesets with 1 changes to 1 files | |
6 |
updating |
|
6 | updating to branch default | |
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 | pulling from ../source2 |
|
8 | pulling from ../source2 | |
9 | pulling from ../source1 |
|
9 | pulling from ../source1 |
@@ -1,5 +1,5 b'' | |||||
1 | adding foo |
|
1 | adding foo | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | % should fail |
|
4 | % should fail | |
5 | pulling from ../tt |
|
5 | pulling from ../tt |
@@ -9,7 +9,7 b' adding changesets' | |||||
9 | adding manifests |
|
9 | adding manifests | |
10 | adding file changes |
|
10 | adding file changes | |
11 | added 1 changesets with 1 changes to 1 files |
|
11 | added 1 changesets with 1 changes to 1 files | |
12 |
updating |
|
12 | updating to branch default | |
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | checking changesets |
|
14 | checking changesets | |
15 | checking manifests |
|
15 | checking manifests |
@@ -1,7 +1,7 b'' | |||||
1 | adding foo |
|
1 | adding foo | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 |
updating |
|
4 | updating to branch default | |
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 | pushing to ../2 |
|
6 | pushing to ../2 | |
7 | searching for changes |
|
7 | searching for changes |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | % expect ssl error |
|
4 | % expect ssl error | |
5 | pushing to http://localhost/ |
|
5 | pushing to http://localhost/ |
@@ -125,19 +125,19 b' hg push -r 10 -r 11 ../f; echo $?' | |||||
125 |
|
125 | |||
126 | echo % checking prepush logic does not allow silently pushing multiple new heads |
|
126 | echo % checking prepush logic does not allow silently pushing multiple new heads | |
127 | cd .. |
|
127 | cd .. | |
128 |
hg init |
|
128 | hg init h | |
129 |
echo init > |
|
129 | echo init > h/init | |
130 |
hg -R |
|
130 | hg -R h ci -Am init | |
131 |
echo a > |
|
131 | echo a > h/a | |
132 |
hg -R |
|
132 | hg -R h ci -Am a | |
133 |
hg clone |
|
133 | hg clone h i | |
134 | hg -R g up 0 |
|
|||
135 | echo b > g/b |
|
|||
136 | hg -R g ci -Am b |
|
|||
137 | hg -R h up 0 |
|
134 | hg -R h up 0 | |
138 |
echo |
|
135 | echo b > h/b | |
139 |
hg -R h ci -Am |
|
136 | hg -R h ci -Am b | |
140 |
hg -R |
|
137 | hg -R i up 0 | |
|
138 | echo c > i/c | |||
|
139 | hg -R i ci -Am c | |||
|
140 | hg -R i push h | |||
141 | echo |
|
141 | echo | |
142 |
|
142 | |||
143 | exit 0 |
|
143 | exit 0 |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | pushing to ../a |
|
3 | pushing to ../a | |
4 | searching for changes |
|
4 | searching for changes | |
@@ -24,7 +24,7 b' adding manifests' | |||||
24 | adding file changes |
|
24 | adding file changes | |
25 | added 2 changesets with 1 changes to 1 files |
|
25 | added 2 changesets with 1 changes to 1 files | |
26 | adding foo |
|
26 | adding foo | |
27 |
updating |
|
27 | updating to branch default | |
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 | created new head |
|
30 | created new head | |
@@ -125,18 +125,17 b' adding file changes' | |||||
125 | added 2 changesets with 2 changes to 1 files |
|
125 | added 2 changesets with 2 changes to 1 files | |
126 | 0 |
|
126 | 0 | |
127 | % checking prepush logic does not allow silently pushing multiple new heads |
|
127 | % checking prepush logic does not allow silently pushing multiple new heads | |
128 | abort: repository g already exists! |
|
|||
129 | adding init |
|
128 | adding init | |
130 | adding a |
|
129 | adding a | |
131 |
updating |
|
130 | updating to branch default | |
132 |
|
|
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
133 |
|
|
132 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
134 | adding b |
|
133 | adding b | |
135 | created new head |
|
134 | created new head | |
136 |
|
|
135 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
137 | adding c |
|
136 | adding c | |
138 | created new head |
|
137 | created new head | |
139 |
pushing to |
|
138 | pushing to h | |
140 | searching for changes |
|
139 | searching for changes | |
141 | abort: push creates new remote heads! |
|
140 | abort: push creates new remote heads! | |
142 | (did you forget to merge? use push -f to force) |
|
141 | (did you forget to merge? use push -f to force) |
@@ -14,7 +14,6 b' basic commands:' | |||||
14 | init create a new repository in the given directory |
|
14 | init create a new repository in the given directory | |
15 | log show revision history of entire repository or files |
|
15 | log show revision history of entire repository or files | |
16 | merge merge working directory with another revision |
|
16 | merge merge working directory with another revision | |
17 | parents show the parents of the working directory or revision |
|
|||
18 | pull pull changes from the specified source |
|
17 | pull pull changes from the specified source | |
19 | push push changes to the specified destination |
|
18 | push push changes to the specified destination | |
20 | remove remove the specified files on the next commit |
|
19 | remove remove the specified files on the next commit |
@@ -1,6 +1,6 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 |
updating |
|
3 | updating to branch default | |
4 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 |
|
5 | |||
6 | % Now b has one revision to be pulled from a |
|
6 | % Now b has one revision to be pulled from a |
@@ -1,7 +1,7 b'' | |||||
1 | % create source repository |
|
1 | % create source repository | |
2 | adding a |
|
2 | adding a | |
3 | % fork source repository |
|
3 | % fork source repository | |
4 |
updating |
|
4 | updating to branch default | |
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 | adding b |
|
6 | adding b | |
7 | % update source repository |
|
7 | % update source repository |
@@ -1,5 +1,5 b'' | |||||
1 | adding a/f |
|
1 | adding a/f | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | moving a/f to b/f |
|
4 | moving a/f to b/f | |
5 | adding a/aa/g |
|
5 | adding a/aa/g |
@@ -1,7 +1,7 b'' | |||||
1 | # -- setting up base repo |
|
1 | # -- setting up base repo | |
2 | adding a |
|
2 | adding a | |
3 | # -- cloning base repo |
|
3 | # -- cloning base repo | |
4 |
updating |
|
4 | updating to branch default | |
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 | # -- setting up cset to push |
|
6 | # -- setting up cset to push | |
7 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
7 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -4,7 +4,7 b' checking manifests' | |||||
4 | crosschecking files in changesets and manifests |
|
4 | crosschecking files in changesets and manifests | |
5 | checking files |
|
5 | checking files | |
6 | 1 files, 1 changesets, 1 total revisions |
|
6 | 1 files, 1 changesets, 1 total revisions | |
7 |
updating |
|
7 | updating to branch default | |
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | pulling from ../branch |
|
10 | pulling from ../branch |
@@ -32,7 +32,7 b' adding changesets' | |||||
32 | adding manifests |
|
32 | adding manifests | |
33 | adding file changes |
|
33 | adding file changes | |
34 | added 1 changesets with 1 changes to 1 files |
|
34 | added 1 changesets with 1 changes to 1 files | |
35 |
updating |
|
35 | updating to branch default | |
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
37 | checking changesets |
|
37 | checking changesets | |
38 | checking manifests |
|
38 | checking manifests | |
@@ -44,7 +44,7 b' adding changesets' | |||||
44 | adding manifests |
|
44 | adding manifests | |
45 | adding file changes |
|
45 | adding file changes | |
46 | added 2 changesets with 2 changes to 1 files |
|
46 | added 2 changesets with 2 changes to 1 files | |
47 |
updating |
|
47 | updating to branch default | |
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
49 | checking changesets |
|
49 | checking changesets | |
50 | checking manifests |
|
50 | checking manifests | |
@@ -56,7 +56,7 b' adding changesets' | |||||
56 | adding manifests |
|
56 | adding manifests | |
57 | adding file changes |
|
57 | adding file changes | |
58 | added 3 changesets with 3 changes to 1 files |
|
58 | added 3 changesets with 3 changes to 1 files | |
59 |
updating |
|
59 | updating to branch default | |
60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
61 | checking changesets |
|
61 | checking changesets | |
62 | checking manifests |
|
62 | checking manifests | |
@@ -68,7 +68,7 b' adding changesets' | |||||
68 | adding manifests |
|
68 | adding manifests | |
69 | adding file changes |
|
69 | adding file changes | |
70 | added 4 changesets with 4 changes to 1 files |
|
70 | added 4 changesets with 4 changes to 1 files | |
71 |
updating |
|
71 | updating to branch default | |
72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
73 | checking changesets |
|
73 | checking changesets | |
74 | checking manifests |
|
74 | checking manifests | |
@@ -80,7 +80,7 b' adding changesets' | |||||
80 | adding manifests |
|
80 | adding manifests | |
81 | adding file changes |
|
81 | adding file changes | |
82 | added 2 changesets with 2 changes to 1 files |
|
82 | added 2 changesets with 2 changes to 1 files | |
83 |
updating |
|
83 | updating to branch default | |
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
85 | checking changesets |
|
85 | checking changesets | |
86 | checking manifests |
|
86 | checking manifests | |
@@ -92,7 +92,7 b' adding changesets' | |||||
92 | adding manifests |
|
92 | adding manifests | |
93 | adding file changes |
|
93 | adding file changes | |
94 | added 3 changesets with 3 changes to 1 files |
|
94 | added 3 changesets with 3 changes to 1 files | |
95 |
updating |
|
95 | updating to branch default | |
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
97 | checking changesets |
|
97 | checking changesets | |
98 | checking manifests |
|
98 | checking manifests | |
@@ -104,7 +104,7 b' adding changesets' | |||||
104 | adding manifests |
|
104 | adding manifests | |
105 | adding file changes |
|
105 | adding file changes | |
106 | added 4 changesets with 5 changes to 2 files |
|
106 | added 4 changesets with 5 changes to 2 files | |
107 |
updating |
|
107 | updating to branch default | |
108 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
108 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
109 | checking changesets |
|
109 | checking changesets | |
110 | checking manifests |
|
110 | checking manifests | |
@@ -116,7 +116,7 b' adding changesets' | |||||
116 | adding manifests |
|
116 | adding manifests | |
117 | adding file changes |
|
117 | adding file changes | |
118 | added 5 changesets with 6 changes to 3 files |
|
118 | added 5 changesets with 6 changes to 3 files | |
119 |
updating |
|
119 | updating to branch default | |
120 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
120 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
121 | checking changesets |
|
121 | checking changesets | |
122 | checking manifests |
|
122 | checking manifests | |
@@ -128,7 +128,7 b' adding changesets' | |||||
128 | adding manifests |
|
128 | adding manifests | |
129 | adding file changes |
|
129 | adding file changes | |
130 | added 5 changesets with 5 changes to 2 files |
|
130 | added 5 changesets with 5 changes to 2 files | |
131 |
updating |
|
131 | updating to branch default | |
132 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
133 | checking changesets |
|
133 | checking changesets | |
134 | checking manifests |
|
134 | checking manifests |
@@ -6,7 +6,7 b' abort: no suitable response from remote ' | |||||
6 | streaming all changes |
|
6 | streaming all changes | |
7 | XXX files to transfer, XXX bytes of data |
|
7 | XXX files to transfer, XXX bytes of data | |
8 | transferred XXX bytes in XXX seconds (XXX XB/sec) |
|
8 | transferred XXX bytes in XXX seconds (XXX XB/sec) | |
9 |
updating |
|
9 | updating to branch default | |
10 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
|
10 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved | |
11 | checking changesets |
|
11 | checking changesets | |
12 | checking manifests |
|
12 | checking manifests | |
@@ -19,7 +19,7 b' adding changesets' | |||||
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 1 changesets with 2 changes to 2 files |
|
21 | added 1 changesets with 2 changes to 2 files | |
22 |
updating |
|
22 | updating to branch default | |
23 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 | # verify |
|
24 | # verify | |
25 | checking changesets |
|
25 | checking changesets |
@@ -12,7 +12,7 b' adding changesets' | |||||
12 | adding manifests |
|
12 | adding manifests | |
13 | adding file changes |
|
13 | adding file changes | |
14 | added 1 changesets with 1 changes to 1 files |
|
14 | added 1 changesets with 1 changes to 1 files | |
15 |
updating |
|
15 | updating to branch default | |
16 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 | checking changesets |
|
17 | checking changesets | |
18 | checking manifests |
|
18 | checking manifests | |
@@ -39,7 +39,7 b' adding changesets' | |||||
39 | adding manifests |
|
39 | adding manifests | |
40 | adding file changes |
|
40 | adding file changes | |
41 | added 1 changesets with 1 changes to 1 files |
|
41 | added 1 changesets with 1 changes to 1 files | |
42 |
updating |
|
42 | updating to branch default | |
43 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
43 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
44 | checking changesets |
|
44 | checking changesets | |
45 | checking manifests |
|
45 | checking manifests | |
@@ -50,7 +50,7 b' a' | |||||
50 | default = static-http://localhost/ |
|
50 | default = static-http://localhost/ | |
51 | % test with empty repo (issue965) |
|
51 | % test with empty repo (issue965) | |
52 | no changes found |
|
52 | no changes found | |
53 |
updating |
|
53 | updating to branch default | |
54 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
54 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
55 | checking changesets |
|
55 | checking changesets | |
56 | checking manifests |
|
56 | checking manifests |
@@ -15,7 +15,6 b' basic commands:' | |||||
15 | init create a new repository in the given directory |
|
15 | init create a new repository in the given directory | |
16 | log show revision history of entire repository or files |
|
16 | log show revision history of entire repository or files | |
17 | merge merge working directory with another revision |
|
17 | merge merge working directory with another revision | |
18 | parents show the parents of the working directory or revision |
|
|||
19 | pull pull changes from the specified source |
|
18 | pull pull changes from the specified source | |
20 | push push changes to the specified destination |
|
19 | push push changes to the specified destination | |
21 | remove remove the specified files on the next commit |
|
20 | remove remove the specified files on the next commit |
@@ -97,7 +97,7 b' conflict' | |||||
97 | t3 |
|
97 | t3 | |
98 | >>>>>>> other |
|
98 | >>>>>>> other | |
99 | % clone |
|
99 | % clone | |
100 |
updating |
|
100 | updating to branch default | |
101 | pulling subrepo s |
|
101 | pulling subrepo s | |
102 | requesting all changes |
|
102 | requesting all changes | |
103 | adding changesets |
|
103 | adding changesets |
@@ -3,5 +3,5 b' adding changesets' | |||||
3 | adding manifests |
|
3 | adding manifests | |
4 | adding file changes |
|
4 | adding file changes | |
5 | added 1 changesets with 4 changes to 4 files |
|
5 | added 1 changesets with 4 changes to 4 files | |
6 |
updating |
|
6 | updating to branch default | |
7 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -19,7 +19,7 b' 1. commit a symlink' | |||||
19 | ? a/b/c/demo |
|
19 | ? a/b/c/demo | |
20 | adding a/b/c/demo |
|
20 | adding a/b/c/demo | |
21 | 2. clone it |
|
21 | 2. clone it | |
22 |
updating |
|
22 | updating to branch default | |
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 | # git symlink diff |
|
24 | # git symlink diff | |
25 | diff --git a/a/b/c/demo b/a/b/c/demo |
|
25 | diff --git a/a/b/c/demo b/a/b/c/demo |
@@ -10,7 +10,7 b' 3 b2' | |||||
10 | 2 0:17ab29e464c6 b1 |
|
10 | 2 0:17ab29e464c6 b1 | |
11 | 1 r2 |
|
11 | 1 r2 | |
12 | 0 r1 |
|
12 | 0 r1 | |
13 |
updating |
|
13 | updating to branch default | |
14 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
15 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
16 | % rebase b onto r1 |
|
16 | % rebase b onto r1 | |
@@ -28,7 +28,7 b' 3 b2' | |||||
28 | 2 0:17ab29e464c6 b1 |
|
28 | 2 0:17ab29e464c6 b1 | |
29 | 1 r2 |
|
29 | 1 r2 | |
30 | 0 r1 |
|
30 | 0 r1 | |
31 |
updating |
|
31 | updating to branch default | |
32 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
33 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
33 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
34 | % rebase b onto r1, skipping b2 |
|
34 | % rebase b onto r1, skipping b2 | |
@@ -49,7 +49,7 b' adding changesets' | |||||
49 | adding manifests |
|
49 | adding manifests | |
50 | adding file changes |
|
50 | adding file changes | |
51 | added 2 changesets with 2 changes to 2 files |
|
51 | added 2 changesets with 2 changes to 2 files | |
52 |
updating |
|
52 | updating to branch default | |
53 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
53 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
54 | searching for changes |
|
54 | searching for changes | |
55 | applying 37a1297eb21b |
|
55 | applying 37a1297eb21b | |
@@ -75,7 +75,7 b' 1 r2' | |||||
75 | 0 r1 |
|
75 | 0 r1 | |
76 | % skip local changes transplanted to the source |
|
76 | % skip local changes transplanted to the source | |
77 | adding b4 |
|
77 | adding b4 | |
78 |
updating |
|
78 | updating to branch default | |
79 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
79 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
80 | searching for changes |
|
80 | searching for changes | |
81 | applying 4333daefcb15 |
|
81 | applying 4333daefcb15 | |
@@ -86,7 +86,7 b' adding changesets' | |||||
86 | adding manifests |
|
86 | adding manifests | |
87 | adding file changes |
|
87 | adding file changes | |
88 | added 1 changesets with 1 changes to 1 files |
|
88 | added 1 changesets with 1 changes to 1 files | |
89 |
updating |
|
89 | updating to branch default | |
90 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
91 | searching for changes |
|
91 | searching for changes | |
92 | searching for changes |
|
92 | searching for changes |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | diff -r 33aaa84a386b a |
|
5 | diff -r 33aaa84a386b a |
@@ -5,7 +5,7 b' adding changesets' | |||||
5 | adding manifests |
|
5 | adding manifests | |
6 | adding file changes |
|
6 | adding file changes | |
7 | added 2 changesets with 2 changes to 1 files |
|
7 | added 2 changesets with 2 changes to 1 files | |
8 | updating working directory |
|
8 | updating to branch foo | |
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | % heads |
|
10 | % heads | |
11 | changeset: 1:cd2a86ecc814 |
|
11 | changeset: 1:cd2a86ecc814 |
@@ -4,7 +4,7 b' pretxnchangegroup.crlf = python:hgext.wi' | |||||
4 |
|
4 | |||
5 | commit should succeed |
|
5 | commit should succeed | |
6 |
|
6 | |||
7 |
updating |
|
7 | updating to branch default | |
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | commit should fail |
|
9 | commit should fail | |
10 | Attempt to commit or push text file(s) using CRLF line endings |
|
10 | Attempt to commit or push text file(s) using CRLF line endings | |
@@ -113,7 +113,7 b' 1' | |||||
113 |
|
113 | |||
114 |
|
114 | |||
115 |
|
115 | |||
116 |
updating |
|
116 | updating to branch default | |
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
118 |
|
118 | |||
119 | adding dupe/a |
|
119 | adding dupe/a |
General Comments 0
You need to be logged in to leave comments.
Login now