hgbook
view po/zh.po @ 643:61ac4138e086
Update Chinese translation
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Tue Mar 17 16:25:30 2009 +0800 (2009-03-17) |
| parents | a4b71115602d |
| children | 3b864df20e3b |
line source
1 #
2 # Simplified Chinese translation for hgbook
3 # This file is distributed under the same license as the hgbook.
4 #
5 # Authors:
6 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
7 #
8 # Update to new pot:
9 # msgmerge --update zh.po hgbook.pot
10 #
11 # Check translation:
12 # msgfmt --statistics -c -o zh.mo zh.po
13 #
14 # Please format your translation before commit:
15 # msgcat --sort-by-file --width=80 -o zh_new.po zh.po
16 # mv -f zh_new.po zh.po
17 #
18 # Dictionary:
19 # blame 追溯
20 # branch 分支
21 # changes 修改
22 # changeset 修改集
23 # checkout 检出
24 # remove 移除(从版本库删除)
25 # delete 删除(只从文件系统删除)
26 # patchset 补丁集
27 # pushing to 推到
28 # pulling from 拉自，抓取
29 # rename 改名
30 # repository 版本库
31 # revert 恢复
32 # revision 版本
33 # tag 标签
34 # tip 顶点
35 # undo 撤销
36 # unversioned 未版本控制
37 # versioned 受版本控制
38 # working copy 工作副本
39 # ...
40 #
41 msgid ""
42 msgstr ""
43 "Project-Id-Version: hgbook 1.2\n"
44 "POT-Creation-Date: 2009-03-17 10:44+0800\n"
45 "PO-Revision-Date: 2009-03-16 18:32+0800\n"
46 "Last-Translator: \n"
47 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
48 "MIME-Version: 1.0\n"
49 "Content-Type: text/plain; charset=UTF-8\n"
50 "Content-Transfer-Encoding: 8bit\n"
51 "X-Poedit-Language: Chinese\n"
52 "X-Poedit-Country: CHINA\n"
53 "X-Poedit-SourceCharset: utf-8\n"
55 #. type: Content of: <book><title>
56 #: ../en/00book.xml:41
57 msgid "Mercurial: The Definitive Guide"
58 msgstr "Mercurial 权威指南"
60 #. type: Content of: <book><subtitle>
61 #: ../en/00book.xml:46
62 msgid "Compiled from $rev_id$"
63 msgstr "编译自 $rev_id$"
65 #. type: Content of: <book><bookinfo><authorgroup><author><firstname>
66 #: ../en/00book.xml:50
67 msgid "Bryan"
68 msgstr "Bryan"
70 #. type: Content of: <book><bookinfo><authorgroup><author><surname>
71 #: ../en/00book.xml:51
72 msgid "O'Sullivan"
73 msgstr "O'Sullivan"
75 #. type: Content of: <book><bookinfo>
76 #: ../en/00book.xml:55
77 msgid ""
78 "<editor> <firstname>Mike</firstname> <surname>Loukides</surname> </editor> "
79 "<copyright> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</"
80 "year> <holder>Bryan O'Sullivan</holder> </copyright>"
81 msgstr ""
82 "<editor> <firstname>Mike</firstname> <surname>Loukides</surname> </editor> "
83 "<copyright> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</"
84 "year> <holder>Bryan O'Sullivan</holder> </copyright>"
86 #. type: Content of: <book><appendix><title>
87 #: ../en/appA-cmdref.xml:4
88 msgid "Command reference"
89 msgstr "命令参考"
91 #. type: Content of: <book><appendix><para>
92 #: ../en/appA-cmdref.xml:6
93 msgid ""
94 "\\cmdref{add}{add files at the next commit} \\optref{add}{I}{include} \\optref"
95 "{add}{X}{exclude} \\optref{add}{n}{dry-run}"
96 msgstr ""
98 #. type: Content of: <book><appendix><para>
99 #: ../en/appA-cmdref.xml:11
100 msgid "\\cmdref{diff}{print changes in history or working directory}"
101 msgstr ""
103 #. type: Content of: <book><appendix><para>
104 #: ../en/appA-cmdref.xml:13
105 msgid ""
106 "Show differences between revisions for the specified files or directories, "
107 "using the unified diff format. For a description of the unified diff format, "
108 "see section <xref linkend=\"sec.mq.patch\"/>."
109 msgstr ""
111 #. type: Content of: <book><appendix><para>
112 #: ../en/appA-cmdref.xml:17
113 msgid ""
114 "By default, this command does not print diffs for files that Mercurial "
115 "considers to contain binary data. To control this behaviour, see the <option "
116 "role=\"hg-opt-diff\">-a</option> and <option role=\"hg-opt-diff\">--git</"
117 "option> options."
118 msgstr ""
120 #. type: Content of: <book><appendix><sect2><title>
121 #: ../en/appA-cmdref.xml:22
122 msgid "Options"
123 msgstr "选项"
125 #. type: Content of: <book><appendix><sect2><para>
126 #: ../en/appA-cmdref.xml:24
127 msgid "\\loptref{diff}{nodates}"
128 msgstr ""
130 #. type: Content of: <book><appendix><sect2><para>
131 #: ../en/appA-cmdref.xml:26
132 msgid "Omit date and time information when printing diff headers."
133 msgstr ""
135 #. type: Content of: <book><appendix><sect2><para>
136 #: ../en/appA-cmdref.xml:28
137 msgid "\\optref{diff}{B}{ignore-blank-lines}"
138 msgstr ""
140 #. type: Content of: <book><appendix><sect2><para>
141 #: ../en/appA-cmdref.xml:30
142 msgid ""
143 "Do not print changes that only insert or delete blank lines. A line that "
144 "contains only whitespace is not considered blank."
145 msgstr ""
147 #. type: Content of: <book><appendix><sect2><para>
148 #: ../en/appA-cmdref.xml:34
149 msgid "\\optref{diff}{I}{include}"
150 msgstr ""
152 #. type: Content of: <book><appendix><sect2><para>
153 #: ../en/appA-cmdref.xml:37
154 msgid "Include files and directories whose names match the given patterns."
155 msgstr ""
157 #. type: Content of: <book><appendix><sect2><para>
158 #: ../en/appA-cmdref.xml:40
159 msgid "\\optref{diff}{X}{exclude}"
160 msgstr ""
162 #. type: Content of: <book><appendix><sect2><para>
163 #: ../en/appA-cmdref.xml:43
164 msgid "Exclude files and directories whose names match the given patterns."
165 msgstr ""
167 #. type: Content of: <book><appendix><sect2><para>
168 #: ../en/appA-cmdref.xml:46
169 msgid "\\optref{diff}{a}{text}"
170 msgstr ""
172 #. type: Content of: <book><appendix><sect2><para>
173 #: ../en/appA-cmdref.xml:49
174 msgid ""
175 "If this option is not specified, <command role=\"hg-cmd\">hg diff</command> "
176 "will refuse to print diffs for files that it detects as binary. Specifying "
177 "<option role=\"hg-opt-diff\">-a</option> forces <command role=\"hg-cmd\">hg "
178 "diff</command> to treat all files as text, and generate diffs for all of them."
179 msgstr ""
181 #. type: Content of: <book><appendix><sect2><para>
182 #: ../en/appA-cmdref.xml:55
183 msgid ""
184 "This option is useful for files that are <quote>mostly text</quote> but have "
185 "a few embedded NUL characters. If you use it on files that contain a lot of "
186 "binary data, its output will be incomprehensible."
187 msgstr ""
189 #. type: Content of: <book><appendix><sect2><para>
190 #: ../en/appA-cmdref.xml:60
191 msgid "\\optref{diff}{b}{ignore-space-change}"
192 msgstr ""
194 #. type: Content of: <book><appendix><sect2><para>
195 #: ../en/appA-cmdref.xml:63
196 msgid ""
197 "Do not print a line if the only change to that line is in the amount of white "
198 "space it contains."
199 msgstr ""
201 #. type: Content of: <book><appendix><sect2><para>
202 #: ../en/appA-cmdref.xml:67
203 msgid "\\optref{diff}{g}{git}"
204 msgstr ""
206 #. type: Content of: <book><appendix><sect2><para>
207 #: ../en/appA-cmdref.xml:70
208 msgid ""
209 "Print <command>git</command>-compatible diffs. XXX reference a format "
210 "description."
211 msgstr ""
213 #. type: Content of: <book><appendix><sect2><para>
214 #: ../en/appA-cmdref.xml:74
215 msgid "\\optref{diff}{p}{show-function}"
216 msgstr ""
218 #. type: Content of: <book><appendix><sect2><para>
219 #: ../en/appA-cmdref.xml:77
220 msgid ""
221 "Display the name of the enclosing function in a hunk header, using a simple "
222 "heuristic. This functionality is enabled by default, so the <option role="
223 "\"hg-opt-diff\">-p</option> option has no effect unless you change the value "
224 "of the <envar role=\"rc-item-diff\">showfunc</envar> config item, as in the "
225 "following example."
226 msgstr ""
228 #. type: Content of: <book><appendix><sect2><para>
229 #: ../en/appA-cmdref.xml:84
230 msgid "\\optref{diff}{r}{rev}"
231 msgstr ""
233 #. type: Content of: <book><appendix><sect2><para>
234 #: ../en/appA-cmdref.xml:87
235 msgid ""
236 "Specify one or more revisions to compare. The <command role=\"hg-cmd\">hg "
237 "diff</command> command accepts up to two <option role=\"hg-opt-diff\">-r</"
238 "option> options to specify the revisions to compare."
239 msgstr ""
241 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
242 #: ../en/appA-cmdref.xml:93
243 msgid ""
244 "Display the differences between the parent revision of the working directory "
245 "and the working directory."
246 msgstr ""
248 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
249 #: ../en/appA-cmdref.xml:97
250 msgid ""
251 "Display the differences between the specified changeset and the working "
252 "directory."
253 msgstr ""
255 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
256 #: ../en/appA-cmdref.xml:101
257 msgid "Display the differences between the two specified changesets."
258 msgstr ""
260 #. type: Content of: <book><appendix><sect2><para>
261 #: ../en/appA-cmdref.xml:105
262 msgid ""
263 "You can specify two revisions using either two <option role=\"hg-opt-diff\">-"
264 "r</option> options or revision range notation. For example, the two revision "
265 "specifications below are equivalent."
266 msgstr ""
268 #. type: Content of: <book><appendix><sect2><para>
269 #: ../en/appA-cmdref.xml:112
270 msgid ""
271 "When you provide two revisions, Mercurial treats the order of those revisions "
272 "as significant. Thus, <command role=\"hg-cmd\">hg diff -r10:20</command> "
273 "will produce a diff that will transform files from their contents as of "
274 "revision 10 to their contents as of revision 20, while <command role=\"hg-cmd"
275 "\">hg diff -r20:10</command> means the opposite: the diff that will transform "
276 "files from their revision 20 contents to their revision 10 contents. You "
277 "cannot reverse the ordering in this way if you are diffing against the "
278 "working directory."
279 msgstr ""
281 #. type: Content of: <book><appendix><sect2><para>
282 #: ../en/appA-cmdref.xml:122
283 msgid "\\optref{diff}{w}{ignore-all-space}"
284 msgstr ""
286 #. type: Content of: <book><appendix><sect2><para>
287 #: ../en/appA-cmdref.xml:125
288 msgid "\\cmdref{version}{print version and copyright information}"
289 msgstr ""
291 #. type: Content of: <book><appendix><sect2><para>
292 #: ../en/appA-cmdref.xml:128
293 msgid ""
294 "This command displays the version of Mercurial you are running, and its "
295 "copyright license. There are four kinds of version string that you may see."
296 msgstr ""
298 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
299 #: ../en/appA-cmdref.xml:133
300 msgid ""
301 "The string <quote><literal>unknown</literal></quote>. This version of "
302 "Mercurial was not built in a Mercurial repository, and cannot determine its "
303 "own version."
304 msgstr ""
306 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
307 #: ../en/appA-cmdref.xml:138
308 msgid ""
309 "A short numeric string, such as <quote><literal>1.1</literal></quote>. This "
310 "is a build of a revision of Mercurial that was identified by a specific tag "
311 "in the repository where it was built. (This doesn't necessarily mean that "
312 "you're running an official release; someone else could have added that tag to "
313 "any revision in the repository where they built Mercurial.)"
314 msgstr ""
316 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
317 #: ../en/appA-cmdref.xml:146
318 msgid ""
319 "A hexadecimal string, such as <quote><literal>875489e31abe</literal></"
320 "quote>. This is a build of the given revision of Mercurial."
321 msgstr ""
323 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
324 #: ../en/appA-cmdref.xml:150
325 msgid ""
326 "A hexadecimal string followed by a date, such as <quote><literal>875489e31abe"
327 "+20070205</literal></quote>. This is a build of the given revision of "
328 "Mercurial, where the build repository contained some local changes that had "
329 "not been committed."
330 msgstr ""
332 #. type: Content of: <book><appendix><sect2><title>
333 #: ../en/appA-cmdref.xml:159
334 msgid "Tips and tricks"
335 msgstr ""
337 #. type: Content of: <book><appendix><sect2><sect3><title>
338 #: ../en/appA-cmdref.xml:162
339 msgid ""
340 "Why do the results of <command role=\"hg-cmd\">hg diff</command> and <command "
341 "role=\"hg-cmd\">hg status</command> differ?"
342 msgstr ""
343 "为什么 <command role=\"hg-cmd\">hg diff</command> 与 <command role=\"hg-cmd"
344 "\">hg status</command> 的结果不同 ?"
346 #. type: Content of: <book><appendix><sect2><sect3><para>
347 #: ../en/appA-cmdref.xml:164
348 msgid ""
349 "When you run the <command role=\"hg-cmd\">hg status</command> command, you'll "
350 "see a list of files that Mercurial will record changes for the next time you "
351 "perform a commit. If you run the <command role=\"hg-cmd\">hg diff</command> "
352 "command, you may notice that it prints diffs for only a <emphasis>subset</"
353 "emphasis> of the files that <command role=\"hg-cmd\">hg status</command> "
354 "listed. There are two possible reasons for this."
355 msgstr ""
357 #. type: Content of: <book><appendix><sect2><sect3><para>
358 #: ../en/appA-cmdref.xml:171
359 msgid ""
360 "The first is that <command role=\"hg-cmd\">hg status</command> prints some "
361 "kinds of modifications that <command role=\"hg-cmd\">hg diff</command> "
362 "doesn't normally display. The <command role=\"hg-cmd\">hg diff</command> "
363 "command normally outputs unified diffs, which don't have the ability to "
364 "represent some changes that Mercurial can track. Most notably, traditional "
365 "diffs can't represent a change in whether or not a file is executable, but "
366 "Mercurial records this information."
367 msgstr ""
369 #. type: Content of: <book><appendix><sect2><sect3><para>
370 #: ../en/appA-cmdref.xml:179
371 msgid ""
372 "If you use the <option role=\"hg-opt-diff\">--git</option> option to <command "
373 "role=\"hg-cmd\">hg diff</command>, it will display <command>git</command>-"
374 "compatible diffs that <emphasis>can</emphasis> display this extra information."
375 msgstr ""
377 #. type: Content of: <book><appendix><sect2><sect3><para>
378 #: ../en/appA-cmdref.xml:184
379 msgid ""
380 "The second possible reason that <command role=\"hg-cmd\">hg diff</command> "
381 "might be printing diffs for a subset of the files displayed by <command role="
382 "\"hg-cmd\">hg status</command> is that if you invoke it without any "
383 "arguments, <command role=\"hg-cmd\">hg diff</command> prints diffs against "
384 "the first parent of the working directory. If you have run <command role="
385 "\"hg-cmd\">hg merge</command> to merge two changesets, but you haven't yet "
386 "committed the results of the merge, your working directory has two parents "
387 "(use <command role=\"hg-cmd\">hg parents</command> to see them). While "
388 "<command role=\"hg-cmd\">hg status</command> prints modifications relative to "
389 "<emphasis>both</emphasis> parents after an uncommitted merge, <command role="
390 "\"hg-cmd\">hg diff</command> still operates relative only to the first "
391 "parent. You can get it to print diffs relative to the second parent by "
392 "specifying that parent with the <option role=\"hg-opt-diff\">-r</option> "
393 "option. There is no way to print diffs relative to both parents."
394 msgstr ""
396 #. type: Content of: <book><appendix><sect2><sect3><title>
397 #: ../en/appA-cmdref.xml:200
398 msgid "Generating safe binary diffs"
399 msgstr "生成安全的二进制差异"
401 #. type: Content of: <book><appendix><sect2><sect3><para>
402 #: ../en/appA-cmdref.xml:202
403 msgid ""
404 "If you use the <option role=\"hg-opt-diff\">-a</option> option to force "
405 "Mercurial to print diffs of files that are either <quote>mostly text</quote> "
406 "or contain lots of binary data, those diffs cannot subsequently be applied by "
407 "either Mercurial's <command role=\"hg-cmd\">hg import</command> command or "
408 "the system's <command>patch</command> command."
409 msgstr ""
411 #. type: Content of: <book><appendix><sect2><sect3><para>
412 #: ../en/appA-cmdref.xml:209
413 msgid ""
414 "If you want to generate a diff of a binary file that is safe to use as input "
415 "for <command role=\"hg-cmd\">hg import</command>, use the <command role=\"hg-"
416 "cmd\">hg diff</command>{--git} option when you generate the patch. The "
417 "system <command>patch</command> command cannot handle binary patches at all."
418 msgstr ""
420 #. type: Content of: <book><appendix><title>
421 #: ../en/appB-mq-ref.xml:5
422 msgid "Mercurial Queues reference"
423 msgstr "Mercurial 队列参考"
425 #. type: Content of: <book><appendix><sect1><title>
426 #: ../en/appB-mq-ref.xml:8
427 msgid "MQ command reference"
428 msgstr "MQ 命令参考"
430 #. type: Content of: <book><appendix><sect1><para>
431 #: ../en/appB-mq-ref.xml:10
432 msgid ""
433 "For an overview of the commands provided by MQ, use the command <command role="
434 "\"hg-cmd\">hg help mq</command>."
435 msgstr ""
437 #. type: Content of: <book><appendix><sect1><sect2><title>
438 #: ../en/appB-mq-ref.xml:14
439 msgid ""
440 "<command role=\"hg-ext-mq\">qapplied</command>&emdash;print applied patches"
441 msgstr "<command role=\"hg-ext-mq\">qapplied</command>&emdash;显示已应用的补丁"
443 #. type: Content of: <book><appendix><sect1><sect2><para>
444 #: ../en/appB-mq-ref.xml:17
445 msgid ""
446 "The <command role=\"hg-ext-mq\">qapplied</command> command prints the current "
447 "stack of applied patches. Patches are printed in oldest-to-newest order, so "
448 "the last patch in the list is the <quote>top</quote> patch."
449 msgstr ""
451 #. type: Content of: <book><appendix><sect1><sect2><title>
452 #: ../en/appB-mq-ref.xml:24
453 msgid ""
454 "<command role=\"hg-ext-mq\">qcommit</command>&emdash;commit changes in the "
455 "queue repository"
456 msgstr "<command role=\"hg-ext-mq\">qcommit</command>&emdash;提交队列中的修改"
458 #. type: Content of: <book><appendix><sect1><sect2><para>
459 #: ../en/appB-mq-ref.xml:27
460 msgid ""
461 "The <command role=\"hg-ext-mq\">qcommit</command> command commits any "
462 "outstanding changes in the <filename role=\"special\" class=\"directory\">.hg/"
463 "patches</filename> repository. This command only works if the <filename role="
464 "\"special\" class=\"directory\">.hg/patches</filename> directory is a "
465 "repository, i.e. you created the directory using <command role=\"hg-cmd\">hg "
466 "qinit <option role=\"hg-ext-mq-cmd-qinit-opt\">-c</option></command> or ran "
467 "<command role=\"hg-cmd\">hg init</command> in the directory after running "
468 "<command role=\"hg-ext-mq\">qinit</command>."
469 msgstr ""
471 #. type: Content of: <book><appendix><sect1><sect2><para>
472 #: ../en/appB-mq-ref.xml:39
473 msgid ""
474 "This command is shorthand for <command role=\"hg-cmd\">hg commit --cwd .hg/"
475 "patches</command>."
476 msgstr ""
478 #. type: Content of: <book><appendix><sect1><sect2><para>
479 #: ../en/appB-mq-ref.xml:42
480 msgid ""
481 "\\subsection{<command role=\"hg-ext-mq\">qdelete</command>&emdash;delete a "
482 "patch from the <filename role=\"special\">series</filename> file}"
483 msgstr ""
485 #. type: Content of: <book><appendix><sect1><sect2><para>
486 #: ../en/appB-mq-ref.xml:47
487 msgid ""
488 "The <command role=\"hg-ext-mq\">qdelete</command> command removes the entry "
489 "for a patch from the <filename role=\"special\">series</filename> file in the "
490 "<filename role=\"special\" class=\"directory\">.hg/patches</filename> "
491 "directory. It does not pop the patch if the patch is already applied. By "
492 "default, it does not delete the patch file; use the <option role=\"hg-ext-mq-"
493 "cmd-qdel-opt\">-f</option> option to do that."
494 msgstr ""
496 #. type: Content of: <book><appendix><sect1><sect2><para>
497 #: ../en/appB-mq-ref.xml:56 ../en/appB-mq-ref.xml:98 ../en/appB-mq-ref.xml:156
498 #: ../en/appB-mq-ref.xml:196 ../en/appB-mq-ref.xml:263
499 #: ../en/appB-mq-ref.xml:334 ../en/appB-mq-ref.xml:403
500 #: ../en/appB-mq-ref.xml:496
501 msgid "Options:"
502 msgstr ""
504 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
505 #: ../en/appB-mq-ref.xml:58
506 msgid ""
507 "<option role=\"hg-ext-mq-cmd-qdel-opt\">-f</option>: Delete the patch file."
508 msgstr ""
510 #. type: Content of: <book><appendix><sect1><sect2><title>
511 #: ../en/appB-mq-ref.xml:65
512 msgid ""
513 "<command role=\"hg-ext-mq\">qdiff</command>&emdash;print a diff of the "
514 "topmost applied patch"
515 msgstr ""
516 "<command role=\"hg-ext-mq\">qdiff</command>&emdash;显示最新应用补丁的差异"
518 #. type: Content of: <book><appendix><sect1><sect2><para>
519 #: ../en/appB-mq-ref.xml:68
520 msgid ""
521 "The <command role=\"hg-ext-mq\">qdiff</command> command prints a diff of the "
522 "topmost applied patch. It is equivalent to <command role=\"hg-cmd\">hg diff -"
523 "r-2:-1</command>."
524 msgstr ""
526 #. type: Content of: <book><appendix><sect1><sect2><title>
527 #: ../en/appB-mq-ref.xml:74
528 msgid ""
529 "<command role=\"hg-ext-mq\">qfold</command>&emdash;merge (<quote>fold</"
530 "quote>) several patches into one"
531 msgstr ""
532 "<command role=\"hg-ext-mq\">qfold</command>&emdash;将多个补丁合并(<quote>折叠"
533 "</quote>)成一个"
535 #. type: Content of: <book><appendix><sect1><sect2><para>
536 #: ../en/appB-mq-ref.xml:77
537 msgid ""
538 "The <command role=\"hg-ext-mq\">qfold</command> command merges multiple "
539 "patches into the topmost applied patch, so that the topmost applied patch "
540 "makes the union of all of the changes in the patches in question."
541 msgstr ""
543 #. type: Content of: <book><appendix><sect1><sect2><para>
544 #: ../en/appB-mq-ref.xml:82
545 msgid ""
546 "The patches to fold must not be applied; <command role=\"hg-ext-mq\">qfold</"
547 "command> will exit with an error if any is. The order in which patches are "
548 "folded is significant; <command role=\"hg-cmd\">hg qfold a b</command> means "
549 "<quote>apply the current topmost patch, followed by <literal>a</literal>, "
550 "followed by <literal>b</literal></quote>."
551 msgstr ""
553 #. type: Content of: <book><appendix><sect1><sect2><para>
554 #: ../en/appB-mq-ref.xml:90
555 msgid ""
556 "The comments from the folded patches are appended to the comments of the "
557 "destination patch, with each block of comments separated by three asterisk "
558 "(<quote><literal>*</literal></quote>) characters. Use the <option role=\"hg-"
559 "ext-mq-cmd-qfold-opt\">-e</option> option to edit the commit message for the "
560 "combined patch/changeset after the folding has completed."
561 msgstr ""
563 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
564 #: ../en/appB-mq-ref.xml:100
565 msgid ""
566 "<option role=\"hg-ext-mq-cmd-qfold-opt\">-e</option>: Edit the commit message "
567 "and patch description for the newly folded patch."
568 msgstr ""
570 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
571 #: ../en/appB-mq-ref.xml:105
572 msgid ""
573 "<option role=\"hg-ext-mq-cmd-qfold-opt\">-l</option>: Use the contents of the "
574 "given file as the new commit message and patch description for the folded "
575 "patch."
576 msgstr ""
578 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
579 #: ../en/appB-mq-ref.xml:110
580 msgid ""
581 "<option role=\"hg-ext-mq-cmd-qfold-opt\">-m</option>: Use the given text as "
582 "the new commit message and patch description for the folded patch."
583 msgstr ""
585 #. type: Content of: <book><appendix><sect1><sect2><title>
586 #: ../en/appB-mq-ref.xml:118
587 msgid ""
588 "<command role=\"hg-ext-mq\">qheader</command>&emdash;display the header/"
589 "description of a patch"
590 msgstr "<command role=\"hg-ext-mq\">qheader</command>&emdash;显示补丁头部描述"
592 #. type: Content of: <book><appendix><sect1><sect2><para>
593 #: ../en/appB-mq-ref.xml:122
594 msgid ""
595 "The <command role=\"hg-ext-mq\">qheader</command> command prints the header, "
596 "or description, of a patch. By default, it prints the header of the topmost "
597 "applied patch. Given an argument, it prints the header of the named patch."
598 msgstr ""
600 #. type: Content of: <book><appendix><sect1><sect2><title>
601 #: ../en/appB-mq-ref.xml:129
602 msgid ""
603 "<command role=\"hg-ext-mq\">qimport</command>&emdash;import a third-party "
604 "patch into the queue"
605 msgstr ""
606 "<command role=\"hg-ext-mq\">qimport</command>&emdash;将第三方补丁导入队列"
608 #. type: Content of: <book><appendix><sect1><sect2><para>
609 #: ../en/appB-mq-ref.xml:132
610 msgid ""
611 "The <command role=\"hg-ext-mq\">qimport</command> command adds an entry for "
612 "an external patch to the <filename role=\"special\">series</filename> file, "
613 "and copies the patch into the <filename role=\"special\" class=\"directory\">."
614 "hg/patches</filename> directory. It adds the entry immediately after the "
615 "topmost applied patch, but does not push the patch."
616 msgstr ""
618 #. type: Content of: <book><appendix><sect1><sect2><para>
619 #: ../en/appB-mq-ref.xml:140
620 msgid ""
621 "If the <filename role=\"special\" class=\"directory\">.hg/patches</filename> "
622 "directory is a repository, <command role=\"hg-ext-mq\">qimport</command> "
623 "automatically does an <command role=\"hg-cmd\">hg add</command> of the "
624 "imported patch."
625 msgstr ""
627 #. type: Content of: <book><appendix><sect1><sect2><title>
628 #: ../en/appB-mq-ref.xml:148
629 msgid ""
630 "<command role=\"hg-ext-mq\">qinit</command>&emdash;prepare a repository to "
631 "work with MQ"
632 msgstr "<command role=\"hg-ext-mq\">qinit</command>&emdash;为使用 MQ 配置版本库"
634 #. type: Content of: <book><appendix><sect1><sect2><para>
635 #: ../en/appB-mq-ref.xml:151
636 msgid ""
637 "The <command role=\"hg-ext-mq\">qinit</command> command prepares a repository "
638 "to work with MQ. It creates a directory called <filename role=\"special\" "
639 "class=\"directory\">.hg/patches</filename>."
640 msgstr ""
642 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
643 #: ../en/appB-mq-ref.xml:158
644 msgid ""
645 "<option role=\"hg-ext-mq-cmd-qinit-opt\">-c</option>: Create <filename role="
646 "\"special\" class=\"directory\">.hg/patches</filename> as a repository in its "
647 "own right. Also creates a <filename role=\"special\">.hgignore</filename> "
648 "file that will ignore the <filename role=\"special\">status</filename> file."
649 msgstr ""
651 #. type: Content of: <book><appendix><sect1><sect2><para>
652 #: ../en/appB-mq-ref.xml:168
653 msgid ""
654 "When the <filename role=\"special\" class=\"directory\">.hg/patches</"
655 "filename> directory is a repository, the <command role=\"hg-ext-mq\">qimport</"
656 "command> and <command role=\"hg-ext-mq\">qnew</command> commands "
657 "automatically <command role=\"hg-cmd\">hg add</command> new patches."
658 msgstr ""
660 #. type: Content of: <book><appendix><sect1><sect2><title>
661 #: ../en/appB-mq-ref.xml:177
662 msgid "<command role=\"hg-ext-mq\">qnew</command>&emdash;create a new patch"
663 msgstr "<command role=\"hg-ext-mq\">qnew</command>&emdash;创建新补丁"
665 #. type: Content of: <book><appendix><sect1><sect2><para>
666 #: ../en/appB-mq-ref.xml:180
667 msgid ""
668 "The <command role=\"hg-ext-mq\">qnew</command> command creates a new patch. "
669 "It takes one mandatory argument, the name to use for the patch file. The "
670 "newly created patch is created empty by default. It is added to the "
671 "<filename role=\"special\">series</filename> file after the current topmost "
672 "applied patch, and is immediately pushed on top of that patch."
673 msgstr ""
675 #. type: Content of: <book><appendix><sect1><sect2><para>
676 #: ../en/appB-mq-ref.xml:188
677 msgid ""
678 "If <command role=\"hg-ext-mq\">qnew</command> finds modified files in the "
679 "working directory, it will refuse to create a new patch unless the <option "
680 "role=\"hg-ext-mq-cmd-qnew-opt\">-f</option> option is used (see below). This "
681 "behaviour allows you to <command role=\"hg-ext-mq\">qrefresh</command> your "
682 "topmost applied patch before you apply a new patch on top of it."
683 msgstr ""
685 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
686 #: ../en/appB-mq-ref.xml:198
687 msgid ""
688 "<option role=\"hg-ext-mq-cmd-qnew-opt\">-f</option>: Create a new patch if "
689 "the contents of the working directory are modified. Any outstanding "
690 "modifications are added to the newly created patch, so after this command "
691 "completes, the working directory will no longer be modified."
692 msgstr ""
694 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
695 #: ../en/appB-mq-ref.xml:205
696 msgid ""
697 "<option role=\"hg-ext-mq-cmd-qnew-opt\">-m</option>: Use the given text as "
698 "the commit message. This text will be stored at the beginning of the patch "
699 "file, before the patch data."
700 msgstr ""
702 #. type: Content of: <book><appendix><sect1><sect2><title>
703 #: ../en/appB-mq-ref.xml:214
704 msgid ""
705 "<command role=\"hg-ext-mq\">qnext</command>&emdash;print the name of the next "
706 "patch"
707 msgstr "<command role=\"hg-ext-mq\">qnext</command>&emdash;显示下个补丁的名称"
709 #. type: Content of: <book><appendix><sect1><sect2><para>
710 #: ../en/appB-mq-ref.xml:217
711 msgid ""
712 "The <command role=\"hg-ext-mq\">qnext</command> command prints the name name "
713 "of the next patch in the <filename role=\"special\">series</filename> file "
714 "after the topmost applied patch. This patch will become the topmost applied "
715 "patch if you run <command role=\"hg-ext-mq\">qpush</command>."
716 msgstr ""
718 #. type: Content of: <book><appendix><sect1><sect2><title>
719 #: ../en/appB-mq-ref.xml:226
720 msgid ""
721 "<command role=\"hg-ext-mq\">qpop</command>&emdash;pop patches off the stack"
722 msgstr "<command role=\"hg-ext-mq\">qpop</command>&emdash;删除堆栈顶部的补丁"
724 #. type: Content of: <book><appendix><sect1><sect2><para>
725 #: ../en/appB-mq-ref.xml:229
726 msgid ""
727 "The <command role=\"hg-ext-mq\">qpop</command> command removes applied "
728 "patches from the top of the stack of applied patches. By default, it removes "
729 "only one patch."
730 msgstr ""
732 #. type: Content of: <book><appendix><sect1><sect2><para>
733 #: ../en/appB-mq-ref.xml:233
734 msgid ""
735 "This command removes the changesets that represent the popped patches from "
736 "the repository, and updates the working directory to undo the effects of the "
737 "patches."
738 msgstr ""
740 #. type: Content of: <book><appendix><sect1><sect2><para>
741 #: ../en/appB-mq-ref.xml:237
742 msgid ""
743 "This command takes an optional argument, which it uses as the name or index "
744 "of the patch to pop to. If given a name, it will pop patches until the named "
745 "patch is the topmost applied patch. If given a number, <command role=\"hg-"
746 "ext-mq\">qpop</command> treats the number as an index into the entries in the "
747 "series file, counting from zero (empty lines and lines containing only "
748 "comments do not count). It pops patches until the patch identified by the "
749 "given index is the topmost applied patch."
750 msgstr ""
752 #. type: Content of: <book><appendix><sect1><sect2><para>
753 #: ../en/appB-mq-ref.xml:247
754 msgid ""
755 "The <command role=\"hg-ext-mq\">qpop</command> command does not read or write "
756 "patches or the <filename role=\"special\">series</filename> file. It is thus "
757 "safe to <command role=\"hg-ext-mq\">qpop</command> a patch that you have "
758 "removed from the <filename role=\"special\">series</filename> file, or a "
759 "patch that you have renamed or deleted entirely. In the latter two cases, "
760 "use the name of the patch as it was when you applied it."
761 msgstr ""
763 #. type: Content of: <book><appendix><sect1><sect2><para>
764 #: ../en/appB-mq-ref.xml:256
765 msgid ""
766 "By default, the <command role=\"hg-ext-mq\">qpop</command> command will not "
767 "pop any patches if the working directory has been modified. You can override "
768 "this behaviour using the <option role=\"hg-ext-mq-cmd-qpop-opt\">-f</option> "
769 "option, which reverts all modifications in the working directory."
770 msgstr ""
772 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
773 #: ../en/appB-mq-ref.xml:265
774 msgid ""
775 "<option role=\"hg-ext-mq-cmd-qpop-opt\">-a</option>: Pop all applied "
776 "patches. This returns the repository to its state before you applied any "
777 "patches."
778 msgstr ""
780 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
781 #: ../en/appB-mq-ref.xml:270
782 msgid ""
783 "<option role=\"hg-ext-mq-cmd-qpop-opt\">-f</option>: Forcibly revert any "
784 "modifications to the working directory when popping."
785 msgstr ""
787 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
788 #: ../en/appB-mq-ref.xml:275
789 msgid ""
790 "<option role=\"hg-ext-mq-cmd-qpop-opt\">-n</option>: Pop a patch from the "
791 "named queue."
792 msgstr ""
794 #. type: Content of: <book><appendix><sect1><sect2><para>
795 #: ../en/appB-mq-ref.xml:280
796 msgid ""
797 "The <command role=\"hg-ext-mq\">qpop</command> command removes one line from "
798 "the end of the <filename role=\"special\">status</filename> file for each "
799 "patch that it pops."
800 msgstr ""
802 #. type: Content of: <book><appendix><sect1><sect2><title>
803 #: ../en/appB-mq-ref.xml:287
804 msgid ""
805 "<command role=\"hg-ext-mq\">qprev</command>&emdash;print the name of the "
806 "previous patch"
807 msgstr "<command role=\"hg-ext-mq\">qprev</command>&emdash;显示上个补丁的名称"
809 #. type: Content of: <book><appendix><sect1><sect2><para>
810 #: ../en/appB-mq-ref.xml:290
811 msgid ""
812 "The <command role=\"hg-ext-mq\">qprev</command> command prints the name of "
813 "the patch in the <filename role=\"special\">series</filename> file that comes "
814 "before the topmost applied patch. This will become the topmost applied patch "
815 "if you run <command role=\"hg-ext-mq\">qpop</command>."
816 msgstr ""
818 #. type: Content of: <book><appendix><sect1><sect2><title>
819 #: ../en/appB-mq-ref.xml:299
820 msgid ""
821 "<command role=\"hg-ext-mq\">qpush</command>&emdash;push patches onto the stack"
822 msgstr "<command role=\"hg-ext-mq\">qpush</command>&emdash;增加补丁到堆栈"
824 #. type: Content of: <book><appendix><sect1><sect2><para>
825 #: ../en/appB-mq-ref.xml:302
826 msgid ""
827 "The <command role=\"hg-ext-mq\">qpush</command> command adds patches onto the "
828 "applied stack. By default, it adds only one patch."
829 msgstr ""
831 #. type: Content of: <book><appendix><sect1><sect2><para>
832 #: ../en/appB-mq-ref.xml:306
833 msgid ""
834 "This command creates a new changeset to represent each applied patch, and "
835 "updates the working directory to apply the effects of the patches."
836 msgstr ""
838 #. type: Content of: <book><appendix><sect1><sect2><para>
839 #: ../en/appB-mq-ref.xml:310
840 msgid "The default data used when creating a changeset are as follows:"
841 msgstr ""
843 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
844 #: ../en/appB-mq-ref.xml:313
845 msgid ""
846 "The commit date and time zone are the current date and time zone. Because "
847 "these data are used to compute the identity of a changeset, this means that "
848 "if you <command role=\"hg-ext-mq\">qpop</command> a patch and <command role="
849 "\"hg-ext-mq\">qpush</command> it again, the changeset that you push will have "
850 "a different identity than the changeset you popped."
851 msgstr ""
853 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
854 #: ../en/appB-mq-ref.xml:321
855 msgid ""
856 "The author is the same as the default used by the <command role=\"hg-cmd\">hg "
857 "commit</command> command."
858 msgstr ""
860 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
861 #: ../en/appB-mq-ref.xml:325
862 msgid ""
863 "The commit message is any text from the patch file that comes before the "
864 "first diff header. If there is no such text, a default commit message is "
865 "used that identifies the name of the patch."
866 msgstr ""
868 #. type: Content of: <book><appendix><sect1><sect2><para>
869 #: ../en/appB-mq-ref.xml:330
870 msgid ""
871 "If a patch contains a Mercurial patch header (XXX add link), the information "
872 "in the patch header overrides these defaults."
873 msgstr ""
875 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
876 #: ../en/appB-mq-ref.xml:336
877 msgid ""
878 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-a</option>: Push all unapplied "
879 "patches from the <filename role=\"special\">series</filename> file until "
880 "there are none left to push."
881 msgstr ""
883 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
884 #: ../en/appB-mq-ref.xml:342
885 msgid ""
886 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-l</option>: Add the name of the "
887 "patch to the end of the commit message."
888 msgstr ""
890 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
891 #: ../en/appB-mq-ref.xml:346
892 msgid ""
893 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-m</option>: If a patch fails to "
894 "apply cleanly, use the entry for the patch in another saved queue to compute "
895 "the parameters for a three-way merge, and perform a three-way merge using the "
896 "normal Mercurial merge machinery. Use the resolution of the merge as the new "
897 "patch content."
898 msgstr ""
900 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
901 #: ../en/appB-mq-ref.xml:354
902 msgid ""
903 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-n</option>: Use the named queue if "
904 "merging while pushing."
905 msgstr ""
907 #. type: Content of: <book><appendix><sect1><sect2><para>
908 #: ../en/appB-mq-ref.xml:359
909 msgid ""
910 "The <command role=\"hg-ext-mq\">qpush</command> command reads, but does not "
911 "modify, the <filename role=\"special\">series</filename> file. It appends "
912 "one line to the <command role=\"hg-cmd\">hg status</command> file for each "
913 "patch that it pushes."
914 msgstr ""
916 #. type: Content of: <book><appendix><sect1><sect2><title>
917 #: ../en/appB-mq-ref.xml:367
918 msgid ""
919 "<command role=\"hg-ext-mq\">qrefresh</command>&emdash;update the topmost "
920 "applied patch"
921 msgstr "<command role=\"hg-ext-mq\">qrefresh</command>&emdash;更新最新的补丁"
923 #. type: Content of: <book><appendix><sect1><sect2><para>
924 #: ../en/appB-mq-ref.xml:371
925 msgid ""
926 "The <command role=\"hg-ext-mq\">qrefresh</command> command updates the "
927 "topmost applied patch. It modifies the patch, removes the old changeset that "
928 "represented the patch, and creates a new changeset to represent the modified "
929 "patch."
930 msgstr ""
932 #. type: Content of: <book><appendix><sect1><sect2><para>
933 #: ../en/appB-mq-ref.xml:377
934 msgid ""
935 "The <command role=\"hg-ext-mq\">qrefresh</command> command looks for the "
936 "following modifications:"
937 msgstr ""
939 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
940 #: ../en/appB-mq-ref.xml:380
941 msgid ""
942 "Changes to the commit message, i.e. the text before the first diff header in "
943 "the patch file, are reflected in the new changeset that represents the patch."
944 msgstr ""
946 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
947 #: ../en/appB-mq-ref.xml:385
948 msgid ""
949 "Modifications to tracked files in the working directory are added to the "
950 "patch."
951 msgstr ""
953 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
954 #: ../en/appB-mq-ref.xml:388
955 msgid ""
956 "Changes to the files tracked using <command role=\"hg-cmd\">hg add</command>, "
957 "<command role=\"hg-cmd\">hg copy</command>, <command role=\"hg-cmd\">hg "
958 "remove</command>, or <command role=\"hg-cmd\">hg rename</command>. Added "
959 "files and copy and rename destinations are added to the patch, while removed "
960 "files and rename sources are removed."
961 msgstr ""
963 #. type: Content of: <book><appendix><sect1><sect2><para>
964 #: ../en/appB-mq-ref.xml:397
965 msgid ""
966 "Even if <command role=\"hg-ext-mq\">qrefresh</command> detects no changes, it "
967 "still recreates the changeset that represents the patch. This causes the "
968 "identity of the changeset to differ from the previous changeset that "
969 "identified the patch."
970 msgstr ""
972 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
973 #: ../en/appB-mq-ref.xml:405
974 msgid ""
975 "<option role=\"hg-ext-mq-cmd-qrefresh-opt\">-e</option>: Modify the commit "
976 "and patch description, using the preferred text editor."
977 msgstr ""
979 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
980 #: ../en/appB-mq-ref.xml:410
981 msgid ""
982 "<option role=\"hg-ext-mq-cmd-qrefresh-opt\">-m</option>: Modify the commit "
983 "message and patch description, using the given text."
984 msgstr ""
986 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
987 #: ../en/appB-mq-ref.xml:415
988 msgid ""
989 "<option role=\"hg-ext-mq-cmd-qrefresh-opt\">-l</option>: Modify the commit "
990 "message and patch description, using text from the given file."
991 msgstr ""
993 #. type: Content of: <book><appendix><sect1><sect2><title>
994 #: ../en/appB-mq-ref.xml:423
995 msgid "<command role=\"hg-ext-mq\">qrename</command>&emdash;rename a patch"
996 msgstr "<command role=\"hg-ext-mq\">qrename</command>&emdash;改名补丁"
998 #. type: Content of: <book><appendix><sect1><sect2><para>
999 #: ../en/appB-mq-ref.xml:426
1000 msgid ""
1001 "The <command role=\"hg-ext-mq\">qrename</command> command renames a patch, "
1002 "and changes the entry for the patch in the <filename role=\"special\">series</"
1003 "filename> file."
1004 msgstr ""
1006 #. type: Content of: <book><appendix><sect1><sect2><para>
1007 #: ../en/appB-mq-ref.xml:430
1008 msgid ""
1009 "With a single argument, <command role=\"hg-ext-mq\">qrename</command> renames "
1010 "the topmost applied patch. With two arguments, it renames its first argument "
1011 "to its second."
1012 msgstr ""
1014 #. type: Content of: <book><appendix><sect1><sect2><title>
1015 #: ../en/appB-mq-ref.xml:437
1016 msgid ""
1017 "<command role=\"hg-ext-mq\">qrestore</command>&emdash;restore saved queue "
1018 "state"
1019 msgstr "<command role=\"hg-ext-mq\">qrestore</command>&emdash;恢复保存的队列"
1021 #. type: Content of: <book><appendix><sect1><sect2><para>
1022 #: ../en/appB-mq-ref.xml:441
1023 msgid "XXX No idea what this does."
1024 msgstr ""
1026 #. type: Content of: <book><appendix><sect1><sect2><title>
1027 #: ../en/appB-mq-ref.xml:445
1028 msgid ""
1029 "<command role=\"hg-ext-mq\">qsave</command>&emdash;save current queue state"
1030 msgstr "<command role=\"hg-ext-mq\">qsave</command>&emdash;保存当前的队列状态"
1032 #. type: Content of: <book><appendix><sect1><sect2><para>
1033 #: ../en/appB-mq-ref.xml:448
1034 msgid "XXX Likewise."
1035 msgstr ""
1037 #. type: Content of: <book><appendix><sect1><sect2><title>
1038 #: ../en/appB-mq-ref.xml:452
1039 msgid ""
1040 "<command role=\"hg-ext-mq\">qseries</command>&emdash;print the entire patch "
1041 "series"
1042 msgstr "<command role=\"hg-ext-mq\">qseries</command>&emdash;显示补丁序列"
1044 #. type: Content of: <book><appendix><sect1><sect2><para>
1045 #: ../en/appB-mq-ref.xml:455
1046 msgid ""
1047 "The <command role=\"hg-ext-mq\">qseries</command> command prints the entire "
1048 "patch series from the <filename role=\"special\">series</filename> file. It "
1049 "prints only patch names, not empty lines or comments. It prints in order "
1050 "from first to be applied to last."
1051 msgstr ""
1053 #. type: Content of: <book><appendix><sect1><sect2><title>
1054 #: ../en/appB-mq-ref.xml:463
1055 msgid ""
1056 "<command role=\"hg-ext-mq\">qtop</command>&emdash;print the name of the "
1057 "current patch"
1058 msgstr "<command role=\"hg-ext-mq\">qtop</command>&emdash;显示当前补丁的名称"
1060 #. type: Content of: <book><appendix><sect1><sect2><para>
1061 #: ../en/appB-mq-ref.xml:466
1062 msgid ""
1063 "The <command role=\"hg-ext-mq\">qtop</command> prints the name of the topmost "
1064 "currently applied patch."
1065 msgstr ""
1067 #. type: Content of: <book><appendix><sect1><sect2><title>
1068 #: ../en/appB-mq-ref.xml:471
1069 msgid ""
1070 "<command role=\"hg-ext-mq\">qunapplied</command>&emdash;print patches not yet "
1071 "applied"
1072 msgstr ""
1073 "<command role=\"hg-ext-mq\">qunapplied</command>&emdash;显示尚未应用的补丁"
1075 #. type: Content of: <book><appendix><sect1><sect2><para>
1076 #: ../en/appB-mq-ref.xml:475
1077 msgid ""
1078 "The <command role=\"hg-ext-mq\">qunapplied</command> command prints the names "
1079 "of patches from the <filename role=\"special\">series</filename> file that "
1080 "are not yet applied. It prints them in order from the next patch that will "
1081 "be pushed to the last."
1082 msgstr ""
1084 #. type: Content of: <book><appendix><sect1><sect2><title>
1085 #: ../en/appB-mq-ref.xml:483
1086 msgid ""
1087 "<command role=\"hg-cmd\">hg strip</command>&emdash;remove a revision and "
1088 "descendants"
1089 msgstr "<command role=\"hg-cmd\">hg strip</command>&emdash;删除一个版本及其后继"
1091 #. type: Content of: <book><appendix><sect1><sect2><para>
1092 #: ../en/appB-mq-ref.xml:486
1093 msgid ""
1094 "The <command role=\"hg-cmd\">hg strip</command> command removes a revision, "
1095 "and all of its descendants, from the repository. It undoes the effects of "
1096 "the removed revisions from the repository, and updates the working directory "
1097 "to the first parent of the removed revision."
1098 msgstr ""
1100 #. type: Content of: <book><appendix><sect1><sect2><para>
1101 #: ../en/appB-mq-ref.xml:492
1102 msgid ""
1103 "The <command role=\"hg-cmd\">hg strip</command> command saves a backup of the "
1104 "removed changesets in a bundle, so that they can be reapplied if removed in "
1105 "error."
1106 msgstr ""
1108 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
1109 #: ../en/appB-mq-ref.xml:498
1110 msgid ""
1111 "<option role=\"hg-opt-strip\">-b</option>: Save unrelated changesets that are "
1112 "intermixed with the stripped changesets in the backup bundle."
1113 msgstr ""
1115 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
1116 #: ../en/appB-mq-ref.xml:502
1117 msgid ""
1118 "<option role=\"hg-opt-strip\">-f</option>: If a branch has multiple heads, "
1119 "remove all heads. XXX This should be renamed, and use <literal>-f</literal> "
1120 "to strip revs when there are pending changes."
1121 msgstr ""
1123 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
1124 #: ../en/appB-mq-ref.xml:507
1125 msgid "<option role=\"hg-opt-strip\">-n</option>: Do not save a backup bundle."
1126 msgstr ""
1128 #. type: Content of: <book><appendix><sect1><title>
1129 #: ../en/appB-mq-ref.xml:514
1130 msgid "MQ file reference"
1131 msgstr "MQ 文件参考"
1133 #. type: Content of: <book><appendix><sect1><sect2><title>
1134 #: ../en/appB-mq-ref.xml:517
1135 msgid "The <filename role=\"special\">series</filename> file"
1136 msgstr "<filename role=\"special\">序列</filename>文件"
1138 #. type: Content of: <book><appendix><sect1><sect2><para>
1139 #: ../en/appB-mq-ref.xml:520
1140 msgid ""
1141 "The <filename role=\"special\">series</filename> file contains a list of the "
1142 "names of all patches that MQ can apply. It is represented as a list of "
1143 "names, with one name saved per line. Leading and trailing white space in "
1144 "each line are ignored."
1145 msgstr ""
1147 #. type: Content of: <book><appendix><sect1><sect2><para>
1148 #: ../en/appB-mq-ref.xml:526
1149 msgid ""
1150 "Lines may contain comments. A comment begins with the <quote><literal>#</"
1151 "literal></quote> character, and extends to the end of the line. Empty lines, "
1152 "and lines that contain only comments, are ignored."
1153 msgstr ""
1155 #. type: Content of: <book><appendix><sect1><sect2><para>
1156 #: ../en/appB-mq-ref.xml:531
1157 msgid ""
1158 "You will often need to edit the <filename role=\"special\">series</filename> "
1159 "file by hand, hence the support for comments and empty lines noted above. "
1160 "For example, you can comment out a patch temporarily, and <command role=\"hg-"
1161 "ext-mq\">qpush</command> will skip over that patch when applying patches. "
1162 "You can also change the order in which patches are applied by reordering "
1163 "their entries in the <filename role=\"special\">series</filename> file."
1164 msgstr ""
1166 #. type: Content of: <book><appendix><sect1><sect2><para>
1167 #: ../en/appB-mq-ref.xml:540
1168 msgid ""
1169 "Placing the <filename role=\"special\">series</filename> file under revision "
1170 "control is also supported; it is a good idea to place all of the patches that "
1171 "it refers to under revision control, as well. If you create a patch "
1172 "directory using the <option role=\"hg-ext-mq-cmd-qinit-opt\">-c</option> "
1173 "option to <command role=\"hg-ext-mq\">qinit</command>, this will be done for "
1174 "you automatically."
1175 msgstr ""
1177 #. type: Content of: <book><appendix><sect1><sect2><title>
1178 #: ../en/appB-mq-ref.xml:550
1179 msgid "The <filename role=\"special\">status</filename> file"
1180 msgstr "<filename role=\"special\">状态</filename>文件"
1182 #. type: Content of: <book><appendix><sect1><sect2><para>
1183 #: ../en/appB-mq-ref.xml:553
1184 msgid ""
1185 "The <filename role=\"special\">status</filename> file contains the names and "
1186 "changeset hashes of all patches that MQ currently has applied. Unlike the "
1187 "<filename role=\"special\">series</filename> file, this file is not intended "
1188 "for editing. You should not place this file under revision control, or "
1189 "modify it in any way. It is used by MQ strictly for internal book-keeping."
1190 msgstr ""
1192 #. type: Content of: <book><appendix><title>
1193 #: ../en/appC-srcinstall.xml:5
1194 msgid "Installing Mercurial from source"
1195 msgstr "从源代码安装 Mercurial"
1197 #. type: Content of: <book><appendix><sect1><title>
1198 #: ../en/appC-srcinstall.xml:8
1199 msgid "On a Unix-like system"
1200 msgstr "类 Unix 系统"
1202 #. type: Content of: <book><appendix><sect1><para>
1203 #: ../en/appC-srcinstall.xml:10
1204 msgid ""
1205 "If you are using a Unix-like system that has a sufficiently recent version of "
1206 "Python (2.3 or newer) available, it is easy to install Mercurial from source."
1207 msgstr ""
1209 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1210 #: ../en/appC-srcinstall.xml:14
1211 msgid ""
1212 "Download a recent source tarball from <ulink url=\"http://www.selenic.com/"
1213 "mercurial/download\">http://www.selenic.com/mercurial/download</ulink>."
1214 msgstr ""
1216 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1217 #: ../en/appC-srcinstall.xml:17
1218 msgid "Unpack the tarball:"
1219 msgstr ""
1221 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1222 #: ../en/appC-srcinstall.xml:20
1223 msgid ""
1224 "Go into the source directory and run the installer script. This will build "
1225 "Mercurial and install it in your home directory."
1226 msgstr ""
1228 #. type: Content of: <book><appendix><sect1><para>
1229 #: ../en/appC-srcinstall.xml:27
1230 msgid ""
1231 "Once the install finishes, Mercurial will be in the <literal>bin</literal> "
1232 "subdirectory of your home directory. Don't forget to make sure that this "
1233 "directory is present in your shell's search path."
1234 msgstr ""
1236 #. type: Content of: <book><appendix><sect1><para>
1237 #: ../en/appC-srcinstall.xml:32
1238 msgid ""
1239 "You will probably need to set the <envar>PYTHONPATH</envar> environment "
1240 "variable so that the Mercurial executable can find the rest of the Mercurial "
1241 "packages. For example, on my laptop, I have set it to <literal>/home/bos/lib/"
1242 "python</literal>. The exact path that you will need to use depends on how "
1243 "Python was built for your system, but should be easy to figure out. If "
1244 "you're uncertain, look through the output of the installer script above, and "
1245 "see where the contents of the <literal>mercurial</literal> directory were "
1246 "installed to."
1247 msgstr ""
1249 #. type: Content of: <book><appendix><sect1><title>
1250 #: ../en/appC-srcinstall.xml:44
1251 msgid "On Windows"
1252 msgstr "Windows 系统"
1254 #. type: Content of: <book><appendix><sect1><para>
1255 #: ../en/appC-srcinstall.xml:46
1256 msgid ""
1257 "Building and installing Mercurial on Windows requires a variety of tools, a "
1258 "fair amount of technical knowledge, and considerable patience. I very much "
1259 "<emphasis>do not recommend</emphasis> this route if you are a <quote>casual "
1260 "user</quote>. Unless you intend to hack on Mercurial, I strongly suggest "
1261 "that you use a binary package instead."
1262 msgstr ""
1264 #. type: Content of: <book><appendix><sect1><para>
1265 #: ../en/appC-srcinstall.xml:53
1266 msgid ""
1267 "If you are intent on building Mercurial from source on Windows, follow the "
1268 "<quote>hard way</quote> directions on the Mercurial wiki at <ulink url="
1269 "\"http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall\">http://www."
1270 "selenic.com/mercurial/wiki/index.cgi/WindowsInstall</ulink>, and expect the "
1271 "process to involve a lot of fiddly work."
1272 msgstr ""
1274 #. type: Content of: <book><appendix><title>
1275 #: ../en/appD-license.xml:5
1276 msgid "Open Publication License"
1277 msgstr ""
1279 #. type: Content of: <book><appendix><para>
1280 #: ../en/appD-license.xml:7
1281 msgid "Version 1.0, 8 June 1999"
1282 msgstr ""
1284 #. type: Content of: <book><appendix><sect1><title>
1285 #: ../en/appD-license.xml:10
1286 msgid "Requirements on both unmodified and modified versions"
1287 msgstr ""
1289 #. type: Content of: <book><appendix><sect1><para>
1290 #: ../en/appD-license.xml:13
1291 msgid ""
1292 "The Open Publication works may be reproduced and distributed in whole or in "
1293 "part, in any medium physical or electronic, provided that the terms of this "
1294 "license are adhered to, and that this license or an incorporation of it by "
1295 "reference (with any options elected by the author(s) and/or publisher) is "
1296 "displayed in the reproduction."
1297 msgstr ""
1299 #. type: Content of: <book><appendix><sect1><para>
1300 #: ../en/appD-license.xml:20
1301 msgid "Proper form for an incorporation by reference is as follows:"
1302 msgstr ""
1304 #. type: Content of: <book><appendix><sect1><blockquote><para>
1305 #: ../en/appD-license.xml:24
1306 msgid ""
1307 "Copyright (c) <emphasis>year</emphasis> by <emphasis>author's name or "
1308 "designee</emphasis>. This material may be distributed only subject to the "
1309 "terms and conditions set forth in the Open Publication License, v<emphasis>x."
1310 "y</emphasis> or later (the latest version is presently available at <ulink "
1311 "url=\"http://www.opencontent.org/openpub/\">http://www.opencontent.org/"
1312 "openpub/</ulink>)."
1313 msgstr ""
1315 #. type: Content of: <book><appendix><sect1><para>
1316 #: ../en/appD-license.xml:33
1317 msgid ""
1318 "The reference must be immediately followed with any options elected by the "
1319 "author(s) and/or publisher of the document (see section <xref linkend=\"sec."
1320 "opl.options\"/>)."
1321 msgstr ""
1323 #. type: Content of: <book><appendix><sect1><para>
1324 #: ../en/appD-license.xml:37
1325 msgid ""
1326 "Commercial redistribution of Open Publication-licensed material is permitted."
1327 msgstr ""
1329 #. type: Content of: <book><appendix><sect1><para>
1330 #: ../en/appD-license.xml:40
1331 msgid ""
1332 "Any publication in standard (paper) book form shall require the citation of "
1333 "the original publisher and author. The publisher and author's names shall "
1334 "appear on all outer surfaces of the book. On all outer surfaces of the book "
1335 "the original publisher's name shall be as large as the title of the work and "
1336 "cited as possessive with respect to the title."
1337 msgstr ""
1339 #. type: Content of: <book><appendix><sect1><title>
1340 #: ../en/appD-license.xml:49
1341 msgid "Copyright"
1342 msgstr ""
1344 #. type: Content of: <book><appendix><sect1><para>
1345 #: ../en/appD-license.xml:51
1346 msgid ""
1347 "The copyright to each Open Publication is owned by its author(s) or designee."
1348 msgstr ""
1350 #. type: Content of: <book><appendix><sect1><title>
1351 #: ../en/appD-license.xml:56
1352 msgid "Scope of license"
1353 msgstr ""
1355 #. type: Content of: <book><appendix><sect1><para>
1356 #: ../en/appD-license.xml:58
1357 msgid ""
1358 "The following license terms apply to all Open Publication works, unless "
1359 "otherwise explicitly stated in the document."
1360 msgstr ""
1362 #. type: Content of: <book><appendix><sect1><para>
1363 #: ../en/appD-license.xml:62
1364 msgid ""
1365 "Mere aggregation of Open Publication works or a portion of an Open "
1366 "Publication work with other works or programs on the same media shall not "
1367 "cause this license to apply to those other works. The aggregate work shall "
1368 "contain a notice specifying the inclusion of the Open Publication material "
1369 "and appropriate copyright notice."
1370 msgstr ""
1372 #. type: Content of: <book><appendix><sect1><para>
1373 #: ../en/appD-license.xml:69
1374 msgid ""
1375 "<emphasis role=\"bold\">Severability</emphasis>. If any part of this license "
1376 "is found to be unenforceable in any jurisdiction, the remaining portions of "
1377 "the license remain in force."
1378 msgstr ""
1380 #. type: Content of: <book><appendix><sect1><para>
1381 #: ../en/appD-license.xml:74
1382 msgid ""
1383 "<emphasis role=\"bold\">No warranty</emphasis>. Open Publication works are "
1384 "licensed and provided <quote>as is</quote> without warranty of any kind, "
1385 "express or implied, including, but not limited to, the implied warranties of "
1386 "merchantability and fitness for a particular purpose or a warranty of non-"
1387 "infringement."
1388 msgstr ""
1390 #. type: Content of: <book><appendix><sect1><title>
1391 #: ../en/appD-license.xml:83
1392 msgid "Requirements on modified works"
1393 msgstr ""
1395 #. type: Content of: <book><appendix><sect1><para>
1396 #: ../en/appD-license.xml:85
1397 msgid ""
1398 "All modified versions of documents covered by this license, including "
1399 "translations, anthologies, compilations and partial documents, must meet the "
1400 "following requirements:"
1401 msgstr ""
1403 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1404 #: ../en/appD-license.xml:90
1405 msgid "The modified version must be labeled as such."
1406 msgstr ""
1408 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1409 #: ../en/appD-license.xml:93
1410 msgid ""
1411 "The person making the modifications must be identified and the modifications "
1412 "dated."
1413 msgstr ""
1415 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1416 #: ../en/appD-license.xml:96
1417 msgid ""
1418 "Acknowledgement of the original author and publisher if applicable must be "
1419 "retained according to normal academic citation practices."
1420 msgstr ""
1422 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1423 #: ../en/appD-license.xml:100
1424 msgid "The location of the original unmodified document must be identified."
1425 msgstr ""
1427 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1428 #: ../en/appD-license.xml:103
1429 msgid ""
1430 "The original author's (or authors') name(s) may not be used to assert or "
1431 "imply endorsement of the resulting document without the original author's (or "
1432 "authors') permission."
1433 msgstr ""
1435 #. type: Content of: <book><appendix><sect1><title>
1436 #: ../en/appD-license.xml:111
1437 msgid "Good-practice recommendations"
1438 msgstr ""
1440 #. type: Content of: <book><appendix><sect1><para>
1441 #: ../en/appD-license.xml:113
1442 msgid ""
1443 "In addition to the requirements of this license, it is requested from and "
1444 "strongly recommended of redistributors that:"
1445 msgstr ""
1447 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1448 #: ../en/appD-license.xml:118
1449 msgid ""
1450 "If you are distributing Open Publication works on hardcopy or CD-ROM, you "
1451 "provide email notification to the authors of your intent to redistribute at "
1452 "least thirty days before your manuscript or media freeze, to give the authors "
1453 "time to provide updated documents. This notification should describe "
1454 "modifications, if any, made to the document."
1455 msgstr ""
1457 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1458 #: ../en/appD-license.xml:125
1459 msgid ""
1460 "All substantive modifications (including deletions) be either clearly marked "
1461 "up in the document or else described in an attachment to the document."
1462 msgstr ""
1464 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1465 #: ../en/appD-license.xml:129
1466 msgid ""
1467 "Finally, while it is not mandatory under this license, it is considered good "
1468 "form to offer a free copy of any hardcopy and CD-ROM expression of an Open "
1469 "Publication-licensed work to its author(s)."
1470 msgstr ""
1472 #. type: Content of: <book><appendix><sect1><title>
1473 #: ../en/appD-license.xml:137
1474 msgid "License options"
1475 msgstr ""
1477 #. type: Content of: <book><appendix><sect1><para>
1478 #: ../en/appD-license.xml:139
1479 msgid ""
1480 "The author(s) and/or publisher of an Open Publication-licensed document may "
1481 "elect certain options by appending language to the reference to or copy of "
1482 "the license. These options are considered part of the license instance and "
1483 "must be included with the license (or its incorporation by reference) in "
1484 "derived works."
1485 msgstr ""
1487 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1488 #: ../en/appD-license.xml:147
1489 msgid ""
1490 "To prohibit distribution of substantively modified versions without the "
1491 "explicit permission of the author(s). <quote>Substantive modification</quote> "
1492 "is defined as a change to the semantic content of the document, and excludes "
1493 "mere changes in format or typographical corrections."
1494 msgstr ""
1496 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1497 #: ../en/appD-license.xml:154
1498 msgid ""
1499 "To accomplish this, add the phrase <quote>Distribution of substantively "
1500 "modified versions of this document is prohibited without the explicit "
1501 "permission of the copyright holder.</quote> to the license reference or copy."
1502 msgstr ""
1504 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1505 #: ../en/appD-license.xml:160
1506 msgid ""
1507 "To prohibit any publication of this work or derivative works in whole or in "
1508 "part in standard (paper) book form for commercial purposes is prohibited "
1509 "unless prior permission is obtained from the copyright holder."
1510 msgstr ""
1512 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
1513 #: ../en/appD-license.xml:165
1514 msgid ""
1515 "To accomplish this, add the phrase <quote>Distribution of the work or "
1516 "derivative of the work in any standard (paper) book form is prohibited unless "
1517 "prior permission is obtained from the copyright holder.</quote> to the "
1518 "license reference or copy."
1519 msgstr ""
1521 #. type: Content of: <book><chapter><title>
1522 #: ../en/ch01-intro.xml:5
1523 msgid "Introduction"
1524 msgstr "简介"
1526 #. type: Content of: <book><chapter><sect1><title>
1527 #: ../en/ch01-intro.xml:8
1528 msgid "About revision control"
1529 msgstr "关于版本控制"
1531 #. type: Content of: <book><chapter><sect1><para>
1532 #: ../en/ch01-intro.xml:10
1533 msgid ""
1534 "Revision control is the process of managing multiple versions of a piece of "
1535 "information. In its simplest form, this is something that many people do by "
1536 "hand: every time you modify a file, save it under a new name that contains a "
1537 "number, each one higher than the number of the preceding version."
1538 msgstr ""
1540 #. type: Content of: <book><chapter><sect1><para>
1541 #: ../en/ch01-intro.xml:16
1542 msgid ""
1543 "Manually managing multiple versions of even a single file is an error-prone "
1544 "task, though, so software tools to help automate this process have long been "
1545 "available. The earliest automated revision control tools were intended to "
1546 "help a single user to manage revisions of a single file. Over the past few "
1547 "decades, the scope of revision control tools has expanded greatly; they now "
1548 "manage multiple files, and help multiple people to work together. The best "
1549 "modern revision control tools have no problem coping with thousands of people "
1550 "working together on projects that consist of hundreds of thousands of files."
1551 msgstr ""
1553 #. type: Content of: <book><chapter><sect1><sect2><title>
1554 #: ../en/ch01-intro.xml:28
1555 msgid "Why use revision control?"
1556 msgstr "为什么使用版本控制?"
1558 #. type: Content of: <book><chapter><sect1><sect2><para>
1559 #: ../en/ch01-intro.xml:30
1560 msgid ""
1561 "There are a number of reasons why you or your team might want to use an "
1562 "automated revision control tool for a project."
1563 msgstr ""
1565 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1566 #: ../en/ch01-intro.xml:34
1567 msgid ""
1568 "It will track the history and evolution of your project, so you don't have "
1569 "to. For every change, you'll have a log of <emphasis>who</emphasis> made it; "
1570 "<emphasis>why</emphasis> they made it; <emphasis>when</emphasis> they made "
1571 "it; and <emphasis>what</emphasis> the change was."
1572 msgstr ""
1574 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1575 #: ../en/ch01-intro.xml:41
1576 msgid ""
1577 "When you're working with other people, revision control software makes it "
1578 "easier for you to collaborate. For example, when people more or less "
1579 "simultaneously make potentially incompatible changes, the software will help "
1580 "you to identify and resolve those conflicts."
1581 msgstr ""
1583 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1584 #: ../en/ch01-intro.xml:47
1585 msgid ""
1586 "It can help you to recover from mistakes. If you make a change that later "
1587 "turns out to be in error, you can revert to an earlier version of one or more "
1588 "files. In fact, a <emphasis>really</emphasis> good revision control tool "
1589 "will even help you to efficiently figure out exactly when a problem was "
1590 "introduced (see section <xref linkend=\"sec.undo.bisect\"/> for details)."
1591 msgstr ""
1593 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1594 #: ../en/ch01-intro.xml:54
1595 msgid ""
1596 "It will help you to work simultaneously on, and manage the drift between, "
1597 "multiple versions of your project."
1598 msgstr ""
1600 #. type: Content of: <book><chapter><sect1><sect2><para>
1601 #: ../en/ch01-intro.xml:57
1602 msgid ""
1603 "Most of these reasons are equally valid---at least in theory---whether you're "
1604 "working on a project by yourself, or with a hundred other people."
1605 msgstr ""
1607 #. type: Content of: <book><chapter><sect1><sect2><para>
1608 #: ../en/ch01-intro.xml:61
1609 msgid ""
1610 "A key question about the practicality of revision control at these two "
1611 "different scales (<quote>lone hacker</quote> and <quote>huge team</quote>) is "
1612 "how its <emphasis>benefits</emphasis> compare to its <emphasis>costs</"
1613 "emphasis>. A revision control tool that's difficult to understand or use is "
1614 "going to impose a high cost."
1615 msgstr ""
1617 #. type: Content of: <book><chapter><sect1><sect2><para>
1618 #: ../en/ch01-intro.xml:69
1619 msgid ""
1620 "A five-hundred-person project is likely to collapse under its own weight "
1621 "almost immediately without a revision control tool and process. In this case, "
1622 "the cost of using revision control might hardly seem worth considering, since "
1623 "<emphasis>without</emphasis> it, failure is almost guaranteed."
1624 msgstr ""
1626 #. type: Content of: <book><chapter><sect1><sect2><para>
1627 #: ../en/ch01-intro.xml:76
1628 msgid ""
1629 "On the other hand, a one-person <quote>quick hack</quote> might seem like a "
1630 "poor place to use a revision control tool, because surely the cost of using "
1631 "one must be close to the overall cost of the project. Right?"
1632 msgstr ""
1634 #. type: Content of: <book><chapter><sect1><sect2><para>
1635 #: ../en/ch01-intro.xml:81
1636 msgid ""
1637 "Mercurial uniquely supports <emphasis>both</emphasis> of these scales of "
1638 "development. You can learn the basics in just a few minutes, and due to its "
1639 "low overhead, you can apply revision control to the smallest of projects with "
1640 "ease. Its simplicity means you won't have a lot of abstruse concepts or "
1641 "command sequences competing for mental space with whatever you're "
1642 "<emphasis>really</emphasis> trying to do. At the same time, Mercurial's high "
1643 "performance and peer-to-peer nature let you scale painlessly to handle large "
1644 "projects."
1645 msgstr ""
1647 #. type: Content of: <book><chapter><sect1><sect2><para>
1648 #: ../en/ch01-intro.xml:91
1649 msgid ""
1650 "No revision control tool can rescue a poorly run project, but a good choice "
1651 "of tools can make a huge difference to the fluidity with which you can work "
1652 "on a project."
1653 msgstr ""
1655 #. type: Content of: <book><chapter><sect1><sect2><title>
1656 #: ../en/ch01-intro.xml:97
1657 msgid "The many names of revision control"
1658 msgstr "版本控制的别名"
1660 #. type: Content of: <book><chapter><sect1><sect2><para>
1661 #: ../en/ch01-intro.xml:99
1662 msgid ""
1663 "Revision control is a diverse field, so much so that it doesn't actually have "
1664 "a single name or acronym. Here are a few of the more common names and "
1665 "acronyms you'll encounter:"
1666 msgstr ""
1668 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1669 #: ../en/ch01-intro.xml:104
1670 msgid "Revision control (RCS)"
1671 msgstr "版本控制(RCS)"
1673 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1674 #: ../en/ch01-intro.xml:105
1675 msgid "Software configuration management (SCM), or configuration management"
1676 msgstr "软件配置管理(SCM)，或配置管理"
1678 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1679 #: ../en/ch01-intro.xml:107
1680 msgid "Source code management"
1681 msgstr "源代码管理"
1683 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1684 #: ../en/ch01-intro.xml:108
1685 msgid "Source code control, or source control"
1686 msgstr "源代码控制，或源控制"
1688 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
1689 #: ../en/ch01-intro.xml:110
1690 msgid "Version control (VCS)"
1691 msgstr "版本控制(VCS)"
1693 #. type: Content of: <book><chapter><sect1><sect2><para>
1694 #: ../en/ch01-intro.xml:112
1695 msgid ""
1696 "Some people claim that these terms actually have different meanings, but in "
1697 "practice they overlap so much that there's no agreed or even useful way to "
1698 "tease them apart."
1699 msgstr ""
1701 #. type: Content of: <book><chapter><sect1><title>
1702 #: ../en/ch01-intro.xml:119
1703 msgid "A short history of revision control"
1704 msgstr "版本控制简史"
1706 #. type: Content of: <book><chapter><sect1><para>
1707 #: ../en/ch01-intro.xml:121
1708 msgid ""
1709 "The best known of the old-time revision control tools is SCCS (Source Code "
1710 "Control System), which Marc Rochkind wrote at Bell Labs, in the early 1970s. "
1711 "SCCS operated on individual files, and required every person working on a "
1712 "project to have access to a shared workspace on a single system. Only one "
1713 "person could modify a file at any time; arbitration for access to files was "
1714 "via locks. It was common for people to lock files, and later forget to "
1715 "unlock them, preventing anyone else from modifying those files without the "
1716 "help of an administrator."
1717 msgstr ""
1719 #. type: Content of: <book><chapter><sect1><para>
1720 #: ../en/ch01-intro.xml:132
1721 msgid ""
1722 "Walter Tichy developed a free alternative to SCCS in the early 1980s; he "
1723 "called his program RCS (Revision Control System). Like SCCS, RCS required "
1724 "developers to work in a single shared workspace, and to lock files to prevent "
1725 "multiple people from modifying them simultaneously."
1726 msgstr ""
1728 #. type: Content of: <book><chapter><sect1><para>
1729 #: ../en/ch01-intro.xml:138
1730 msgid ""
1731 "Later in the 1980s, Dick Grune used RCS as a building block for a set of "
1732 "shell scripts he initially called cmt, but then renamed to CVS (Concurrent "
1733 "Versions System). The big innovation of CVS was that it let developers work "
1734 "simultaneously and somewhat independently in their own personal workspaces. "
1735 "The personal workspaces prevented developers from stepping on each other's "
1736 "toes all the time, as was common with SCCS and RCS. Each developer had a copy "
1737 "of every project file, and could modify their copies independently. They had "
1738 "to merge their edits prior to committing changes to the central repository."
1739 msgstr ""
1741 #. type: Content of: <book><chapter><sect1><para>
1742 #: ../en/ch01-intro.xml:149
1743 msgid ""
1744 "Brian Berliner took Grune's original scripts and rewrote them in C, releasing "
1745 "in 1989 the code that has since developed into the modern version of CVS. "
1746 "CVS subsequently acquired the ability to operate over a network connection, "
1747 "giving it a client/server architecture. CVS's architecture is centralised; "
1748 "only the server has a copy of the history of the project. Client workspaces "
1749 "just contain copies of recent versions of the project's files, and a little "
1750 "metadata to tell them where the server is. CVS has been enormously "
1751 "successful; it is probably the world's most widely used revision control "
1752 "system."
1753 msgstr ""
1755 #. type: Content of: <book><chapter><sect1><para>
1756 #: ../en/ch01-intro.xml:160
1757 msgid ""
1758 "In the early 1990s, Sun Microsystems developed an early distributed revision "
1759 "control system, called TeamWare. A TeamWare workspace contains a complete "
1760 "copy of the project's history. TeamWare has no notion of a central "
1761 "repository. (CVS relied upon RCS for its history storage; TeamWare used "
1762 "SCCS.)"
1763 msgstr ""
1765 #. type: Content of: <book><chapter><sect1><para>
1766 #: ../en/ch01-intro.xml:167
1767 msgid ""
1768 "As the 1990s progressed, awareness grew of a number of problems with CVS. It "
1769 "records simultaneous changes to multiple files individually, instead of "
1770 "grouping them together as a single logically atomic operation. It does not "
1771 "manage its file hierarchy well; it is easy to make a mess of a repository by "
1772 "renaming files and directories. Worse, its source code is difficult to read "
1773 "and maintain, which made the <quote>pain level</quote> of fixing these "
1774 "architectural problems prohibitive."
1775 msgstr ""
1777 #. type: Content of: <book><chapter><sect1><para>
1778 #: ../en/ch01-intro.xml:177
1779 msgid ""
1780 "In 2001, Jim Blandy and Karl Fogel, two developers who had worked on CVS, "
1781 "started a project to replace it with a tool that would have a better "
1782 "architecture and cleaner code. The result, Subversion, does not stray from "
1783 "CVS's centralised client/server model, but it adds multi-file atomic commits, "
1784 "better namespace management, and a number of other features that make it a "
1785 "generally better tool than CVS. Since its initial release, it has rapidly "
1786 "grown in popularity."
1787 msgstr ""
1789 #. type: Content of: <book><chapter><sect1><para>
1790 #: ../en/ch01-intro.xml:186
1791 msgid ""
1792 "More or less simultaneously, Graydon Hoare began working on an ambitious "
1793 "distributed revision control system that he named Monotone. While Monotone "
1794 "addresses many of CVS's design flaws and has a peer-to-peer architecture, it "
1795 "goes beyond earlier (and subsequent) revision control tools in a number of "
1796 "innovative ways. It uses cryptographic hashes as identifiers, and has an "
1797 "integral notion of <quote>trust</quote> for code from different sources."
1798 msgstr ""
1800 #. type: Content of: <book><chapter><sect1><para>
1801 #: ../en/ch01-intro.xml:195
1802 msgid ""
1803 "Mercurial began life in 2005. While a few aspects of its design are "
1804 "influenced by Monotone, Mercurial focuses on ease of use, high performance, "
1805 "and scalability to very large projects."
1806 msgstr ""
1808 #. type: Content of: <book><chapter><sect1><title>
1809 #: ../en/ch01-intro.xml:202
1810 msgid "Trends in revision control"
1811 msgstr "版本控制的发展趋势"
1813 #. type: Content of: <book><chapter><sect1><para>
1814 #: ../en/ch01-intro.xml:204
1815 msgid ""
1816 "There has been an unmistakable trend in the development and use of revision "
1817 "control tools over the past four decades, as people have become familiar with "
1818 "the capabilities of their tools and constrained by their limitations."
1819 msgstr ""
1821 #. type: Content of: <book><chapter><sect1><para>
1822 #: ../en/ch01-intro.xml:209
1823 msgid ""
1824 "The first generation began by managing single files on individual computers. "
1825 "Although these tools represented a huge advance over ad-hoc manual revision "
1826 "control, their locking model and reliance on a single computer limited them "
1827 "to small, tightly-knit teams."
1828 msgstr ""
1830 #. type: Content of: <book><chapter><sect1><para>
1831 #: ../en/ch01-intro.xml:215
1832 msgid ""
1833 "The second generation loosened these constraints by moving to network-"
1834 "centered architectures, and managing entire projects at a time. As projects "
1835 "grew larger, they ran into new problems. With clients needing to talk to "
1836 "servers very frequently, server scaling became an issue for large projects. "
1837 "An unreliable network connection could prevent remote users from being able "
1838 "to talk to the server at all. As open source projects started making read-"
1839 "only access available anonymously to anyone, people without commit privileges "
1840 "found that they could not use the tools to interact with a project in a "
1841 "natural way, as they could not record their changes."
1842 msgstr ""
1844 #. type: Content of: <book><chapter><sect1><para>
1845 #: ../en/ch01-intro.xml:227
1846 msgid ""
1847 "The current generation of revision control tools is peer-to-peer in nature. "
1848 "All of these systems have dropped the dependency on a single central server, "
1849 "and allow people to distribute their revision control data to where it's "
1850 "actually needed. Collaboration over the Internet has moved from constrained "
1851 "by technology to a matter of choice and consensus. Modern tools can operate "
1852 "offline indefinitely and autonomously, with a network connection only needed "
1853 "when syncing changes with another repository."
1854 msgstr ""
1856 #. type: Content of: <book><chapter><sect1><title>
1857 #: ../en/ch01-intro.xml:239
1858 msgid "A few of the advantages of distributed revision control"
1859 msgstr "分布版本控制的优点"
1861 #. type: Content of: <book><chapter><sect1><para>
1862 #: ../en/ch01-intro.xml:242
1863 msgid ""
1864 "Even though distributed revision control tools have for several years been as "
1865 "robust and usable as their previous-generation counterparts, people using "
1866 "older tools have not yet necessarily woken up to their advantages. There are "
1867 "a number of ways in which distributed tools shine relative to centralised "
1868 "ones."
1869 msgstr ""
1871 #. type: Content of: <book><chapter><sect1><para>
1872 #: ../en/ch01-intro.xml:249
1873 msgid ""
1874 "For an individual developer, distributed tools are almost always much faster "
1875 "than centralised tools. This is for a simple reason: a centralised tool "
1876 "needs to talk over the network for many common operations, because most "
1877 "metadata is stored in a single copy on the central server. A distributed "
1878 "tool stores all of its metadata locally. All else being equal, talking over "
1879 "the network adds overhead to a centralised tool. Don't underestimate the "
1880 "value of a snappy, responsive tool: you're going to spend a lot of time "
1881 "interacting with your revision control software."
1882 msgstr ""
1884 #. type: Content of: <book><chapter><sect1><para>
1885 #: ../en/ch01-intro.xml:260
1886 msgid ""
1887 "Distributed tools are indifferent to the vagaries of your server "
1888 "infrastructure, again because they replicate metadata to so many locations. "
1889 "If you use a centralised system and your server catches fire, you'd better "
1890 "hope that your backup media are reliable, and that your last backup was "
1891 "recent and actually worked. With a distributed tool, you have many backups "
1892 "available on every contributor's computer."
1893 msgstr ""
1895 #. type: Content of: <book><chapter><sect1><para>
1896 #: ../en/ch01-intro.xml:268
1897 msgid ""
1898 "The reliability of your network will affect distributed tools far less than "
1899 "it will centralised tools. You can't even use a centralised tool without a "
1900 "network connection, except for a few highly constrained commands. With a "
1901 "distributed tool, if your network connection goes down while you're working, "
1902 "you may not even notice. The only thing you won't be able to do is talk to "
1903 "repositories on other computers, something that is relatively rare compared "
1904 "with local operations. If you have a far-flung team of collaborators, this "
1905 "may be significant."
1906 msgstr ""
1908 #. type: Content of: <book><chapter><sect1><sect2><title>
1909 #: ../en/ch01-intro.xml:279
1910 msgid "Advantages for open source projects"
1911 msgstr "开源项目的优点"
1913 #. type: Content of: <book><chapter><sect1><sect2><para>
1914 #: ../en/ch01-intro.xml:281
1915 msgid ""
1916 "If you take a shine to an open source project and decide that you would like "
1917 "to start hacking on it, and that project uses a distributed revision control "
1918 "tool, you are at once a peer with the people who consider themselves the "
1919 "<quote>core</quote> of that project. If they publish their repositories, you "
1920 "can immediately copy their project history, start making changes, and record "
1921 "your work, using the same tools in the same ways as insiders. By contrast, "
1922 "with a centralised tool, you must use the software in a <quote>read only</"
1923 "quote> mode unless someone grants you permission to commit changes to their "
1924 "central server. Until then, you won't be able to record changes, and your "
1925 "local modifications will be at risk of corruption any time you try to update "
1926 "your client's view of the repository."
1927 msgstr ""
1929 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
1930 #: ../en/ch01-intro.xml:297
1931 msgid "The forking non-problem"
1932 msgstr ""
1934 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
1935 #: ../en/ch01-intro.xml:299
1936 msgid ""
1937 "It has been suggested that distributed revision control tools pose some sort "
1938 "of risk to open source projects because they make it easy to <quote>fork</"
1939 "quote> the development of a project. A fork happens when there are "
1940 "differences in opinion or attitude between groups of developers that cause "
1941 "them to decide that they can't work together any longer. Each side takes a "
1942 "more or less complete copy of the project's source code, and goes off in its "
1943 "own direction."
1944 msgstr ""
1946 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
1947 #: ../en/ch01-intro.xml:309
1948 msgid ""
1949 "Sometimes the camps in a fork decide to reconcile their differences. With a "
1950 "centralised revision control system, the <emphasis>technical</emphasis> "
1951 "process of reconciliation is painful, and has to be performed largely by "
1952 "hand. You have to decide whose revision history is going to <quote>win</"
1953 "quote>, and graft the other team's changes into the tree somehow. This "
1954 "usually loses some or all of one side's revision history."
1955 msgstr ""
1957 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
1958 #: ../en/ch01-intro.xml:318
1959 msgid ""
1960 "What distributed tools do with respect to forking is they make forking the "
1961 "<emphasis>only</emphasis> way to develop a project. Every single change that "
1962 "you make is potentially a fork point. The great strength of this approach is "
1963 "that a distributed revision control tool has to be really good at "
1964 "<emphasis>merging</emphasis> forks, because forks are absolutely fundamental: "
1965 "they happen all the time."
1966 msgstr ""
1968 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
1969 #: ../en/ch01-intro.xml:327
1970 msgid ""
1971 "If every piece of work that everybody does, all the time, is framed in terms "
1972 "of forking and merging, then what the open source world refers to as a "
1973 "<quote>fork</quote> becomes <emphasis>purely</emphasis> a social issue. If "
1974 "anything, distributed tools <emphasis>lower</emphasis> the likelihood of a "
1975 "fork:"
1976 msgstr ""
1978 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
1979 #: ../en/ch01-intro.xml:334
1980 msgid ""
1981 "They eliminate the social distinction that centralised tools impose: that "
1982 "between insiders (people with commit access) and outsiders (people without)."
1983 msgstr ""
1985 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
1986 #: ../en/ch01-intro.xml:338
1987 msgid ""
1988 "They make it easier to reconcile after a social fork, because all that's "
1989 "involved from the perspective of the revision control software is just "
1990 "another merge."
1991 msgstr ""
1993 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
1994 #: ../en/ch01-intro.xml:343
1995 msgid ""
1996 "Some people resist distributed tools because they want to retain tight "
1997 "control over their projects, and they believe that centralised tools give "
1998 "them this control. However, if you're of this belief, and you publish your "
1999 "CVS or Subversion repositories publicly, there are plenty of tools available "
2000 "that can pull out your entire project's history (albeit slowly) and recreate "
2001 "it somewhere that you don't control. So while your control in this case is "
2002 "illusory, you are forgoing the ability to fluidly collaborate with whatever "
2003 "people feel compelled to mirror and fork your history."
2004 msgstr ""
2006 #. type: Content of: <book><chapter><sect1><sect2><title>
2007 #: ../en/ch01-intro.xml:358
2008 msgid "Advantages for commercial projects"
2009 msgstr "商业项目的优点"
2011 #. type: Content of: <book><chapter><sect1><sect2><para>
2012 #: ../en/ch01-intro.xml:360
2013 msgid ""
2014 "Many commercial projects are undertaken by teams that are scattered across "
2015 "the globe. Contributors who are far from a central server will see slower "
2016 "command execution and perhaps less reliability. Commercial revision control "
2017 "systems attempt to ameliorate these problems with remote-site replication add-"
2018 "ons that are typically expensive to buy and cantankerous to administer. A "
2019 "distributed system doesn't suffer from these problems in the first place. "
2020 "Better yet, you can easily set up multiple authoritative servers, say one per "
2021 "site, so that there's no redundant communication between repositories over "
2022 "expensive long-haul network links."
2023 msgstr ""
2025 #. type: Content of: <book><chapter><sect1><sect2><para>
2026 #: ../en/ch01-intro.xml:372
2027 msgid ""
2028 "Centralised revision control systems tend to have relatively low "
2029 "scalability. It's not unusual for an expensive centralised system to fall "
2030 "over under the combined load of just a few dozen concurrent users. Once "
2031 "again, the typical response tends to be an expensive and clunky replication "
2032 "facility. Since the load on a central server---if you have one at all---is "
2033 "many times lower with a distributed tool (because all of the data is "
2034 "replicated everywhere), a single cheap server can handle the needs of a much "
2035 "larger team, and replication to balance load becomes a simple matter of "
2036 "scripting."
2037 msgstr ""
2039 #. type: Content of: <book><chapter><sect1><sect2><para>
2040 #: ../en/ch01-intro.xml:384
2041 msgid ""
2042 "If you have an employee in the field, troubleshooting a problem at a "
2043 "customer's site, they'll benefit from distributed revision control. The tool "
2044 "will let them generate custom builds, try different fixes in isolation from "
2045 "each other, and search efficiently through history for the sources of bugs "
2046 "and regressions in the customer's environment, all without needing to connect "
2047 "to your company's network."
2048 msgstr ""
2050 #. type: Content of: <book><chapter><sect1><title>
2051 #: ../en/ch01-intro.xml:395
2052 msgid "Why choose Mercurial?"
2053 msgstr "为什么选择 Mercurial?"
2055 #. type: Content of: <book><chapter><sect1><para>
2056 #: ../en/ch01-intro.xml:397
2057 msgid ""
2058 "Mercurial has a unique set of properties that make it a particularly good "
2059 "choice as a revision control system."
2060 msgstr ""
2062 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2063 #: ../en/ch01-intro.xml:400
2064 msgid "It is easy to learn and use."
2065 msgstr ""
2067 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2068 #: ../en/ch01-intro.xml:401
2069 msgid "It is lightweight."
2070 msgstr ""
2072 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2073 #: ../en/ch01-intro.xml:402
2074 msgid "It scales excellently."
2075 msgstr ""
2077 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2078 #: ../en/ch01-intro.xml:403
2079 msgid "It is easy to customise."
2080 msgstr ""
2082 #. type: Content of: <book><chapter><sect1><para>
2083 #: ../en/ch01-intro.xml:406
2084 msgid ""
2085 "If you are at all familiar with revision control systems, you should be able "
2086 "to get up and running with Mercurial in less than five minutes. Even if not, "
2087 "it will take no more than a few minutes longer. Mercurial's command and "
2088 "feature sets are generally uniform and consistent, so you can keep track of a "
2089 "few general rules instead of a host of exceptions."
2090 msgstr ""
2092 #. type: Content of: <book><chapter><sect1><para>
2093 #: ../en/ch01-intro.xml:413
2094 msgid ""
2095 "On a small project, you can start working with Mercurial in moments. Creating "
2096 "new changes and branches; transferring changes around (whether locally or "
2097 "over a network); and history and status operations are all fast. Mercurial "
2098 "attempts to stay nimble and largely out of your way by combining low "
2099 "cognitive overhead with blazingly fast operations."
2100 msgstr ""
2102 #. type: Content of: <book><chapter><sect1><para>
2103 #: ../en/ch01-intro.xml:420
2104 msgid ""
2105 "The usefulness of Mercurial is not limited to small projects: it is used by "
2106 "projects with hundreds to thousands of contributors, each containing tens of "
2107 "thousands of files and hundreds of megabytes of source code."
2108 msgstr ""
2110 #. type: Content of: <book><chapter><sect1><para>
2111 #: ../en/ch01-intro.xml:425
2112 msgid ""
2113 "If the core functionality of Mercurial is not enough for you, it's easy to "
2114 "build on. Mercurial is well suited to scripting tasks, and its clean "
2115 "internals and implementation in Python make it easy to add features in the "
2116 "form of extensions. There are a number of popular and useful extensions "
2117 "already available, ranging from helping to identify bugs to improving "
2118 "performance."
2119 msgstr ""
2121 #. type: Content of: <book><chapter><sect1><title>
2122 #: ../en/ch01-intro.xml:435
2123 msgid "Mercurial compared with other tools"
2124 msgstr "Mercurial 与其它工具的比较"
2126 #. type: Content of: <book><chapter><sect1><para>
2127 #: ../en/ch01-intro.xml:437
2128 msgid ""
2129 "Before you read on, please understand that this section necessarily reflects "
2130 "my own experiences, interests, and (dare I say it) biases. I have used every "
2131 "one of the revision control tools listed below, in most cases for several "
2132 "years at a time."
2133 msgstr ""
2135 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2136 #: ../en/ch01-intro.xml:445 ../en/ch01-intro.xml:656
2137 msgid "Subversion"
2138 msgstr ""
2140 #. type: Content of: <book><chapter><sect1><sect2><para>
2141 #: ../en/ch01-intro.xml:447
2142 msgid ""
2143 "Subversion is a popular revision control tool, developed to replace CVS. It "
2144 "has a centralised client/server architecture."
2145 msgstr ""
2147 #. type: Content of: <book><chapter><sect1><sect2><para>
2148 #: ../en/ch01-intro.xml:451
2149 msgid ""
2150 "Subversion and Mercurial have similarly named commands for performing the "
2151 "same operations, so if you're familiar with one, it is easy to learn to use "
2152 "the other. Both tools are portable to all popular operating systems."
2153 msgstr ""
2155 #. type: Content of: <book><chapter><sect1><sect2><para>
2156 #: ../en/ch01-intro.xml:456
2157 msgid ""
2158 "Prior to version 1.5, Subversion had no useful support for merges. At the "
2159 "time of writing, its merge tracking capability is new, and known to be <ulink "
2160 "url=\"http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced."
2161 "html#svn.branchmerge.advanced.finalword\">complicated and buggy</ulink>."
2162 msgstr ""
2164 #. type: Content of: <book><chapter><sect1><sect2><para>
2165 #: ../en/ch01-intro.xml:462
2166 msgid ""
2167 "Mercurial has a substantial performance advantage over Subversion on every "
2168 "revision control operation I have benchmarked. I have measured its advantage "
2169 "as ranging from a factor of two to a factor of six when compared with "
2170 "Subversion 1.4.3's <emphasis>ra_local</emphasis> file store, which is the "
2171 "fastest access method available. In more realistic deployments involving a "
2172 "network-based store, Subversion will be at a substantially larger "
2173 "disadvantage. Because many Subversion commands must talk to the server and "
2174 "Subversion does not have useful replication facilities, server capacity and "
2175 "network bandwidth become bottlenecks for modestly large projects."
2176 msgstr ""
2178 #. type: Content of: <book><chapter><sect1><sect2><para>
2179 #: ../en/ch01-intro.xml:475
2180 msgid ""
2181 "Additionally, Subversion incurs substantial storage overhead to avoid network "
2182 "transactions for a few common operations, such as finding modified files "
2183 "(<literal>status</literal>) and displaying modifications against the current "
2184 "revision (<literal>diff</literal>). As a result, a Subversion working copy "
2185 "is often the same size as, or larger than, a Mercurial repository and working "
2186 "directory, even though the Mercurial repository contains a complete history "
2187 "of the project."
2188 msgstr ""
2190 #. type: Content of: <book><chapter><sect1><sect2><para>
2191 #: ../en/ch01-intro.xml:485
2192 msgid ""
2193 "Subversion is widely supported by third party tools. Mercurial currently "
2194 "lags considerably in this area. This gap is closing, however, and indeed "
2195 "some of Mercurial's GUI tools now outshine their Subversion equivalents. "
2196 "Like Mercurial, Subversion has an excellent user manual."
2197 msgstr ""
2199 #. type: Content of: <book><chapter><sect1><sect2><para>
2200 #: ../en/ch01-intro.xml:491
2201 msgid ""
2202 "Because Subversion doesn't store revision history on the client, it is well "
2203 "suited to managing projects that deal with lots of large, opaque binary "
2204 "files. If you check in fifty revisions to an incompressible 10MB file, "
2205 "Subversion's client-side space usage stays constant The space used by any "
2206 "distributed SCM will grow rapidly in proportion to the number of revisions, "
2207 "because the differences between each revision are large."
2208 msgstr ""
2210 #. type: Content of: <book><chapter><sect1><sect2><para>
2211 #: ../en/ch01-intro.xml:500
2212 msgid ""
2213 "In addition, it's often difficult or, more usually, impossible to merge "
2214 "different versions of a binary file. Subversion's ability to let a user lock "
2215 "a file, so that they temporarily have the exclusive right to commit changes "
2216 "to it, can be a significant advantage to a project where binary files are "
2217 "widely used."
2218 msgstr ""
2220 #. type: Content of: <book><chapter><sect1><sect2><para>
2221 #: ../en/ch01-intro.xml:507
2222 msgid ""
2223 "Mercurial can import revision history from a Subversion repository. It can "
2224 "also export revision history to a Subversion repository. This makes it easy "
2225 "to <quote>test the waters</quote> and use Mercurial and Subversion in "
2226 "parallel before deciding to switch. History conversion is incremental, so "
2227 "you can perform an initial conversion, then small additional conversions "
2228 "afterwards to bring in new changes."
2229 msgstr ""
2231 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2232 #: ../en/ch01-intro.xml:519 ../en/ch01-intro.xml:658
2233 msgid "Git"
2234 msgstr ""
2236 #. type: Content of: <book><chapter><sect1><sect2><para>
2237 #: ../en/ch01-intro.xml:521
2238 msgid ""
2239 "Git is a distributed revision control tool that was developed for managing "
2240 "the Linux kernel source tree. Like Mercurial, its early design was somewhat "
2241 "influenced by Monotone."
2242 msgstr ""
2244 #. type: Content of: <book><chapter><sect1><sect2><para>
2245 #: ../en/ch01-intro.xml:526
2246 msgid ""
2247 "Git has a very large command set, with version 1.5.0 providing 139 individual "
2248 "commands. It has something of a reputation for being difficult to learn. "
2249 "Compared to Git, Mercurial has a strong focus on simplicity."
2250 msgstr ""
2252 #. type: Content of: <book><chapter><sect1><sect2><para>
2253 #: ../en/ch01-intro.xml:531
2254 msgid ""
2255 "In terms of performance, Git is extremely fast. In several cases, it is "
2256 "faster than Mercurial, at least on Linux, while Mercurial performs better on "
2257 "other operations. However, on Windows, the performance and general level of "
2258 "support that Git provides is, at the time of writing, far behind that of "
2259 "Mercurial."
2260 msgstr ""
2262 #. type: Content of: <book><chapter><sect1><sect2><para>
2263 #: ../en/ch01-intro.xml:538
2264 msgid ""
2265 "While a Mercurial repository needs no maintenance, a Git repository requires "
2266 "frequent manual <quote>repacks</quote> of its metadata. Without these, "
2267 "performance degrades, while space usage grows rapidly. A server that "
2268 "contains many Git repositories that are not rigorously and frequently "
2269 "repacked will become heavily disk-bound during backups, and there have been "
2270 "instances of daily backups taking far longer than 24 hours as a result. A "
2271 "freshly packed Git repository is slightly smaller than a Mercurial "
2272 "repository, but an unpacked repository is several orders of magnitude larger."
2273 msgstr ""
2275 #. type: Content of: <book><chapter><sect1><sect2><para>
2276 #: ../en/ch01-intro.xml:549
2277 msgid ""
2278 "The core of Git is written in C. Many Git commands are implemented as shell "
2279 "or Perl scripts, and the quality of these scripts varies widely. I have "
2280 "encountered several instances where scripts charged along blindly in the "
2281 "presence of errors that should have been fatal."
2282 msgstr ""
2284 #. type: Content of: <book><chapter><sect1><sect2><para>
2285 #: ../en/ch01-intro.xml:555
2286 msgid "Mercurial can import revision history from a Git repository."
2287 msgstr ""
2289 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2290 #: ../en/ch01-intro.xml:561 ../en/ch01-intro.xml:657
2291 msgid "CVS"
2292 msgstr ""
2294 #. type: Content of: <book><chapter><sect1><sect2><para>
2295 #: ../en/ch01-intro.xml:563
2296 msgid ""
2297 "CVS is probably the most widely used revision control tool in the world. Due "
2298 "to its age and internal untidiness, it has been only lightly maintained for "
2299 "many years."
2300 msgstr ""
2302 #. type: Content of: <book><chapter><sect1><sect2><para>
2303 #: ../en/ch01-intro.xml:567
2304 msgid ""
2305 "It has a centralised client/server architecture. It does not group related "
2306 "file changes into atomic commits, making it easy for people to <quote>break "
2307 "the build</quote>: one person can successfully commit part of a change and "
2308 "then be blocked by the need for a merge, causing other people to see only a "
2309 "portion of the work they intended to do. This also affects how you work with "
2310 "project history. If you want to see all of the modifications someone made as "
2311 "part of a task, you will need to manually inspect the descriptions and "
2312 "timestamps of the changes made to each file involved (if you even know what "
2313 "those files were)."
2314 msgstr ""
2316 #. type: Content of: <book><chapter><sect1><sect2><para>
2317 #: ../en/ch01-intro.xml:579
2318 msgid ""
2319 "CVS has a muddled notion of tags and branches that I will not attempt to even "
2320 "describe. It does not support renaming of files or directories well, making "
2321 "it easy to corrupt a repository. It has almost no internal consistency "
2322 "checking capabilities, so it is usually not even possible to tell whether or "
2323 "how a repository is corrupt. I would not recommend CVS for any project, "
2324 "existing or new."
2325 msgstr ""
2327 #. type: Content of: <book><chapter><sect1><sect2><para>
2328 #: ../en/ch01-intro.xml:587
2329 msgid ""
2330 "Mercurial can import CVS revision history. However, there are a few caveats "
2331 "that apply; these are true of every other revision control tool's CVS "
2332 "importer, too. Due to CVS's lack of atomic changes and unversioned "
2333 "filesystem hierarchy, it is not possible to reconstruct CVS history "
2334 "completely accurately; some guesswork is involved, and renames will usually "
2335 "not show up. Because a lot of advanced CVS administration has to be done by "
2336 "hand and is hence error-prone, it's common for CVS importers to run into "
2337 "multiple problems with corrupted repositories (completely bogus revision "
2338 "timestamps and files that have remained locked for over a decade are just two "
2339 "of the less interesting problems I can recall from personal experience)."
2340 msgstr ""
2342 #. type: Content of: <book><chapter><sect1><sect2><para>
2343 #: ../en/ch01-intro.xml:601
2344 msgid "Mercurial can import revision history from a CVS repository."
2345 msgstr ""
2347 #. type: Content of: <book><chapter><sect1><sect2><title>
2348 #: ../en/ch01-intro.xml:607
2349 msgid "Commercial tools"
2350 msgstr "商业工具"
2352 #. type: Content of: <book><chapter><sect1><sect2><para>
2353 #: ../en/ch01-intro.xml:609
2354 msgid ""
2355 "Perforce has a centralised client/server architecture, with no client-side "
2356 "caching of any data. Unlike modern revision control tools, Perforce requires "
2357 "that a user run a command to inform the server about every file they intend "
2358 "to edit."
2359 msgstr ""
2361 #. type: Content of: <book><chapter><sect1><sect2><para>
2362 #: ../en/ch01-intro.xml:615
2363 msgid ""
2364 "The performance of Perforce is quite good for small teams, but it falls off "
2365 "rapidly as the number of users grows beyond a few dozen. Modestly large "
2366 "Perforce installations require the deployment of proxies to cope with the "
2367 "load their users generate."
2368 msgstr ""
2370 #. type: Content of: <book><chapter><sect1><sect2><title>
2371 #: ../en/ch01-intro.xml:624
2372 msgid "Choosing a revision control tool"
2373 msgstr "选择版本控制工具"
2375 #. type: Content of: <book><chapter><sect1><sect2><para>
2376 #: ../en/ch01-intro.xml:626
2377 msgid ""
2378 "With the exception of CVS, all of the tools listed above have unique "
2379 "strengths that suit them to particular styles of work. There is no single "
2380 "revision control tool that is best in all situations."
2381 msgstr ""
2383 #. type: Content of: <book><chapter><sect1><sect2><para>
2384 #: ../en/ch01-intro.xml:631
2385 msgid ""
2386 "As an example, Subversion is a good choice for working with frequently edited "
2387 "binary files, due to its centralised nature and support for file locking."
2388 msgstr ""
2390 #. type: Content of: <book><chapter><sect1><sect2><para>
2391 #: ../en/ch01-intro.xml:635
2392 msgid ""
2393 "I personally find Mercurial's properties of simplicity, performance, and good "
2394 "merge support to be a compelling combination that has served me well for "
2395 "several years."
2396 msgstr ""
2398 #. type: Content of: <book><chapter><sect1><title>
2399 #: ../en/ch01-intro.xml:643
2400 msgid "Switching from another tool to Mercurial"
2401 msgstr "从其它工具切换到 Mercurial"
2403 #. type: Content of: <book><chapter><sect1><para>
2404 #: ../en/ch01-intro.xml:645
2405 msgid ""
2406 "Mercurial is bundled with an extension named <literal role=\"hg-ext"
2407 "\">convert</literal>, which can incrementally import revision history from "
2408 "several other revision control tools. By <quote>incremental</quote>, I mean "
2409 "that you can convert all of a project's history to date in one go, then rerun "
2410 "the conversion later to obtain new changes that happened after the initial "
2411 "conversion."
2412 msgstr ""
2414 #. type: Content of: <book><chapter><sect1><para>
2415 #: ../en/ch01-intro.xml:653
2416 msgid ""
2417 "The revision control tools supported by <literal role=\"hg-ext\">convert</"
2418 "literal> are as follows:"
2419 msgstr ""
2421 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2422 #: ../en/ch01-intro.xml:659
2423 msgid "Darcs"
2424 msgstr ""
2426 #. type: Content of: <book><chapter><sect1><para>
2427 #: ../en/ch01-intro.xml:661
2428 msgid ""
2429 "In addition, <literal role=\"hg-ext\">convert</literal> can export changes "
2430 "from Mercurial to Subversion. This makes it possible to try Subversion and "
2431 "Mercurial in parallel before committing to a switchover, without risking the "
2432 "loss of any work."
2433 msgstr ""
2435 #. type: Content of: <book><chapter><sect1><para>
2436 #: ../en/ch01-intro.xml:667
2437 msgid ""
2438 "The <command role=\"hg-ext-conver\">convert</command> command is easy to "
2439 "use. Simply point it at the path or URL of the source repository, optionally "
2440 "give it the name of the destination repository, and it will start working. "
2441 "After the initial conversion, just run the same command again to import new "
2442 "changes."
2443 msgstr ""
2445 #. type: Content of: <book><chapter><title>
2446 #: ../en/ch02-tour-basic.xml:5
2447 msgid "A tour of Mercurial: the basics"
2448 msgstr "Mercurial 教程: 基础知识"
2450 #. type: Content of: <book><chapter><sect1><title>
2451 #: ../en/ch02-tour-basic.xml:8
2452 msgid "Installing Mercurial on your system"
2453 msgstr "安装 Mercurial"
2455 #. type: Content of: <book><chapter><sect1><para>
2456 #: ../en/ch02-tour-basic.xml:10
2457 msgid ""
2458 "Prebuilt binary packages of Mercurial are available for every popular "
2459 "operating system. These make it easy to start using Mercurial on your "
2460 "computer immediately."
2461 msgstr ""
2463 #. type: Content of: <book><chapter><sect1><sect2><title>
2464 #: ../en/ch02-tour-basic.xml:15
2465 msgid "Linux"
2466 msgstr ""
2468 #. type: Content of: <book><chapter><sect1><sect2><para>
2469 #: ../en/ch02-tour-basic.xml:17
2470 msgid ""
2471 "Because each Linux distribution has its own packaging tools, policies, and "
2472 "rate of development, it's difficult to give a comprehensive set of "
2473 "instructions on how to install Mercurial binaries. The version of Mercurial "
2474 "that you will end up with can vary depending on how active the person is who "
2475 "maintains the package for your distribution."
2476 msgstr ""
2478 #. type: Content of: <book><chapter><sect1><sect2><para>
2479 #: ../en/ch02-tour-basic.xml:24
2480 msgid ""
2481 "To keep things simple, I will focus on installing Mercurial from the command "
2482 "line under the most popular Linux distributions. Most of these distributions "
2483 "provide graphical package managers that will let you install Mercurial with a "
2484 "single click; the package name to look for is <literal>mercurial</literal>."
2485 msgstr ""
2487 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2488 #: ../en/ch02-tour-basic.xml:32
2489 msgid "Debian:"
2490 msgstr ""
2492 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2493 #: ../en/ch02-tour-basic.xml:35
2494 msgid "Fedora Core:"
2495 msgstr ""
2497 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2498 #: ../en/ch02-tour-basic.xml:38
2499 msgid "Gentoo:"
2500 msgstr ""
2502 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2503 #: ../en/ch02-tour-basic.xml:40
2504 msgid "OpenSUSE:"
2505 msgstr ""
2507 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2508 #: ../en/ch02-tour-basic.xml:43
2509 msgid ""
2510 "Ubuntu: Ubuntu's Mercurial package is based on Debian's. To install it, run "
2511 "the following command."
2512 msgstr ""
2514 #. type: Content of: <book><chapter><sect1><sect2><title>
2515 #: ../en/ch02-tour-basic.xml:52
2516 msgid "Solaris"
2517 msgstr ""
2519 #. type: Content of: <book><chapter><sect1><sect2><para>
2520 #: ../en/ch02-tour-basic.xml:54
2521 msgid ""
2522 "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www."
2523 "sunfreeware.com</ulink>, is a good source for a large number of pre-built "
2524 "Solaris packages for 32 and 64 bit Intel and Sparc architectures, including "
2525 "current versions of Mercurial."
2526 msgstr ""
2528 #. type: Content of: <book><chapter><sect1><sect2><title>
2529 #: ../en/ch02-tour-basic.xml:62
2530 msgid "Mac OS X"
2531 msgstr ""
2533 #. type: Content of: <book><chapter><sect1><sect2><para>
2534 #: ../en/ch02-tour-basic.xml:64
2535 msgid ""
2536 "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url="
2537 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. "
2538 "This package works on both Intel- and Power-based Macs. Before you can use "
2539 "it, you must install a compatible version of Universal MacPython "
2540 "<citation>web:macpython</citation>. This is easy to do; simply follow the "
2541 "instructions on Lee's site."
2542 msgstr ""
2544 #. type: Content of: <book><chapter><sect1><sect2><para>
2545 #: ../en/ch02-tour-basic.xml:73
2546 msgid ""
2547 "It's also possible to install Mercurial using Fink or MacPorts, two popular "
2548 "free package managers for Mac OS X. If you have Fink, use <command>sudo apt-"
2549 "get install mercurial-py25</command>. If MacPorts, <command>sudo port "
2550 "install mercurial</command>."
2551 msgstr ""
2553 #. type: Content of: <book><chapter><sect1><sect2><title>
2554 #: ../en/ch02-tour-basic.xml:81
2555 msgid "Windows"
2556 msgstr ""
2558 #. type: Content of: <book><chapter><sect1><sect2><para>
2559 #: ../en/ch02-tour-basic.xml:83
2560 msgid ""
2561 "Lee Cantey publishes an installer of Mercurial for Windows at <ulink url="
2562 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. "
2563 "This package has no external dependencies; it <quote>just works</quote>."
2564 msgstr ""
2566 #. type: Content of: <book><chapter><sect1><sect2><note><para>
2567 #: ../en/ch02-tour-basic.xml:90
2568 msgid ""
2569 "The Windows version of Mercurial does not automatically convert line endings "
2570 "between Windows and Unix styles. If you want to share work with Unix users, "
2571 "you must do a little additional configuration work. XXX Flesh this out."
2572 msgstr ""
2574 #. type: Content of: <book><chapter><sect1><title>
2575 #: ../en/ch02-tour-basic.xml:100
2576 msgid "Getting started"
2577 msgstr "开始"
2579 #. type: Content of: <book><chapter><sect1><para>
2580 #: ../en/ch02-tour-basic.xml:102
2581 msgid ""
2582 "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command "
2583 "to find out whether Mercurial is actually installed properly. The actual "
2584 "version information that it prints isn't so important; it's whether it prints "
2585 "anything at all that we care about."
2586 msgstr ""
2588 #. type: Content of: <book><chapter><sect1><sect2><title>
2589 #: ../en/ch02-tour-basic.xml:111
2590 msgid "Built-in help"
2591 msgstr "内置帮助"
2593 #. type: Content of: <book><chapter><sect1><sect2><para>
2594 #: ../en/ch02-tour-basic.xml:113
2595 msgid ""
2596 "Mercurial provides a built-in help system. This is invaluable for those "
2597 "times when you find yourself stuck trying to remember how to run a command. "
2598 "If you are completely stuck, simply run <command role=\"hg-cmd\">hg help</"
2599 "command>; it will print a brief list of commands, along with a description of "
2600 "what each does. If you ask for help on a specific command (as below), it "
2601 "prints more detailed information."
2602 msgstr ""
2604 #. type: Content of: <book><chapter><sect1><sect2><para>
2605 #: ../en/ch02-tour-basic.xml:124
2606 msgid ""
2607 "For a more impressive level of detail (which you won't usually need) run "
2608 "<command role=\"hg-cmd\">hg help <option role=\"hg-opt-global\">-v</option></"
2609 "command>. The <option role=\"hg-opt-global\">-v</option> option is short for "
2610 "<option role=\"hg-opt-global\">--verbose</option>, and tells Mercurial to "
2611 "print more information than it usually would."
2612 msgstr ""
2614 #. type: Content of: <book><chapter><sect1><title>
2615 #: ../en/ch02-tour-basic.xml:135
2616 msgid "Working with a repository"
2617 msgstr "使用版本库"
2619 #. type: Content of: <book><chapter><sect1><para>
2620 #: ../en/ch02-tour-basic.xml:137
2621 msgid ""
2622 "In Mercurial, everything happens inside a <emphasis>repository</emphasis>. "
2623 "The repository for a project contains all of the files that <quote>belong to</"
2624 "quote> that project, along with a historical record of the project's files."
2625 msgstr ""
2627 #. type: Content of: <book><chapter><sect1><para>
2628 #: ../en/ch02-tour-basic.xml:143
2629 msgid ""
2630 "There's nothing particularly magical about a repository; it is simply a "
2631 "directory tree in your filesystem that Mercurial treats as special. You can "
2632 "rename or delete a repository any time you like, using either the command "
2633 "line or your file browser."
2634 msgstr ""
2636 #. type: Content of: <book><chapter><sect1><sect2><title>
2637 #: ../en/ch02-tour-basic.xml:150
2638 msgid "Making a local copy of a repository"
2639 msgstr "创建版本库的工作副本"
2641 #. type: Content of: <book><chapter><sect1><sect2><para>
2642 #: ../en/ch02-tour-basic.xml:152
2643 msgid ""
2644 "<emphasis>Copying</emphasis> a repository is just a little bit special. "
2645 "While you could use a normal file copying command to make a copy of a "
2646 "repository, it's best to use a built-in command that Mercurial provides. "
2647 "This command is called <command role=\"hg-cmd\">hg clone</command>, because "
2648 "it creates an identical copy of an existing repository."
2649 msgstr ""
2651 #. type: Content of: <book><chapter><sect1><sect2><para>
2652 #: ../en/ch02-tour-basic.xml:161
2653 msgid ""
2654 "If our clone succeeded, we should now have a local directory called <filename "
2655 "class=\"directory\">hello</filename>. This directory will contain some files."
2656 msgstr ""
2658 #. type: Content of: <book><chapter><sect1><sect2><para>
2659 #: ../en/ch02-tour-basic.xml:167
2660 msgid ""
2661 "These files have the same contents and history in our repository as they do "
2662 "in the repository we cloned."
2663 msgstr ""
2665 #. type: Content of: <book><chapter><sect1><sect2><para>
2666 #: ../en/ch02-tour-basic.xml:170
2667 msgid ""
2668 "Every Mercurial repository is complete, self-contained, and independent. It "
2669 "contains its own private copy of a project's files and history. A cloned "
2670 "repository remembers the location of the repository it was cloned from, but "
2671 "it does not communicate with that repository, or any other, unless you tell "
2672 "it to."
2673 msgstr ""
2675 #. type: Content of: <book><chapter><sect1><sect2><para>
2676 #: ../en/ch02-tour-basic.xml:177
2677 msgid ""
2678 "What this means for now is that we're free to experiment with our repository, "
2679 "safe in the knowledge that it's a private <quote>sandbox</quote> that won't "
2680 "affect anyone else."
2681 msgstr ""
2683 #. type: Content of: <book><chapter><sect1><sect2><title>
2684 #: ../en/ch02-tour-basic.xml:183
2685 msgid "What's in a repository?"
2686 msgstr "什么是版本库?"
2688 #. type: Content of: <book><chapter><sect1><sect2><para>
2689 #: ../en/ch02-tour-basic.xml:185
2690 msgid ""
2691 "When we take a more detailed look inside a repository, we can see that it "
2692 "contains a directory named <filename class=\"directory\">.hg</filename>. "
2693 "This is where Mercurial keeps all of its metadata for the repository."
2694 msgstr ""
2696 #. type: Content of: <book><chapter><sect1><sect2><para>
2697 #: ../en/ch02-tour-basic.xml:192
2698 msgid ""
2699 "The contents of the <filename class=\"directory\">.hg</filename> directory "
2700 "and its subdirectories are private to Mercurial. Every other file and "
2701 "directory in the repository is yours to do with as you please."
2702 msgstr ""
2704 #. type: Content of: <book><chapter><sect1><sect2><para>
2705 #: ../en/ch02-tour-basic.xml:198
2706 msgid ""
2707 "To introduce a little terminology, the <filename class=\"directory\">.hg</"
2708 "filename> directory is the <quote>real</quote> repository, and all of the "
2709 "files and directories that coexist with it are said to live in the "
2710 "<emphasis>working directory</emphasis>. An easy way to remember the "
2711 "distinction is that the <emphasis>repository</emphasis> contains the "
2712 "<emphasis>history</emphasis> of your project, while the <emphasis>working "
2713 "directory</emphasis> contains a <emphasis>snapshot</emphasis> of your project "
2714 "at a particular point in history."
2715 msgstr ""
2717 #. type: Content of: <book><chapter><sect1><title>
2718 #: ../en/ch02-tour-basic.xml:213
2719 msgid "A tour through history"
2720 msgstr "回溯历史"
2722 #. type: Content of: <book><chapter><sect1><para>
2723 #: ../en/ch02-tour-basic.xml:215
2724 msgid ""
2725 "One of the first things we might want to do with a new, unfamiliar repository "
2726 "is understand its history. The <command role=\"hg-cmd\">hg log</command> "
2727 "command gives us a view of history."
2728 msgstr ""
2730 #. type: Content of: <book><chapter><sect1><para>
2731 #: ../en/ch02-tour-basic.xml:222
2732 msgid ""
2733 "By default, this command prints a brief paragraph of output for each change "
2734 "to the project that was recorded. In Mercurial terminology, we call each of "
2735 "these recorded events a <emphasis>changeset</emphasis>, because it can "
2736 "contain a record of changes to several files."
2737 msgstr ""
2739 #. type: Content of: <book><chapter><sect1><para>
2740 #: ../en/ch02-tour-basic.xml:228
2741 msgid ""
2742 "The fields in a record of output from <command role=\"hg-cmd\">hg log</"
2743 "command> are as follows."
2744 msgstr ""
2746 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2747 #: ../en/ch02-tour-basic.xml:231
2748 msgid ""
2749 "<literal>changeset</literal>: This field has the format of a number, followed "
2750 "by a colon, followed by a hexadecimal string. These are "
2751 "<emphasis>identifiers</emphasis> for the changeset. There are two "
2752 "identifiers because the number is shorter and easier to type than the hex "
2753 "string."
2754 msgstr ""
2756 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2757 #: ../en/ch02-tour-basic.xml:237
2758 msgid ""
2759 "<literal>user</literal>: The identity of the person who created the "
2760 "changeset. This is a free-form field, but it most often contains a person's "
2761 "name and email address."
2762 msgstr ""
2764 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2765 #: ../en/ch02-tour-basic.xml:241
2766 msgid ""
2767 "<literal>date</literal>: The date and time on which the changeset was "
2768 "created, and the timezone in which it was created. (The date and time are "
2769 "local to that timezone; they display what time and date it was for the person "
2770 "who created the changeset.)"
2771 msgstr ""
2773 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2774 #: ../en/ch02-tour-basic.xml:246
2775 msgid ""
2776 "<literal>summary</literal>: The first line of the text message that the "
2777 "creator of the changeset entered to describe the changeset."
2778 msgstr ""
2780 #. type: Content of: <book><chapter><sect1><para>
2781 #: ../en/ch02-tour-basic.xml:249
2782 msgid ""
2783 "The default output printed by <command role=\"hg-cmd\">hg log</command> is "
2784 "purely a summary; it is missing a lot of detail."
2785 msgstr ""
2787 #. type: Content of: <book><chapter><sect1><para>
2788 #: ../en/ch02-tour-basic.xml:253
2789 msgid ""
2790 "Figure <xref endterm=\"fig.tour-basic.history.caption\" linkend=\"fig.tour-"
2791 "basic.history\"/> provides a graphical representation of the history of the "
2792 "<filename class=\"directory\">hello</filename> repository, to make it a "
2793 "little easier to see which direction history is <quote>flowing</quote> in. "
2794 "We'll be returning to this figure several times in this chapter and the "
2795 "chapter that follows."
2796 msgstr ""
2798 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
2799 #: ../en/ch02-tour-basic.xml:264
2800 msgid ""
2801 "<imageobject><imagedata fileref=\"images/tour-history.png\"/></imageobject>"
2802 msgstr ""
2804 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><textobject><phrase>
2805 #: ../en/ch02-tour-basic.xml:265 ../en/ch03-tour-merge.xml:48
2806 #: ../en/ch03-tour-merge.xml:78 ../en/ch03-tour-merge.xml:126
2807 #: ../en/ch03-tour-merge.xml:182 ../en/ch03-tour-merge.xml:254
2808 #: ../en/ch04-concepts.xml:56 ../en/ch04-concepts.xml:108
2809 #: ../en/ch04-concepts.xml:194 ../en/ch04-concepts.xml:301
2810 #: ../en/ch04-concepts.xml:353 ../en/ch04-concepts.xml:370
2811 #: ../en/ch04-concepts.xml:414 ../en/ch04-concepts.xml:436
2812 #: ../en/ch04-concepts.xml:480 ../en/ch06-collab.xml:277
2813 #: ../en/ch09-undo.xml:366 ../en/ch09-undo.xml:417 ../en/ch09-undo.xml:485
2814 #: ../en/ch09-undo.xml:527 ../en/ch12-mq.xml:409
2815 msgid "XXX add text"
2816 msgstr ""
2818 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
2819 #: ../en/ch02-tour-basic.xml:266
2820 msgid ""
2821 "Graphical history of the <filename class=\"directory\">hello</filename> "
2822 "repository"
2823 msgstr ""
2825 #. type: Content of: <book><chapter><sect1><sect2><title>
2826 #: ../en/ch02-tour-basic.xml:273
2827 msgid "Changesets, revisions, and talking to other people"
2828 msgstr "改变集，版本，与其它用户交互"
2830 #. type: Content of: <book><chapter><sect1><sect2><para>
2831 #: ../en/ch02-tour-basic.xml:276
2832 msgid ""
2833 "As English is a notoriously sloppy language, and computer science has a "
2834 "hallowed history of terminological confusion (why use one term when four will "
2835 "do?), revision control has a variety of words and phrases that mean the same "
2836 "thing. If you are talking about Mercurial history with other people, you "
2837 "will find that the word <quote>changeset</quote> is often compressed to "
2838 "<quote>change</quote> or (when written) <quote>cset</quote>, and sometimes a "
2839 "changeset is referred to as a <quote>revision</quote> or a <quote>rev</quote>."
2840 msgstr ""
2842 #. type: Content of: <book><chapter><sect1><sect2><para>
2843 #: ../en/ch02-tour-basic.xml:286
2844 msgid ""
2845 "While it doesn't matter what <emphasis>word</emphasis> you use to refer to "
2846 "the concept of <quote>a changeset</quote>, the <emphasis>identifier</"
2847 "emphasis> that you use to refer to <quote>a <emphasis>specific</emphasis> "
2848 "changeset</quote> is of great importance. Recall that the <literal>changeset</"
2849 "literal> field in the output from <command role=\"hg-cmd\">hg log</command> "
2850 "identifies a changeset using both a number and a hexadecimal string."
2851 msgstr ""
2853 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2854 #: ../en/ch02-tour-basic.xml:295
2855 msgid ""
2856 "The revision number is <emphasis>only valid in that repository</emphasis>,"
2857 msgstr ""
2859 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2860 #: ../en/ch02-tour-basic.xml:297
2861 msgid ""
2862 "while the hex string is the <emphasis>permanent, unchanging identifier</"
2863 "emphasis> that will always identify that exact changeset in <emphasis>every</"
2864 "emphasis> copy of the repository."
2865 msgstr ""
2867 #. type: Content of: <book><chapter><sect1><sect2><para>
2868 #: ../en/ch02-tour-basic.xml:302
2869 msgid ""
2870 "This distinction is important. If you send someone an email talking about "
2871 "<quote>revision 33</quote>, there's a high likelihood that their revision 33 "
2872 "will <emphasis>not be the same</emphasis> as yours. The reason for this is "
2873 "that a revision number depends on the order in which changes arrived in a "
2874 "repository, and there is no guarantee that the same changes will happen in "
2875 "the same order in different repositories. Three changes $a,b,c$ can easily "
2876 "appear in one repository as $0,1,2$, while in another as $1,0,2$."
2877 msgstr ""
2879 #. type: Content of: <book><chapter><sect1><sect2><para>
2880 #: ../en/ch02-tour-basic.xml:312
2881 msgid ""
2882 "Mercurial uses revision numbers purely as a convenient shorthand. If you "
2883 "need to discuss a changeset with someone, or make a record of a changeset for "
2884 "some other reason (for example, in a bug report), use the hexadecimal "
2885 "identifier."
2886 msgstr ""
2888 #. type: Content of: <book><chapter><sect1><sect2><title>
2889 #: ../en/ch02-tour-basic.xml:320
2890 msgid "Viewing specific revisions"
2891 msgstr "察看指定版本"
2893 #. type: Content of: <book><chapter><sect1><sect2><para>
2894 #: ../en/ch02-tour-basic.xml:322
2895 msgid ""
2896 "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a "
2897 "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option "
2898 "role=\"hg-opt-log\">--rev</option>) option. You can use either a revision "
2899 "number or a long-form changeset identifier, and you can provide as many "
2900 "revisions as you want."
2901 msgstr ""
2903 #. type: Content of: <book><chapter><sect1><sect2><para>
2904 #: ../en/ch02-tour-basic.xml:331
2905 msgid ""
2906 "If you want to see the history of several revisions without having to list "
2907 "each one, you can use <emphasis>range notation</emphasis>; this lets you "
2908 "express the idea <quote>I want all revisions between <literal>abc</literal> "
2909 "and <literal>def</literal>, inclusive</quote>."
2910 msgstr ""
2912 #. type: Content of: <book><chapter><sect1><sect2><para>
2913 #: ../en/ch02-tour-basic.xml:339
2914 msgid ""
2915 "Mercurial also honours the order in which you specify revisions, so <command "
2916 "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command "
2917 "role=\"hg-cmd\">hg log -r 4:2</command> prints 4, 3, and 2."
2918 msgstr ""
2920 #. type: Content of: <book><chapter><sect1><sect2><title>
2921 #: ../en/ch02-tour-basic.xml:346
2922 msgid "More detailed information"
2923 msgstr "更详细的信息"
2925 #. type: Content of: <book><chapter><sect1><sect2><para>
2926 #: ../en/ch02-tour-basic.xml:348
2927 msgid ""
2928 "While the summary information printed by <command role=\"hg-cmd\">hg log</"
2929 "command> is useful if you already know what you're looking for, you may need "
2930 "to see a complete description of the change, or a list of the files changed, "
2931 "if you're trying to decide whether a changeset is the one you're looking for. "
2932 "The <command role=\"hg-cmd\">hg log</command> command's <option role=\"hg-opt-"
2933 "global\">-v</option> (or <option role=\"hg-opt-global\">--verbose</option>) "
2934 "option gives you this extra detail."
2935 msgstr ""
2937 #. type: Content of: <book><chapter><sect1><sect2><para>
2938 #: ../en/ch02-tour-basic.xml:360
2939 msgid ""
2940 "If you want to see both the description and content of a change, add the "
2941 "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--"
2942 "patch</option>) option. This displays the content of a change as a "
2943 "<emphasis>unified diff</emphasis> (if you've never seen a unified diff "
2944 "before, see section <xref linkend=\"sec.mq.patch\"/> for an overview)."
2945 msgstr ""
2947 #. type: Content of: <book><chapter><sect1><title>
2948 #: ../en/ch02-tour-basic.xml:373
2949 msgid "All about command options"
2950 msgstr "命令选项"
2952 #. type: Content of: <book><chapter><sect1><para>
2953 #: ../en/ch02-tour-basic.xml:375
2954 msgid ""
2955 "Let's take a brief break from exploring Mercurial commands to discuss a "
2956 "pattern in the way that they work; you may find this useful to keep in mind "
2957 "as we continue our tour."
2958 msgstr ""
2960 #. type: Content of: <book><chapter><sect1><para>
2961 #: ../en/ch02-tour-basic.xml:379
2962 msgid ""
2963 "Mercurial has a consistent and straightforward approach to dealing with the "
2964 "options that you can pass to commands. It follows the conventions for "
2965 "options that are common to modern Linux and Unix systems."
2966 msgstr ""
2968 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2969 #: ../en/ch02-tour-basic.xml:384
2970 msgid ""
2971 "Every option has a long name. For example, as we've already seen, the "
2972 "<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-"
2973 "opt-log\">--rev</option> option."
2974 msgstr ""
2976 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2977 #: ../en/ch02-tour-basic.xml:388
2978 msgid ""
2979 "Most options have short names, too. Instead of <option role=\"hg-opt-log\">--"
2980 "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>. (The "
2981 "reason that some options don't have short names is that the options in "
2982 "question are rarely used.)"
2983 msgstr ""
2985 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2986 #: ../en/ch02-tour-basic.xml:393
2987 msgid ""
2988 "Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</"
2989 "option>), while short options start with one (e.g. <option role=\"hg-opt-log"
2990 "\">-r</option>)."
2991 msgstr ""
2993 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2994 #: ../en/ch02-tour-basic.xml:397
2995 msgid ""
2996 "Option naming and usage is consistent across commands. For example, every "
2997 "command that lets you specify a changeset ID or revision number accepts both "
2998 "<option role=\"hg-opt-log\">-r</option> and <option role=\"hg-opt-log\">--"
2999 "rev</option> arguments."
3000 msgstr ""
3002 #. type: Content of: <book><chapter><sect1><para>
3003 #: ../en/ch02-tour-basic.xml:403
3004 msgid ""
3005 "In the examples throughout this book, I use short options instead of long. "
3006 "This just reflects my own preference, so don't read anything significant into "
3007 "it."
3008 msgstr ""
3010 #. type: Content of: <book><chapter><sect1><para>
3011 #: ../en/ch02-tour-basic.xml:407
3012 msgid ""
3013 "Most commands that print output of some kind will print more output when "
3014 "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-"
3015 "global\">--verbose</option>) option, and less when passed <option role=\"hg-"
3016 "opt-global\">-q</option> (or <option role=\"hg-opt-global\">--quiet</option>)."
3017 msgstr ""
3019 #. type: Content of: <book><chapter><sect1><title>
3020 #: ../en/ch02-tour-basic.xml:415
3021 msgid "Making and reviewing changes"
3022 msgstr "创建和复审修改"
3024 #. type: Content of: <book><chapter><sect1><para>
3025 #: ../en/ch02-tour-basic.xml:417
3026 msgid ""
3027 "Now that we have a grasp of viewing history in Mercurial, let's take a look "
3028 "at making some changes and examining them."
3029 msgstr ""
3031 #. type: Content of: <book><chapter><sect1><para>
3032 #: ../en/ch02-tour-basic.xml:421
3033 msgid ""
3034 "The first thing we'll do is isolate our experiment in a repository of its "
3035 "own. We use the <command role=\"hg-cmd\">hg clone</command> command, but we "
3036 "don't need to clone a copy of the remote repository. Since we already have a "
3037 "copy of it locally, we can just clone that instead. This is much faster than "
3038 "cloning over the network, and cloning a local repository uses less disk space "
3039 "in most cases, too."
3040 msgstr ""
3042 #. type: Content of: <book><chapter><sect1><para>
3043 #: ../en/ch02-tour-basic.xml:431
3044 msgid ""
3045 "As an aside, it's often good practice to keep a <quote>pristine</quote> copy "
3046 "of a remote repository around, which you can then make temporary clones of to "
3047 "create sandboxes for each task you want to work on. This lets you work on "
3048 "multiple tasks in parallel, each isolated from the others until it's complete "
3049 "and you're ready to integrate it back. Because local clones are so cheap, "
3050 "there's almost no overhead to cloning and destroying repositories whenever "
3051 "you want."
3052 msgstr ""
3054 #. type: Content of: <book><chapter><sect1><para>
3055 #: ../en/ch02-tour-basic.xml:440
3056 msgid ""
3057 "In our <filename class=\"directory\">my-hello</filename> repository, we have "
3058 "a file <filename>hello.c</filename> that contains the classic <quote>hello, "
3059 "world</quote> program. Let's use the ancient and venerable <command>sed</"
3060 "command> command to edit this file so that it prints a second line of "
3061 "output. (I'm only using <command>sed</command> to do this because it's easy "
3062 "to write a scripted example this way. Since you're not under the same "
3063 "constraint, you probably won't want to use <command>sed</command>; simply use "
3064 "your preferred text editor to do the same thing.)"
3065 msgstr ""
3067 #. type: Content of: <book><chapter><sect1><para>
3068 #: ../en/ch02-tour-basic.xml:453
3069 msgid ""
3070 "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us "
3071 "what Mercurial knows about the files in the repository."
3072 msgstr ""
3074 #. type: Content of: <book><chapter><sect1><para>
3075 #: ../en/ch02-tour-basic.xml:459
3076 msgid ""
3077 "The <command role=\"hg-cmd\">hg status</command> command prints no output for "
3078 "some files, but a line starting with <quote><literal>M</literal></quote> for "
3079 "<filename>hello.c</filename>. Unless you tell it to, <command role=\"hg-cmd"
3080 "\">hg status</command> will not print any output for files that have not been "
3081 "modified."
3082 msgstr ""
3084 #. type: Content of: <book><chapter><sect1><para>
3085 #: ../en/ch02-tour-basic.xml:466
3086 msgid ""
3087 "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed "
3088 "that we modified <filename>hello.c</filename>. We didn't need to "
3089 "<emphasis>inform</emphasis> Mercurial that we were going to modify the file "
3090 "before we started, or that we had modified the file after we were done; it "
3091 "was able to figure this out itself."
3092 msgstr ""
3094 #. type: Content of: <book><chapter><sect1><para>
3095 #: ../en/ch02-tour-basic.xml:474
3096 msgid ""
3097 "It's a little bit helpful to know that we've modified <filename>hello.c</"
3098 "filename>, but we might prefer to know exactly <emphasis>what</emphasis> "
3099 "changes we've made to it. To do this, we use the <command role=\"hg-cmd\">hg "
3100 "diff</command> command."
3101 msgstr ""
3103 #. type: Content of: <book><chapter><sect1><title>
3104 #: ../en/ch02-tour-basic.xml:484
3105 msgid "Recording changes in a new changeset"
3106 msgstr "在新修改集中记录修改"
3108 #. type: Content of: <book><chapter><sect1><para>
3109 #: ../en/ch02-tour-basic.xml:486
3110 msgid ""
3111 "We can modify files, build and test our changes, and use <command role=\"hg-"
3112 "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to "
3113 "review our changes, until we're satisfied with what we've done and arrive at "
3114 "a natural stopping point where we want to record our work in a new changeset."
3115 msgstr ""
3117 #. type: Content of: <book><chapter><sect1><para>
3118 #: ../en/ch02-tour-basic.xml:493
3119 msgid ""
3120 "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new "
3121 "changeset; we'll usually refer to this as <quote>making a commit</quote> or "
3122 "<quote>committing</quote>."
3123 msgstr ""
3125 #. type: Content of: <book><chapter><sect1><sect2><title>
3126 #: ../en/ch02-tour-basic.xml:499
3127 msgid "Setting up a username"
3128 msgstr "配置用户名称"
3130 #. type: Content of: <book><chapter><sect1><sect2><para>
3131 #: ../en/ch02-tour-basic.xml:501
3132 msgid ""
3133 "When you try to run <command role=\"hg-cmd\">hg commit</command> for the "
3134 "first time, it is not guaranteed to succeed. Mercurial records your name and "
3135 "address with each change that you commit, so that you and others will later "
3136 "be able to tell who made each change. Mercurial tries to automatically "
3137 "figure out a sensible username to commit the change with. It will attempt "
3138 "each of the following methods, in order:"
3139 msgstr ""
3141 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3142 #: ../en/ch02-tour-basic.xml:510
3143 msgid ""
3144 "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the "
3145 "<command role=\"hg-cmd\">hg commit</command> command on the command line, "
3146 "followed by a username, this is always given the highest precedence."
3147 msgstr ""
3149 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3150 #: ../en/ch02-tour-basic.xml:515
3151 msgid ""
3152 "If you have set the <envar>HGUSER</envar> environment variable, this is "
3153 "checked next."
3154 msgstr ""
3156 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3157 #: ../en/ch02-tour-basic.xml:518
3158 msgid ""
3159 "If you create a file in your home directory called <filename role=\"special"
3160 "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> "
3161 "entry, that will be used next. To see what the contents of this file should "
3162 "look like, refer to section <xref linkend=\"sec.tour-basic.username\"/> below."
3163 msgstr ""
3165 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3166 #: ../en/ch02-tour-basic.xml:525
3167 msgid ""
3168 "If you have set the <envar>EMAIL</envar> environment variable, this will be "
3169 "used next."
3170 msgstr ""
3172 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3173 #: ../en/ch02-tour-basic.xml:528
3174 msgid ""
3175 "Mercurial will query your system to find out your local user name and host "
3176 "name, and construct a username from these components. Since this often "
3177 "results in a username that is not very useful, it will print a warning if it "
3178 "has to do this."
3179 msgstr ""
3181 #. type: Content of: <book><chapter><sect1><sect2><para>
3182 #: ../en/ch02-tour-basic.xml:535
3183 msgid ""
3184 "If all of these mechanisms fail, Mercurial will fail, printing an error "
3185 "message. In this case, it will not let you commit until you set up a "
3186 "username."
3187 msgstr ""
3189 #. type: Content of: <book><chapter><sect1><sect2><para>
3190 #: ../en/ch02-tour-basic.xml:539
3191 msgid ""
3192 "You should think of the <envar>HGUSER</envar> environment variable and the "
3193 "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-"
3194 "cmd\">hg commit</command> command as ways to <emphasis>override</emphasis> "
3195 "Mercurial's default selection of username. For normal use, the simplest and "
3196 "most robust way to set a username for yourself is by creating a <filename "
3197 "role=\"special\">.hgrc</filename> file; see below for details."
3198 msgstr ""
3200 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
3201 #: ../en/ch02-tour-basic.xml:548
3202 msgid "Creating a Mercurial configuration file"
3203 msgstr "创建 Mercurial 的配置文件"
3205 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
3206 #: ../en/ch02-tour-basic.xml:550
3207 msgid ""
3208 "To set a user name, use your favourite editor to create a file called "
3209 "<filename role=\"special\">.hgrc</filename> in your home directory. "
3210 "Mercurial will use this file to look up your personalised configuration "
3211 "settings. The initial contents of your <filename role=\"special\">.hgrc</"
3212 "filename> should look like this."
3213 msgstr ""
3215 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
3216 #: ../en/ch02-tour-basic.xml:561
3217 msgid ""
3218 "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</"
3219 "emphasis> of the config file, so you can read the <quote><literal>username "
3220 "= ...</literal></quote> line as meaning <quote>set the value of the "
3221 "<literal>username</literal> item in the <literal>ui</literal> section</"
3222 "quote>. A section continues until a new section begins, or the end of the "
3223 "file. Mercurial ignores empty lines and treats any text from "
3224 "<quote><literal>#</literal></quote> to the end of a line as a comment."
3225 msgstr ""
3227 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
3228 #: ../en/ch02-tour-basic.xml:574
3229 msgid "Choosing a user name"
3230 msgstr "选择用户名称"
3232 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
3233 #: ../en/ch02-tour-basic.xml:576
3234 msgid ""
3235 "You can use any text you like as the value of the <literal>username</literal> "
3236 "config item, since this information is for reading by other people, but for "
3237 "interpreting by Mercurial. The convention that most people follow is to use "
3238 "their name and email address, as in the example above."
3239 msgstr ""
3241 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
3242 #: ../en/ch02-tour-basic.xml:583
3243 msgid ""
3244 "Mercurial's built-in web server obfuscates email addresses, to make it more "
3245 "difficult for the email harvesting tools that spammers use. This reduces the "
3246 "likelihood that you'll start receiving more junk email if you publish a "
3247 "Mercurial repository on the web."
3248 msgstr ""
3250 #. type: Content of: <book><chapter><sect1><sect2><title>
3251 #: ../en/ch02-tour-basic.xml:593
3252 msgid "Writing a commit message"
3253 msgstr "写提交日志"
3255 #. type: Content of: <book><chapter><sect1><sect2><para>
3256 #: ../en/ch02-tour-basic.xml:595
3257 msgid ""
3258 "When we commit a change, Mercurial drops us into a text editor, to enter a "
3259 "message that will describe the modifications we've made in this changeset. "
3260 "This is called the <emphasis>commit message</emphasis>. It will be a record "
3261 "for readers of what we did and why, and it will be printed by <command role="
3262 "\"hg-cmd\">hg log</command> after we've finished committing."
3263 msgstr ""
3265 #. type: Content of: <book><chapter><sect1><sect2><para>
3266 #: ../en/ch02-tour-basic.xml:605
3267 msgid ""
3268 "The editor that the <command role=\"hg-cmd\">hg commit</command> command "
3269 "drops us into will contain an empty line, followed by a number of lines "
3270 "starting with <quote><literal>HG:</literal></quote>."
3271 msgstr ""
3273 #. type: Content of: <book><chapter><sect1><sect2><para>
3274 #: ../en/ch02-tour-basic.xml:612
3275 msgid ""
3276 "Mercurial ignores the lines that start with <quote><literal>HG:</literal></"
3277 "quote>; it uses them only to tell us which files it's recording changes to. "
3278 "Modifying or deleting these lines has no effect."
3279 msgstr ""
3281 #. type: Content of: <book><chapter><sect1><sect2><title>
3282 #: ../en/ch02-tour-basic.xml:618
3283 msgid "Writing a good commit message"
3284 msgstr "写好提交日志"
3286 #. type: Content of: <book><chapter><sect1><sect2><para>
3287 #: ../en/ch02-tour-basic.xml:620
3288 msgid ""
3289 "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of "
3290 "a commit message by default, it's best to write a commit message whose first "
3291 "line stands alone. Here's a real example of a commit message that "
3292 "<emphasis>doesn't</emphasis> follow this guideline, and hence has a summary "
3293 "that is not readable."
3294 msgstr ""
3296 #. type: Content of: <book><chapter><sect1><sect2><para>
3297 #: ../en/ch02-tour-basic.xml:634
3298 msgid ""
3299 "As far as the remainder of the contents of the commit message are concerned, "
3300 "there are no hard-and-fast rules. Mercurial itself doesn't interpret or care "
3301 "about the contents of the commit message, though your project may have "
3302 "policies that dictate a certain kind of formatting."
3303 msgstr ""
3305 #. type: Content of: <book><chapter><sect1><sect2><para>
3306 #: ../en/ch02-tour-basic.xml:640
3307 msgid ""
3308 "My personal preference is for short, but informative, commit messages that "
3309 "tell me something that I can't figure out with a quick glance at the output "
3310 "of <command role=\"hg-cmd\">hg log --patch</command>."
3311 msgstr ""
3313 #. type: Content of: <book><chapter><sect1><sect2><title>
3314 #: ../en/ch02-tour-basic.xml:647
3315 msgid "Aborting a commit"
3316 msgstr "终止提交"
3318 #. type: Content of: <book><chapter><sect1><sect2><para>
3319 #: ../en/ch02-tour-basic.xml:649
3320 msgid ""
3321 "If you decide that you don't want to commit while in the middle of editing a "
3322 "commit message, simply exit from your editor without saving the file that "
3323 "it's editing. This will cause nothing to happen to either the repository or "
3324 "the working directory."
3325 msgstr ""
3327 #. type: Content of: <book><chapter><sect1><sect2><para>
3328 #: ../en/ch02-tour-basic.xml:654
3329 msgid ""
3330 "If we run the <command role=\"hg-cmd\">hg commit</command> command without "
3331 "any arguments, it records all of the changes we've made, as reported by "
3332 "<command role=\"hg-cmd\">hg status</command> and <command role=\"hg-cmd\">hg "
3333 "diff</command>."
3334 msgstr ""
3336 #. type: Content of: <book><chapter><sect1><sect2><title>
3337 #: ../en/ch02-tour-basic.xml:661
3338 msgid "Admiring our new handiwork"
3339 msgstr "欣赏我们的新手艺"
3341 #. type: Content of: <book><chapter><sect1><sect2><para>
3342 #: ../en/ch02-tour-basic.xml:663
3343 msgid ""
3344 "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg "
3345 "tip</command> command to display the changeset we just created. This command "
3346 "produces output that is identical to <command role=\"hg-cmd\">hg log</"
3347 "command>, but it only displays the newest revision in the repository."
3348 msgstr ""
3350 #. type: Content of: <book><chapter><sect1><sect2><para>
3351 #: ../en/ch02-tour-basic.xml:672
3352 msgid ""
3353 "We refer to the newest revision in the repository as the tip revision, or "
3354 "simply the tip."
3355 msgstr ""
3357 #. type: Content of: <book><chapter><sect1><title>
3358 #: ../en/ch02-tour-basic.xml:679
3359 msgid "Sharing changes"
3360 msgstr "共享修改"
3362 #. type: Content of: <book><chapter><sect1><para>
3363 #: ../en/ch02-tour-basic.xml:681
3364 msgid ""
3365 "We mentioned earlier that repositories in Mercurial are self-contained. This "
3366 "means that the changeset we just created exists only in our <filename class="
3367 "\"directory\">my-hello</filename> repository. Let's look at a few ways that "
3368 "we can propagate this change into other repositories."
3369 msgstr ""
3371 #. type: Content of: <book><chapter><sect1><sect2><title>
3372 #: ../en/ch02-tour-basic.xml:689
3373 msgid "Pulling changes from another repository"
3374 msgstr "从其它版本库取得修改"
3376 #. type: Content of: <book><chapter><sect1><sect2><para>
3377 #: ../en/ch02-tour-basic.xml:690
3378 msgid ""
3379 "To get started, let's clone our original <filename class=\"directory\">hello</"
3380 "filename> repository, which does not contain the change we just committed. "
3381 "We'll call our temporary repository <filename class=\"directory\">hello-pull</"
3382 "filename>."
3383 msgstr ""
3385 #. type: Content of: <book><chapter><sect1><sect2><para>
3386 #: ../en/ch02-tour-basic.xml:698
3387 msgid ""
3388 "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring "
3389 "changes from <filename class=\"directory\">my-hello</filename> into <filename "
3390 "class=\"directory\">hello-pull</filename>. However, blindly pulling unknown "
3391 "changes into a repository is a somewhat scary prospect. Mercurial provides "
3392 "the <command role=\"hg-cmd\">hg incoming</command> command to tell us what "
3393 "changes the <command role=\"hg-cmd\">hg pull</command> command "
3394 "<emphasis>would</emphasis> pull into the repository, without actually pulling "
3395 "the changes in."
3396 msgstr ""
3398 #. type: Content of: <book><chapter><sect1><sect2><para>
3399 #: ../en/ch02-tour-basic.xml:711
3400 msgid ""
3401 "(Of course, someone could cause more changesets to appear in the repository "
3402 "that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get "
3403 "a chance to <command role=\"hg-cmd\">hg pull</command> the changes, so that "
3404 "we could end up pulling changes that we didn't expect.)"
3405 msgstr ""
3407 #. type: Content of: <book><chapter><sect1><sect2><para>
3408 #: ../en/ch02-tour-basic.xml:718
3409 msgid ""
3410 "Bringing changes into a repository is a simple matter of running the <command "
3411 "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to "
3412 "pull from."
3413 msgstr ""
3415 #. type: Content of: <book><chapter><sect1><sect2><para>
3416 #: ../en/ch02-tour-basic.xml:725
3417 msgid ""
3418 "As you can see from the before-and-after output of <command role=\"hg-cmd"
3419 "\">hg tip</command>, we have successfully pulled changes into our "
3420 "repository. There remains one step before we can see these changes in the "
3421 "working directory."
3422 msgstr ""
3424 #. type: Content of: <book><chapter><sect1><sect2><title>
3425 #: ../en/ch02-tour-basic.xml:733
3426 msgid "Updating the working directory"
3427 msgstr "更新工作目录"
3429 #. type: Content of: <book><chapter><sect1><sect2><para>
3430 #: ../en/ch02-tour-basic.xml:735
3431 msgid ""
3432 "We have so far glossed over the relationship between a repository and its "
3433 "working directory. The <command role=\"hg-cmd\">hg pull</command> command "
3434 "that we ran in section <xref linkend=\"sec.tour.pull\"/> brought changes into "
3435 "the repository, but if we check, there's no sign of those changes in the "
3436 "working directory. This is because <command role=\"hg-cmd\">hg pull</"
3437 "command> does not (by default) touch the working directory. Instead, we use "
3438 "the <command role=\"hg-cmd\">hg update</command> command to do this."
3439 msgstr ""
3441 #. type: Content of: <book><chapter><sect1><sect2><para>
3442 #: ../en/ch02-tour-basic.xml:747
3443 msgid ""
3444 "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> "
3445 "doesn't update the working directory automatically. There's actually a good "
3446 "reason for this: you can use <command role=\"hg-cmd\">hg update</command> to "
3447 "update the working directory to the state it was in at <emphasis>any "
3448 "revision</emphasis> in the history of the repository. If you had the working "
3449 "directory updated to an old revision---to hunt down the origin of a bug, "
3450 "say---and ran a <command role=\"hg-cmd\">hg pull</command> which "
3451 "automatically updated the working directory to a new revision, you might not "
3452 "be terribly happy."
3453 msgstr ""
3455 #. type: Content of: <book><chapter><sect1><sect2><para>
3456 #: ../en/ch02-tour-basic.xml:758
3457 msgid ""
3458 "However, since pull-then-update is such a common thing to do, Mercurial lets "
3459 "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> "
3460 "option to <command role=\"hg-cmd\">hg pull</command>."
3461 msgstr ""
3463 #. type: Content of: <book><chapter><sect1><sect2><para>
3464 #: ../en/ch02-tour-basic.xml:763
3465 msgid ""
3466 "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> "
3467 "in section <xref linkend=\"sec.tour.pull\"/> when we ran it without <option "
3468 "role=\"hg-opt-pull\">-u</option>, you can see that it printed a helpful "
3469 "reminder that we'd have to take an explicit step to update the working "
3470 "directory:"
3471 msgstr ""
3473 #. type: Content of: <book><chapter><sect1><sect2><para>
3474 #: ../en/ch02-tour-basic.xml:772
3475 msgid ""
3476 "To find out what revision the working directory is at, use the <command role="
3477 "\"hg-cmd\">hg parents</command> command."
3478 msgstr ""
3480 #. type: Content of: <book><chapter><sect1><sect2><para>
3481 #: ../en/ch02-tour-basic.xml:778
3482 msgid ""
3483 "If you look back at figure <xref endterm=\"fig.tour-basic.history.caption\" "
3484 "linkend=\"fig.tour-basic.history\"/>, you'll see arrows connecting each "
3485 "changeset. The node that the arrow leads <emphasis>from</emphasis> in each "
3486 "case is a parent, and the node that the arrow leads <emphasis>to</emphasis> "
3487 "is its child. The working directory has a parent in just the same way; this "
3488 "is the changeset that the working directory currently contains."
3489 msgstr ""
3491 #. type: Content of: <book><chapter><sect1><sect2><para>
3492 #: ../en/ch02-tour-basic.xml:788
3493 msgid ""
3494 "To update the working directory to a particular revision, give a revision "
3495 "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> "
3496 "command."
3497 msgstr ""
3499 #. type: Content of: <book><chapter><sect1><sect2><para>
3500 #: ../en/ch02-tour-basic.xml:795
3501 msgid ""
3502 "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</"
3503 "command> will update to the tip revision, as shown by the second call to "
3504 "<command role=\"hg-cmd\">hg update</command> in the example above."
3505 msgstr ""
3507 #. type: Content of: <book><chapter><sect1><sect2><title>
3508 #: ../en/ch02-tour-basic.xml:803
3509 msgid "Pushing changes to another repository"
3510 msgstr "发布修改到其它版本库"
3512 #. type: Content of: <book><chapter><sect1><sect2><para>
3513 #: ../en/ch02-tour-basic.xml:805
3514 msgid ""
3515 "Mercurial lets us push changes to another repository, from the repository "
3516 "we're currently visiting. As with the example of <command role=\"hg-cmd\">hg "
3517 "pull</command> above, we'll create a temporary repository to push our changes "
3518 "into."
3519 msgstr ""
3521 #. type: Content of: <book><chapter><sect1><sect2><para>
3522 #: ../en/ch02-tour-basic.xml:813
3523 msgid ""
3524 "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what "
3525 "changes would be pushed into another repository."
3526 msgstr ""
3528 #. type: Content of: <book><chapter><sect1><sect2><para>
3529 #: ../en/ch02-tour-basic.xml:819
3530 msgid ""
3531 "And the <command role=\"hg-cmd\">hg push</command> command does the actual "
3532 "push."
3533 msgstr ""
3535 #. type: Content of: <book><chapter><sect1><sect2><para>
3536 #: ../en/ch02-tour-basic.xml:825
3537 msgid ""
3538 "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd"
3539 "\">hg push</command> command does not update the working directory in the "
3540 "repository that it's pushing changes into. (Unlike <command role=\"hg-cmd"
3541 "\">hg pull</command>, <command role=\"hg-cmd\">hg push</command> does not "
3542 "provide a <literal>-u</literal> option that updates the other repository's "
3543 "working directory.)"
3544 msgstr ""
3546 #. type: Content of: <book><chapter><sect1><sect2><para>
3547 #: ../en/ch02-tour-basic.xml:834
3548 msgid ""
3549 "What happens if we try to pull or push changes and the receiving repository "
3550 "already has those changes? Nothing too exciting."
3551 msgstr ""
3553 #. type: Content of: <book><chapter><sect1><sect2><title>
3554 #: ../en/ch02-tour-basic.xml:841
3555 msgid "Sharing changes over a network"
3556 msgstr "通过网络共享修改"
3558 #. type: Content of: <book><chapter><sect1><sect2><para>
3559 #: ../en/ch02-tour-basic.xml:843
3560 msgid ""
3561 "The commands we have covered in the previous few sections are not limited to "
3562 "working with local repositories. Each works in exactly the same fashion over "
3563 "a network connection; simply pass in a URL instead of a local path."
3564 msgstr ""
3566 #. type: Content of: <book><chapter><sect1><sect2><para>
3567 #: ../en/ch02-tour-basic.xml:851
3568 msgid ""
3569 "In this example, we can see what changes we could push to the remote "
3570 "repository, but the repository is understandably not set up to let anonymous "
3571 "users push to it."
3572 msgstr ""
3574 #. type: Content of: <book><chapter><title>
3575 #: ../en/ch03-tour-merge.xml:5
3576 msgid "A tour of Mercurial: merging work"
3577 msgstr "Mercurial 教程: 合并工作"
3579 #. type: Content of: <book><chapter><para>
3580 #: ../en/ch03-tour-merge.xml:7
3581 msgid ""
3582 "We've now covered cloning a repository, making changes in a repository, and "
3583 "pulling or pushing changes from one repository into another. Our next step "
3584 "is <emphasis>merging</emphasis> changes from separate repositories."
3585 msgstr ""
3587 #. type: Content of: <book><chapter><sect1><title>
3588 #: ../en/ch03-tour-merge.xml:13
3589 msgid "Merging streams of work"
3590 msgstr "合并的流程"
3592 #. type: Content of: <book><chapter><sect1><para>
3593 #: ../en/ch03-tour-merge.xml:15
3594 msgid ""
3595 "Merging is a fundamental part of working with a distributed revision control "
3596 "tool."
3597 msgstr ""
3599 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
3600 #: ../en/ch03-tour-merge.xml:18
3601 msgid ""
3602 "Alice and Bob each have a personal copy of a repository for a project they're "
3603 "collaborating on. Alice fixes a bug in her repository; Bob adds a new "
3604 "feature in his. They want the shared repository to contain both the bug fix "
3605 "and the new feature."
3606 msgstr ""
3608 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
3609 #: ../en/ch03-tour-merge.xml:24
3610 msgid ""
3611 "I frequently work on several different tasks for a single project at once, "
3612 "each safely isolated in its own repository. Working this way means that I "
3613 "often need to merge one piece of my own work with another."
3614 msgstr ""
3616 #. type: Content of: <book><chapter><sect1><para>
3617 #: ../en/ch03-tour-merge.xml:30
3618 msgid ""
3619 "Because merging is such a common thing to need to do, Mercurial makes it "
3620 "easy. Let's walk through the process. We'll begin by cloning yet another "
3621 "repository (see how often they spring up?) and making a change in it."
3622 msgstr ""
3624 #. type: Content of: <book><chapter><sect1><para>
3625 #: ../en/ch03-tour-merge.xml:37
3626 msgid ""
3627 "We should now have two copies of <filename>hello.c</filename> with different "
3628 "contents. The histories of the two repositories have also diverged, as "
3629 "illustrated in figure <xref endterm=\"fig.tour-merge.sep-repos.caption\" "
3630 "linkend=\"fig.tour-merge.sep-repos\"/>."
3631 msgstr ""
3633 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
3634 #: ../en/ch03-tour-merge.xml:47
3635 msgid ""
3636 "<imageobject><imagedata fileref=\"images/tour-merge-sep-repos.png\"/></"
3637 "imageobject>"
3638 msgstr ""
3640 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
3641 #: ../en/ch03-tour-merge.xml:49
3642 msgid ""
3643 "Divergent recent histories of the <filename class=\"directory\">my-hello</"
3644 "filename> and <filename class=\"directory\">my-new-hello</filename> "
3645 "repositories"
3646 msgstr ""
3648 #. type: Content of: <book><chapter><sect1><para>
3649 #: ../en/ch03-tour-merge.xml:57
3650 msgid ""
3651 "We already know that pulling changes from our <filename class=\"directory"
3652 "\">my-hello</filename> repository will have no effect on the working "
3653 "directory."
3654 msgstr ""
3656 #. type: Content of: <book><chapter><sect1><para>
3657 #: ../en/ch03-tour-merge.xml:63
3658 msgid ""
3659 "However, the <command role=\"hg-cmd\">hg pull</command> command says "
3660 "something about <quote>heads</quote>."
3661 msgstr ""
3663 #. type: Content of: <book><chapter><sect1><sect2><title>
3664 #: ../en/ch03-tour-merge.xml:67
3665 msgid "Head changesets"
3666 msgstr "顶点改变集"
3668 #. type: Content of: <book><chapter><sect1><sect2><para>
3669 #: ../en/ch03-tour-merge.xml:69
3670 msgid ""
3671 "A head is a change that has no descendants, or children, as they're also "
3672 "known. The tip revision is thus a head, because the newest revision in a "
3673 "repository doesn't have any children, but a repository can contain more than "
3674 "one head."
3675 msgstr ""
3677 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
3678 #: ../en/ch03-tour-merge.xml:77
3679 msgid ""
3680 "<imageobject><imagedata fileref=\"images/tour-merge-pull.png\"/></imageobject>"
3681 msgstr ""
3683 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
3684 #: ../en/ch03-tour-merge.xml:79
3685 msgid ""
3686 "Repository contents after pulling from <filename class=\"directory\">my-"
3687 "hello</filename> into <filename class=\"directory\">my-new-hello</filename>"
3688 msgstr ""
3690 #. type: Content of: <book><chapter><sect1><sect2><para>
3691 #: ../en/ch03-tour-merge.xml:85
3692 msgid ""
3693 "In figure <xref endterm=\"fig.tour-merge.pull.caption\" linkend=\"fig.tour-"
3694 "merge.pull\"/>, you can see the effect of the pull from <filename class="
3695 "\"directory\">my-hello</filename> into <filename class=\"directory\">my-new-"
3696 "hello</filename>. The history that was already present in <filename class="
3697 "\"directory\">my-new-hello</filename> is untouched, but a new revision has "
3698 "been added. By referring to figure <xref endterm=\"fig.tour-merge.sep-repos."
3699 "caption\" linkend=\"fig.tour-merge.sep-repos\"/>, we can see that the "
3700 "<emphasis>changeset ID</emphasis> remains the same in the new repository, but "
3701 "the <emphasis>revision number</emphasis> has changed. (This, incidentally, "
3702 "is a fine example of why it's not safe to use revision numbers when "
3703 "discussing changesets.) We can view the heads in a repository using the "
3704 "<command role=\"hg-cmd\">hg heads</command> command."
3705 msgstr ""
3707 #. type: Content of: <book><chapter><sect1><sect2><title>
3708 #: ../en/ch03-tour-merge.xml:106
3709 msgid "Performing the merge"
3710 msgstr "执行合并"
3712 #. type: Content of: <book><chapter><sect1><sect2><para>
3713 #: ../en/ch03-tour-merge.xml:108
3714 msgid ""
3715 "What happens if we try to use the normal <command role=\"hg-cmd\">hg update</"
3716 "command> command to update to the new tip?"
3717 msgstr ""
3719 #. type: Content of: <book><chapter><sect1><sect2><para>
3720 #: ../en/ch03-tour-merge.xml:114
3721 msgid ""
3722 "Mercurial is telling us that the <command role=\"hg-cmd\">hg update</command> "
3723 "command won't do a merge; it won't update the working directory when it "
3724 "thinks we might be wanting to do a merge, unless we force it to do so. "
3725 "Instead, we use the <command role=\"hg-cmd\">hg merge</command> command to "
3726 "merge the two heads."
3727 msgstr ""
3729 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
3730 #: ../en/ch03-tour-merge.xml:125
3731 msgid ""
3732 "<imageobject><imagedata fileref=\"images/tour-merge-merge.png\"/></"
3733 "imageobject>"
3734 msgstr ""
3736 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
3737 #: ../en/ch03-tour-merge.xml:127
3738 msgid "Working directory and repository during merge, and following commit"
3739 msgstr ""
3741 #. type: Content of: <book><chapter><sect1><sect2><para>
3742 #: ../en/ch03-tour-merge.xml:132
3743 msgid ""
3744 "This updates the working directory so that it contains changes from "
3745 "<emphasis>both</emphasis> heads, which is reflected in both the output of "
3746 "<command role=\"hg-cmd\">hg parents</command> and the contents of "
3747 "<filename>hello.c</filename>."
3748 msgstr ""
3750 #. type: Content of: <book><chapter><sect1><sect2><title>
3751 #: ../en/ch03-tour-merge.xml:142
3752 msgid "Committing the results of the merge"
3753 msgstr "提交合并结果"
3755 #. type: Content of: <book><chapter><sect1><sect2><para>
3756 #: ../en/ch03-tour-merge.xml:144
3757 msgid ""
3758 "Whenever we've done a merge, <command role=\"hg-cmd\">hg parents</command> "
3759 "will display two parents until we <command role=\"hg-cmd\">hg commit</"
3760 "command> the results of the merge."
3761 msgstr ""
3763 #. type: Content of: <book><chapter><sect1><sect2><para>
3764 #: ../en/ch03-tour-merge.xml:151
3765 msgid ""
3766 "We now have a new tip revision; notice that it has <emphasis>both</emphasis> "
3767 "of our former heads as its parents. These are the same revisions that were "
3768 "previously displayed by <command role=\"hg-cmd\">hg parents</command>."
3769 msgstr ""
3771 #. type: Content of: <book><chapter><sect1><sect2><para>
3772 #: ../en/ch03-tour-merge.xml:158
3773 msgid ""
3774 "In figure <xref endterm=\"fig.tour-merge.merge.caption\" linkend=\"fig.tour-"
3775 "merge.merge\"/>, you can see a representation of what happens to the working "
3776 "directory during the merge, and how this affects the repository when the "
3777 "commit happens. During the merge, the working directory has two parent "
3778 "changesets, and these become the parents of the new changeset."
3779 msgstr ""
3781 #. type: Content of: <book><chapter><sect1><title>
3782 #: ../en/ch03-tour-merge.xml:169
3783 msgid "Merging conflicting changes"
3784 msgstr "合并有冲突的改变"
3786 #. type: Content of: <book><chapter><sect1><para>
3787 #: ../en/ch03-tour-merge.xml:171
3788 msgid ""
3789 "Most merges are simple affairs, but sometimes you'll find yourself merging "
3790 "changes where each modifies the same portions of the same files. Unless both "
3791 "modifications are identical, this results in a <emphasis>conflict</emphasis>, "
3792 "where you have to decide how to reconcile the different changes into "
3793 "something coherent."
3794 msgstr ""
3796 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
3797 #: ../en/ch03-tour-merge.xml:180
3798 msgid ""
3799 "<imageobject><imagedata fileref=\"images/tour-merge-conflict.png\"/> </"
3800 "imageobject>"
3801 msgstr ""
3803 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
3804 #: ../en/ch03-tour-merge.xml:183
3805 msgid "Conflicting changes to a document"
3806 msgstr ""
3808 #. type: Content of: <book><chapter><sect1><para>
3809 #: ../en/ch03-tour-merge.xml:188
3810 msgid ""
3811 "Figure <xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-"
3812 "merge.conflict\"/> illustrates an instance of two conflicting changes to a "
3813 "document. We started with a single version of the file; then we made some "
3814 "changes; while someone else made different changes to the same text. Our "
3815 "task in resolving the conflicting changes is to decide what the file should "
3816 "look like."
3817 msgstr ""
3819 #. type: Content of: <book><chapter><sect1><para>
3820 #: ../en/ch03-tour-merge.xml:196
3821 msgid ""
3822 "Mercurial doesn't have a built-in facility for handling conflicts. Instead, "
3823 "it runs an external program called <command>hgmerge</command>. This is a "
3824 "shell script that is bundled with Mercurial; you can change it to behave "
3825 "however you please. What it does by default is try to find one of several "
3826 "different merging tools that are likely to be installed on your system. It "
3827 "first tries a few fully automatic merging tools; if these don't succeed "
3828 "(because the resolution process requires human guidance) or aren't present, "
3829 "the script tries a few different graphical merging tools."
3830 msgstr ""
3832 #. type: Content of: <book><chapter><sect1><para>
3833 #: ../en/ch03-tour-merge.xml:207
3834 msgid ""
3835 "It's also possible to get Mercurial to run another program or script instead "
3836 "of <command>hgmerge</command>, by setting the <envar>HGMERGE</envar> "
3837 "environment variable to the name of your preferred program."
3838 msgstr ""
3840 #. type: Content of: <book><chapter><sect1><sect2><title>
3841 #: ../en/ch03-tour-merge.xml:213
3842 msgid "Using a graphical merge tool"
3843 msgstr "使用图形合并工具"
3845 #. type: Content of: <book><chapter><sect1><sect2><para>
3846 #: ../en/ch03-tour-merge.xml:215
3847 msgid ""
3848 "My preferred graphical merge tool is <command>kdiff3</command>, which I'll "
3849 "use to describe the features that are common to graphical file merging "
3850 "tools. You can see a screenshot of <command>kdiff3</command> in action in "
3851 "figure <xref endterm=\"fig.tour-merge.kdiff3.caption\" linkend=\"fig.tour-"
3852 "merge.kdiff3\"/>. The kind of merge it is performing is called a "
3853 "<emphasis>three-way merge</emphasis>, because there are three different "
3854 "versions of the file of interest to us. The tool thus splits the upper "
3855 "portion of the window into three panes:"
3856 msgstr ""
3858 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
3859 #: ../en/ch03-tour-merge.xml:226
3860 msgid ""
3861 "At the left is the <emphasis>base</emphasis> version of the file, i.e. the "
3862 "most recent version from which the two versions we're trying to merge are "
3863 "descended."
3864 msgstr ""
3866 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
3867 #: ../en/ch03-tour-merge.xml:231
3868 msgid ""
3869 "In the middle is <quote>our</quote> version of the file, with the contents "
3870 "that we modified."
3871 msgstr ""
3873 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
3874 #: ../en/ch03-tour-merge.xml:234
3875 msgid ""
3876 "On the right is <quote>their</quote> version of the file, the one that from "
3877 "the changeset that we're trying to merge with."
3878 msgstr ""
3880 #. type: Content of: <book><chapter><sect1><sect2><para>
3881 #: ../en/ch03-tour-merge.xml:238
3882 msgid ""
3883 "In the pane below these is the current <emphasis>result</emphasis> of the "
3884 "merge. Our task is to replace all of the red text, which indicates unresolved "
3885 "conflicts, with some sensible merger of the <quote>ours</quote> and "
3886 "<quote>theirs</quote> versions of the file."
3887 msgstr ""
3889 #. type: Content of: <book><chapter><sect1><sect2><para>
3890 #: ../en/ch03-tour-merge.xml:245
3891 msgid ""
3892 "All four of these panes are <emphasis>locked together</emphasis>; if we "
3893 "scroll vertically or horizontally in any of them, the others are updated to "
3894 "display the corresponding sections of their respective files."
3895 msgstr ""
3897 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
3898 #: ../en/ch03-tour-merge.xml:252
3899 msgid ""
3900 "<imageobject><imagedata width=\"100%\" fileref=\"images/kdiff3.png\"/> </"
3901 "imageobject>"
3902 msgstr ""
3904 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
3905 #: ../en/ch03-tour-merge.xml:255
3906 msgid "Using <command>kdiff3</command> to merge versions of a file"
3907 msgstr ""
3909 #. type: Content of: <book><chapter><sect1><sect2><para>
3910 #: ../en/ch03-tour-merge.xml:261
3911 msgid ""
3912 "For each conflicting portion of the file, we can choose to resolve the "
3913 "conflict using some combination of text from the base version, ours, or "
3914 "theirs. We can also manually edit the merged file at any time, in case we "
3915 "need to make further modifications."
3916 msgstr ""
3918 #. type: Content of: <book><chapter><sect1><sect2><para>
3919 #: ../en/ch03-tour-merge.xml:267
3920 msgid ""
3921 "There are <emphasis>many</emphasis> file merging tools available, too many to "
3922 "cover here. They vary in which platforms they are available for, and in "
3923 "their particular strengths and weaknesses. Most are tuned for merging files "
3924 "containing plain text, while a few are aimed at specialised file formats "
3925 "(generally XML)."
3926 msgstr ""
3928 #. type: Content of: <book><chapter><sect1><sect2><title>
3929 #: ../en/ch03-tour-merge.xml:276
3930 msgid "A worked example"
3931 msgstr "合并实例"
3933 #. type: Content of: <book><chapter><sect1><sect2><para>
3934 #: ../en/ch03-tour-merge.xml:278
3935 msgid ""
3936 "In this example, we will reproduce the file modification history of figure "
3937 "<xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-merge."
3938 "conflict\"/> above. Let's begin by creating a repository with a base version "
3939 "of our document."
3940 msgstr ""
3942 #. type: Content of: <book><chapter><sect1><sect2><para>
3943 #: ../en/ch03-tour-merge.xml:286
3944 msgid "We'll clone the repository and make a change to the file."
3945 msgstr ""
3947 #. type: Content of: <book><chapter><sect1><sect2><para>
3948 #: ../en/ch03-tour-merge.xml:291
3949 msgid ""
3950 "And another clone, to simulate someone else making a change to the file. "
3951 "(This hints at the idea that it's not all that unusual to merge with yourself "
3952 "when you isolate tasks in separate repositories, and indeed to find and "
3953 "resolve conflicts while doing so.)"
3954 msgstr ""
3956 #. type: Content of: <book><chapter><sect1><sect2><para>
3957 #: ../en/ch03-tour-merge.xml:299
3958 msgid ""
3959 "Having created two different versions of the file, we'll set up an "
3960 "environment suitable for running our merge."
3961 msgstr ""
3963 #. type: Content of: <book><chapter><sect1><sect2><para>
3964 #: ../en/ch03-tour-merge.xml:305
3965 msgid ""
3966 "In this example, I won't use Mercurial's normal <command>hgmerge</command> "
3967 "program to do the merge, because it would drop my nice automated example-"
3968 "running tool into a graphical user interface. Instead, I'll set "
3969 "<envar>HGMERGE</envar> to tell Mercurial to use the non-interactive "
3970 "<command>merge</command> command. This is bundled with many Unix-like "
3971 "systems. If you're following this example on your computer, don't bother "
3972 "setting <envar>HGMERGE</envar>."
3973 msgstr ""
3975 #. type: Content of: <book><chapter><sect1><sect2><para>
3976 #: ../en/ch03-tour-merge.xml:315
3977 msgid "<emphasis role=\"bold\">XXX FIX THIS EXAMPLE.</emphasis>"
3978 msgstr ""
3980 #. type: Content of: <book><chapter><sect1><sect2><para>
3981 #: ../en/ch03-tour-merge.xml:320
3982 msgid ""
3983 "Because <command>merge</command> can't resolve the conflicting changes, it "
3984 "leaves <emphasis>merge markers</emphasis> inside the file that has conflicts, "
3985 "indicating which lines have conflicts, and whether they came from our version "
3986 "of the file or theirs."
3987 msgstr ""
3989 #. type: Content of: <book><chapter><sect1><sect2><para>
3990 #: ../en/ch03-tour-merge.xml:326
3991 msgid ""
3992 "Mercurial can tell from the way <command>merge</command> exits that it wasn't "
3993 "able to merge successfully, so it tells us what commands we'll need to run if "
3994 "we want to redo the merging operation. This could be useful if, for example, "
3995 "we were running a graphical merge tool and quit because we were confused or "
3996 "realised we had made a mistake."
3997 msgstr ""
3999 #. type: Content of: <book><chapter><sect1><sect2><para>
4000 #: ../en/ch03-tour-merge.xml:333
4001 msgid ""
4002 "If automatic or manual merges fail, there's nothing to prevent us from "
4003 "<quote>fixing up</quote> the affected files ourselves, and committing the "
4004 "results of our merge:"
4005 msgstr ""
4007 #. type: Content of: <book><chapter><sect1><title>
4008 #: ../en/ch03-tour-merge.xml:342
4009 msgid "Simplifying the pull-merge-commit sequence"
4010 msgstr "简化拉-合并-提交程序"
4012 #. type: Content of: <book><chapter><sect1><para>
4013 #: ../en/ch03-tour-merge.xml:344
4014 msgid ""
4015 "The process of merging changes as outlined above is straightforward, but "
4016 "requires running three commands in sequence."
4017 msgstr ""
4019 #. type: Content of: <book><chapter><sect1><para>
4020 #: ../en/ch03-tour-merge.xml:350
4021 msgid ""
4022 "In the case of the final commit, you also need to enter a commit message, "
4023 "which is almost always going to be a piece of uninteresting "
4024 "<quote>boilerplate</quote> text."
4025 msgstr ""
4027 #. type: Content of: <book><chapter><sect1><para>
4028 #: ../en/ch03-tour-merge.xml:354
4029 msgid ""
4030 "It would be nice to reduce the number of steps needed, if this were "
4031 "possible. Indeed, Mercurial is distributed with an extension called <literal "
4032 "role=\"hg-ext\">fetch</literal> that does just this."
4033 msgstr ""
4035 #. type: Content of: <book><chapter><sect1><para>
4036 #: ../en/ch03-tour-merge.xml:359
4037 msgid ""
4038 "Mercurial provides a flexible extension mechanism that lets people extend its "
4039 "functionality, while keeping the core of Mercurial small and easy to deal "
4040 "with. Some extensions add new commands that you can use from the command "
4041 "line, while others work <quote>behind the scenes,</quote> for example adding "
4042 "capabilities to the server."
4043 msgstr ""
4045 #. type: Content of: <book><chapter><sect1><para>
4046 #: ../en/ch03-tour-merge.xml:366
4047 msgid ""
4048 "The <literal role=\"hg-ext\">fetch</literal> extension adds a new command "
4049 "called, not surprisingly, <command role=\"hg-cmd\">hg fetch</command>. This "
4050 "extension acts as a combination of <command role=\"hg-cmd\">hg pull</"
4051 "command>, <command role=\"hg-cmd\">hg update</command> and <command role=\"hg-"
4052 "cmd\">hg merge</command>. It begins by pulling changes from another "
4053 "repository into the current repository. If it finds that the changes added a "
4054 "new head to the repository, it begins a merge, then commits the result of the "
4055 "merge with an automatically-generated commit message. If no new heads were "
4056 "added, it updates the working directory to the new tip changeset."
4057 msgstr ""
4059 #. type: Content of: <book><chapter><sect1><para>
4060 #: ../en/ch03-tour-merge.xml:379
4061 msgid ""
4062 "Enabling the <literal role=\"hg-ext\">fetch</literal> extension is easy. "
4063 "Edit your <filename role=\"special\">.hgrc</filename>, and either go to the "
4064 "<literal role=\"rc-extensions\">extensions</literal> section or create an "
4065 "<literal role=\"rc-extensions\">extensions</literal> section. Then add a line "
4066 "that simply reads <quote><literal>fetch </literal></quote>."
4067 msgstr ""
4069 #. type: Content of: <book><chapter><sect1><para>
4070 #: ../en/ch03-tour-merge.xml:389
4071 msgid ""
4072 "(Normally, on the right-hand side of the <quote><literal>=</literal></quote> "
4073 "would appear the location of the extension, but since the <literal role=\"hg-"
4074 "ext\">fetch</literal> extension is in the standard distribution, Mercurial "
4075 "knows where to search for it.)"
4076 msgstr ""
4078 #. type: Content of: <book><chapter><title>
4079 #: ../en/ch04-concepts.xml:5
4080 msgid "Behind the scenes"
4081 msgstr "Mercurial 内幕"
4083 #. type: Content of: <book><chapter><para>
4084 #: ../en/ch04-concepts.xml:7
4085 msgid ""
4086 "Unlike many revision control systems, the concepts upon which Mercurial is "
4087 "built are simple enough that it's easy to understand how the software really "
4088 "works. Knowing this certainly isn't necessary, but I find it useful to have "
4089 "a <quote>mental model</quote> of what's going on."
4090 msgstr ""
4092 #. type: Content of: <book><chapter><para>
4093 #: ../en/ch04-concepts.xml:13
4094 msgid ""
4095 "This understanding gives me confidence that Mercurial has been carefully "
4096 "designed to be both <emphasis>safe</emphasis> and <emphasis>efficient</"
4097 "emphasis>. And just as importantly, if it's easy for me to retain a good "
4098 "idea of what the software is doing when I perform a revision control task, "
4099 "I'm less likely to be surprised by its behaviour."
4100 msgstr ""
4102 #. type: Content of: <book><chapter><para>
4103 #: ../en/ch04-concepts.xml:20
4104 msgid ""
4105 "In this chapter, we'll initially cover the core concepts behind Mercurial's "
4106 "design, then continue to discuss some of the interesting details of its "
4107 "implementation."
4108 msgstr ""
4110 #. type: Content of: <book><chapter><sect1><title>
4111 #: ../en/ch04-concepts.xml:25
4112 msgid "Mercurial's historical record"
4113 msgstr "Mercurial 的历史记录"
4115 #. type: Content of: <book><chapter><sect1><sect2><title>
4116 #: ../en/ch04-concepts.xml:28
4117 msgid "Tracking the history of a single file"
4118 msgstr "跟踪单一文件的历史"
4120 #. type: Content of: <book><chapter><sect1><sect2><para>
4121 #: ../en/ch04-concepts.xml:30
4122 msgid ""
4123 "When Mercurial tracks modifications to a file, it stores the history of that "
4124 "file in a metadata object called a <emphasis>filelog</emphasis>. Each entry "
4125 "in the filelog contains enough information to reconstruct one revision of the "
4126 "file that is being tracked. Filelogs are stored as files in the <filename "
4127 "role=\"special\" class=\"directory\">.hg/store/data</filename> directory. A "
4128 "filelog contains two kinds of information: revision data, and an index to "
4129 "help Mercurial to find a revision efficiently."
4130 msgstr ""
4132 #. type: Content of: <book><chapter><sect1><sect2><para>
4133 #: ../en/ch04-concepts.xml:41
4134 msgid ""
4135 "A file that is large, or has a lot of history, has its filelog stored in "
4136 "separate data (<quote><literal>.d</literal></quote> suffix) and index "
4137 "(<quote><literal>.i</literal></quote> suffix) files. For small files without "
4138 "much history, the revision data and index are combined in a single "
4139 "<quote><literal>.i</literal></quote> file. The correspondence between a file "
4140 "in the working directory and the filelog that tracks its history in the "
4141 "repository is illustrated in figure <xref endterm=\"fig.concepts.filelog."
4142 "caption\" linkend=\"fig.concepts.filelog\"/>."
4143 msgstr ""
4145 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4146 #: ../en/ch04-concepts.xml:55
4147 msgid "<imageobject><imagedata fileref=\"images/filelog.png\"/></imageobject>"
4148 msgstr ""
4150 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4151 #: ../en/ch04-concepts.xml:57
4152 msgid ""
4153 "Relationships between files in working directory and filelogs in repository"
4154 msgstr ""
4156 #. type: Content of: <book><chapter><sect1><sect2><title>
4157 #: ../en/ch04-concepts.xml:65
4158 msgid "Managing tracked files"
4159 msgstr "管理跟踪的文件"
4161 #. type: Content of: <book><chapter><sect1><sect2><para>
4162 #: ../en/ch04-concepts.xml:67
4163 msgid ""
4164 "Mercurial uses a structure called a <emphasis>manifest</emphasis> to collect "
4165 "together information about the files that it tracks. Each entry in the "
4166 "manifest contains information about the files present in a single changeset. "
4167 "An entry records which files are present in the changeset, the revision of "
4168 "each file, and a few other pieces of file metadata."
4169 msgstr ""
4171 #. type: Content of: <book><chapter><sect1><sect2><title>
4172 #: ../en/ch04-concepts.xml:77
4173 msgid "Recording changeset information"
4174 msgstr "记录修改集信息"
4176 #. type: Content of: <book><chapter><sect1><sect2><para>
4177 #: ../en/ch04-concepts.xml:79
4178 msgid ""
4179 "The <emphasis>changelog</emphasis> contains information about each "
4180 "changeset. Each revision records who committed a change, the changeset "
4181 "comment, other pieces of changeset-related information, and the revision of "
4182 "the manifest to use."
4183 msgstr ""
4185 #. type: Content of: <book><chapter><sect1><sect2><title>
4186 #: ../en/ch04-concepts.xml:87
4187 msgid "Relationships between revisions"
4188 msgstr "版本之间的关系"
4190 #. type: Content of: <book><chapter><sect1><sect2><para>
4191 #: ../en/ch04-concepts.xml:89
4192 msgid ""
4193 "Within a changelog, a manifest, or a filelog, each revision stores a pointer "
4194 "to its immediate parent (or to its two parents, if it's a merge revision). "
4195 "As I mentioned above, there are also relationships between revisions "
4196 "<emphasis>across</emphasis> these structures, and they are hierarchical in "
4197 "nature."
4198 msgstr ""
4200 #. type: Content of: <book><chapter><sect1><sect2><para>
4201 #: ../en/ch04-concepts.xml:96
4202 msgid ""
4203 "For every changeset in a repository, there is exactly one revision stored in "
4204 "the changelog. Each revision of the changelog contains a pointer to a single "
4205 "revision of the manifest. A revision of the manifest stores a pointer to a "
4206 "single revision of each filelog tracked when that changeset was created. "
4207 "These relationships are illustrated in figure <xref endterm=\"fig.concepts."
4208 "metadata.caption\" linkend=\"fig.concepts.metadata\"/>."
4209 msgstr ""
4211 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4212 #: ../en/ch04-concepts.xml:107
4213 msgid "<imageobject><imagedata fileref=\"images/metadata.png\"/></imageobject>"
4214 msgstr ""
4216 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4217 #: ../en/ch04-concepts.xml:109
4218 msgid "Metadata relationships"
4219 msgstr ""
4221 #. type: Content of: <book><chapter><sect1><sect2><para>
4222 #: ../en/ch04-concepts.xml:114
4223 msgid ""
4224 "As the illustration shows, there is <emphasis>not</emphasis> a <quote>one to "
4225 "one</quote> relationship between revisions in the changelog, manifest, or "
4226 "filelog. If the manifest hasn't changed between two changesets, the changelog "
4227 "entries for those changesets will point to the same revision of the "
4228 "manifest. If a file that Mercurial tracks hasn't changed between two "
4229 "changesets, the entry for that file in the two revisions of the manifest will "
4230 "point to the same revision of its filelog."
4231 msgstr ""
4233 #. type: Content of: <book><chapter><sect1><title>
4234 #: ../en/ch04-concepts.xml:127
4235 msgid "Safe, efficient storage"
4236 msgstr "安全，高效的存储"
4238 #. type: Content of: <book><chapter><sect1><para>
4239 #: ../en/ch04-concepts.xml:129
4240 msgid ""
4241 "The underpinnings of changelogs, manifests, and filelogs are provided by a "
4242 "single structure called the <emphasis>revlog</emphasis>."
4243 msgstr ""
4245 #. type: Content of: <book><chapter><sect1><sect2><title>
4246 #: ../en/ch04-concepts.xml:134
4247 msgid "Efficient storage"
4248 msgstr "高效存储"
4250 #. type: Content of: <book><chapter><sect1><sect2><para>
4251 #: ../en/ch04-concepts.xml:136
4252 msgid ""
4253 "The revlog provides efficient storage of revisions using a <emphasis>delta</"
4254 "emphasis> mechanism. Instead of storing a complete copy of a file for each "
4255 "revision, it stores the changes needed to transform an older revision into "
4256 "the new revision. For many kinds of file data, these deltas are typically a "
4257 "fraction of a percent of the size of a full copy of a file."
4258 msgstr ""
4260 #. type: Content of: <book><chapter><sect1><sect2><para>
4261 #: ../en/ch04-concepts.xml:144
4262 msgid ""
4263 "Some obsolete revision control systems can only work with deltas of text "
4264 "files. They must either store binary files as complete snapshots or encoded "
4265 "into a text representation, both of which are wasteful approaches. Mercurial "
4266 "can efficiently handle deltas of files with arbitrary binary contents; it "
4267 "doesn't need to treat text as special."
4268 msgstr ""
4270 #. type: Content of: <book><chapter><sect1><sect2><title>
4271 #: ../en/ch04-concepts.xml:153
4272 msgid "Safe operation"
4273 msgstr "安全操作"
4275 #. type: Content of: <book><chapter><sect1><sect2><para>
4276 #: ../en/ch04-concepts.xml:155
4277 msgid ""
4278 "Mercurial only ever <emphasis>appends</emphasis> data to the end of a revlog "
4279 "file. It never modifies a section of a file after it has written it. This is "
4280 "both more robust and efficient than schemes that need to modify or rewrite "
4281 "data."
4282 msgstr ""
4284 #. type: Content of: <book><chapter><sect1><sect2><para>
4285 #: ../en/ch04-concepts.xml:161
4286 msgid ""
4287 "In addition, Mercurial treats every write as part of a <emphasis>transaction</"
4288 "emphasis> that can span a number of files. A transaction is "
4289 "<emphasis>atomic</emphasis>: either the entire transaction succeeds and its "
4290 "effects are all visible to readers in one go, or the whole thing is undone. "
4291 "This guarantee of atomicity means that if you're running two copies of "
4292 "Mercurial, where one is reading data and one is writing it, the reader will "
4293 "never see a partially written result that might confuse it."
4294 msgstr ""
4296 #. type: Content of: <book><chapter><sect1><sect2><para>
4297 #: ../en/ch04-concepts.xml:171
4298 msgid ""
4299 "The fact that Mercurial only appends to files makes it easier to provide this "
4300 "transactional guarantee. The easier it is to do stuff like this, the more "
4301 "confident you should be that it's done correctly."
4302 msgstr ""
4304 #. type: Content of: <book><chapter><sect1><sect2><title>
4305 #: ../en/ch04-concepts.xml:178
4306 msgid "Fast retrieval"
4307 msgstr "快速检索"
4309 #. type: Content of: <book><chapter><sect1><sect2><para>
4310 #: ../en/ch04-concepts.xml:180
4311 msgid ""
4312 "Mercurial cleverly avoids a pitfall common to all earlier revision control "
4313 "systems: the problem of <emphasis>inefficient retrieval</emphasis>. Most "
4314 "revision control systems store the contents of a revision as an incremental "
4315 "series of modifications against a <quote>snapshot</quote>. To reconstruct a "
4316 "specific revision, you must first read the snapshot, and then every one of "
4317 "the revisions between the snapshot and your target revision. The more "
4318 "history that a file accumulates, the more revisions you must read, hence the "
4319 "longer it takes to reconstruct a particular revision."
4320 msgstr ""
4322 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4323 #: ../en/ch04-concepts.xml:193
4324 msgid "<imageobject><imagedata fileref=\"images/snapshot.png\"/></imageobject>"
4325 msgstr ""
4327 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4328 #: ../en/ch04-concepts.xml:195
4329 msgid "Snapshot of a revlog, with incremental deltas"
4330 msgstr ""
4332 #. type: Content of: <book><chapter><sect1><sect2><para>
4333 #: ../en/ch04-concepts.xml:200
4334 msgid ""
4335 "The innovation that Mercurial applies to this problem is simple but "
4336 "effective. Once the cumulative amount of delta information stored since the "
4337 "last snapshot exceeds a fixed threshold, it stores a new snapshot "
4338 "(compressed, of course), instead of another delta. This makes it possible to "
4339 "reconstruct <emphasis>any</emphasis> revision of a file quickly. This "
4340 "approach works so well that it has since been copied by several other "
4341 "revision control systems."
4342 msgstr ""
4344 #. type: Content of: <book><chapter><sect1><sect2><para>
4345 #: ../en/ch04-concepts.xml:209
4346 msgid ""
4347 "Figure <xref endterm=\"fig.concepts.snapshot.caption\" linkend=\"fig.concepts."
4348 "snapshot\"/> illustrates the idea. In an entry in a revlog's index file, "
4349 "Mercurial stores the range of entries from the data file that it must read to "
4350 "reconstruct a particular revision."
4351 msgstr ""
4353 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
4354 #: ../en/ch04-concepts.xml:216
4355 msgid "Aside: the influence of video compression"
4356 msgstr ""
4358 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4359 #: ../en/ch04-concepts.xml:218
4360 msgid ""
4361 "If you're familiar with video compression or have ever watched a TV feed "
4362 "through a digital cable or satellite service, you may know that most video "
4363 "compression schemes store each frame of video as a delta against its "
4364 "predecessor frame. In addition, these schemes use <quote>lossy</quote> "
4365 "compression techniques to increase the compression ratio, so visual errors "
4366 "accumulate over the course of a number of inter-frame deltas."
4367 msgstr ""
4369 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4370 #: ../en/ch04-concepts.xml:227
4371 msgid ""
4372 "Because it's possible for a video stream to <quote>drop out</quote> "
4373 "occasionally due to signal glitches, and to limit the accumulation of "
4374 "artefacts introduced by the lossy compression process, video encoders "
4375 "periodically insert a complete frame (called a <quote>key frame</quote>) into "
4376 "the video stream; the next delta is generated against that frame. This means "
4377 "that if the video signal gets interrupted, it will resume once the next key "
4378 "frame is received. Also, the accumulation of encoding errors restarts anew "
4379 "with each key frame."
4380 msgstr ""
4382 #. type: Content of: <book><chapter><sect1><sect2><title>
4383 #: ../en/ch04-concepts.xml:241
4384 msgid "Identification and strong integrity"
4385 msgstr "鉴别和强完整性"
4387 #. type: Content of: <book><chapter><sect1><sect2><para>
4388 #: ../en/ch04-concepts.xml:243
4389 msgid ""
4390 "Along with delta or snapshot information, a revlog entry contains a "
4391 "cryptographic hash of the data that it represents. This makes it difficult "
4392 "to forge the contents of a revision, and easy to detect accidental corruption."
4393 msgstr ""
4395 #. type: Content of: <book><chapter><sect1><sect2><para>
4396 #: ../en/ch04-concepts.xml:248
4397 msgid ""
4398 "Hashes provide more than a mere check against corruption; they are used as "
4399 "the identifiers for revisions. The changeset identification hashes that you "
4400 "see as an end user are from revisions of the changelog. Although filelogs "
4401 "and the manifest also use hashes, Mercurial only uses these behind the scenes."
4402 msgstr ""
4404 #. type: Content of: <book><chapter><sect1><sect2><para>
4405 #: ../en/ch04-concepts.xml:255
4406 msgid ""
4407 "Mercurial verifies that hashes are correct when it retrieves file revisions "
4408 "and when it pulls changes from another repository. If it encounters an "
4409 "integrity problem, it will complain and stop whatever it's doing."
4410 msgstr ""
4412 #. type: Content of: <book><chapter><sect1><sect2><para>
4413 #: ../en/ch04-concepts.xml:260
4414 msgid ""
4415 "In addition to the effect it has on retrieval efficiency, Mercurial's use of "
4416 "periodic snapshots makes it more robust against partial data corruption. If "
4417 "a revlog becomes partly corrupted due to a hardware error or system bug, it's "
4418 "often possible to reconstruct some or most revisions from the uncorrupted "
4419 "sections of the revlog, both before and after the corrupted section. This "
4420 "would not be possible with a delta-only storage model."
4421 msgstr ""
4423 #. type: Content of: <book><chapter><sect1><title>
4424 #: ../en/ch04-concepts.xml:272
4425 msgid "Revision history, branching, and merging"
4426 msgstr "修订历史，分支与合并"
4428 #. type: Content of: <book><chapter><sect1><para>
4429 #: ../en/ch04-concepts.xml:274
4430 msgid ""
4431 "Every entry in a Mercurial revlog knows the identity of its immediate "
4432 "ancestor revision, usually referred to as its <emphasis>parent</emphasis>. "
4433 "In fact, a revision contains room for not one parent, but two. Mercurial "
4434 "uses a special hash, called the <quote>null ID</quote>, to represent the idea "
4435 "<quote>there is no parent here</quote>. This hash is simply a string of "
4436 "zeroes."
4437 msgstr ""
4439 #. type: Content of: <book><chapter><sect1><para>
4440 #: ../en/ch04-concepts.xml:282
4441 msgid ""
4442 "In figure <xref endterm=\"fig.concepts.revlog.caption\" linkend=\"fig."
4443 "concepts.revlog\"/>, you can see an example of the conceptual structure of a "
4444 "revlog. Filelogs, manifests, and changelogs all have this same structure; "
4445 "they differ only in the kind of data stored in each delta or snapshot."
4446 msgstr ""
4448 #. type: Content of: <book><chapter><sect1><para>
4449 #: ../en/ch04-concepts.xml:289
4450 msgid ""
4451 "The first revision in a revlog (at the bottom of the image) has the null ID "
4452 "in both of its parent slots. For a <quote>normal</quote> revision, its first "
4453 "parent slot contains the ID of its parent revision, and its second contains "
4454 "the null ID, indicating that the revision has only one real parent. Any two "
4455 "revisions that have the same parent ID are branches. A revision that "
4456 "represents a merge between branches has two normal revision IDs in its parent "
4457 "slots."
4458 msgstr ""
4460 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
4461 #: ../en/ch04-concepts.xml:300
4462 msgid "<imageobject><imagedata fileref=\"images/revlog.png\"/></imageobject>"
4463 msgstr ""
4465 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
4466 #: ../en/ch04-concepts.xml:302
4467 msgid "Revision in revlog"
4468 msgstr ""
4470 #. type: Content of: <book><chapter><sect1><title>
4471 #: ../en/ch04-concepts.xml:309
4472 msgid "The working directory"
4473 msgstr "工作目录"
4475 #. type: Content of: <book><chapter><sect1><para>
4476 #: ../en/ch04-concepts.xml:311
4477 msgid ""
4478 "In the working directory, Mercurial stores a snapshot of the files from the "
4479 "repository as of a particular changeset."
4480 msgstr ""
4482 #. type: Content of: <book><chapter><sect1><para>
4483 #: ../en/ch04-concepts.xml:314
4484 msgid ""
4485 "The working directory <quote>knows</quote> which changeset it contains. When "
4486 "you update the working directory to contain a particular changeset, Mercurial "
4487 "looks up the appropriate revision of the manifest to find out which files it "
4488 "was tracking at the time that changeset was committed, and which revision of "
4489 "each file was then current. It then recreates a copy of each of those files, "
4490 "with the same contents it had when the changeset was committed."
4491 msgstr ""
4493 #. type: Content of: <book><chapter><sect1><para>
4494 #: ../en/ch04-concepts.xml:323
4495 msgid ""
4496 "The <emphasis>dirstate</emphasis> contains Mercurial's knowledge of the "
4497 "working directory. This details which changeset the working directory is "
4498 "updated to, and all of the files that Mercurial is tracking in the working "
4499 "directory."
4500 msgstr ""
4502 #. type: Content of: <book><chapter><sect1><para>
4503 #: ../en/ch04-concepts.xml:329
4504 msgid ""
4505 "Just as a revision of a revlog has room for two parents, so that it can "
4506 "represent either a normal revision (with one parent) or a merge of two "
4507 "earlier revisions, the dirstate has slots for two parents. When you use the "
4508 "<command role=\"hg-cmd\">hg update</command> command, the changeset that you "
4509 "update to is stored in the <quote>first parent</quote> slot, and the null ID "
4510 "in the second. When you <command role=\"hg-cmd\">hg merge</command> with "
4511 "another changeset, the first parent remains unchanged, and the second parent "
4512 "is filled in with the changeset you're merging with. The <command role=\"hg-"
4513 "cmd\">hg parents</command> command tells you what the parents of the dirstate "
4514 "are."
4515 msgstr ""
4517 #. type: Content of: <book><chapter><sect1><sect2><title>
4518 #: ../en/ch04-concepts.xml:343
4519 msgid "What happens when you commit"
4520 msgstr "当你提交时发生的事情"
4522 #. type: Content of: <book><chapter><sect1><sect2><para>
4523 #: ../en/ch04-concepts.xml:345
4524 msgid ""
4525 "The dirstate stores parent information for more than just book-keeping "
4526 "purposes. Mercurial uses the parents of the dirstate as <emphasis>the "
4527 "parents of a new changeset</emphasis> when you perform a commit."
4528 msgstr ""
4530 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4531 #: ../en/ch04-concepts.xml:352
4532 msgid "<imageobject><imagedata fileref=\"images/wdir.png\"/></imageobject>"
4533 msgstr ""
4535 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4536 #: ../en/ch04-concepts.xml:354
4537 msgid "The working directory can have two parents"
4538 msgstr ""
4540 #. type: Content of: <book><chapter><sect1><sect2><para>
4541 #: ../en/ch04-concepts.xml:359
4542 msgid ""
4543 "Figure <xref endterm=\"fig.concepts.wdir.caption\" linkend=\"fig.concepts.wdir"
4544 "\"/> shows the normal state of the working directory, where it has a single "
4545 "changeset as parent. That changeset is the <emphasis>tip</emphasis>, the "
4546 "newest changeset in the repository that has no children."
4547 msgstr ""
4549 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4550 #: ../en/ch04-concepts.xml:368
4551 msgid ""
4552 "<imageobject><imagedata fileref=\"images/wdir-after-commit.png\"/> </"
4553 "imageobject>"
4554 msgstr ""
4556 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4557 #: ../en/ch04-concepts.xml:371
4558 msgid "The working directory gains new parents after a commit"
4559 msgstr ""
4561 #. type: Content of: <book><chapter><sect1><sect2><para>
4562 #: ../en/ch04-concepts.xml:376
4563 msgid ""
4564 "It's useful to think of the working directory as <quote>the changeset I'm "
4565 "about to commit</quote>. Any files that you tell Mercurial that you've "
4566 "added, removed, renamed, or copied will be reflected in that changeset, as "
4567 "will modifications to any files that Mercurial is already tracking; the new "
4568 "changeset will have the parents of the working directory as its parents."
4569 msgstr ""
4571 #. type: Content of: <book><chapter><sect1><sect2><para>
4572 #: ../en/ch04-concepts.xml:384
4573 msgid ""
4574 "After a commit, Mercurial will update the parents of the working directory, "
4575 "so that the first parent is the ID of the new changeset, and the second is "
4576 "the null ID. This is shown in figure <xref endterm=\"fig.concepts.wdir-after-"
4577 "commit.caption\" linkend=\"fig.concepts.wdir-after-commit\"/>. Mercurial "
4578 "doesn't touch any of the files in the working directory when you commit; it "
4579 "just modifies the dirstate to note its new parents."
4580 msgstr ""
4582 #. type: Content of: <book><chapter><sect1><sect2><title>
4583 #: ../en/ch04-concepts.xml:396
4584 msgid "Creating a new head"
4585 msgstr "创建新顶点"
4587 #. type: Content of: <book><chapter><sect1><sect2><para>
4588 #: ../en/ch04-concepts.xml:398
4589 msgid ""
4590 "It's perfectly normal to update the working directory to a changeset other "
4591 "than the current tip. For example, you might want to know what your project "
4592 "looked like last Tuesday, or you could be looking through changesets to see "
4593 "which one introduced a bug. In cases like this, the natural thing to do is "
4594 "update the working directory to the changeset you're interested in, and then "
4595 "examine the files in the working directory directly to see their contents as "
4596 "they were when you committed that changeset. The effect of this is shown in "
4597 "figure <xref endterm=\"fig.concepts.wdir-pre-branch.caption\" linkend=\"fig."
4598 "concepts.wdir-pre-branch\"/>."
4599 msgstr ""
4601 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4602 #: ../en/ch04-concepts.xml:412
4603 msgid ""
4604 "<imageobject><imagedata fileref=\"images/wdir-pre-branch.png\"/> </"
4605 "imageobject>"
4606 msgstr ""
4608 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4609 #: ../en/ch04-concepts.xml:415
4610 msgid "The working directory, updated to an older changeset"
4611 msgstr ""
4613 #. type: Content of: <book><chapter><sect1><sect2><para>
4614 #: ../en/ch04-concepts.xml:420
4615 msgid ""
4616 "Having updated the working directory to an older changeset, what happens if "
4617 "you make some changes, and then commit? Mercurial behaves in the same way as "
4618 "I outlined above. The parents of the working directory become the parents of "
4619 "the new changeset. This new changeset has no children, so it becomes the new "
4620 "tip. And the repository now contains two changesets that have no children; "
4621 "we call these <emphasis>heads</emphasis>. You can see the structure that "
4622 "this creates in figure <xref endterm=\"fig.concepts.wdir-branch.caption\" "
4623 "linkend=\"fig.concepts.wdir-branch\"/>."
4624 msgstr ""
4626 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4627 #: ../en/ch04-concepts.xml:434
4628 msgid ""
4629 "<imageobject><imagedata fileref=\"images/wdir-branch.png\"/> </imageobject>"
4630 msgstr ""
4632 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4633 #: ../en/ch04-concepts.xml:437
4634 msgid "After a commit made while synced to an older changeset"
4635 msgstr ""
4637 #. type: Content of: <book><chapter><sect1><sect2><note><para>
4638 #: ../en/ch04-concepts.xml:443
4639 msgid ""
4640 "If you're new to Mercurial, you should keep in mind a common <quote>error</"
4641 "quote>, which is to use the <command role=\"hg-cmd\">hg pull</command> "
4642 "command without any options. By default, the <command role=\"hg-cmd\">hg "
4643 "pull</command> command <emphasis>does not</emphasis> update the working "
4644 "directory, so you'll bring new changesets into your repository, but the "
4645 "working directory will stay synced at the same changeset as before the pull. "
4646 "If you make some changes and commit afterwards, you'll thus create a new "
4647 "head, because your working directory isn't synced to whatever the current tip "
4648 "is."
4649 msgstr ""
4651 #. type: Content of: <book><chapter><sect1><sect2><note><para>
4652 #: ../en/ch04-concepts.xml:455
4653 msgid ""
4654 "I put the word <quote>error</quote> in quotes because all that you need to do "
4655 "to rectify this situation is <command role=\"hg-cmd\">hg merge</command>, "
4656 "then <command role=\"hg-cmd\">hg commit</command>. In other words, this "
4657 "almost never has negative consequences; it just surprises people. I'll "
4658 "discuss other ways to avoid this behaviour, and why Mercurial behaves in this "
4659 "initially surprising way, later on."
4660 msgstr ""
4662 #. type: Content of: <book><chapter><sect1><sect2><title>
4663 #: ../en/ch04-concepts.xml:467
4664 msgid "Merging heads"
4665 msgstr "合并顶点"
4667 #. type: Content of: <book><chapter><sect1><sect2><para>
4668 #: ../en/ch04-concepts.xml:469
4669 msgid ""
4670 "When you run the <command role=\"hg-cmd\">hg merge</command> command, "
4671 "Mercurial leaves the first parent of the working directory unchanged, and "
4672 "sets the second parent to the changeset you're merging with, as shown in "
4673 "figure <xref endterm=\"fig.concepts.wdir-merge.caption\" linkend=\"fig."
4674 "concepts.wdir-merge\"/>."
4675 msgstr ""
4677 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4678 #: ../en/ch04-concepts.xml:478
4679 msgid ""
4680 "<imageobject><imagedata fileref=\"images/wdir-merge.png\"/> </imageobject>"
4681 msgstr ""
4683 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4684 #: ../en/ch04-concepts.xml:481
4685 msgid "Merging two heads"
4686 msgstr ""
4688 #. type: Content of: <book><chapter><sect1><sect2><para>
4689 #: ../en/ch04-concepts.xml:486
4690 msgid ""
4691 "Mercurial also has to modify the working directory, to merge the files "
4692 "managed in the two changesets. Simplified a little, the merging process goes "
4693 "like this, for every file in the manifests of both changesets."
4694 msgstr ""
4696 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4697 #: ../en/ch04-concepts.xml:491
4698 msgid "If neither changeset has modified a file, do nothing with that file."
4699 msgstr ""
4701 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4702 #: ../en/ch04-concepts.xml:494
4703 msgid ""
4704 "If one changeset has modified a file, and the other hasn't, create the "
4705 "modified copy of the file in the working directory."
4706 msgstr ""
4708 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4709 #: ../en/ch04-concepts.xml:498
4710 msgid ""
4711 "If one changeset has removed a file, and the other hasn't (or has also "
4712 "deleted it), delete the file from the working directory."
4713 msgstr ""
4715 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4716 #: ../en/ch04-concepts.xml:502
4717 msgid ""
4718 "If one changeset has removed a file, but the other has modified the file, ask "
4719 "the user what to do: keep the modified file, or remove it?"
4720 msgstr ""
4722 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4723 #: ../en/ch04-concepts.xml:506
4724 msgid ""
4725 "If both changesets have modified a file, invoke an external merge program to "
4726 "choose the new contents for the merged file. This may require input from the "
4727 "user."
4728 msgstr ""
4730 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4731 #: ../en/ch04-concepts.xml:511
4732 msgid ""
4733 "If one changeset has modified a file, and the other has renamed or copied the "
4734 "file, make sure that the changes follow the new name of the file."
4735 msgstr ""
4737 #. type: Content of: <book><chapter><sect1><sect2><para>
4738 #: ../en/ch04-concepts.xml:515
4739 msgid ""
4740 "There are more details&emdash;merging has plenty of corner cases&emdash;but "
4741 "these are the most common choices that are involved in a merge. As you can "
4742 "see, most cases are completely automatic, and indeed most merges finish "
4743 "automatically, without requiring your input to resolve any conflicts."
4744 msgstr ""
4746 #. type: Content of: <book><chapter><sect1><sect2><para>
4747 #: ../en/ch04-concepts.xml:522
4748 msgid ""
4749 "When you're thinking about what happens when you commit after a merge, once "
4750 "again the working directory is <quote>the changeset I'm about to commit</"
4751 "quote>. After the <command role=\"hg-cmd\">hg merge</command> command "
4752 "completes, the working directory has two parents; these will become the "
4753 "parents of the new changeset."
4754 msgstr ""
4756 #. type: Content of: <book><chapter><sect1><sect2><para>
4757 #: ../en/ch04-concepts.xml:529
4758 msgid ""
4759 "Mercurial lets you perform multiple merges, but you must commit the results "
4760 "of each individual merge as you go. This is necessary because Mercurial only "
4761 "tracks two parents for both revisions and the working directory. While it "
4762 "would be technically possible to merge multiple changesets at once, the "
4763 "prospect of user confusion and making a terrible mess of a merge immediately "
4764 "becomes overwhelming."
4765 msgstr ""
4767 #. type: Content of: <book><chapter><sect1><title>
4768 #: ../en/ch04-concepts.xml:540
4769 msgid "Other interesting design features"
4770 msgstr "其它有趣的设计特性"
4772 #. type: Content of: <book><chapter><sect1><para>
4773 #: ../en/ch04-concepts.xml:542
4774 msgid ""
4775 "In the sections above, I've tried to highlight some of the most important "
4776 "aspects of Mercurial's design, to illustrate that it pays careful attention "
4777 "to reliability and performance. However, the attention to detail doesn't "
4778 "stop there. There are a number of other aspects of Mercurial's construction "
4779 "that I personally find interesting. I'll detail a few of them here, separate "
4780 "from the <quote>big ticket</quote> items above, so that if you're interested, "
4781 "you can gain a better idea of the amount of thinking that goes into a well-"
4782 "designed system."
4783 msgstr ""
4785 #. type: Content of: <book><chapter><sect1><sect2><title>
4786 #: ../en/ch04-concepts.xml:553
4787 msgid "Clever compression"
4788 msgstr "智能压缩"
4790 #. type: Content of: <book><chapter><sect1><sect2><para>
4791 #: ../en/ch04-concepts.xml:555
4792 msgid ""
4793 "When appropriate, Mercurial will store both snapshots and deltas in "
4794 "compressed form. It does this by always <emphasis>trying to</emphasis> "
4795 "compress a snapshot or delta, but only storing the compressed version if it's "
4796 "smaller than the uncompressed version."
4797 msgstr ""
4799 #. type: Content of: <book><chapter><sect1><sect2><para>
4800 #: ../en/ch04-concepts.xml:561
4801 msgid ""
4802 "This means that Mercurial does <quote>the right thing</quote> when storing a "
4803 "file whose native form is compressed, such as a <literal>zip</literal> "
4804 "archive or a JPEG image. When these types of files are compressed a second "
4805 "time, the resulting file is usually bigger than the once-compressed form, and "
4806 "so Mercurial will store the plain <literal>zip</literal> or JPEG."
4807 msgstr ""
4809 #. type: Content of: <book><chapter><sect1><sect2><para>
4810 #: ../en/ch04-concepts.xml:569
4811 msgid ""
4812 "Deltas between revisions of a compressed file are usually larger than "
4813 "snapshots of the file, and Mercurial again does <quote>the right thing</"
4814 "quote> in these cases. It finds that such a delta exceeds the threshold at "
4815 "which it should store a complete snapshot of the file, so it stores the "
4816 "snapshot, again saving space compared to a naive delta-only approach."
4817 msgstr ""
4819 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
4820 #: ../en/ch04-concepts.xml:578
4821 msgid "Network recompression"
4822 msgstr "网络重新压缩"
4824 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4825 #: ../en/ch04-concepts.xml:580
4826 msgid ""
4827 "When storing revisions on disk, Mercurial uses the <quote>deflate</quote> "
4828 "compression algorithm (the same one used by the popular <literal>zip</"
4829 "literal> archive format), which balances good speed with a respectable "
4830 "compression ratio. However, when transmitting revision data over a network "
4831 "connection, Mercurial uncompresses the compressed revision data."
4832 msgstr ""
4834 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4835 #: ../en/ch04-concepts.xml:588
4836 msgid ""
4837 "If the connection is over HTTP, Mercurial recompresses the entire stream of "
4838 "data using a compression algorithm that gives a better compression ratio (the "
4839 "Burrows-Wheeler algorithm from the widely used <literal>bzip2</literal> "
4840 "compression package). This combination of algorithm and compression of the "
4841 "entire stream (instead of a revision at a time) substantially reduces the "
4842 "number of bytes to be transferred, yielding better network performance over "
4843 "almost all kinds of network."
4844 msgstr ""
4846 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4847 #: ../en/ch04-concepts.xml:598
4848 msgid ""
4849 "(If the connection is over <command>ssh</command>, Mercurial "
4850 "<emphasis>doesn't</emphasis> recompress the stream, because <command>ssh</"
4851 "command> can already do this itself.)"
4852 msgstr ""
4854 #. type: Content of: <book><chapter><sect1><sect2><title>
4855 #: ../en/ch04-concepts.xml:606
4856 msgid "Read/write ordering and atomicity"
4857 msgstr "读写顺序与原子性"
4859 #. type: Content of: <book><chapter><sect1><sect2><para>
4860 #: ../en/ch04-concepts.xml:608
4861 msgid ""
4862 "Appending to files isn't the whole story when it comes to guaranteeing that a "
4863 "reader won't see a partial write. If you recall figure <xref endterm=\"fig."
4864 "concepts.metadata.caption\" linkend=\"fig.concepts.metadata\"/>, revisions in "
4865 "the changelog point to revisions in the manifest, and revisions in the "
4866 "manifest point to revisions in filelogs. This hierarchy is deliberate."
4867 msgstr ""
4869 #. type: Content of: <book><chapter><sect1><sect2><para>
4870 #: ../en/ch04-concepts.xml:616
4871 msgid ""
4872 "A writer starts a transaction by writing filelog and manifest data, and "
4873 "doesn't write any changelog data until those are finished. A reader starts "
4874 "by reading changelog data, then manifest data, followed by filelog data."
4875 msgstr ""
4877 #. type: Content of: <book><chapter><sect1><sect2><para>
4878 #: ../en/ch04-concepts.xml:621
4879 msgid ""
4880 "Since the writer has always finished writing filelog and manifest data before "
4881 "it writes to the changelog, a reader will never read a pointer to a partially "
4882 "written manifest revision from the changelog, and it will never read a "
4883 "pointer to a partially written filelog revision from the manifest."
4884 msgstr ""
4886 #. type: Content of: <book><chapter><sect1><sect2><title>
4887 #: ../en/ch04-concepts.xml:629
4888 msgid "Concurrent access"
4889 msgstr "并发访问"
4891 #. type: Content of: <book><chapter><sect1><sect2><para>
4892 #: ../en/ch04-concepts.xml:631
4893 msgid ""
4894 "The read/write ordering and atomicity guarantees mean that Mercurial never "
4895 "needs to <emphasis>lock</emphasis> a repository when it's reading data, even "
4896 "if the repository is being written to while the read is occurring. This has a "
4897 "big effect on scalability; you can have an arbitrary number of Mercurial "
4898 "processes safely reading data from a repository safely all at once, no matter "
4899 "whether it's being written to or not."
4900 msgstr ""
4902 #. type: Content of: <book><chapter><sect1><sect2><para>
4903 #: ../en/ch04-concepts.xml:640
4904 msgid ""
4905 "The lockless nature of reading means that if you're sharing a repository on a "
4906 "multi-user system, you don't need to grant other local users permission to "
4907 "<emphasis>write</emphasis> to your repository in order for them to be able to "
4908 "clone it or pull changes from it; they only need <emphasis>read</emphasis> "
4909 "permission. (This is <emphasis>not</emphasis> a common feature among "
4910 "revision control systems, so don't take it for granted! Most require readers "
4911 "to be able to lock a repository to access it safely, and this requires write "
4912 "permission on at least one directory, which of course makes for all kinds of "
4913 "nasty and annoying security and administrative problems.)"
4914 msgstr ""
4916 #. type: Content of: <book><chapter><sect1><sect2><para>
4917 #: ../en/ch04-concepts.xml:653
4918 msgid ""
4919 "Mercurial uses locks to ensure that only one process can write to a "
4920 "repository at a time (the locking mechanism is safe even over filesystems "
4921 "that are notoriously hostile to locking, such as NFS). If a repository is "
4922 "locked, a writer will wait for a while to retry if the repository becomes "
4923 "unlocked, but if the repository remains locked for too long, the process "
4924 "attempting to write will time out after a while. This means that your daily "
4925 "automated scripts won't get stuck forever and pile up if a system crashes "
4926 "unnoticed, for example. (Yes, the timeout is configurable, from zero to "
4927 "infinity.)"
4928 msgstr ""
4930 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
4931 #: ../en/ch04-concepts.xml:665
4932 msgid "Safe dirstate access"
4933 msgstr "安全的目录状态访问"
4935 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4936 #: ../en/ch04-concepts.xml:667
4937 msgid ""
4938 "As with revision data, Mercurial doesn't take a lock to read the dirstate "
4939 "file; it does acquire a lock to write it. To avoid the possibility of "
4940 "reading a partially written copy of the dirstate file, Mercurial writes to a "
4941 "file with a unique name in the same directory as the dirstate file, then "
4942 "renames the temporary file atomically to <filename>dirstate</filename>. The "
4943 "file named <filename>dirstate</filename> is thus guaranteed to be complete, "
4944 "not partially written."
4945 msgstr ""
4947 #. type: Content of: <book><chapter><sect1><sect2><title>
4948 #: ../en/ch04-concepts.xml:680
4949 msgid "Avoiding seeks"
4950 msgstr "避免查找"
4952 #. type: Content of: <book><chapter><sect1><sect2><para>
4953 #: ../en/ch04-concepts.xml:682
4954 msgid ""
4955 "Critical to Mercurial's performance is the avoidance of seeks of the disk "
4956 "head, since any seek is far more expensive than even a comparatively large "
4957 "read operation."
4958 msgstr ""
4960 #. type: Content of: <book><chapter><sect1><sect2><para>
4961 #: ../en/ch04-concepts.xml:686
4962 msgid ""
4963 "This is why, for example, the dirstate is stored in a single file. If there "
4964 "were a dirstate file per directory that Mercurial tracked, the disk would "
4965 "seek once per directory. Instead, Mercurial reads the entire single dirstate "
4966 "file in one step."
4967 msgstr ""
4969 #. type: Content of: <book><chapter><sect1><sect2><para>
4970 #: ../en/ch04-concepts.xml:692
4971 msgid ""
4972 "Mercurial also uses a <quote>copy on write</quote> scheme when cloning a "
4973 "repository on local storage. Instead of copying every revlog file from the "
4974 "old repository into the new repository, it makes a <quote>hard link</quote>, "
4975 "which is a shorthand way to say <quote>these two names point to the same "
4976 "file</quote>. When Mercurial is about to write to one of a revlog's files, "
4977 "it checks to see if the number of names pointing at the file is greater than "
4978 "one. If it is, more than one repository is using the file, so Mercurial "
4979 "makes a new copy of the file that is private to this repository."
4980 msgstr ""
4982 #. type: Content of: <book><chapter><sect1><sect2><para>
4983 #: ../en/ch04-concepts.xml:703
4984 msgid ""
4985 "A few revision control developers have pointed out that this idea of making a "
4986 "complete private copy of a file is not very efficient in its use of storage. "
4987 "While this is true, storage is cheap, and this method gives the highest "
4988 "performance while deferring most book-keeping to the operating system. An "
4989 "alternative scheme would most likely reduce performance and increase the "
4990 "complexity of the software, each of which is much more important to the "
4991 "<quote>feel</quote> of day-to-day use."
4992 msgstr ""
4994 #. type: Content of: <book><chapter><sect1><sect2><title>
4995 #: ../en/ch04-concepts.xml:715
4996 msgid "Other contents of the dirstate"
4997 msgstr "目录状态的其它内容"
4999 #. type: Content of: <book><chapter><sect1><sect2><para>
5000 #: ../en/ch04-concepts.xml:717
5001 msgid ""
5002 "Because Mercurial doesn't force you to tell it when you're modifying a file, "
5003 "it uses the dirstate to store some extra information so it can determine "
5004 "efficiently whether you have modified a file. For each file in the working "
5005 "directory, it stores the time that it last modified the file itself, and the "
5006 "size of the file at that time."
5007 msgstr ""
5009 #. type: Content of: <book><chapter><sect1><sect2><para>
5010 #: ../en/ch04-concepts.xml:724
5011 msgid ""
5012 "When you explicitly <command role=\"hg-cmd\">hg add</command>, <command role="
5013 "\"hg-cmd\">hg remove</command>, <command role=\"hg-cmd\">hg rename</command> "
5014 "or <command role=\"hg-cmd\">hg copy</command> files, Mercurial updates the "
5015 "dirstate so that it knows what to do with those files when you commit."
5016 msgstr ""
5018 #. type: Content of: <book><chapter><sect1><sect2><para>
5019 #: ../en/ch04-concepts.xml:731
5020 msgid ""
5021 "When Mercurial is checking the states of files in the working directory, it "
5022 "first checks a file's modification time. If that has not changed, the file "
5023 "must not have been modified. If the file's size has changed, the file must "
5024 "have been modified. If the modification time has changed, but the size has "
5025 "not, only then does Mercurial need to read the actual contents of the file to "
5026 "see if they've changed. Storing these few extra pieces of information "
5027 "dramatically reduces the amount of data that Mercurial needs to read, which "
5028 "yields large performance improvements compared to other revision control "
5029 "systems."
5030 msgstr ""
5032 #. type: Content of: <book><chapter><title>
5033 #: ../en/ch05-daily.xml:5
5034 msgid "Mercurial in daily use"
5035 msgstr "Mercurial 的日常使用"
5037 #. type: Content of: <book><chapter><sect1><title>
5038 #: ../en/ch05-daily.xml:8
5039 msgid "Telling Mercurial which files to track"
5040 msgstr "告诉 Mercurial 要跟踪哪些文件"
5042 #. type: Content of: <book><chapter><sect1><para>
5043 #: ../en/ch05-daily.xml:10
5044 msgid ""
5045 "Mercurial does not work with files in your repository unless you tell it to "
5046 "manage them. The <command role=\"hg-cmd\">hg status</command> command will "
5047 "tell you which files Mercurial doesn't know about; it uses a <quote><literal>?"
5048 "</literal></quote> to display such files."
5049 msgstr ""
5051 #
5052 #. type: Content of: <book><chapter><sect1><para>
5053 #: ../en/ch05-daily.xml:17
5054 msgid ""
5055 "To tell Mercurial to track a file, use the <command role=\"hg-cmd\">hg add</"
5056 "command> command. Once you have added a file, the entry in the output of "
5057 "<command role=\"hg-cmd\">hg status</command> for that file changes from "
5058 "<quote><literal>?</literal></quote> to <quote><literal>A</literal></quote>."
5059 msgstr ""
5061 #. type: Content of: <book><chapter><sect1><para>
5062 #: ../en/ch05-daily.xml:26
5063 msgid ""
5064 "After you run a <command role=\"hg-cmd\">hg commit</command>, the files that "
5065 "you added before the commit will no longer be listed in the output of "
5066 "<command role=\"hg-cmd\">hg status</command>. The reason for this is that "
5067 "<command role=\"hg-cmd\">hg status</command> only tells you about "
5068 "<quote>interesting</quote> files&emdash;those that you have modified or told "
5069 "Mercurial to do something with&emdash;by default. If you have a repository "
5070 "that contains thousands of files, you will rarely want to know about files "
5071 "that Mercurial is tracking, but that have not changed. (You can still get "
5072 "this information; we'll return to this later.)"
5073 msgstr ""
5075 #. type: Content of: <book><chapter><sect1><para>
5076 #: ../en/ch05-daily.xml:38
5077 msgid ""
5078 "Once you add a file, Mercurial doesn't do anything with it immediately. "
5079 "Instead, it will take a snapshot of the file's state the next time you "
5080 "perform a commit. It will then continue to track the changes you make to the "
5081 "file every time you commit, until you remove the file."
5082 msgstr ""
5084 #. type: Content of: <book><chapter><sect1><sect2><title>
5085 #: ../en/ch05-daily.xml:45
5086 msgid "Explicit versus implicit file naming"
5087 msgstr "明确与隐含文件命名"
5089 #. type: Content of: <book><chapter><sect1><sect2><para>
5090 #: ../en/ch05-daily.xml:47
5091 msgid ""
5092 "A useful behaviour that Mercurial has is that if you pass the name of a "
5093 "directory to a command, every Mercurial command will treat this as <quote>I "
5094 "want to operate on every file in this directory and its subdirectories</"
5095 "quote>."
5096 msgstr ""
5098 #. type: Content of: <book><chapter><sect1><sect2><para>
5099 #: ../en/ch05-daily.xml:54
5100 msgid ""
5101 "Notice in this example that Mercurial printed the names of the files it "
5102 "added, whereas it didn't do so when we added the file named <filename>a</"
5103 "filename> in the earlier example."
5104 msgstr ""
5106 #. type: Content of: <book><chapter><sect1><sect2><para>
5107 #: ../en/ch05-daily.xml:59
5108 msgid ""
5109 "What's going on is that in the former case, we explicitly named the file to "
5110 "add on the command line, so the assumption that Mercurial makes in such cases "
5111 "is that you know what you were doing, and it doesn't print any output."
5112 msgstr ""
5114 #. type: Content of: <book><chapter><sect1><sect2><para>
5115 #: ../en/ch05-daily.xml:64
5116 msgid ""
5117 "However, when we <emphasis>imply</emphasis> the names of files by giving the "
5118 "name of a directory, Mercurial takes the extra step of printing the name of "
5119 "each file that it does something with. This makes it more clear what is "
5120 "happening, and reduces the likelihood of a silent and nasty surprise. This "
5121 "behaviour is common to most Mercurial commands."
5122 msgstr ""
5124 #. type: Content of: <book><chapter><sect1><sect2><title>
5125 #: ../en/ch05-daily.xml:73
5126 msgid "Aside: Mercurial tracks files, not directories"
5127 msgstr "旁白: Mercurial 只跟踪文件，不跟踪目录"
5129 #. type: Content of: <book><chapter><sect1><sect2><para>
5130 #: ../en/ch05-daily.xml:75
5131 msgid ""
5132 "Mercurial does not track directory information. Instead, it tracks the path "
5133 "to a file. Before creating a file, it first creates any missing directory "
5134 "components of the path. After it deletes a file, it then deletes any empty "
5135 "directories that were in the deleted file's path. This sounds like a trivial "
5136 "distinction, but it has one minor practical consequence: it is not possible "
5137 "to represent a completely empty directory in Mercurial."
5138 msgstr ""
5140 #. type: Content of: <book><chapter><sect1><sect2><para>
5141 #: ../en/ch05-daily.xml:84
5142 msgid ""
5143 "Empty directories are rarely useful, and there are unintrusive workarounds "
5144 "that you can use to achieve an appropriate effect. The developers of "
5145 "Mercurial thus felt that the complexity that would be required to manage "
5146 "empty directories was not worth the limited benefit this feature would bring."
5147 msgstr ""
5149 #. type: Content of: <book><chapter><sect1><sect2><para>
5150 #: ../en/ch05-daily.xml:91
5151 msgid ""
5152 "If you need an empty directory in your repository, there are a few ways to "
5153 "achieve this. One is to create a directory, then <command role=\"hg-cmd\">hg "
5154 "add</command> a <quote>hidden</quote> file to that directory. On Unix-like "
5155 "systems, any file name that begins with a period (<quote><literal>.</"
5156 "literal></quote>) is treated as hidden by most commands and GUI tools. This "
5157 "approach is illustrated below."
5158 msgstr ""
5160 #. type: Content of: <book><chapter><sect1><sect2><para>
5161 #: ../en/ch05-daily.xml:102
5162 msgid ""
5163 "Another way to tackle a need for an empty directory is to simply create one "
5164 "in your automated build scripts before they will need it."
5165 msgstr ""
5167 #. type: Content of: <book><chapter><sect1><title>
5168 #: ../en/ch05-daily.xml:109
5169 msgid "How to stop tracking a file"
5170 msgstr "如何停止跟踪文件"
5172 #
5173 #. type: Content of: <book><chapter><sect1><para>
5174 #: ../en/ch05-daily.xml:111
5175 msgid ""
5176 "Once you decide that a file no longer belongs in your repository, use the "
5177 "<command role=\"hg-cmd\">hg remove</command> command; this deletes the file, "
5178 "and tells Mercurial to stop tracking it. A removed file is represented in "
5179 "the output of <command role=\"hg-cmd\">hg status</command> with a "
5180 "<quote><literal>R</literal></quote>."
5181 msgstr ""
5183 #. type: Content of: <book><chapter><sect1><para>
5184 #: ../en/ch05-daily.xml:120
5185 msgid ""
5186 "After you <command role=\"hg-cmd\">hg remove</command> a file, Mercurial will "
5187 "no longer track changes to that file, even if you recreate a file with the "
5188 "same name in your working directory. If you do recreate a file with the same "
5189 "name and want Mercurial to track the new file, simply <command role=\"hg-cmd"
5190 "\">hg add</command> it. Mercurial will know that the newly added file is not "
5191 "related to the old file of the same name."
5192 msgstr ""
5194 #. type: Content of: <book><chapter><sect1><sect2><title>
5195 #: ../en/ch05-daily.xml:129
5196 msgid "Removing a file does not affect its history"
5197 msgstr "删除文件不影响历史"
5199 #. type: Content of: <book><chapter><sect1><sect2><para>
5200 #: ../en/ch05-daily.xml:131
5201 msgid "It is important to understand that removing a file has only two effects."
5202 msgstr ""
5204 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
5205 #: ../en/ch05-daily.xml:134
5206 msgid "It removes the current version of the file from the working directory."
5207 msgstr ""
5209 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
5210 #: ../en/ch05-daily.xml:137
5211 msgid ""
5212 "It stops Mercurial from tracking changes to the file, from the time of the "
5213 "next commit."
5214 msgstr ""
5216 #. type: Content of: <book><chapter><sect1><sect2><para>
5217 #: ../en/ch05-daily.xml:140
5218 msgid ""
5219 "Removing a file <emphasis>does not</emphasis> in any way alter the "
5220 "<emphasis>history</emphasis> of the file."
5221 msgstr ""
5223 #. type: Content of: <book><chapter><sect1><sect2><para>
5224 #: ../en/ch05-daily.xml:143
5225 msgid ""
5226 "If you update the working directory to a changeset in which a file that you "
5227 "have removed was still tracked, it will reappear in the working directory, "
5228 "with the contents it had when you committed that changeset. If you then "
5229 "update the working directory to a later changeset, in which the file had been "
5230 "removed, Mercurial will once again remove the file from the working directory."
5231 msgstr ""
5233 #. type: Content of: <book><chapter><sect1><sect2><title>
5234 #: ../en/ch05-daily.xml:153
5235 msgid "Missing files"
5236 msgstr "丢失的文件"
5238 #. type: Content of: <book><chapter><sect1><sect2><para>
5239 #: ../en/ch05-daily.xml:155
5240 msgid ""
5241 "Mercurial considers a file that you have deleted, but not used <command role="
5242 "\"hg-cmd\">hg remove</command> to delete, to be <emphasis>missing</"
5243 "emphasis>. A missing file is represented with <quote><literal>!</literal></"
5244 "quote> in the output of <command role=\"hg-cmd\">hg status</command>. "
5245 "Mercurial commands will not generally do anything with missing files."
5246 msgstr ""
5248 #. type: Content of: <book><chapter><sect1><sect2><para>
5249 #: ../en/ch05-daily.xml:165
5250 msgid ""
5251 "If your repository contains a file that <command role=\"hg-cmd\">hg status</"
5252 "command> reports as missing, and you want the file to stay gone, you can run "
5253 "<command role=\"hg-cmd\">hg remove <option role=\"hg-opt-remove\">--after</"
5254 "option></command> at any time later on, to tell Mercurial that you really did "
5255 "mean to remove the file."
5256 msgstr ""
5258 #. type: Content of: <book><chapter><sect1><sect2><para>
5259 #: ../en/ch05-daily.xml:175
5260 msgid ""
5261 "On the other hand, if you deleted the missing file by accident, give <command "
5262 "role=\"hg-cmd\">hg revert</command> the name of the file to recover. It will "
5263 "reappear, in unmodified form."
5264 msgstr ""
5266 #. type: Content of: <book><chapter><sect1><sect2><title>
5267 #: ../en/ch05-daily.xml:184
5268 msgid "Aside: why tell Mercurial explicitly to remove a file?"
5269 msgstr "旁白: 为什么要明确告诉 Mercurial 删除文件?"
5271 #. type: Content of: <book><chapter><sect1><sect2><para>
5272 #: ../en/ch05-daily.xml:187
5273 msgid ""
5274 "You might wonder why Mercurial requires you to explicitly tell it that you "
5275 "are deleting a file. Early during the development of Mercurial, it let you "
5276 "delete a file however you pleased; Mercurial would notice the absence of the "
5277 "file automatically when you next ran a <command role=\"hg-cmd\">hg commit</"
5278 "command>, and stop tracking the file. In practice, this made it too easy to "
5279 "accidentally remove a file without noticing."
5280 msgstr ""
5282 #. type: Content of: <book><chapter><sect1><sect2><title>
5283 #: ../en/ch05-daily.xml:198
5284 msgid "Useful shorthand&emdash;adding and removing files in one step"
5285 msgstr "有用的速记&emdash;一个步骤添加和删除文件"
5287 #. type: Content of: <book><chapter><sect1><sect2><para>
5288 #: ../en/ch05-daily.xml:201
5289 msgid ""
5290 "Mercurial offers a combination command, <command role=\"hg-cmd\">hg "
5291 "addremove</command>, that adds untracked files and marks missing files as "
5292 "removed."
5293 msgstr ""
5295 #. type: Content of: <book><chapter><sect1><sect2><para>
5296 #: ../en/ch05-daily.xml:207
5297 msgid ""
5298 "The <command role=\"hg-cmd\">hg commit</command> command also provides a "
5299 "<option role=\"hg-opt-commit\">-A</option> option that performs this same add-"
5300 "and-remove, immediately followed by a commit."
5301 msgstr ""
5303 #. type: Content of: <book><chapter><sect1><title>
5304 #: ../en/ch05-daily.xml:217
5305 msgid "Copying files"
5306 msgstr "复制文件"
5308 #. type: Content of: <book><chapter><sect1><para>
5309 #: ../en/ch05-daily.xml:219
5310 msgid ""
5311 "Mercurial provides a <command role=\"hg-cmd\">hg copy</command> command that "
5312 "lets you make a new copy of a file. When you copy a file using this command, "
5313 "Mercurial makes a record of the fact that the new file is a copy of the "
5314 "original file. It treats these copied files specially when you merge your "
5315 "work with someone else's."
5316 msgstr ""
5318 #. type: Content of: <book><chapter><sect1><sect2><title>
5319 #: ../en/ch05-daily.xml:227
5320 msgid "The results of copying during a merge"
5321 msgstr "合并期间的复制结果"
5323 #. type: Content of: <book><chapter><sect1><sect2><para>
5324 #: ../en/ch05-daily.xml:229
5325 msgid ""
5326 "What happens during a merge is that changes <quote>follow</quote> a copy. To "
5327 "best illustrate what this means, let's create an example. We'll start with "
5328 "the usual tiny repository that contains a single file."
5329 msgstr ""
5331 #. type: Content of: <book><chapter><sect1><sect2><para>
5332 #: ../en/ch05-daily.xml:236
5333 msgid ""
5334 "We need to do some work in parallel, so that we'll have something to merge. "
5335 "So let's clone our repository."
5336 msgstr ""
5338 #. type: Content of: <book><chapter><sect1><sect2><para>
5339 #: ../en/ch05-daily.xml:242
5340 msgid ""
5341 "Back in our initial repository, let's use the <command role=\"hg-cmd\">hg "
5342 "copy</command> command to make a copy of the first file we created."
5343 msgstr ""
5345 #. type: Content of: <book><chapter><sect1><sect2><para>
5346 #: ../en/ch05-daily.xml:248
5347 msgid ""
5348 "If we look at the output of the <command role=\"hg-cmd\">hg status</command> "
5349 "command afterwards, the copied file looks just like a normal added file."
5350 msgstr ""
5352 #. type: Content of: <book><chapter><sect1><sect2><para>
5353 #: ../en/ch05-daily.xml:254
5354 msgid ""
5355 "But if we pass the <option role=\"hg-opt-status\">-C</option> option to "
5356 "<command role=\"hg-cmd\">hg status</command>, it prints another line of "
5357 "output: this is the file that our newly-added file was copied <emphasis>from</"
5358 "emphasis>."
5359 msgstr ""
5361 #. type: Content of: <book><chapter><sect1><sect2><para>
5362 #: ../en/ch05-daily.xml:262
5363 msgid ""
5364 "Now, back in the repository we cloned, let's make a change in parallel. "
5365 "We'll add a line of content to the original file that we created."
5366 msgstr ""
5368 #. type: Content of: <book><chapter><sect1><sect2><para>
5369 #: ../en/ch05-daily.xml:268
5370 msgid ""
5371 "Now we have a modified <filename>file</filename> in this repository. When we "
5372 "pull the changes from the first repository, and merge the two heads, "
5373 "Mercurial will propagate the changes that we made locally to <filename>file</"
5374 "filename> into its copy, <filename>new-file</filename>."
5375 msgstr ""
5377 #. type: Content of: <book><chapter><sect1><sect2><title>
5378 #: ../en/ch05-daily.xml:278
5379 msgid "Why should changes follow copies?"
5380 msgstr "为什么复制后需要后续修改?"
5382 #. type: Content of: <book><chapter><sect1><sect2><para>
5383 #: ../en/ch05-daily.xml:280
5384 msgid ""
5385 "This behaviour, of changes to a file propagating out to copies of the file, "
5386 "might seem esoteric, but in most cases it's highly desirable."
5387 msgstr ""
5389 #. type: Content of: <book><chapter><sect1><sect2><para>
5390 #: ../en/ch05-daily.xml:284
5391 msgid ""
5392 "First of all, remember that this propagation <emphasis>only</emphasis> "
5393 "happens when you merge. So if you <command role=\"hg-cmd\">hg copy</command> "
5394 "a file, and subsequently modify the original file during the normal course of "
5395 "your work, nothing will happen."
5396 msgstr ""
5398 #. type: Content of: <book><chapter><sect1><sect2><para>
5399 #: ../en/ch05-daily.xml:290
5400 msgid ""
5401 "The second thing to know is that modifications will only propagate across a "
5402 "copy as long as the repository that you're pulling changes from "
5403 "<emphasis>doesn't know</emphasis> about the copy."
5404 msgstr ""
5406 #. type: Content of: <book><chapter><sect1><sect2><para>
5407 #: ../en/ch05-daily.xml:295
5408 msgid ""
5409 "The reason that Mercurial does this is as follows. Let's say I make an "
5410 "important bug fix in a source file, and commit my changes. Meanwhile, you've "
5411 "decided to <command role=\"hg-cmd\">hg copy</command> the file in your "
5412 "repository, without knowing about the bug or having seen the fix, and you "
5413 "have started hacking on your copy of the file."
5414 msgstr ""
5416 #. type: Content of: <book><chapter><sect1><sect2><para>
5417 #: ../en/ch05-daily.xml:302
5418 msgid ""
5419 "If you pulled and merged my changes, and Mercurial <emphasis>didn't</"
5420 "emphasis> propagate changes across copies, your source file would now contain "
5421 "the bug, and unless you remembered to propagate the bug fix by hand, the bug "
5422 "would <emphasis>remain</emphasis> in your copy of the file."
5423 msgstr ""
5425 #. type: Content of: <book><chapter><sect1><sect2><para>
5426 #: ../en/ch05-daily.xml:308
5427 msgid ""
5428 "By automatically propagating the change that fixed the bug from the original "
5429 "file to the copy, Mercurial prevents this class of problem. To my knowledge, "
5430 "Mercurial is the <emphasis>only</emphasis> revision control system that "
5431 "propagates changes across copies like this."
5432 msgstr ""
5434 #. type: Content of: <book><chapter><sect1><sect2><para>
5435 #: ../en/ch05-daily.xml:314
5436 msgid ""
5437 "Once your change history has a record that the copy and subsequent merge "
5438 "occurred, there's usually no further need to propagate changes from the "
5439 "original file to the copied file, and that's why Mercurial only propagates "
5440 "changes across copies until this point, and no further."
5441 msgstr ""
5443 #. type: Content of: <book><chapter><sect1><sect2><title>
5444 #: ../en/ch05-daily.xml:322
5445 msgid "How to make changes <emphasis>not</emphasis> follow a copy"
5446 msgstr "如何让复制后<emphasis>不</emphasis>修改?"
5448 #. type: Content of: <book><chapter><sect1><sect2><para>
5449 #: ../en/ch05-daily.xml:325
5450 msgid ""
5451 "If, for some reason, you decide that this business of automatically "
5452 "propagating changes across copies is not for you, simply use your system's "
5453 "normal file copy command (on Unix-like systems, that's <command>cp</command>) "
5454 "to make a copy of a file, then <command role=\"hg-cmd\">hg add</command> the "
5455 "new copy by hand. Before you do so, though, please do reread section <xref "
5456 "linkend=\"sec.daily.why-copy\"/>, and make an informed decision that this "
5457 "behaviour is not appropriate to your specific case."
5458 msgstr ""
5460 #. type: Content of: <book><chapter><sect1><sect2><title>
5461 #: ../en/ch05-daily.xml:338
5462 msgid "Behaviour of the <command role=\"hg-cmd\">hg copy</command> command"
5463 msgstr "命令 <command role=\"hg-cmd\">hg copy</command> 的特性"
5465 #. type: Content of: <book><chapter><sect1><sect2><para>
5466 #: ../en/ch05-daily.xml:341
5467 msgid ""
5468 "When you use the <command role=\"hg-cmd\">hg copy</command> command, "
5469 "Mercurial makes a copy of each source file as it currently stands in the "
5470 "working directory. This means that if you make some modifications to a file, "
5471 "then <command role=\"hg-cmd\">hg copy</command> it without first having "
5472 "committed those changes, the new copy will also contain the modifications you "
5473 "have made up until that point. (I find this behaviour a little "
5474 "counterintuitive, which is why I mention it here.)"
5475 msgstr ""
5477 #. type: Content of: <book><chapter><sect1><sect2><para>
5478 #: ../en/ch05-daily.xml:351
5479 msgid ""
5480 "The <command role=\"hg-cmd\">hg copy</command> command acts similarly to the "
5481 "Unix <command>cp</command> command (you can use the <command role=\"hg-cmd"
5482 "\">hg cp</command> alias if you prefer). The last argument is the "
5483 "<emphasis>destination</emphasis>, and all prior arguments are "
5484 "<emphasis>sources</emphasis>. If you pass it a single file as the source, "
5485 "and the destination does not exist, it creates a new file with that name."
5486 msgstr ""
5488 #. type: Content of: <book><chapter><sect1><sect2><para>
5489 #: ../en/ch05-daily.xml:362
5490 msgid ""
5491 "If the destination is a directory, Mercurial copies its sources into that "
5492 "directory."
5493 msgstr ""
5495 #. type: Content of: <book><chapter><sect1><sect2><para>
5496 #: ../en/ch05-daily.xml:367
5497 msgid ""
5498 "Copying a directory is recursive, and preserves the directory structure of "
5499 "the source."
5500 msgstr ""
5502 #. type: Content of: <book><chapter><sect1><sect2><para>
5503 #: ../en/ch05-daily.xml:373
5504 msgid ""
5505 "If the source and destination are both directories, the source tree is "
5506 "recreated in the destination directory."
5507 msgstr ""
5509 #
5510 #. type: Content of: <book><chapter><sect1><sect2><para>
5511 #: ../en/ch05-daily.xml:378
5512 msgid ""
5513 "As with the <command role=\"hg-cmd\">hg rename</command> command, if you copy "
5514 "a file manually and then want Mercurial to know that you've copied the file, "
5515 "simply use the <option role=\"hg-opt-copy\">--after</option> option to "
5516 "<command role=\"hg-cmd\">hg copy</command>."
5517 msgstr ""
5519 #. type: Content of: <book><chapter><sect1><title>
5520 #: ../en/ch05-daily.xml:389
5521 msgid "Renaming files"
5522 msgstr "改名文件"
5524 #. type: Content of: <book><chapter><sect1><para>
5525 #: ../en/ch05-daily.xml:391
5526 msgid ""
5527 "It's rather more common to need to rename a file than to make a copy of it. "
5528 "The reason I discussed the <command role=\"hg-cmd\">hg copy</command> command "
5529 "before talking about renaming files is that Mercurial treats a rename in "
5530 "essentially the same way as a copy. Therefore, knowing what Mercurial does "
5531 "when you copy a file tells you what to expect when you rename a file."
5532 msgstr ""
5534 #. type: Content of: <book><chapter><sect1><para>
5535 #: ../en/ch05-daily.xml:399
5536 msgid ""
5537 "When you use the <command role=\"hg-cmd\">hg rename</command> command, "
5538 "Mercurial makes a copy of each source file, then deletes it and marks the "
5539 "file as removed."
5540 msgstr ""
5542 #. type: Content of: <book><chapter><sect1><para>
5543 #: ../en/ch05-daily.xml:405
5544 msgid ""
5545 "The <command role=\"hg-cmd\">hg status</command> command shows the newly "
5546 "copied file as added, and the copied-from file as removed."
5547 msgstr ""
5549 #. type: Content of: <book><chapter><sect1><para>
5550 #: ../en/ch05-daily.xml:411
5551 msgid ""
5552 "As with the results of a <command role=\"hg-cmd\">hg copy</command>, we must "
5553 "use the <option role=\"hg-opt-status\">-C</option> option to <command role="
5554 "\"hg-cmd\">hg status</command> to see that the added file is really being "
5555 "tracked by Mercurial as a copy of the original, now removed, file."
5556 msgstr ""
5558 #. type: Content of: <book><chapter><sect1><para>
5559 #: ../en/ch05-daily.xml:420
5560 msgid ""
5561 "As with <command role=\"hg-cmd\">hg remove</command> and <command role=\"hg-"
5562 "cmd\">hg copy</command>, you can tell Mercurial about a rename after the fact "
5563 "using the <option role=\"hg-opt-rename\">--after</option> option. In most "
5564 "other respects, the behaviour of the <command role=\"hg-cmd\">hg rename</"
5565 "command> command, and the options it accepts, are similar to the <command "
5566 "role=\"hg-cmd\">hg copy</command> command."
5567 msgstr ""
5569 #. type: Content of: <book><chapter><sect1><sect2><title>
5570 #: ../en/ch05-daily.xml:430
5571 msgid "Renaming files and merging changes"
5572 msgstr "改名文件与合并修改"
5574 #. type: Content of: <book><chapter><sect1><sect2><para>
5575 #: ../en/ch05-daily.xml:432
5576 msgid ""
5577 "Since Mercurial's rename is implemented as copy-and-remove, the same "
5578 "propagation of changes happens when you merge after a rename as after a copy."
5579 msgstr ""
5581 #. type: Content of: <book><chapter><sect1><sect2><para>
5582 #: ../en/ch05-daily.xml:436
5583 msgid ""
5584 "If I modify a file, and you rename it to a new name, and then we merge our "
5585 "respective changes, my modifications to the file under its original name will "
5586 "be propagated into the file under its new name. (This is something you might "
5587 "expect to <quote>simply work,</quote> but not all revision control systems "
5588 "actually do this.)"
5589 msgstr ""
5591 #. type: Content of: <book><chapter><sect1><sect2><para>
5592 #: ../en/ch05-daily.xml:443
5593 msgid ""
5594 "Whereas having changes follow a copy is a feature where you can perhaps nod "
5595 "and say <quote>yes, that might be useful,</quote> it should be clear that "
5596 "having them follow a rename is definitely important. Without this facility, "
5597 "it would simply be too easy for changes to become orphaned when files are "
5598 "renamed."
5599 msgstr ""
5601 #. type: Content of: <book><chapter><sect1><sect2><title>
5602 #: ../en/ch05-daily.xml:452
5603 msgid "Divergent renames and merging"
5604 msgstr "改名与合并的分歧"
5606 #. type: Content of: <book><chapter><sect1><sect2><para>
5607 #: ../en/ch05-daily.xml:454
5608 msgid ""
5609 "The case of diverging names occurs when two developers start with a "
5610 "file&emdash;let's call it <filename>foo</filename>&emdash;in their respective "
5611 "repositories."
5612 msgstr ""
5614 #. type: Content of: <book><chapter><sect1><sect2><para>
5615 #: ../en/ch05-daily.xml:461
5616 msgid "Anne renames the file to <filename>bar</filename>."
5617 msgstr ""
5619 #. type: Content of: <book><chapter><sect1><sect2><para>
5620 #: ../en/ch05-daily.xml:465
5621 msgid "Meanwhile, Bob renames it to <filename>quux</filename>."
5622 msgstr ""
5624 #. type: Content of: <book><chapter><sect1><sect2><para>
5625 #: ../en/ch05-daily.xml:470
5626 msgid ""
5627 "I like to think of this as a conflict because each developer has expressed "
5628 "different intentions about what the file ought to be named."
5629 msgstr ""
5631 #
5632 #. type: Content of: <book><chapter><sect1><sect2><para>
5633 #: ../en/ch05-daily.xml:474
5634 msgid ""
5635 "What do you think should happen when they merge their work? Mercurial's "
5636 "actual behaviour is that it always preserves <emphasis>both</emphasis> names "
5637 "when it merges changesets that contain divergent renames."
5638 msgstr ""
5640 #. type: Content of: <book><chapter><sect1><sect2><para>
5641 #: ../en/ch05-daily.xml:481
5642 msgid ""
5643 "Notice that Mercurial does warn about the divergent renames, but it leaves it "
5644 "up to you to do something about the divergence after the merge."
5645 msgstr ""
5647 #. type: Content of: <book><chapter><sect1><sect2><title>
5648 #: ../en/ch05-daily.xml:487
5649 msgid "Convergent renames and merging"
5650 msgstr "收敛改名与合并"
5652 #. type: Content of: <book><chapter><sect1><sect2><para>
5653 #: ../en/ch05-daily.xml:489
5654 msgid ""
5655 "Another kind of rename conflict occurs when two people choose to rename "
5656 "different <emphasis>source</emphasis> files to the same "
5657 "<emphasis>destination</emphasis>. In this case, Mercurial runs its normal "
5658 "merge machinery, and lets you guide it to a suitable resolution."
5659 msgstr ""
5661 #. type: Content of: <book><chapter><sect1><sect2><title>
5662 #: ../en/ch05-daily.xml:497
5663 msgid "Other name-related corner cases"
5664 msgstr "其它名称相关的角落"
5666 #. type: Content of: <book><chapter><sect1><sect2><para>
5667 #: ../en/ch05-daily.xml:499
5668 msgid ""
5669 "Mercurial has a longstanding bug in which it fails to handle a merge where "
5670 "one side has a file with a given name, while another has a directory with the "
5671 "same name. This is documented as <ulink role=\"hg-bug\" url=\"http://www."
5672 "selenic.com/mercurial/bts/issue29\">issue 29</ulink>."
5673 msgstr ""
5675 #. type: Content of: <book><chapter><sect1><title>
5676 #: ../en/ch05-daily.xml:511
5677 msgid "Recovering from mistakes"
5678 msgstr "从错误恢复"
5680 #. type: Content of: <book><chapter><sect1><para>
5681 #: ../en/ch05-daily.xml:513
5682 msgid ""
5683 "Mercurial has some useful commands that will help you to recover from some "
5684 "common mistakes."
5685 msgstr ""
5687 #. type: Content of: <book><chapter><sect1><para>
5688 #: ../en/ch05-daily.xml:516
5689 msgid ""
5690 "The <command role=\"hg-cmd\">hg revert</command> command lets you undo "
5691 "changes that you have made to your working directory. For example, if you "
5692 "<command role=\"hg-cmd\">hg add</command> a file by accident, just run "
5693 "<command role=\"hg-cmd\">hg revert</command> with the name of the file you "
5694 "added, and while the file won't be touched in any way, it won't be tracked "
5695 "for adding by Mercurial any longer, either. You can also use <command role="
5696 "\"hg-cmd\">hg revert</command> to get rid of erroneous changes to a file."
5697 msgstr ""
5699 #. type: Content of: <book><chapter><sect1><para>
5700 #: ../en/ch05-daily.xml:526
5701 msgid ""
5702 "It's useful to remember that the <command role=\"hg-cmd\">hg revert</command> "
5703 "command is useful for changes that you have not yet committed. Once you've "
5704 "committed a change, if you decide it was a mistake, you can still do "
5705 "something about it, though your options may be more limited."
5706 msgstr ""
5708 #. type: Content of: <book><chapter><sect1><para>
5709 #: ../en/ch05-daily.xml:532
5710 msgid ""
5711 "For more information about the <command role=\"hg-cmd\">hg revert</command> "
5712 "command, and details about how to deal with changes you have already "
5713 "committed, see chapter <xref linkend=\"chap.undo\"/>."
5714 msgstr ""
5716 #. type: Content of: <book><chapter><title>
5717 #: ../en/ch06-collab.xml:5
5718 msgid "Collaborating with other people"
5719 msgstr "团体协作"
5721 #. type: Content of: <book><chapter><para>
5722 #: ../en/ch06-collab.xml:7
5723 msgid ""
5724 "As a completely decentralised tool, Mercurial doesn't impose any policy on "
5725 "how people ought to work with each other. However, if you're new to "
5726 "distributed revision control, it helps to have some tools and examples in "
5727 "mind when you're thinking about possible workflow models."
5728 msgstr ""
5730 #. type: Content of: <book><chapter><sect1><title>
5731 #: ../en/ch06-collab.xml:14
5732 msgid "Mercurial's web interface"
5733 msgstr "Mercurial 的 web 接口"
5735 #. type: Content of: <book><chapter><sect1><para>
5736 #: ../en/ch06-collab.xml:16
5737 msgid ""
5738 "Mercurial has a powerful web interface that provides several useful "
5739 "capabilities."
5740 msgstr ""
5742 #. type: Content of: <book><chapter><sect1><para>
5743 #: ../en/ch06-collab.xml:19
5744 msgid ""
5745 "For interactive use, the web interface lets you browse a single repository or "
5746 "a collection of repositories. You can view the history of a repository, "
5747 "examine each change (comments and diffs), and view the contents of each "
5748 "directory and file."
5749 msgstr ""
5751 #. type: Content of: <book><chapter><sect1><para>
5752 #: ../en/ch06-collab.xml:24
5753 msgid ""
5754 "Also for human consumption, the web interface provides an RSS feed of the "
5755 "changes in a repository. This lets you <quote>subscribe</quote> to a "
5756 "repository using your favourite feed reader, and be automatically notified of "
5757 "activity in that repository as soon as it happens. I find this capability "
5758 "much more convenient than the model of subscribing to a mailing list to which "
5759 "notifications are sent, as it requires no additional configuration on the "
5760 "part of whoever is serving the repository."
5761 msgstr ""
5763 #. type: Content of: <book><chapter><sect1><para>
5764 #: ../en/ch06-collab.xml:34
5765 msgid ""
5766 "The web interface also lets remote users clone a repository, pull changes "
5767 "from it, and (when the server is configured to permit it) push changes back "
5768 "to it. Mercurial's HTTP tunneling protocol aggressively compresses data, so "
5769 "that it works efficiently even over low-bandwidth network connections."
5770 msgstr ""
5772 #. type: Content of: <book><chapter><sect1><para>
5773 #: ../en/ch06-collab.xml:40
5774 msgid ""
5775 "The easiest way to get started with the web interface is to use your web "
5776 "browser to visit an existing repository, such as the master Mercurial "
5777 "repository at <ulink url=\"http://www.selenic.com/repo/hg?style=gitweb"
5778 "\">http://www.selenic.com/repo/hg?style=gitweb</ulink>."
5779 msgstr ""
5781 #. type: Content of: <book><chapter><sect1><para>
5782 #: ../en/ch06-collab.xml:45
5783 msgid ""
5784 "If you're interested in providing a web interface to your own repositories, "
5785 "Mercurial provides two ways to do this. The first is using the <command role="
5786 "\"hg-cmd\">hg serve</command> command, which is best suited to short-term "
5787 "<quote>lightweight</quote> serving. See section <xref linkend=\"sec.collab."
5788 "serve\"/> below for details of how to use this command. If you have a long-"
5789 "lived repository that you'd like to make permanently available, Mercurial has "
5790 "built-in support for the CGI (Common Gateway Interface) standard, which all "
5791 "common web servers support. See section <xref linkend=\"sec.collab.cgi\"/> "
5792 "for details of CGI configuration."
5793 msgstr ""
5795 #. type: Content of: <book><chapter><sect1><title>
5796 #: ../en/ch06-collab.xml:60
5797 msgid "Collaboration models"
5798 msgstr "协作模型"
5800 #. type: Content of: <book><chapter><sect1><para>
5801 #: ../en/ch06-collab.xml:62
5802 msgid ""
5803 "With a suitably flexible tool, making decisions about workflow is much more "
5804 "of a social engineering challenge than a technical one. Mercurial imposes few "
5805 "limitations on how you can structure the flow of work in a project, so it's "
5806 "up to you and your group to set up and live with a model that matches your "
5807 "own particular needs."
5808 msgstr ""
5810 #. type: Content of: <book><chapter><sect1><sect2><title>
5811 #: ../en/ch06-collab.xml:70
5812 msgid "Factors to keep in mind"
5813 msgstr "要牢记的因素"
5815 #. type: Content of: <book><chapter><sect1><sect2><para>
5816 #: ../en/ch06-collab.xml:72
5817 msgid ""
5818 "The most important aspect of any model that you must keep in mind is how well "
5819 "it matches the needs and capabilities of the people who will be using it. "
5820 "This might seem self-evident; even so, you still can't afford to forget it "
5821 "for a moment."
5822 msgstr ""
5824 #. type: Content of: <book><chapter><sect1><sect2><para>
5825 #: ../en/ch06-collab.xml:78
5826 msgid ""
5827 "I once put together a workflow model that seemed to make perfect sense to me, "
5828 "but that caused a considerable amount of consternation and strife within my "
5829 "development team. In spite of my attempts to explain why we needed a complex "
5830 "set of branches, and how changes ought to flow between them, a few team "
5831 "members revolted. Even though they were smart people, they didn't want to "
5832 "pay attention to the constraints we were operating under, or face the "
5833 "consequences of those constraints in the details of the model that I was "
5834 "advocating."
5835 msgstr ""
5837 #. type: Content of: <book><chapter><sect1><sect2><para>
5838 #: ../en/ch06-collab.xml:88
5839 msgid ""
5840 "Don't sweep foreseeable social or technical problems under the rug. Whatever "
5841 "scheme you put into effect, you should plan for mistakes and problem "
5842 "scenarios. Consider adding automated machinery to prevent, or quickly "
5843 "recover from, trouble that you can anticipate. As an example, if you intend "
5844 "to have a branch with not-for-release changes in it, you'd do well to think "
5845 "early about the possibility that someone might accidentally merge those "
5846 "changes into a release branch. You could avoid this particular problem by "
5847 "writing a hook that prevents changes from being merged from an inappropriate "
5848 "branch."
5849 msgstr ""
5851 #. type: Content of: <book><chapter><sect1><sect2><title>
5852 #: ../en/ch06-collab.xml:102
5853 msgid "Informal anarchy"
5854 msgstr "无政府状态"
5856 #. type: Content of: <book><chapter><sect1><sect2><para>
5857 #: ../en/ch06-collab.xml:104
5858 msgid ""
5859 "I wouldn't suggest an <quote>anything goes</quote> approach as something "
5860 "sustainable, but it's a model that's easy to grasp, and it works perfectly "
5861 "well in a few unusual situations."
5862 msgstr ""
5864 #. type: Content of: <book><chapter><sect1><sect2><para>
5865 #: ../en/ch06-collab.xml:109
5866 msgid ""
5867 "As one example, many projects have a loose-knit group of collaborators who "
5868 "rarely physically meet each other. Some groups like to overcome the "
5869 "isolation of working at a distance by organising occasional <quote>sprints</"
5870 "quote>. In a sprint, a number of people get together in a single location (a "
5871 "company's conference room, a hotel meeting room, that kind of place) and "
5872 "spend several days more or less locked in there, hacking intensely on a "
5873 "handful of projects."
5874 msgstr ""
5876 #. type: Content of: <book><chapter><sect1><sect2><para>
5877 #: ../en/ch06-collab.xml:118
5878 msgid ""
5879 "A sprint is the perfect place to use the <command role=\"hg-cmd\">hg serve</"
5880 "command> command, since <command role=\"hg-cmd\">hg serve</command> does not "
5881 "require any fancy server infrastructure. You can get started with <command "
5882 "role=\"hg-cmd\">hg serve</command> in moments, by reading section <xref "
5883 "linkend=\"sec.collab.serve\"/> below. Then simply tell the person next to "
5884 "you that you're running a server, send the URL to them in an instant message, "
5885 "and you immediately have a quick-turnaround way to work together. They can "
5886 "type your URL into their web browser and quickly review your changes; or they "
5887 "can pull a bugfix from you and verify it; or they can clone a branch "
5888 "containing a new feature and try it out."
5889 msgstr ""
5891 #. type: Content of: <book><chapter><sect1><sect2><para>
5892 #: ../en/ch06-collab.xml:132
5893 msgid ""
5894 "The charm, and the problem, with doing things in an ad hoc fashion like this "
5895 "is that only people who know about your changes, and where they are, can see "
5896 "them. Such an informal approach simply doesn't scale beyond a handful "
5897 "people, because each individual needs to know about $n$ different "
5898 "repositories to pull from."
5899 msgstr ""
5901 #. type: Content of: <book><chapter><sect1><sect2><title>
5902 #: ../en/ch06-collab.xml:141
5903 msgid "A single central repository"
5904 msgstr "单一中央版本库"
5906 #. type: Content of: <book><chapter><sect1><sect2><para>
5907 #: ../en/ch06-collab.xml:143
5908 msgid ""
5909 "For smaller projects migrating from a centralised revision control tool, "
5910 "perhaps the easiest way to get started is to have changes flow through a "
5911 "single shared central repository. This is also the most common "
5912 "<quote>building block</quote> for more ambitious workflow schemes."
5913 msgstr ""
5915 #. type: Content of: <book><chapter><sect1><sect2><para>
5916 #: ../en/ch06-collab.xml:149
5917 msgid ""
5918 "Contributors start by cloning a copy of this repository. They can pull "
5919 "changes from it whenever they need to, and some (perhaps all) developers have "
5920 "permission to push a change back when they're ready for other people to see "
5921 "it."
5922 msgstr ""
5924 #. type: Content of: <book><chapter><sect1><sect2><para>
5925 #: ../en/ch06-collab.xml:154
5926 msgid ""
5927 "Under this model, it can still often make sense for people to pull changes "
5928 "directly from each other, without going through the central repository. "
5929 "Consider a case in which I have a tentative bug fix, but I am worried that if "
5930 "I were to publish it to the central repository, it might subsequently break "
5931 "everyone else's trees as they pull it. To reduce the potential for damage, I "
5932 "can ask you to clone my repository into a temporary repository of your own "
5933 "and test it. This lets us put off publishing the potentially unsafe change "
5934 "until it has had a little testing."
5935 msgstr ""
5937 #. type: Content of: <book><chapter><sect1><sect2><para>
5938 #: ../en/ch06-collab.xml:165
5939 msgid ""
5940 "In this kind of scenario, people usually use the <command>ssh</command> "
5941 "protocol to securely push changes to the central repository, as documented in "
5942 "section <xref linkend=\"sec.collab.ssh\"/>. It's also usual to publish a "
5943 "read-only copy of the repository over HTTP using CGI, as in section <xref "
5944 "linkend=\"sec.collab.cgi\"/>. Publishing over HTTP satisfies the needs of "
5945 "people who don't have push access, and those who want to use web browsers to "
5946 "browse the repository's history."
5947 msgstr ""
5949 #. type: Content of: <book><chapter><sect1><sect2><title>
5950 #: ../en/ch06-collab.xml:178
5951 msgid "Working with multiple branches"
5952 msgstr "使用多个分支工作"
5954 #. type: Content of: <book><chapter><sect1><sect2><para>
5955 #: ../en/ch06-collab.xml:180
5956 msgid ""
5957 "Projects of any significant size naturally tend to make progress on several "
5958 "fronts simultaneously. In the case of software, it's common for a project to "
5959 "go through periodic official releases. A release might then go into "
5960 "<quote>maintenance mode</quote> for a while after its first publication; "
5961 "maintenance releases tend to contain only bug fixes, not new features. In "
5962 "parallel with these maintenance releases, one or more future releases may be "
5963 "under development. People normally use the word <quote>branch</quote> to "
5964 "refer to one of these many slightly different directions in which development "
5965 "is proceeding."
5966 msgstr ""
5968 #. type: Content of: <book><chapter><sect1><sect2><para>
5969 #: ../en/ch06-collab.xml:193
5970 msgid ""
5971 "Mercurial is particularly well suited to managing a number of simultaneous, "
5972 "but not identical, branches. Each <quote>development direction</quote> can "
5973 "live in its own central repository, and you can merge changes from one to "
5974 "another as the need arises. Because repositories are independent of each "
5975 "other, unstable changes in a development branch will never affect a stable "
5976 "branch unless someone explicitly merges those changes in."
5977 msgstr ""
5979 #. type: Content of: <book><chapter><sect1><sect2><para>
5980 #: ../en/ch06-collab.xml:202
5981 msgid ""
5982 "Here's an example of how this can work in practice. Let's say you have one "
5983 "<quote>main branch</quote> on a central server."
5984 msgstr ""
5986 #. type: Content of: <book><chapter><sect1><sect2><para>
5987 #: ../en/ch06-collab.xml:208
5988 msgid "People clone it, make changes locally, test them, and push them back."
5989 msgstr ""
5991 #. type: Content of: <book><chapter><sect1><sect2><para>
5992 #: ../en/ch06-collab.xml:211
5993 msgid ""
5994 "Once the main branch reaches a release milestone, you can use the <command "
5995 "role=\"hg-cmd\">hg tag</command> command to give a permanent name to the "
5996 "milestone revision."
5997 msgstr ""
5999 #. type: Content of: <book><chapter><sect1><sect2><para>
6000 #: ../en/ch06-collab.xml:217
6001 msgid "Let's say some ongoing development occurs on the main branch."
6002 msgstr ""
6004 #. type: Content of: <book><chapter><sect1><sect2><para>
6005 #: ../en/ch06-collab.xml:222
6006 msgid ""
6007 "Using the tag that was recorded at the milestone, people who clone that "
6008 "repository at any time in the future can use <command role=\"hg-cmd\">hg "
6009 "update</command> to get a copy of the working directory exactly as it was "
6010 "when that tagged revision was committed."
6011 msgstr ""
6013 #
6014 #. type: Content of: <book><chapter><sect1><sect2><para>
6015 #: ../en/ch06-collab.xml:230
6016 msgid ""
6017 "In addition, immediately after the main branch is tagged, someone can then "
6018 "clone the main branch on the server to a new <quote>stable</quote> branch, "
6019 "also on the server."
6020 msgstr ""
6022 #. type: Content of: <book><chapter><sect1><sect2><para>
6023 #: ../en/ch06-collab.xml:236
6024 msgid ""
6025 "Someone who needs to make a change to the stable branch can then clone "
6026 "<emphasis>that</emphasis> repository, make their changes, commit, and push "
6027 "their changes back there."
6028 msgstr ""
6030 #. type: Content of: <book><chapter><sect1><sect2><para>
6031 #: ../en/ch06-collab.xml:242
6032 msgid ""
6033 "Because Mercurial repositories are independent, and Mercurial doesn't move "
6034 "changes around automatically, the stable and main branches are "
6035 "<emphasis>isolated</emphasis> from each other. The changes that you made on "
6036 "the main branch don't <quote>leak</quote> to the stable branch, and vice "
6037 "versa."
6038 msgstr ""
6040 #. type: Content of: <book><chapter><sect1><sect2><para>
6041 #: ../en/ch06-collab.xml:249
6042 msgid ""
6043 "You'll often want all of your bugfixes on the stable branch to show up on the "
6044 "main branch, too. Rather than rewrite a bugfix on the main branch, you can "
6045 "simply pull and merge changes from the stable to the main branch, and "
6046 "Mercurial will bring those bugfixes in for you."
6047 msgstr ""
6049 #. type: Content of: <book><chapter><sect1><sect2><para>
6050 #: ../en/ch06-collab.xml:257
6051 msgid ""
6052 "The main branch will still contain changes that are not on the stable branch, "
6053 "but it will also contain all of the bugfixes from the stable branch. The "
6054 "stable branch remains unaffected by these changes."
6055 msgstr ""
6057 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
6058 #: ../en/ch06-collab.xml:264 ../en/ch06-collab.xml:278
6059 msgid "Feature branches"
6060 msgstr "特性分支"
6062 #. type: Content of: <book><chapter><sect1><sect2><para>
6063 #: ../en/ch06-collab.xml:266
6064 msgid ""
6065 "For larger projects, an effective way to manage change is to break up a team "
6066 "into smaller groups. Each group has a shared branch of its own, cloned from "
6067 "a single <quote>master</quote> branch used by the entire project. People "
6068 "working on an individual branch are typically quite isolated from "
6069 "developments on other branches."
6070 msgstr ""
6072 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
6073 #: ../en/ch06-collab.xml:275
6074 msgid ""
6075 "<imageobject><imagedata fileref=\"images/feature-branches.png\"/> </"
6076 "imageobject>"
6077 msgstr ""
6079 #. type: Content of: <book><chapter><sect1><sect2><para>
6080 #: ../en/ch06-collab.xml:283
6081 msgid ""
6082 "When a particular feature is deemed to be in suitable shape, someone on that "
6083 "feature team pulls and merges from the master branch into the feature branch, "
6084 "then pushes back up to the master branch."
6085 msgstr ""
6087 #. type: Content of: <book><chapter><sect1><sect2><title>
6088 #: ../en/ch06-collab.xml:290
6089 msgid "The release train"
6090 msgstr "发布列车"
6092 #. type: Content of: <book><chapter><sect1><sect2><para>
6093 #: ../en/ch06-collab.xml:292
6094 msgid ""
6095 "Some projects are organised on a <quote>train</quote> basis: a release is "
6096 "scheduled to happen every few months, and whatever features are ready when "
6097 "the <quote>train</quote> is ready to leave are allowed in."
6098 msgstr ""
6100 #. type: Content of: <book><chapter><sect1><sect2><para>
6101 #: ../en/ch06-collab.xml:297
6102 msgid ""
6103 "This model resembles working with feature branches. The difference is that "
6104 "when a feature branch misses a train, someone on the feature team pulls and "
6105 "merges the changes that went out on that train release into the feature "
6106 "branch, and the team continues its work on top of that release so that their "
6107 "feature can make the next release."
6108 msgstr ""
6110 #. type: Content of: <book><chapter><sect1><sect2><title>
6111 #: ../en/ch06-collab.xml:306
6112 msgid "The Linux kernel model"
6113 msgstr "Linux 内核模型"
6115 #. type: Content of: <book><chapter><sect1><sect2><para>
6116 #: ../en/ch06-collab.xml:308
6117 msgid ""
6118 "The development of the Linux kernel has a shallow hierarchical structure, "
6119 "surrounded by a cloud of apparent chaos. Because most Linux developers use "
6120 "<command>git</command>, a distributed revision control tool with capabilities "
6121 "similar to Mercurial, it's useful to describe the way work flows in that "
6122 "environment; if you like the ideas, the approach translates well across tools."
6123 msgstr ""
6125 #. type: Content of: <book><chapter><sect1><sect2><para>
6126 #: ../en/ch06-collab.xml:316
6127 msgid ""
6128 "At the center of the community sits Linus Torvalds, the creator of Linux. He "
6129 "publishes a single source repository that is considered the "
6130 "<quote>authoritative</quote> current tree by the entire developer community. "
6131 "Anyone can clone Linus's tree, but he is very choosy about whose trees he "
6132 "pulls from."
6133 msgstr ""
6135 #. type: Content of: <book><chapter><sect1><sect2><para>
6136 #: ../en/ch06-collab.xml:323
6137 msgid ""
6138 "Linus has a number of <quote>trusted lieutenants</quote>. As a general rule, "
6139 "he pulls whatever changes they publish, in most cases without even reviewing "
6140 "those changes. Some of those lieutenants are generally agreed to be "
6141 "<quote>maintainers</quote>, responsible for specific subsystems within the "
6142 "kernel. If a random kernel hacker wants to make a change to a subsystem that "
6143 "they want to end up in Linus's tree, they must find out who the subsystem's "
6144 "maintainer is, and ask that maintainer to take their change. If the "
6145 "maintainer reviews their changes and agrees to take them, they'll pass them "
6146 "along to Linus in due course."
6147 msgstr ""
6149 #. type: Content of: <book><chapter><sect1><sect2><para>
6150 #: ../en/ch06-collab.xml:335
6151 msgid ""
6152 "Individual lieutenants have their own approaches to reviewing, accepting, and "
6153 "publishing changes; and for deciding when to feed them to Linus. In "
6154 "addition, there are several well known branches that people use for different "
6155 "purposes. For example, a few people maintain <quote>stable</quote> "
6156 "repositories of older versions of the kernel, to which they apply critical "
6157 "fixes as needed. Some maintainers publish multiple trees: one for "
6158 "experimental changes; one for changes that they are about to feed upstream; "
6159 "and so on. Others just publish a single tree."
6160 msgstr ""
6162 #. type: Content of: <book><chapter><sect1><sect2><para>
6163 #: ../en/ch06-collab.xml:346
6164 msgid ""
6165 "This model has two notable features. The first is that it's <quote>pull "
6166 "only</quote>. You have to ask, convince, or beg another developer to take a "
6167 "change from you, because there are almost no trees to which more than one "
6168 "person can push, and there's no way to push changes into a tree that someone "
6169 "else controls."
6170 msgstr ""
6172 #. type: Content of: <book><chapter><sect1><sect2><para>
6173 #: ../en/ch06-collab.xml:353
6174 msgid ""
6175 "The second is that it's based on reputation and acclaim. If you're an "
6176 "unknown, Linus will probably ignore changes from you without even "
6177 "responding. But a subsystem maintainer will probably review them, and will "
6178 "likely take them if they pass their criteria for suitability. The more "
6179 "<quote>good</quote> changes you contribute to a maintainer, the more likely "
6180 "they are to trust your judgment and accept your changes. If you're well-"
6181 "known and maintain a long-lived branch for something Linus hasn't yet "
6182 "accepted, people with similar interests may pull your changes regularly to "
6183 "keep up with your work."
6184 msgstr ""
6186 #. type: Content of: <book><chapter><sect1><sect2><para>
6187 #: ../en/ch06-collab.xml:364
6188 msgid ""
6189 "Reputation and acclaim don't necessarily cross subsystem or <quote>people</"
6190 "quote> boundaries. If you're a respected but specialised storage hacker, and "
6191 "you try to fix a networking bug, that change will receive a level of scrutiny "
6192 "from a network maintainer comparable to a change from a complete stranger."
6193 msgstr ""
6195 #. type: Content of: <book><chapter><sect1><sect2><para>
6196 #: ../en/ch06-collab.xml:371
6197 msgid ""
6198 "To people who come from more orderly project backgrounds, the comparatively "
6199 "chaotic Linux kernel development process often seems completely insane. It's "
6200 "subject to the whims of individuals; people make sweeping changes whenever "
6201 "they deem it appropriate; and the pace of development is astounding. And yet "
6202 "Linux is a highly successful, well-regarded piece of software."
6203 msgstr ""
6205 #. type: Content of: <book><chapter><sect1><sect2><title>
6206 #: ../en/ch06-collab.xml:381
6207 msgid "Pull-only versus shared-push collaboration"
6208 msgstr "只读与共享写协作"
6210 #. type: Content of: <book><chapter><sect1><sect2><para>
6211 #: ../en/ch06-collab.xml:383
6212 msgid ""
6213 "A perpetual source of heat in the open source community is whether a "
6214 "development model in which people only ever pull changes from others is "
6215 "<quote>better than</quote> one in which multiple people can push changes to a "
6216 "shared repository."
6217 msgstr ""
6219 #. type: Content of: <book><chapter><sect1><sect2><para>
6220 #: ../en/ch06-collab.xml:389
6221 msgid ""
6222 "Typically, the backers of the shared-push model use tools that actively "
6223 "enforce this approach. If you're using a centralised revision control tool "
6224 "such as Subversion, there's no way to make a choice over which model you'll "
6225 "use: the tool gives you shared-push, and if you want to do anything else, "
6226 "you'll have to roll your own approach on top (such as applying a patch by "
6227 "hand)."
6228 msgstr ""
6230 #. type: Content of: <book><chapter><sect1><sect2><para>
6231 #: ../en/ch06-collab.xml:397
6232 msgid ""
6233 "A good distributed revision control tool, such as Mercurial, will support "
6234 "both models. You and your collaborators can then structure how you work "
6235 "together based on your own needs and preferences, not on what contortions "
6236 "your tools force you into."
6237 msgstr ""
6239 #. type: Content of: <book><chapter><sect1><sect2><title>
6240 #: ../en/ch06-collab.xml:405
6241 msgid "Where collaboration meets branch management"
6242 msgstr "协作与分支管理"
6244 #. type: Content of: <book><chapter><sect1><sect2><para>
6245 #: ../en/ch06-collab.xml:407
6246 msgid ""
6247 "Once you and your team set up some shared repositories and start propagating "
6248 "changes back and forth between local and shared repos, you begin to face a "
6249 "related, but slightly different challenge: that of managing the multiple "
6250 "directions in which your team may be moving at once. Even though this "
6251 "subject is intimately related to how your team collaborates, it's dense "
6252 "enough to merit treatment of its own, in chapter <xref linkend=\"chap.branch"
6253 "\"/>."
6254 msgstr ""
6256 #. type: Content of: <book><chapter><sect1><title>
6257 #: ../en/ch06-collab.xml:419
6258 msgid "The technical side of sharing"
6259 msgstr "共享的技术因素"
6261 #. type: Content of: <book><chapter><sect1><para>
6262 #: ../en/ch06-collab.xml:421
6263 msgid ""
6264 "The remainder of this chapter is devoted to the question of serving data to "
6265 "your collaborators."
6266 msgstr ""
6268 #. type: Content of: <book><chapter><sect1><title>
6269 #: ../en/ch06-collab.xml:426
6270 msgid "Informal sharing with <command role=\"hg-cmd\">hg serve</command>"
6271 msgstr "使用 <command role=\"hg-cmd\">hg serve</command> 进行非正式共享"
6273 #. type: Content of: <book><chapter><sect1><para>
6274 #: ../en/ch06-collab.xml:429
6275 msgid ""
6276 "Mercurial's <command role=\"hg-cmd\">hg serve</command> command is "
6277 "wonderfully suited to small, tight-knit, and fast-paced group environments. "
6278 "It also provides a great way to get a feel for using Mercurial commands over "
6279 "a network."
6280 msgstr ""
6282 #. type: Content of: <book><chapter><sect1><para>
6283 #: ../en/ch06-collab.xml:434
6284 msgid ""
6285 "Run <command role=\"hg-cmd\">hg serve</command> inside a repository, and in "
6286 "under a second it will bring up a specialised HTTP server; this will accept "
6287 "connections from any client, and serve up data for that repository until you "
6288 "terminate it. Anyone who knows the URL of the server you just started, and "
6289 "can talk to your computer over the network, can then use a web browser or "
6290 "Mercurial to read data from that repository. A URL for a <command role=\"hg-"
6291 "cmd\">hg serve</command> instance running on a laptop is likely to look "
6292 "something like <literal>http://my-laptop.local:8000/</literal>."
6293 msgstr ""
6295 #. type: Content of: <book><chapter><sect1><para>
6296 #: ../en/ch06-collab.xml:445
6297 msgid ""
6298 "The <command role=\"hg-cmd\">hg serve</command> command is <emphasis>not</"
6299 "emphasis> a general-purpose web server. It can do only two things:"
6300 msgstr ""
6302 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
6303 #: ../en/ch06-collab.xml:449
6304 msgid ""
6305 "Allow people to browse the history of the repository it's serving, from their "
6306 "normal web browsers."
6307 msgstr ""
6309 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
6310 #: ../en/ch06-collab.xml:453
6311 msgid ""
6312 "Speak Mercurial's wire protocol, so that people can <command role=\"hg-cmd"
6313 "\">hg clone</command> or <command role=\"hg-cmd\">hg pull</command> changes "
6314 "from that repository."
6315 msgstr ""
6317 #. type: Content of: <book><chapter><sect1><para>
6318 #: ../en/ch06-collab.xml:458
6319 msgid ""
6320 "In particular, <command role=\"hg-cmd\">hg serve</command> won't allow remote "
6321 "users to <emphasis>modify</emphasis> your repository. It's intended for read-"
6322 "only use."
6323 msgstr ""
6325 #. type: Content of: <book><chapter><sect1><para>
6326 #: ../en/ch06-collab.xml:462
6327 msgid ""
6328 "If you're getting started with Mercurial, there's nothing to prevent you from "
6329 "using <command role=\"hg-cmd\">hg serve</command> to serve up a repository on "
6330 "your own computer, then use commands like <command role=\"hg-cmd\">hg clone</"
6331 "command>, <command role=\"hg-cmd\">hg incoming</command>, and so on to talk "
6332 "to that server as if the repository was hosted remotely. This can help you to "
6333 "quickly get acquainted with using commands on network-hosted repositories."
6334 msgstr ""
6336 #. type: Content of: <book><chapter><sect1><sect2><title>
6337 #: ../en/ch06-collab.xml:472
6338 msgid "A few things to keep in mind"
6339 msgstr "要牢记的几件事"
6341 #. type: Content of: <book><chapter><sect1><sect2><para>
6342 #: ../en/ch06-collab.xml:474
6343 msgid ""
6344 "Because it provides unauthenticated read access to all clients, you should "
6345 "only use <command role=\"hg-cmd\">hg serve</command> in an environment where "
6346 "you either don't care, or have complete control over, who can access your "
6347 "network and pull data from your repository."
6348 msgstr ""
6350 #. type: Content of: <book><chapter><sect1><sect2><para>
6351 #: ../en/ch06-collab.xml:480
6352 msgid ""
6353 "The <command role=\"hg-cmd\">hg serve</command> command knows nothing about "
6354 "any firewall software you might have installed on your system or network. It "
6355 "cannot detect or control your firewall software. If other people are unable "
6356 "to talk to a running <command role=\"hg-cmd\">hg serve</command> instance, "
6357 "the second thing you should do (<emphasis>after</emphasis> you make sure that "
6358 "they're using the correct URL) is check your firewall configuration."
6359 msgstr ""
6361 #. type: Content of: <book><chapter><sect1><sect2><para>
6362 #: ../en/ch06-collab.xml:489
6363 msgid ""
6364 "By default, <command role=\"hg-cmd\">hg serve</command> listens for incoming "
6365 "connections on port 8000. If another process is already listening on the "
6366 "port you want to use, you can specify a different port to listen on using the "
6367 "<option role=\"hg-opt-serve\">-p</option> option."
6368 msgstr ""
6370 #. type: Content of: <book><chapter><sect1><sect2><para>
6371 #: ../en/ch06-collab.xml:495
6372 msgid ""
6373 "Normally, when <command role=\"hg-cmd\">hg serve</command> starts, it prints "
6374 "no output, which can be a bit unnerving. If you'd like to confirm that it is "
6375 "indeed running correctly, and find out what URL you should send to your "
6376 "collaborators, start it with the <option role=\"hg-opt-global\">-v</option> "
6377 "option."
6378 msgstr ""
6380 #. type: Content of: <book><chapter><sect1><title>
6381 #: ../en/ch06-collab.xml:505
6382 msgid "Using the Secure Shell (ssh) protocol"
6383 msgstr "使用 ssh 协议"
6385 #. type: Content of: <book><chapter><sect1><para>
6386 #: ../en/ch06-collab.xml:507
6387 msgid ""
6388 "You can pull and push changes securely over a network connection using the "
6389 "Secure Shell (<literal>ssh</literal>) protocol. To use this successfully, "
6390 "you may have to do a little bit of configuration on the client or server "
6391 "sides."
6392 msgstr ""
6394 #. type: Content of: <book><chapter><sect1><para>
6395 #: ../en/ch06-collab.xml:512
6396 msgid ""
6397 "If you're not familiar with ssh, it's a network protocol that lets you "
6398 "securely communicate with another computer. To use it with Mercurial, you'll "
6399 "be setting up one or more user accounts on a server so that remote users can "
6400 "log in and execute commands."
6401 msgstr ""
6403 #. type: Content of: <book><chapter><sect1><para>
6404 #: ../en/ch06-collab.xml:518
6405 msgid ""
6406 "(If you <emphasis>are</emphasis> familiar with ssh, you'll probably find some "
6407 "of the material that follows to be elementary in nature.)"
6408 msgstr ""
6410 #. type: Content of: <book><chapter><sect1><sect2><title>
6411 #: ../en/ch06-collab.xml:523
6412 msgid "How to read and write ssh URLs"
6413 msgstr "如何读写 ssh 路径"
6415 #. type: Content of: <book><chapter><sect1><sect2><para>
6416 #: ../en/ch06-collab.xml:525
6417 msgid "An ssh URL tends to look like this:"
6418 msgstr ""
6420 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6421 #: ../en/ch06-collab.xml:528
6422 msgid ""
6423 "The <quote><literal>ssh://</literal></quote> part tells Mercurial to use the "
6424 "ssh protocol."
6425 msgstr ""
6427 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6428 #: ../en/ch06-collab.xml:531
6429 msgid ""
6430 "The <quote><literal>bos@</literal></quote> component indicates what username "
6431 "to log into the server as. You can leave this out if the remote username is "
6432 "the same as your local username."
6433 msgstr ""
6435 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6436 #: ../en/ch06-collab.xml:536
6437 msgid ""
6438 "The <quote><literal>hg.serpentine.com</literal></quote> gives the hostname of "
6439 "the server to log into."
6440 msgstr ""
6442 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6443 #: ../en/ch06-collab.xml:540
6444 msgid ""
6445 "The <quote>:22</quote> identifies the port number to connect to the server "
6446 "on. The default port is 22, so you only need to specify this part if you're "
6447 "<emphasis>not</emphasis> using port 22."
6448 msgstr ""
6450 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6451 #: ../en/ch06-collab.xml:545
6452 msgid ""
6453 "The remainder of the URL is the local path to the repository on the server."
6454 msgstr ""
6456 #. type: Content of: <book><chapter><sect1><sect2><para>
6457 #: ../en/ch06-collab.xml:549
6458 msgid ""
6459 "There's plenty of scope for confusion with the path component of ssh URLs, as "
6460 "there is no standard way for tools to interpret it. Some programs behave "
6461 "differently than others when dealing with these paths. This isn't an ideal "
6462 "situation, but it's unlikely to change. Please read the following paragraphs "
6463 "carefully."
6464 msgstr ""
6466 #. type: Content of: <book><chapter><sect1><sect2><para>
6467 #: ../en/ch06-collab.xml:556
6468 msgid ""
6469 "Mercurial treats the path to a repository on the server as relative to the "
6470 "remote user's home directory. For example, if user <literal>foo</literal> on "
6471 "the server has a home directory of <filename class=\"directory\">/home/foo</"
6472 "filename>, then an ssh URL that contains a path component of <filename class="
6473 "\"directory\">bar</filename> <emphasis>really</emphasis> refers to the "
6474 "directory <filename class=\"directory\">/home/foo/bar</filename>."
6475 msgstr ""
6477 #. type: Content of: <book><chapter><sect1><sect2><para>
6478 #: ../en/ch06-collab.xml:565
6479 msgid ""
6480 "If you want to specify a path relative to another user's home directory, you "
6481 "can use a path that starts with a tilde character followed by the user's name "
6482 "(let's call them <literal>otheruser</literal>), like this."
6483 msgstr ""
6485 #. type: Content of: <book><chapter><sect1><sect2><para>
6486 #: ../en/ch06-collab.xml:571
6487 msgid ""
6488 "And if you really want to specify an <emphasis>absolute</emphasis> path on "
6489 "the server, begin the path component with two slashes, as in this example."
6490 msgstr ""
6492 #. type: Content of: <book><chapter><sect1><sect2><title>
6493 #: ../en/ch06-collab.xml:578
6494 msgid "Finding an ssh client for your system"
6495 msgstr "为你的系统寻找 ssh 客户端"
6497 #. type: Content of: <book><chapter><sect1><sect2><para>
6498 #: ../en/ch06-collab.xml:580
6499 msgid ""
6500 "Almost every Unix-like system comes with OpenSSH preinstalled. If you're "
6501 "using such a system, run <literal>which ssh</literal> to find out if the "
6502 "<command>ssh</command> command is installed (it's usually in <filename class="
6503 "\"directory\">/usr/bin</filename>). In the unlikely event that it isn't "
6504 "present, take a look at your system documentation to figure out how to "
6505 "install it."
6506 msgstr ""
6508 #. type: Content of: <book><chapter><sect1><sect2><para>
6509 #: ../en/ch06-collab.xml:588
6510 msgid ""
6511 "On Windows, you'll first need to download a suitable ssh client. There are "
6512 "two alternatives."
6513 msgstr ""
6515 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6516 #: ../en/ch06-collab.xml:591
6517 msgid ""
6518 "Simon Tatham's excellent PuTTY package <citation>web:putty</citation> "
6519 "provides a complete suite of ssh client commands."
6520 msgstr ""
6522 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6523 #: ../en/ch06-collab.xml:595
6524 msgid ""
6525 "If you have a high tolerance for pain, you can use the Cygwin port of OpenSSH."
6526 msgstr ""
6528 #. type: Content of: <book><chapter><sect1><sect2><para>
6529 #: ../en/ch06-collab.xml:598
6530 msgid ""
6531 "In either case, you'll need to edit your \\hgini\\ file to tell Mercurial "
6532 "where to find the actual client command. For example, if you're using PuTTY, "
6533 "you'll need to use the <command>plink</command> command as a command-line ssh "
6534 "client."
6535 msgstr ""
6537 #. type: Content of: <book><chapter><sect1><sect2><note><para>
6538 #: ../en/ch06-collab.xml:607
6539 msgid ""
6540 "The path to <command>plink</command> shouldn't contain any whitespace "
6541 "characters, or Mercurial may not be able to run it correctly (so putting it "
6542 "in <filename class=\"directory\">C:\\\\Program Files</filename> is probably "
6543 "not a good idea)."
6544 msgstr ""
6546 #. type: Content of: <book><chapter><sect1><sect2><title>
6547 #: ../en/ch06-collab.xml:616
6548 msgid "Generating a key pair"
6549 msgstr "产生密钥对"
6551 #. type: Content of: <book><chapter><sect1><sect2><para>
6552 #: ../en/ch06-collab.xml:618
6553 msgid ""
6554 "To avoid the need to repetitively type a password every time you need to use "
6555 "your ssh client, I recommend generating a key pair. On a Unix-like system, "
6556 "the <command>ssh-keygen</command> command will do the trick. On Windows, if "
6557 "you're using PuTTY, the <command>puttygen</command> command is what you'll "
6558 "need."
6559 msgstr ""
6561 #. type: Content of: <book><chapter><sect1><sect2><para>
6562 #: ../en/ch06-collab.xml:626
6563 msgid ""
6564 "When you generate a key pair, it's usually <emphasis>highly</emphasis> "
6565 "advisable to protect it with a passphrase. (The only time that you might not "
6566 "want to do this is when you're using the ssh protocol for automated tasks on "
6567 "a secure network.)"
6568 msgstr ""
6570 #. type: Content of: <book><chapter><sect1><sect2><para>
6571 #: ../en/ch06-collab.xml:632
6572 msgid ""
6573 "Simply generating a key pair isn't enough, however. You'll need to add the "
6574 "public key to the set of authorised keys for whatever user you're logging in "
6575 "remotely as. For servers using OpenSSH (the vast majority), this will mean "
6576 "adding the public key to a list in a file called <filename role=\"special"
6577 "\">authorized_keys</filename> in their <filename role=\"special\" class="
6578 "\"directory\">.ssh</filename> directory."
6579 msgstr ""
6581 #. type: Content of: <book><chapter><sect1><sect2><para>
6582 #: ../en/ch06-collab.xml:641
6583 msgid ""
6584 "On a Unix-like system, your public key will have a <filename>.pub</filename> "
6585 "extension. If you're using <command>puttygen</command> on Windows, you can "
6586 "save the public key to a file of your choosing, or paste it from the window "
6587 "it's displayed in straight into the <filename role=\"special"
6588 "\">authorized_keys</filename> file."
6589 msgstr ""
6591 #. type: Content of: <book><chapter><sect1><sect2><title>
6592 #: ../en/ch06-collab.xml:650
6593 msgid "Using an authentication agent"
6594 msgstr "使用认证代理"
6596 #. type: Content of: <book><chapter><sect1><sect2><para>
6597 #: ../en/ch06-collab.xml:652
6598 msgid ""
6599 "An authentication agent is a daemon that stores passphrases in memory (so it "
6600 "will forget passphrases if you log out and log back in again). An ssh client "
6601 "will notice if it's running, and query it for a passphrase. If there's no "
6602 "authentication agent running, or the agent doesn't store the necessary "
6603 "passphrase, you'll have to type your passphrase every time Mercurial tries to "
6604 "communicate with a server on your behalf (e.g. whenever you pull or push "
6605 "changes)."
6606 msgstr ""
6608 #. type: Content of: <book><chapter><sect1><sect2><para>
6609 #: ../en/ch06-collab.xml:661
6610 msgid ""
6611 "The downside of storing passphrases in an agent is that it's possible for a "
6612 "well-prepared attacker to recover the plain text of your passphrases, in some "
6613 "cases even if your system has been power-cycled. You should make your own "
6614 "judgment as to whether this is an acceptable risk. It certainly saves a lot "
6615 "of repeated typing."
6616 msgstr ""
6618 #. type: Content of: <book><chapter><sect1><sect2><para>
6619 #: ../en/ch06-collab.xml:668
6620 msgid ""
6621 "On Unix-like systems, the agent is called <command>ssh-agent</command>, and "
6622 "it's often run automatically for you when you log in. You'll need to use the "
6623 "<command>ssh-add</command> command to add passphrases to the agent's store. "
6624 "On Windows, if you're using PuTTY, the <command>pageant</command> command "
6625 "acts as the agent. It adds an icon to your system tray that will let you "
6626 "manage stored passphrases."
6627 msgstr ""
6629 #. type: Content of: <book><chapter><sect1><sect2><title>
6630 #: ../en/ch06-collab.xml:679
6631 msgid "Configuring the server side properly"
6632 msgstr "正确配置服务器端"
6634 #. type: Content of: <book><chapter><sect1><sect2><para>
6635 #: ../en/ch06-collab.xml:681
6636 msgid ""
6637 "Because ssh can be fiddly to set up if you're new to it, there's a variety of "
6638 "things that can go wrong. Add Mercurial on top, and there's plenty more "
6639 "scope for head-scratching. Most of these potential problems occur on the "
6640 "server side, not the client side. The good news is that once you've gotten a "
6641 "configuration working, it will usually continue to work indefinitely."
6642 msgstr ""
6644 #. type: Content of: <book><chapter><sect1><sect2><para>
6645 #: ../en/ch06-collab.xml:689
6646 msgid ""
6647 "Before you try using Mercurial to talk to an ssh server, it's best to make "
6648 "sure that you can use the normal <command>ssh</command> or <command>putty</"
6649 "command> command to talk to the server first. If you run into problems with "
6650 "using these commands directly, Mercurial surely won't work. Worse, it will "
6651 "obscure the underlying problem. Any time you want to debug ssh-related "
6652 "Mercurial problems, you should drop back to making sure that plain ssh client "
6653 "commands work first, <emphasis>before</emphasis> you worry about whether "
6654 "there's a problem with Mercurial."
6655 msgstr ""
6657 #. type: Content of: <book><chapter><sect1><sect2><para>
6658 #: ../en/ch06-collab.xml:700
6659 msgid ""
6660 "The first thing to be sure of on the server side is that you can actually log "
6661 "in from another machine at all. If you can't use <command>ssh</command> or "
6662 "<command>putty</command> to log in, the error message you get may give you a "
6663 "few hints as to what's wrong. The most common problems are as follows."
6664 msgstr ""
6666 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6667 #: ../en/ch06-collab.xml:707
6668 msgid ""
6669 "If you get a <quote>connection refused</quote> error, either there isn't an "
6670 "SSH daemon running on the server at all, or it's inaccessible due to firewall "
6671 "configuration."
6672 msgstr ""
6674 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6675 #: ../en/ch06-collab.xml:712
6676 msgid ""
6677 "If you get a <quote>no route to host</quote> error, you either have an "
6678 "incorrect address for the server or a seriously locked down firewall that "
6679 "won't admit its existence at all."
6680 msgstr ""
6682 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6683 #: ../en/ch06-collab.xml:717
6684 msgid ""
6685 "If you get a <quote>permission denied</quote> error, you may have mistyped "
6686 "the username on the server, or you could have mistyped your key's passphrase "
6687 "or the remote user's password."
6688 msgstr ""
6690 #. type: Content of: <book><chapter><sect1><sect2><para>
6691 #: ../en/ch06-collab.xml:722
6692 msgid ""
6693 "In summary, if you're having trouble talking to the server's ssh daemon, "
6694 "first make sure that one is running at all. On many systems it will be "
6695 "installed, but disabled, by default. Once you're done with this step, you "
6696 "should then check that the server's firewall is configured to allow incoming "
6697 "connections on the port the ssh daemon is listening on (usually 22). Don't "
6698 "worry about more exotic possibilities for misconfiguration until you've "
6699 "checked these two first."
6700 msgstr ""
6702 #. type: Content of: <book><chapter><sect1><sect2><para>
6703 #: ../en/ch06-collab.xml:732
6704 msgid ""
6705 "If you're using an authentication agent on the client side to store "
6706 "passphrases for your keys, you ought to be able to log into the server "
6707 "without being prompted for a passphrase or a password. If you're prompted "
6708 "for a passphrase, there are a few possible culprits."
6709 msgstr ""
6711 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6712 #: ../en/ch06-collab.xml:738
6713 msgid ""
6714 "You might have forgotten to use <command>ssh-add</command> or "
6715 "<command>pageant</command> to store the passphrase."
6716 msgstr ""
6718 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6719 #: ../en/ch06-collab.xml:742
6720 msgid "You might have stored the passphrase for the wrong key."
6721 msgstr ""
6723 #. type: Content of: <book><chapter><sect1><sect2><para>
6724 #: ../en/ch06-collab.xml:745
6725 msgid ""
6726 "If you're being prompted for the remote user's password, there are another "
6727 "few possible problems to check."
6728 msgstr ""
6730 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6731 #: ../en/ch06-collab.xml:748
6732 msgid ""
6733 "Either the user's home directory or their <filename role=\"special\" class="
6734 "\"directory\">.ssh</filename> directory might have excessively liberal "
6735 "permissions. As a result, the ssh daemon will not trust or read their "
6736 "<filename role=\"special\">authorized_keys</filename> file. For example, a "
6737 "group-writable home or <filename role=\"special\" class=\"directory\">.ssh</"
6738 "filename> directory will often cause this symptom."
6739 msgstr ""
6741 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6742 #: ../en/ch06-collab.xml:757
6743 msgid ""
6744 "The user's <filename role=\"special\">authorized_keys</filename> file may "
6745 "have a problem. If anyone other than the user owns or can write to that file, "
6746 "the ssh daemon will not trust or read it."
6747 msgstr ""
6749 #. type: Content of: <book><chapter><sect1><sect2><para>
6750 #: ../en/ch06-collab.xml:764
6751 msgid ""
6752 "In the ideal world, you should be able to run the following command "
6753 "successfully, and it should print exactly one line of output, the current "
6754 "date and time."
6755 msgstr ""
6757 #. type: Content of: <book><chapter><sect1><sect2><para>
6758 #: ../en/ch06-collab.xml:769
6759 msgid ""
6760 "If, on your server, you have login scripts that print banners or other junk "
6761 "even when running non-interactive commands like this, you should fix them "
6762 "before you continue, so that they only print output if they're run "
6763 "interactively. Otherwise these banners will at least clutter up Mercurial's "
6764 "output. Worse, they could potentially cause problems with running Mercurial "
6765 "commands remotely. Mercurial makes tries to detect and ignore banners in non-"
6766 "interactive <command>ssh</command> sessions, but it is not foolproof. (If "
6767 "you're editing your login scripts on your server, the usual way to see if a "
6768 "login script is running in an interactive shell is to check the return code "
6769 "from the command <literal>tty -s</literal>.)"
6770 msgstr ""
6772 #. type: Content of: <book><chapter><sect1><sect2><para>
6773 #: ../en/ch06-collab.xml:783
6774 msgid ""
6775 "Once you've verified that plain old ssh is working with your server, the next "
6776 "step is to ensure that Mercurial runs on the server. The following command "
6777 "should run successfully:"
6778 msgstr ""
6780 #. type: Content of: <book><chapter><sect1><sect2><para>
6781 #: ../en/ch06-collab.xml:788
6782 msgid ""
6783 "If you see an error message instead of normal <command role=\"hg-cmd\">hg "
6784 "version</command> output, this is usually because you haven't installed "
6785 "Mercurial to <filename class=\"directory\">/usr/bin</filename>. Don't worry "
6786 "if this is the case; you don't need to do that. But you should check for a "
6787 "few possible problems."
6788 msgstr ""
6790 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6791 #: ../en/ch06-collab.xml:795
6792 msgid ""
6793 "Is Mercurial really installed on the server at all? I know this sounds "
6794 "trivial, but it's worth checking!"
6795 msgstr ""
6797 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6798 #: ../en/ch06-collab.xml:799
6799 msgid ""
6800 "Maybe your shell's search path (usually set via the <envar>PATH</envar> "
6801 "environment variable) is simply misconfigured."
6802 msgstr ""
6804 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6805 #: ../en/ch06-collab.xml:803
6806 msgid ""
6807 "Perhaps your <envar>PATH</envar> environment variable is only being set to "
6808 "point to the location of the <command>hg</command> executable if the login "
6809 "session is interactive. This can happen if you're setting the path in the "
6810 "wrong shell login script. See your shell's documentation for details."
6811 msgstr ""
6813 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6814 #: ../en/ch06-collab.xml:810
6815 msgid ""
6816 "The <envar>PYTHONPATH</envar> environment variable may need to contain the "
6817 "path to the Mercurial Python modules. It might not be set at all; it could "
6818 "be incorrect; or it may be set only if the login is interactive."
6819 msgstr ""
6821 #. type: Content of: <book><chapter><sect1><sect2><para>
6822 #: ../en/ch06-collab.xml:817
6823 msgid ""
6824 "If you can run <command role=\"hg-cmd\">hg version</command> over an ssh "
6825 "connection, well done! You've got the server and client sorted out. You "
6826 "should now be able to use Mercurial to access repositories hosted by that "
6827 "username on that server. If you run into problems with Mercurial and ssh at "
6828 "this point, try using the <option role=\"hg-opt-global\">--debug</option> "
6829 "option to get a clearer picture of what's going on."
6830 msgstr ""
6832 #. type: Content of: <book><chapter><sect1><sect2><title>
6833 #: ../en/ch06-collab.xml:827
6834 msgid "Using compression with ssh"
6835 msgstr "通过 ssh 使用压缩"
6837 #. type: Content of: <book><chapter><sect1><sect2><para>
6838 #: ../en/ch06-collab.xml:829
6839 msgid ""
6840 "Mercurial does not compress data when it uses the ssh protocol, because the "
6841 "ssh protocol can transparently compress data. However, the default behaviour "
6842 "of ssh clients is <emphasis>not</emphasis> to request compression."
6843 msgstr ""
6845 #. type: Content of: <book><chapter><sect1><sect2><para>
6846 #: ../en/ch06-collab.xml:834
6847 msgid ""
6848 "Over any network other than a fast LAN (even a wireless network), using "
6849 "compression is likely to significantly speed up Mercurial's network "
6850 "operations. For example, over a WAN, someone measured compression as "
6851 "reducing the amount of time required to clone a particularly large repository "
6852 "from 51 minutes to 17 minutes."
6853 msgstr ""
6855 #. type: Content of: <book><chapter><sect1><sect2><para>
6856 #: ../en/ch06-collab.xml:841
6857 msgid ""
6858 "Both <command>ssh</command> and <command>plink</command> accept a <option "
6859 "role=\"cmd-opt-ssh\">-C</option> option which turns on compression. You can "
6860 "easily edit your <filename role=\"special\"> /.hgrc</filename>\\ to enable "
6861 "compression for all of Mercurial's uses of the ssh protocol."
6862 msgstr ""
6864 #. type: Content of: <book><chapter><sect1><sect2><para>
6865 #: ../en/ch06-collab.xml:848
6866 msgid ""
6867 "If you use <command>ssh</command>, you can configure it to always use "
6868 "compression when talking to your server. To do this, edit your <filename "
6869 "role=\"special\">.ssh/config</filename> file (which may not yet exist), as "
6870 "follows."
6871 msgstr ""
6873 #. type: Content of: <book><chapter><sect1><sect2><para>
6874 #: ../en/ch06-collab.xml:855
6875 msgid ""
6876 "This defines an alias, <literal>hg</literal>. When you use it on the "
6877 "<command>ssh</command> command line or in a Mercurial <literal>ssh</literal>-"
6878 "protocol URL, it will cause <command>ssh</command> to connect to <literal>hg."
6879 "example.com</literal> and use compression. This gives you both a shorter "
6880 "name to type and compression, each of which is a good thing in its own right."
6881 msgstr ""
6883 #. type: Content of: <book><chapter><sect1><title>
6884 #: ../en/ch06-collab.xml:866
6885 msgid "Serving over HTTP using CGI"
6886 msgstr "使用 CGI 通过 HTTP 提供服务"
6888 #. type: Content of: <book><chapter><sect1><para>
6889 #: ../en/ch06-collab.xml:868
6890 msgid ""
6891 "Depending on how ambitious you are, configuring Mercurial's CGI interface can "
6892 "take anything from a few moments to several hours."
6893 msgstr ""
6895 #. type: Content of: <book><chapter><sect1><para>
6896 #: ../en/ch06-collab.xml:872
6897 msgid ""
6898 "We'll begin with the simplest of examples, and work our way towards a more "
6899 "complex configuration. Even for the most basic case, you're almost certainly "
6900 "going to need to read and modify your web server's configuration."
6901 msgstr ""
6903 #. type: Content of: <book><chapter><sect1><note><para>
6904 #: ../en/ch06-collab.xml:878
6905 msgid ""
6906 "Configuring a web server is a complex, fiddly, and highly system-dependent "
6907 "activity. I can't possibly give you instructions that will cover anything "
6908 "like all of the cases you will encounter. Please use your discretion and "
6909 "judgment in following the sections below. Be prepared to make plenty of "
6910 "mistakes, and to spend a lot of time reading your server's error logs."
6911 msgstr ""
6913 #. type: Content of: <book><chapter><sect1><sect2><title>
6914 #: ../en/ch06-collab.xml:888
6915 msgid "Web server configuration checklist"
6916 msgstr "Web 服务器配置检查表"
6918 #. type: Content of: <book><chapter><sect1><sect2><para>
6919 #: ../en/ch06-collab.xml:890
6920 msgid ""
6921 "Before you continue, do take a few moments to check a few aspects of your "
6922 "system's setup."
6923 msgstr ""
6925 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6926 #: ../en/ch06-collab.xml:894
6927 msgid ""
6928 "Do you have a web server installed at all? Mac OS X ships with Apache, but "
6929 "many other systems may not have a web server installed."
6930 msgstr ""
6932 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6933 #: ../en/ch06-collab.xml:898
6934 msgid ""
6935 "If you have a web server installed, is it actually running? On most systems, "
6936 "even if one is present, it will be disabled by default."
6937 msgstr ""
6939 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6940 #: ../en/ch06-collab.xml:902
6941 msgid ""
6942 "Is your server configured to allow you to run CGI programs in the directory "
6943 "where you plan to do so? Most servers default to explicitly disabling the "
6944 "ability to run CGI programs."
6945 msgstr ""
6947 #. type: Content of: <book><chapter><sect1><sect2><para>
6948 #: ../en/ch06-collab.xml:908
6949 msgid ""
6950 "If you don't have a web server installed, and don't have substantial "
6951 "experience configuring Apache, you should consider using the "
6952 "<literal>lighttpd</literal> web server instead of Apache. Apache has a well-"
6953 "deserved reputation for baroque and confusing configuration. While "
6954 "<literal>lighttpd</literal> is less capable in some ways than Apache, most of "
6955 "these capabilities are not relevant to serving Mercurial repositories. And "
6956 "<literal>lighttpd</literal> is undeniably <emphasis>much</emphasis> easier to "
6957 "get started with than Apache."
6958 msgstr ""
6960 #. type: Content of: <book><chapter><sect1><sect2><title>
6961 #: ../en/ch06-collab.xml:921
6962 msgid "Basic CGI configuration"
6963 msgstr "基本 CGI 配置"
6965 #. type: Content of: <book><chapter><sect1><sect2><para>
6966 #: ../en/ch06-collab.xml:923
6967 msgid ""
6968 "On Unix-like systems, it's common for users to have a subdirectory named "
6969 "something like <filename class=\"directory\">public_html</filename> in their "
6970 "home directory, from which they can serve up web pages. A file named "
6971 "<filename>foo</filename> in this directory will be accessible at a URL of the "
6972 "form <literal>http://www.example.com/\\ {</literal>username/foo}."
6973 msgstr ""
6975 #. type: Content of: <book><chapter><sect1><sect2><para>
6976 #: ../en/ch06-collab.xml:932
6977 msgid ""
6978 "To get started, find the <filename role=\"special\">hgweb.cgi</filename> "
6979 "script that should be present in your Mercurial installation. If you can't "
6980 "quickly find a local copy on your system, simply download one from the master "
6981 "Mercurial repository at <ulink url=\"http://www.selenic.com/repo/hg/raw-file/"
6982 "tip/hgweb.cgi\">http://www.selenic.com/repo/hg/raw-file/tip/hgweb.cgi</ulink>."
6983 msgstr ""
6985 #. type: Content of: <book><chapter><sect1><sect2><para>
6986 #: ../en/ch06-collab.xml:939 ../en/ch06-collab.xml:1112
6987 msgid ""
6988 "You'll need to copy this script into your <filename class=\"directory"
6989 "\">public_html</filename> directory, and ensure that it's executable."
6990 msgstr ""
6992 #. type: Content of: <book><chapter><sect1><sect2><para>
6993 #: ../en/ch06-collab.xml:944
6994 msgid ""
6995 "The <literal>755</literal> argument to <command>chmod</command> is a little "
6996 "more general than just making the script executable: it ensures that the "
6997 "script is executable by anyone, and that <quote>group</quote> and "
6998 "<quote>other</quote> write permissions are <emphasis>not</emphasis> set. If "
6999 "you were to leave those write permissions enabled, Apache's <literal>suexec</"
7000 "literal> subsystem would likely refuse to execute the script. In fact, "
7001 "<literal>suexec</literal> also insists that the <emphasis>directory</"
7002 "emphasis> in which the script resides must not be writable by others."
7003 msgstr ""
7005 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7006 #: ../en/ch06-collab.xml:958
7007 msgid "What could <emphasis>possibly</emphasis> go wrong?"
7008 msgstr "什么<emphasis>可能</emphasis>会出错?"
7010 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7011 #: ../en/ch06-collab.xml:961
7012 msgid ""
7013 "Once you've copied the CGI script into place, go into a web browser, and try "
7014 "to open the URL <ulink url=\"http://myhostname/ myuser/hgweb.cgi\">http://"
7015 "myhostname/ myuser/hgweb.cgi</ulink>, <emphasis>but</emphasis> brace yourself "
7016 "for instant failure. There's a high probability that trying to visit this "
7017 "URL will fail, and there are many possible reasons for this. In fact, you're "
7018 "likely to stumble over almost every one of the possible errors below, so "
7019 "please read carefully. The following are all of the problems I ran into on a "
7020 "system running Fedora 7, with a fresh installation of Apache, and a user "
7021 "account that I created specially to perform this exercise."
7022 msgstr ""
7024 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7025 #: ../en/ch06-collab.xml:975
7026 msgid ""
7027 "Your web server may have per-user directories disabled. If you're using "
7028 "Apache, search your config file for a <literal>UserDir</literal> directive. "
7029 "If there's none present, per-user directories will be disabled. If one "
7030 "exists, but its value is <literal>disabled</literal>, then per-user "
7031 "directories will be disabled. Otherwise, the string after <literal>UserDir</"
7032 "literal> gives the name of the subdirectory that Apache will look in under "
7033 "your home directory, for example <filename class=\"directory\">public_html</"
7034 "filename>."
7035 msgstr ""
7037 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7038 #: ../en/ch06-collab.xml:986
7039 msgid ""
7040 "Your file access permissions may be too restrictive. The web server must be "
7041 "able to traverse your home directory and directories under your <filename "
7042 "class=\"directory\">public_html</filename> directory, and read files under "
7043 "the latter too. Here's a quick recipe to help you to make your permissions "
7044 "more appropriate."
7045 msgstr ""
7047 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7048 #: ../en/ch06-collab.xml:996
7049 msgid ""
7050 "The other possibility with permissions is that you might get a completely "
7051 "empty window when you try to load the script. In this case, it's likely that "
7052 "your access permissions are <emphasis>too permissive</emphasis>. Apache's "
7053 "<literal>suexec</literal> subsystem won't execute a script that's group- or "
7054 "world-writable, for example."
7055 msgstr ""
7057 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7058 #: ../en/ch06-collab.xml:1003
7059 msgid ""
7060 "Your web server may be configured to disallow execution of CGI programs in "
7061 "your per-user web directory. Here's Apache's default per-user configuration "
7062 "from my Fedora system."
7063 msgstr ""
7065 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7066 #: ../en/ch06-collab.xml:1014
7067 msgid ""
7068 "If you find a similar-looking <literal>Directory</literal> group in your "
7069 "Apache configuration, the directive to look at inside it is <literal>Options</"
7070 "literal>. Add <literal>ExecCGI</literal> to the end of this list if it's "
7071 "missing, and restart the web server."
7072 msgstr ""
7074 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7075 #: ../en/ch06-collab.xml:1021
7076 msgid ""
7077 "If you find that Apache serves you the text of the CGI script instead of "
7078 "executing it, you may need to either uncomment (if already present) or add a "
7079 "directive like this."
7080 msgstr ""
7082 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7083 #: ../en/ch06-collab.xml:1027
7084 msgid ""
7085 "The next possibility is that you might be served with a colourful Python "
7086 "backtrace claiming that it can't import a <literal>mercurial</literal>-"
7087 "related module. This is actually progress! The server is now capable of "
7088 "executing your CGI script. This error is only likely to occur if you're "
7089 "running a private installation of Mercurial, instead of a system-wide "
7090 "version. Remember that the web server runs the CGI program without any of "
7091 "the environment variables that you take for granted in an interactive "
7092 "session. If this error happens to you, edit your copy of <filename role="
7093 "\"special\">hgweb.cgi</filename> and follow the directions inside it to "
7094 "correctly set your <envar>PYTHONPATH</envar> environment variable."
7095 msgstr ""
7097 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7098 #: ../en/ch06-collab.xml:1041
7099 msgid ""
7100 "Finally, you are <emphasis>certain</emphasis> to by served with another "
7101 "colourful Python backtrace: this one will complain that it can't find "
7102 "<filename class=\"directory\">/path/to/repository</filename>. Edit your "
7103 "<filename role=\"special\">hgweb.cgi</filename> script and replace the "
7104 "<filename class=\"directory\">/path/to/repository</filename> string with the "
7105 "complete path to the repository you want to serve up."
7106 msgstr ""
7108 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7109 #: ../en/ch06-collab.xml:1051
7110 msgid ""
7111 "At this point, when you try to reload the page, you should be presented with "
7112 "a nice HTML view of your repository's history. Whew!"
7113 msgstr ""
7115 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7116 #: ../en/ch06-collab.xml:1057
7117 msgid "Configuring lighttpd"
7118 msgstr "配置 lighttpd"
7120 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7121 #: ../en/ch06-collab.xml:1059
7122 msgid ""
7123 "To be exhaustive in my experiments, I tried configuring the increasingly "
7124 "popular <literal>lighttpd</literal> web server to serve the same repository "
7125 "as I described with Apache above. I had already overcome all of the problems "
7126 "I outlined with Apache, many of which are not server-specific. As a result, "
7127 "I was fairly sure that my file and directory permissions were good, and that "
7128 "my <filename role=\"special\">hgweb.cgi</filename> script was properly edited."
7129 msgstr ""
7131 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7132 #: ../en/ch06-collab.xml:1069
7133 msgid ""
7134 "Once I had Apache running, getting <literal>lighttpd</literal> to serve the "
7135 "repository was a snap (in other words, even if you're trying to use "
7136 "<literal>lighttpd</literal>, you should read the Apache section). I first "
7137 "had to edit the <literal>mod_access</literal> section of its config file to "
7138 "enable <literal>mod_cgi</literal> and <literal>mod_userdir</literal>, both of "
7139 "which were disabled by default on my system. I then added a few lines to the "
7140 "end of the config file, to configure these modules."
7141 msgstr ""
7143 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7144 #: ../en/ch06-collab.xml:1081
7145 msgid ""
7146 "With this done, <literal>lighttpd</literal> ran immediately for me. If I had "
7147 "configured <literal>lighttpd</literal> before Apache, I'd almost certainly "
7148 "have run into many of the same system-level configuration problems as I did "
7149 "with Apache. However, I found <literal>lighttpd</literal> to be noticeably "
7150 "easier to configure than Apache, even though I've used Apache for over a "
7151 "decade, and this was my first exposure to <literal>lighttpd</literal>."
7152 msgstr ""
7154 #. type: Content of: <book><chapter><sect1><sect2><title>
7155 #: ../en/ch06-collab.xml:1094
7156 msgid "Sharing multiple repositories with one CGI script"
7157 msgstr "使用一个 CGI 脚本共享多个版本库"
7159 #. type: Content of: <book><chapter><sect1><sect2><para>
7160 #: ../en/ch06-collab.xml:1096
7161 msgid ""
7162 "The <filename role=\"special\">hgweb.cgi</filename> script only lets you "
7163 "publish a single repository, which is an annoying restriction. If you want "
7164 "to publish more than one without wracking yourself with multiple copies of "
7165 "the same script, each with different names, a better choice is to use the "
7166 "<filename role=\"special\">hgwebdir.cgi</filename> script."
7167 msgstr ""
7169 #. type: Content of: <book><chapter><sect1><sect2><para>
7170 #: ../en/ch06-collab.xml:1104
7171 msgid ""
7172 "The procedure to configure <filename role=\"special\">hgwebdir.cgi</filename> "
7173 "is only a little more involved than for <filename role=\"special\">hgweb.cgi</"
7174 "filename>. First, you must obtain a copy of the script. If you don't have "
7175 "one handy, you can download a copy from the master Mercurial repository at "
7176 "<ulink url=\"http://www.selenic.com/repo/hg/raw-file/tip/hgwebdir.cgi"
7177 "\">http://www.selenic.com/repo/hg/raw-file/tip/hgwebdir.cgi</ulink>."
7178 msgstr ""
7180 #. type: Content of: <book><chapter><sect1><sect2><para>
7181 #: ../en/ch06-collab.xml:1117
7182 msgid ""
7183 "With basic configuration out of the way, try to visit <ulink url=\"http://"
7184 "myhostname/ myuser/hgwebdir.cgi\">http://myhostname/ myuser/hgwebdir.cgi</"
7185 "ulink> in your browser. It should display an empty list of repositories. If "
7186 "you get a blank window or error message, try walking through the list of "
7187 "potential problems in section <xref linkend=\"sec.collab.wtf\"/>."
7188 msgstr ""
7190 #. type: Content of: <book><chapter><sect1><sect2><para>
7191 #: ../en/ch06-collab.xml:1126
7192 msgid ""
7193 "The <filename role=\"special\">hgwebdir.cgi</filename> script relies on an "
7194 "external configuration file. By default, it searches for a file named "
7195 "<filename role=\"special\">hgweb.config</filename> in the same directory as "
7196 "itself. You'll need to create this file, and make it world-readable. The "
7197 "format of the file is similar to a Windows <quote>ini</quote> file, as "
7198 "understood by Python's <literal>ConfigParser</literal> <citation>web:"
7199 "configparser</citation> module."
7200 msgstr ""
7202 #. type: Content of: <book><chapter><sect1><sect2><para>
7203 #: ../en/ch06-collab.xml:1136
7204 msgid ""
7205 "The easiest way to configure <filename role=\"special\">hgwebdir.cgi</"
7206 "filename> is with a section named <literal>collections</literal>. This will "
7207 "automatically publish <emphasis>every</emphasis> repository under the "
7208 "directories you name. The section should look like this:"
7209 msgstr ""
7211 #. type: Content of: <book><chapter><sect1><sect2><para>
7212 #: ../en/ch06-collab.xml:1144
7213 msgid ""
7214 "Mercurial interprets this by looking at the directory name on the "
7215 "<emphasis>right</emphasis> hand side of the <quote><literal>=</literal></"
7216 "quote> sign; finding repositories in that directory hierarchy; and using the "
7217 "text on the <emphasis>left</emphasis> to strip off matching text from the "
7218 "names it will actually list in the web interface. The remaining component of "
7219 "a path after this stripping has occurred is called a <quote>virtual path</"
7220 "quote>."
7221 msgstr ""
7223 #. type: Content of: <book><chapter><sect1><sect2><para>
7224 #: ../en/ch06-collab.xml:1153
7225 msgid ""
7226 "Given the example above, if we have a repository whose local path is "
7227 "<filename class=\"directory\">/my/root/this/repo</filename>, the CGI script "
7228 "will strip the leading <filename class=\"directory\">/my/root</filename> from "
7229 "the name, and publish the repository with a virtual path of <filename class="
7230 "\"directory\">this/repo</filename>. If the base URL for our CGI script is "
7231 "<ulink url=\"http://myhostname/ myuser/hgwebdir.cgi\">http://myhostname/ "
7232 "myuser/hgwebdir.cgi</ulink>, the complete URL for that repository will be "
7233 "<ulink url=\"http://myhostname/ myuser/hgwebdir.cgi/this/repo\">http://"
7234 "myhostname/ myuser/hgwebdir.cgi/this/repo</ulink>."
7235 msgstr ""
7237 #. type: Content of: <book><chapter><sect1><sect2><para>
7238 #: ../en/ch06-collab.xml:1167
7239 msgid ""
7240 "If we replace <filename class=\"directory\">/my/root</filename> on the left "
7241 "hand side of this example with <filename class=\"directory\">/my</filename>, "
7242 "then <filename role=\"special\">hgwebdir.cgi</filename> will only strip off "
7243 "<filename class=\"directory\">/my</filename> from the repository name, and "
7244 "will give us a virtual path of <filename class=\"directory\">root/this/repo</"
7245 "filename> instead of <filename class=\"directory\">this/repo</filename>."
7246 msgstr ""
7248 #. type: Content of: <book><chapter><sect1><sect2><para>
7249 #: ../en/ch06-collab.xml:1177
7250 msgid ""
7251 "The <filename role=\"special\">hgwebdir.cgi</filename> script will "
7252 "recursively search each directory listed in the <literal>collections</"
7253 "literal> section of its configuration file, but it will <literal>not</"
7254 "literal> recurse into the repositories it finds."
7255 msgstr ""
7257 #. type: Content of: <book><chapter><sect1><sect2><para>
7258 #: ../en/ch06-collab.xml:1183
7259 msgid ""
7260 "The <literal>collections</literal> mechanism makes it easy to publish many "
7261 "repositories in a <quote>fire and forget</quote> manner. You only need to "
7262 "set up the CGI script and configuration file one time. Afterwards, you can "
7263 "publish or unpublish a repository at any time by simply moving it into, or "
7264 "out of, the directory hierarchy in which you've configured <filename role="
7265 "\"special\">hgwebdir.cgi</filename> to look."
7266 msgstr ""
7268 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7269 #: ../en/ch06-collab.xml:1193
7270 msgid "Explicitly specifying which repositories to publish"
7271 msgstr "明确指出要发布的版本库"
7273 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7274 #: ../en/ch06-collab.xml:1196
7275 msgid ""
7276 "In addition to the <literal>collections</literal> mechanism, the <filename "
7277 "role=\"special\">hgwebdir.cgi</filename> script allows you to publish a "
7278 "specific list of repositories. To do so, create a <literal>paths</literal> "
7279 "section, with contents of the following form."
7280 msgstr ""
7282 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7283 #: ../en/ch06-collab.xml:1204
7284 msgid ""
7285 "In this case, the virtual path (the component that will appear in a URL) is "
7286 "on the left hand side of each definition, while the path to the repository is "
7287 "on the right. Notice that there does not need to be any relationship between "
7288 "the virtual path you choose and the location of a repository in your "
7289 "filesystem."
7290 msgstr ""
7292 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7293 #: ../en/ch06-collab.xml:1211
7294 msgid ""
7295 "If you wish, you can use both the <literal>collections</literal> and "
7296 "<literal>paths</literal> mechanisms simultaneously in a single configuration "
7297 "file."
7298 msgstr ""
7300 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
7301 #: ../en/ch06-collab.xml:1217
7302 msgid ""
7303 "If multiple repositories have the same virtual path, <filename role=\"special"
7304 "\">hgwebdir.cgi</filename> will not report an error. Instead, it will behave "
7305 "unpredictably."
7306 msgstr ""
7308 #. type: Content of: <book><chapter><sect1><sect2><title>
7309 #: ../en/ch06-collab.xml:1226
7310 msgid "Downloading source archives"
7311 msgstr "下载源代码档案包"
7313 #. type: Content of: <book><chapter><sect1><sect2><para>
7314 #: ../en/ch06-collab.xml:1228
7315 msgid ""
7316 "Mercurial's web interface lets users download an archive of any revision. "
7317 "This archive will contain a snapshot of the working directory as of that "
7318 "revision, but it will not contain a copy of the repository data."
7319 msgstr ""
7321 #. type: Content of: <book><chapter><sect1><sect2><para>
7322 #: ../en/ch06-collab.xml:1233
7323 msgid ""
7324 "By default, this feature is not enabled. To enable it, you'll need to add an "
7325 "<envar role=\"rc-item-web\">allow_archive</envar> item to the <literal role="
7326 "\"rc-web\">web</literal> section of your <filename role=\"special\"> /.hgrc</"
7327 "filename>."
7328 msgstr ""
7330 #. type: Content of: <book><chapter><sect1><sect2><title>
7331 #: ../en/ch06-collab.xml:1241
7332 msgid "Web configuration options"
7333 msgstr "Web 配置选项"
7335 #. type: Content of: <book><chapter><sect1><sect2><para>
7336 #: ../en/ch06-collab.xml:1243
7337 msgid ""
7338 "Mercurial's web interfaces (the <command role=\"hg-cmd\">hg serve</command> "
7339 "command, and the <filename role=\"special\">hgweb.cgi</filename> and "
7340 "<filename role=\"special\">hgwebdir.cgi</filename> scripts) have a number of "
7341 "configuration options that you can set. These belong in a section named "
7342 "<literal role=\"rc-web\">web</literal>."
7343 msgstr ""
7345 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7346 #: ../en/ch06-collab.xml:1251
7347 msgid ""
7348 "<envar role=\"rc-item-web\">allow_archive</envar>: Determines which (if any) "
7349 "archive download mechanisms Mercurial supports. If you enable this feature, "
7350 "users of the web interface will be able to download an archive of whatever "
7351 "revision of a repository they are viewing. To enable the archive feature, "
7352 "this item must take the form of a sequence of words drawn from the list below."
7353 msgstr ""
7355 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
7356 #: ../en/ch06-collab.xml:1260
7357 msgid ""
7358 "<literal>bz2</literal>: A <command>tar</command> archive, compressed using "
7359 "<literal>bzip2</literal> compression. This has the best compression ratio, "
7360 "but uses the most CPU time on the server."
7361 msgstr ""
7363 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
7364 #: ../en/ch06-collab.xml:1266
7365 msgid ""
7366 "<literal>gz</literal>: A <command>tar</command> archive, compressed using "
7367 "<literal>gzip</literal> compression."
7368 msgstr ""
7370 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
7371 #: ../en/ch06-collab.xml:1270
7372 msgid ""
7373 "<literal>zip</literal>: A <command>zip</command> archive, compressed using "
7374 "LZW compression. This format has the worst compression ratio, but is widely "
7375 "used in the Windows world."
7376 msgstr ""
7378 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7379 #: ../en/ch06-collab.xml:1276
7380 msgid ""
7381 "If you provide an empty list, or don't have an <envar role=\"rc-item-web"
7382 "\">allow_archive</envar> entry at all, this feature will be disabled. Here "
7383 "is an example of how to enable all three supported formats."
7384 msgstr ""
7386 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7387 #: ../en/ch06-collab.xml:1283
7388 msgid ""
7389 "<envar role=\"rc-item-web\">allowpull</envar>: Boolean. Determines whether "
7390 "the web interface allows remote users to <command role=\"hg-cmd\">hg pull</"
7391 "command> and <command role=\"hg-cmd\">hg clone</command> this repository over "
7392 "HTTP. If set to <literal>no</literal> or <literal>false</literal>, only the "
7393 "<quote>human-oriented</quote> portion of the web interface is available."
7394 msgstr ""
7396 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7397 #: ../en/ch06-collab.xml:1292
7398 msgid ""
7399 "<envar role=\"rc-item-web\">contact</envar>: String. A free-form (but "
7400 "preferably brief) string identifying the person or group in charge of the "
7401 "repository. This often contains the name and email address of a person or "
7402 "mailing list. It often makes sense to place this entry in a repository's own "
7403 "<filename role=\"special\">.hg/hgrc</filename> file, but it can make sense to "
7404 "use in a global <filename role=\"special\"> /.hgrc</filename>\\ if every "
7405 "repository has a single maintainer."
7406 msgstr ""
7408 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7409 #: ../en/ch06-collab.xml:1303
7410 msgid ""
7411 "<envar role=\"rc-item-web\">maxchanges</envar>: Integer. The default maximum "
7412 "number of changesets to display in a single page of output."
7413 msgstr ""
7415 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7416 #: ../en/ch06-collab.xml:1307
7417 msgid ""
7418 "<envar role=\"rc-item-web\">maxfiles</envar>: Integer. The default maximum "
7419 "number of modified files to display in a single page of output."
7420 msgstr ""
7422 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7423 #: ../en/ch06-collab.xml:1311
7424 msgid ""
7425 "<envar role=\"rc-item-web\">stripes</envar>: Integer. If the web interface "
7426 "displays alternating <quote>stripes</quote> to make it easier to visually "
7427 "align rows when you are looking at a table, this number controls the number "
7428 "of rows in each stripe."
7429 msgstr ""
7431 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7432 #: ../en/ch06-collab.xml:1317
7433 msgid ""
7434 "<envar role=\"rc-item-web\">style</envar>: Controls the template Mercurial "
7435 "uses to display the web interface. Mercurial ships with two web templates, "
7436 "named <literal>default</literal> and <literal>gitweb</literal> (the latter is "
7437 "much more visually attractive). You can also specify a custom template of "
7438 "your own; see chapter <xref linkend=\"chap.template\"/> for details. Here, "
7439 "you can see how to enable the <literal>gitweb</literal> style."
7440 msgstr ""
7442 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7443 #: ../en/ch06-collab.xml:1328
7444 msgid ""
7445 "<envar role=\"rc-item-web\">templates</envar>: Path. The directory in which "
7446 "to search for template files. By default, Mercurial searches in the "
7447 "directory in which it was installed."
7448 msgstr ""
7450 #. type: Content of: <book><chapter><sect1><sect2><para>
7451 #: ../en/ch06-collab.xml:1333
7452 msgid ""
7453 "If you are using <filename role=\"special\">hgwebdir.cgi</filename>, you can "
7454 "place a few configuration items in a <literal role=\"rc-web\">web</literal> "
7455 "section of the <filename role=\"special\">hgweb.config</filename> file "
7456 "instead of a <filename role=\"special\"> /.hgrc</filename>\\ file, for "
7457 "convenience. These items are <envar role=\"rc-item-web\">motd</envar> and "
7458 "<envar role=\"rc-item-web\">style</envar>."
7459 msgstr ""
7461 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7462 #: ../en/ch06-collab.xml:1344
7463 msgid "Options specific to an individual repository"
7464 msgstr "针对单个版本库的选项"
7466 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7467 #: ../en/ch06-collab.xml:1346
7468 msgid ""
7469 "A few <literal role=\"rc-web\">web</literal> configuration items ought to be "
7470 "placed in a repository's local <filename role=\"special\">.hg/hgrc</"
7471 "filename>, rather than a user's or global <filename role=\"special\"> /.hgrc</"
7472 "filename>."
7473 msgstr ""
7475 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7476 #: ../en/ch06-collab.xml:1352
7477 msgid ""
7478 "<envar role=\"rc-item-web\">description</envar>: String. A free-form (but "
7479 "preferably brief) string that describes the contents or purpose of the "
7480 "repository."
7481 msgstr ""
7483 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7484 #: ../en/ch06-collab.xml:1357
7485 msgid ""
7486 "<envar role=\"rc-item-web\">name</envar>: String. The name to use for the "
7487 "repository in the web interface. This overrides the default name, which is "
7488 "the last component of the repository's path."
7489 msgstr ""
7491 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7492 #: ../en/ch06-collab.xml:1365
7493 msgid ""
7494 "Options specific to the <command role=\"hg-cmd\">hg serve</command> command"
7495 msgstr "命令 <command role=\"hg-cmd\">hg serve</command> 的选项"
7497 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7498 #: ../en/ch06-collab.xml:1368
7499 msgid ""
7500 "Some of the items in the <literal role=\"rc-web\">web</literal> section of a "
7501 "<filename role=\"special\"> /.hgrc</filename>\\ file are only for use with "
7502 "the <command role=\"hg-cmd\">hg serve</command> command."
7503 msgstr ""
7505 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7506 #: ../en/ch06-collab.xml:1374
7507 msgid ""
7508 "<envar role=\"rc-item-web\">accesslog</envar>: Path. The name of a file into "
7509 "which to write an access log. By default, the <command role=\"hg-cmd\">hg "
7510 "serve</command> command writes this information to standard output, not to a "
7511 "file. Log entries are written in the standard <quote>combined</quote> file "
7512 "format used by almost all web servers."
7513 msgstr ""
7515 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7516 #: ../en/ch06-collab.xml:1382
7517 msgid ""
7518 "<envar role=\"rc-item-web\">address</envar>: String. The local address on "
7519 "which the server should listen for incoming connections. By default, the "
7520 "server listens on all addresses."
7521 msgstr ""
7523 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7524 #: ../en/ch06-collab.xml:1387
7525 msgid ""
7526 "<envar role=\"rc-item-web\">errorlog</envar>: Path. The name of a file into "
7527 "which to write an error log. By default, the <command role=\"hg-cmd\">hg "
7528 "serve</command> command writes this information to standard error, not to a "
7529 "file."
7530 msgstr ""
7532 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7533 #: ../en/ch06-collab.xml:1393
7534 msgid ""
7535 "<envar role=\"rc-item-web\">ipv6</envar>: Boolean. Whether to use the IPv6 "
7536 "protocol. By default, IPv6 is not used."
7537 msgstr ""
7539 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7540 #: ../en/ch06-collab.xml:1397
7541 msgid ""
7542 "<envar role=\"rc-item-web\">port</envar>: Integer. The TCP port number on "
7543 "which the server should listen. The default port number used is 8000."
7544 msgstr ""
7546 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7547 #: ../en/ch06-collab.xml:1404
7548 msgid ""
7549 "Choosing the right <filename role=\"special\"> /.hgrc</filename>\\ file to "
7550 "add <literal role=\"rc-web\">web</literal> items to"
7551 msgstr ""
7552 "选择正确的 <filename role=\"special\"> /.hgrc</filename> 文件增加到 <literal "
7553 "role=\"rc-web\">web</literal> 条目"
7555 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7556 #: ../en/ch06-collab.xml:1408
7557 msgid ""
7558 "It is important to remember that a web server like Apache or "
7559 "<literal>lighttpd</literal> will run under a user ID that is different to "
7560 "yours. CGI scripts run by your server, such as <filename role=\"special"
7561 "\">hgweb.cgi</filename>, will usually also run under that user ID."
7562 msgstr ""
7564 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7565 #: ../en/ch06-collab.xml:1415
7566 msgid ""
7567 "If you add <literal role=\"rc-web\">web</literal> items to your own personal "
7568 "<filename role=\"special\"> /.hgrc</filename>\\ file, CGI scripts won't read "
7569 "that <filename role=\"special\"> /.hgrc</filename>\\ file. Those settings "
7570 "will thus only affect the behaviour of the <command role=\"hg-cmd\">hg serve</"
7571 "command> command when you run it. To cause CGI scripts to see your settings, "
7572 "either create a <filename role=\"special\"> /.hgrc</filename>\\ file in the "
7573 "home directory of the user ID that runs your web server, or add those "
7574 "settings to a system-wide <filename role=\"special\"> /.hgrc</filename>\\ "
7575 "file."
7576 msgstr ""
7578 #. type: Content of: <book><chapter><title>
7579 #: ../en/ch07-filenames.xml:5
7580 msgid "File names and pattern matching"
7581 msgstr "文件名称与模式匹配"
7583 #. type: Content of: <book><chapter><para>
7584 #: ../en/ch07-filenames.xml:7
7585 msgid ""
7586 "Mercurial provides mechanisms that let you work with file names in a "
7587 "consistent and expressive way."
7588 msgstr ""
7590 #. type: Content of: <book><chapter><sect1><title>
7591 #: ../en/ch07-filenames.xml:11
7592 msgid "Simple file naming"
7593 msgstr "简单文件名称"
7595 #. type: Content of: <book><chapter><sect1><para>
7596 #: ../en/ch07-filenames.xml:13
7597 msgid ""
7598 "Mercurial uses a unified piece of machinery <quote>under the hood</quote> to "
7599 "handle file names. Every command behaves uniformly with respect to file "
7600 "names. The way in which commands work with file names is as follows."
7601 msgstr ""
7603 #. type: Content of: <book><chapter><sect1><para>
7604 #: ../en/ch07-filenames.xml:18
7605 msgid ""
7606 "If you explicitly name real files on the command line, Mercurial works with "
7607 "exactly those files, as you would expect. &interaction.filenames.files;"
7608 msgstr ""
7610 #
7611 #. type: Content of: <book><chapter><sect1><para>
7612 #: ../en/ch07-filenames.xml:22
7613 msgid ""
7614 "When you provide a directory name, Mercurial will interpret this as "
7615 "<quote>operate on every file in this directory and its subdirectories</"
7616 "quote>. Mercurial traverses the files and subdirectories in a directory in "
7617 "alphabetical order. When it encounters a subdirectory, it will traverse that "
7618 "subdirectory before continuing with the current directory."
7619 msgstr ""
7621 #. type: Content of: <book><chapter><sect1><title>
7622 #: ../en/ch07-filenames.xml:33
7623 msgid "Running commands without any file names"
7624 msgstr "不提供文件名称的执行命令"
7626 #. type: Content of: <book><chapter><sect1><para>
7627 #: ../en/ch07-filenames.xml:35
7628 msgid ""
7629 "Mercurial's commands that work with file names have useful default behaviours "
7630 "when you invoke them without providing any file names or patterns. What kind "
7631 "of behaviour you should expect depends on what the command does. Here are a "
7632 "few rules of thumb you can use to predict what a command is likely to do if "
7633 "you don't give it any names to work with."
7634 msgstr ""
7636 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7637 #: ../en/ch07-filenames.xml:42
7638 msgid ""
7639 "Most commands will operate on the entire working directory. This is what the "
7640 "<command role=\"hg-cmd\">hg add</command> command does, for example."
7641 msgstr ""
7643 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7644 #: ../en/ch07-filenames.xml:46
7645 msgid ""
7646 "If the command has effects that are difficult or impossible to reverse, it "
7647 "will force you to explicitly provide at least one name or pattern (see "
7648 "below). This protects you from accidentally deleting files by running "
7649 "<command role=\"hg-cmd\">hg remove</command> with no arguments, for example."
7650 msgstr ""
7652 #
7653 #. type: Content of: <book><chapter><sect1><para>
7654 #: ../en/ch07-filenames.xml:54
7655 msgid ""
7656 "It's easy to work around these default behaviours if they don't suit you. If "
7657 "a command normally operates on the whole working directory, you can invoke it "
7658 "on just the current directory and its subdirectories by giving it the name "
7659 "<quote><filename class=\"directory\">.</filename></quote>."
7660 msgstr ""
7662 #
7663 #. type: Content of: <book><chapter><sect1><para>
7664 #: ../en/ch07-filenames.xml:62
7665 msgid ""
7666 "Along the same lines, some commands normally print file names relative to the "
7667 "root of the repository, even if you're invoking them from a subdirectory. "
7668 "Such a command will print file names relative to your subdirectory if you "
7669 "give it explicit names. Here, we're going to run <command role=\"hg-cmd\">hg "
7670 "status</command> from a subdirectory, and get it to operate on the entire "
7671 "working directory while printing file names relative to our subdirectory, by "
7672 "passing it the output of the <command role=\"hg-cmd\">hg root</command> "
7673 "command."
7674 msgstr ""
7676 #. type: Content of: <book><chapter><sect1><title>
7677 #: ../en/ch07-filenames.xml:76
7678 msgid "Telling you what's going on"
7679 msgstr "告诉你正在做什么"
7681 #. type: Content of: <book><chapter><sect1><para>
7682 #: ../en/ch07-filenames.xml:78
7683 msgid ""
7684 "The <command role=\"hg-cmd\">hg add</command> example in the preceding "
7685 "section illustrates something else that's helpful about Mercurial commands. "
7686 "If a command operates on a file that you didn't name explicitly on the "
7687 "command line, it will usually print the name of the file, so that you will "
7688 "not be surprised what's going on."
7689 msgstr ""
7691 #. type: Content of: <book><chapter><sect1><para>
7692 #: ../en/ch07-filenames.xml:85
7693 msgid ""
7694 "The principle here is of <emphasis>least surprise</emphasis>. If you've "
7695 "exactly named a file on the command line, there's no point in repeating it "
7696 "back at you. If Mercurial is acting on a file <emphasis>implicitly</"
7697 "emphasis>, because you provided no names, or a directory, or a pattern (see "
7698 "below), it's safest to tell you what it's doing."
7699 msgstr ""
7701 #. type: Content of: <book><chapter><sect1><para>
7702 #: ../en/ch07-filenames.xml:92
7703 msgid ""
7704 "For commands that behave this way, you can silence them using the <option "
7705 "role=\"hg-opt-global\">-q</option> option. You can also get them to print "
7706 "the name of every file, even those you've named explicitly, using the <option "
7707 "role=\"hg-opt-global\">-v</option> option."
7708 msgstr ""
7710 #. type: Content of: <book><chapter><sect1><title>
7711 #: ../en/ch07-filenames.xml:100
7712 msgid "Using patterns to identify files"
7713 msgstr "使用模式标识文件"
7715 #. type: Content of: <book><chapter><sect1><para>
7716 #: ../en/ch07-filenames.xml:102
7717 msgid ""
7718 "In addition to working with file and directory names, Mercurial lets you use "
7719 "<emphasis>patterns</emphasis> to identify files. Mercurial's pattern "
7720 "handling is expressive."
7721 msgstr ""
7723 #. type: Content of: <book><chapter><sect1><para>
7724 #: ../en/ch07-filenames.xml:106
7725 msgid ""
7726 "On Unix-like systems (Linux, MacOS, etc.), the job of matching file names to "
7727 "patterns normally falls to the shell. On these systems, you must explicitly "
7728 "tell Mercurial that a name is a pattern. On Windows, the shell does not "
7729 "expand patterns, so Mercurial will automatically identify names that are "
7730 "patterns, and expand them for you."
7731 msgstr ""
7733 #. type: Content of: <book><chapter><sect1><para>
7734 #: ../en/ch07-filenames.xml:113
7735 msgid ""
7736 "To provide a pattern in place of a regular name on the command line, the "
7737 "mechanism is simple:"
7738 msgstr ""
7740 #. type: Content of: <book><chapter><sect1><para>
7741 #: ../en/ch07-filenames.xml:116
7742 msgid ""
7743 "That is, a pattern is identified by a short text string that says what kind "
7744 "of pattern this is, followed by a colon, followed by the actual pattern."
7745 msgstr ""
7747 #. type: Content of: <book><chapter><sect1><para>
7748 #: ../en/ch07-filenames.xml:120
7749 msgid ""
7750 "Mercurial supports two kinds of pattern syntax. The most frequently used is "
7751 "called <literal>glob</literal>; this is the same kind of pattern matching "
7752 "used by the Unix shell, and should be familiar to Windows command prompt "
7753 "users, too."
7754 msgstr ""
7756 #. type: Content of: <book><chapter><sect1><para>
7757 #: ../en/ch07-filenames.xml:125
7758 msgid ""
7759 "When Mercurial does automatic pattern matching on Windows, it uses "
7760 "<literal>glob</literal> syntax. You can thus omit the <quote><literal>glob:</"
7761 "literal></quote> prefix on Windows, but it's safe to use it, too."
7762 msgstr ""
7764 #. type: Content of: <book><chapter><sect1><para>
7765 #: ../en/ch07-filenames.xml:130
7766 msgid ""
7767 "The <literal>re</literal> syntax is more powerful; it lets you specify "
7768 "patterns using regular expressions, also known as regexps."
7769 msgstr ""
7771 #. type: Content of: <book><chapter><sect1><para>
7772 #: ../en/ch07-filenames.xml:134
7773 msgid ""
7774 "By the way, in the examples that follow, notice that I'm careful to wrap all "
7775 "of my patterns in quote characters, so that they won't get expanded by the "
7776 "shell before Mercurial sees them."
7777 msgstr ""
7779 #. type: Content of: <book><chapter><sect1><sect2><title>
7780 #: ../en/ch07-filenames.xml:140
7781 msgid "Shell-style <literal>glob</literal> patterns"
7782 msgstr "外壳风格的 <literal>glob</literal> 模式"
7784 #. type: Content of: <book><chapter><sect1><sect2><para>
7785 #: ../en/ch07-filenames.xml:142
7786 msgid ""
7787 "This is an overview of the kinds of patterns you can use when you're matching "
7788 "on glob patterns."
7789 msgstr ""
7791 #
7792 #. type: Content of: <book><chapter><sect1><sect2><para>
7793 #: ../en/ch07-filenames.xml:145
7794 msgid ""
7795 "The <quote><literal>*</literal></quote> character matches any string, within "
7796 "a single directory."
7797 msgstr ""
7799 #
7800 #. type: Content of: <book><chapter><sect1><sect2><para>
7801 #: ../en/ch07-filenames.xml:150
7802 msgid ""
7803 "The <quote><literal>**</literal></quote> pattern matches any string, and "
7804 "crosses directory boundaries. It's not a standard Unix glob token, but it's "
7805 "accepted by several popular Unix shells, and is very useful."
7806 msgstr ""
7808 #
7809 #. type: Content of: <book><chapter><sect1><sect2><para>
7810 #: ../en/ch07-filenames.xml:157
7811 msgid ""
7812 "The <quote><literal>?</literal></quote> pattern matches any single character."
7813 msgstr ""
7815 #. type: Content of: <book><chapter><sect1><sect2><para>
7816 #: ../en/ch07-filenames.xml:162
7817 msgid ""
7818 "The <quote><literal>[</literal></quote> character begins a "
7819 "<emphasis>character class</emphasis>. This matches any single character "
7820 "within the class. The class ends with a <quote><literal>]</literal></quote> "
7821 "character. A class may contain multiple <emphasis>range</emphasis>s of the "
7822 "form <quote><literal>a-f</literal></quote>, which is shorthand for "
7823 "<quote><literal>abcdef</literal></quote>."
7824 msgstr ""
7826 #. type: Content of: <book><chapter><sect1><sect2><para>
7827 #: ../en/ch07-filenames.xml:172
7828 msgid ""
7829 "If the first character after the <quote><literal>[</literal></quote> in a "
7830 "character class is a <quote><literal>!</literal></quote>, it "
7831 "<emphasis>negates</emphasis> the class, making it match any single character "
7832 "not in the class."
7833 msgstr ""
7835 #. type: Content of: <book><chapter><sect1><sect2><para>
7836 #: ../en/ch07-filenames.xml:178
7837 msgid ""
7838 "A <quote><literal>{</literal></quote> begins a group of subpatterns, where "
7839 "the whole group matches if any subpattern in the group matches. The "
7840 "<quote><literal>,</literal></quote> character separates subpatterns, and "
7841 "<quote><literal>}</literal></quote> ends the group."
7842 msgstr ""
7844 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7845 #: ../en/ch07-filenames.xml:187
7846 msgid "Watch out!"
7847 msgstr "千万小心！"
7849 #
7850 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7851 #: ../en/ch07-filenames.xml:189
7852 msgid ""
7853 "Don't forget that if you want to match a pattern in any directory, you should "
7854 "not be using the <quote><literal>*</literal></quote> match-any token, as this "
7855 "will only match within one directory. Instead, use the <quote><literal>**</"
7856 "literal></quote> token. This small example illustrates the difference "
7857 "between the two."
7858 msgstr ""
7860 #. type: Content of: <book><chapter><sect1><sect2><title>
7861 #: ../en/ch07-filenames.xml:201
7862 msgid "Regular expression matching with <literal>re</literal> patterns"
7863 msgstr "使用 <literal>re</literal> 模式的正则表达式匹配"
7865 #. type: Content of: <book><chapter><sect1><sect2><para>
7866 #: ../en/ch07-filenames.xml:204
7867 msgid ""
7868 "Mercurial accepts the same regular expression syntax as the Python "
7869 "programming language (it uses Python's regexp engine internally). This is "
7870 "based on the Perl language's regexp syntax, which is the most popular dialect "
7871 "in use (it's also used in Java, for example)."
7872 msgstr ""
7874 #. type: Content of: <book><chapter><sect1><sect2><para>
7875 #: ../en/ch07-filenames.xml:210
7876 msgid ""
7877 "I won't discuss Mercurial's regexp dialect in any detail here, as regexps are "
7878 "not often used. Perl-style regexps are in any case already exhaustively "
7879 "documented on a multitude of web sites, and in many books. Instead, I will "
7880 "focus here on a few things you should know if you find yourself needing to "
7881 "use regexps with Mercurial."
7882 msgstr ""
7884 #. type: Content of: <book><chapter><sect1><sect2><para>
7885 #: ../en/ch07-filenames.xml:217
7886 msgid ""
7887 "A regexp is matched against an entire file name, relative to the root of the "
7888 "repository. In other words, even if you're already in subbdirectory "
7889 "<filename class=\"directory\">foo</filename>, if you want to match files "
7890 "under this directory, your pattern must start with <quote><literal>foo/</"
7891 "literal></quote>."
7892 msgstr ""
7894 #. type: Content of: <book><chapter><sect1><sect2><para>
7895 #: ../en/ch07-filenames.xml:224
7896 msgid ""
7897 "One thing to note, if you're familiar with Perl-style regexps, is that "
7898 "Mercurial's are <emphasis>rooted</emphasis>. That is, a regexp starts "
7899 "matching against the beginning of a string; it doesn't look for a match "
7900 "anywhere within the string. To match anywhere in a string, start your "
7901 "pattern with <quote><literal>.*</literal></quote>."
7902 msgstr ""
7904 #. type: Content of: <book><chapter><sect1><title>
7905 #: ../en/ch07-filenames.xml:234
7906 msgid "Filtering files"
7907 msgstr "过滤文件"
7909 #. type: Content of: <book><chapter><sect1><para>
7910 #: ../en/ch07-filenames.xml:236
7911 msgid ""
7912 "Not only does Mercurial give you a variety of ways to specify files; it lets "
7913 "you further winnow those files using <emphasis>filters</emphasis>. Commands "
7914 "that work with file names accept two filtering options."
7915 msgstr ""
7917 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7918 #: ../en/ch07-filenames.xml:241
7919 msgid ""
7920 "<option role=\"hg-opt-global\">-I</option>, or <option role=\"hg-opt-global"
7921 "\">--include</option>, lets you specify a pattern that file names must match "
7922 "in order to be processed."
7923 msgstr ""
7925 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7926 #: ../en/ch07-filenames.xml:246
7927 msgid ""
7928 "<option role=\"hg-opt-global\">-X</option>, or <option role=\"hg-opt-global"
7929 "\">--exclude</option>, gives you a way to <emphasis>avoid</emphasis> "
7930 "processing files, if they match this pattern."
7931 msgstr ""
7933 #. type: Content of: <book><chapter><sect1><para>
7934 #: ../en/ch07-filenames.xml:251
7935 msgid ""
7936 "You can provide multiple <option role=\"hg-opt-global\">-I</option> and "
7937 "<option role=\"hg-opt-global\">-X</option> options on the command line, and "
7938 "intermix them as you please. Mercurial interprets the patterns you provide "
7939 "using glob syntax by default (but you can use regexps if you need to)."
7940 msgstr ""
7942 #. type: Content of: <book><chapter><sect1><para>
7943 #: ../en/ch07-filenames.xml:258
7944 msgid ""
7945 "You can read a <option role=\"hg-opt-global\">-I</option> filter as "
7946 "<quote>process only the files that match this filter</quote>."
7947 msgstr ""
7949 #. type: Content of: <book><chapter><sect1><para>
7950 #: ../en/ch07-filenames.xml:264
7951 msgid ""
7952 "The <option role=\"hg-opt-global\">-X</option> filter is best read as "
7953 "<quote>process only the files that don't match this pattern</quote>."
7954 msgstr ""
7956 #. type: Content of: <book><chapter><sect1><title>
7957 #: ../en/ch07-filenames.xml:272
7958 msgid "Ignoring unwanted files and directories"
7959 msgstr "忽略不需要的文件和目录"
7961 #. type: Content of: <book><chapter><sect1><para>
7962 #: ../en/ch07-filenames.xml:274
7963 msgid "XXX."
7964 msgstr ""
7966 #. type: Content of: <book><chapter><sect1><title>
7967 #: ../en/ch07-filenames.xml:278
7968 msgid "Case sensitivity"
7969 msgstr "大小写敏感性"
7971 #. type: Content of: <book><chapter><sect1><para>
7972 #: ../en/ch07-filenames.xml:280
7973 msgid ""
7974 "If you're working in a mixed development environment that contains both Linux "
7975 "(or other Unix) systems and Macs or Windows systems, you should keep in the "
7976 "back of your mind the knowledge that they treat the case (<quote>N</quote> "
7977 "versus <quote>n</quote>) of file names in incompatible ways. This is not "
7978 "very likely to affect you, and it's easy to deal with if it does, but it "
7979 "could surprise you if you don't know about it."
7980 msgstr ""
7982 #. type: Content of: <book><chapter><sect1><para>
7983 #: ../en/ch07-filenames.xml:289
7984 msgid ""
7985 "Operating systems and filesystems differ in the way they handle the "
7986 "<emphasis>case</emphasis> of characters in file and directory names. There "
7987 "are three common ways to handle case in names."
7988 msgstr ""
7990 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7991 #: ../en/ch07-filenames.xml:294
7992 msgid ""
7993 "Completely case insensitive. Uppercase and lowercase versions of a letter "
7994 "are treated as identical, both when creating a file and during subsequent "
7995 "accesses. This is common on older DOS-based systems."
7996 msgstr ""
7998 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7999 #: ../en/ch07-filenames.xml:299
8000 msgid ""
8001 "Case preserving, but insensitive. When a file or directory is created, the "
8002 "case of its name is stored, and can be retrieved and displayed by the "
8003 "operating system. When an existing file is being looked up, its case is "
8004 "ignored. This is the standard arrangement on Windows and MacOS. The names "
8005 "<filename>foo</filename> and <filename>FoO</filename> identify the same "
8006 "file. This treatment of uppercase and lowercase letters as interchangeable "
8007 "is also referred to as <emphasis>case folding</emphasis>."
8008 msgstr ""
8010 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8011 #: ../en/ch07-filenames.xml:310
8012 msgid ""
8013 "Case sensitive. The case of a name is significant at all times. The names "
8014 "<filename>foo</filename> and {FoO} identify different files. This is the way "
8015 "Linux and Unix systems normally work."
8016 msgstr ""
8018 #. type: Content of: <book><chapter><sect1><para>
8019 #: ../en/ch07-filenames.xml:316
8020 msgid ""
8021 "On Unix-like systems, it is possible to have any or all of the above ways of "
8022 "handling case in action at once. For example, if you use a USB thumb drive "
8023 "formatted with a FAT32 filesystem on a Linux system, Linux will handle names "
8024 "on that filesystem in a case preserving, but insensitive, way."
8025 msgstr ""
8027 #. type: Content of: <book><chapter><sect1><sect2><title>
8028 #: ../en/ch07-filenames.xml:323
8029 msgid "Safe, portable repository storage"
8030 msgstr "安全，可移植的版本库存储"
8032 #. type: Content of: <book><chapter><sect1><sect2><para>
8033 #: ../en/ch07-filenames.xml:325
8034 msgid ""
8035 "Mercurial's repository storage mechanism is <emphasis>case safe</emphasis>. "
8036 "It translates file names so that they can be safely stored on both case "
8037 "sensitive and case insensitive filesystems. This means that you can use "
8038 "normal file copying tools to transfer a Mercurial repository onto, for "
8039 "example, a USB thumb drive, and safely move that drive and repository back "
8040 "and forth between a Mac, a PC running Windows, and a Linux box."
8041 msgstr ""
8043 #. type: Content of: <book><chapter><sect1><sect2><title>
8044 #: ../en/ch07-filenames.xml:336
8045 msgid "Detecting case conflicts"
8046 msgstr "检测大小写冲突"
8048 #. type: Content of: <book><chapter><sect1><sect2><para>
8049 #: ../en/ch07-filenames.xml:338
8050 msgid ""
8051 "When operating in the working directory, Mercurial honours the naming policy "
8052 "of the filesystem where the working directory is located. If the filesystem "
8053 "is case preserving, but insensitive, Mercurial will treat names that differ "
8054 "only in case as the same."
8055 msgstr ""
8057 #. type: Content of: <book><chapter><sect1><sect2><para>
8058 #: ../en/ch07-filenames.xml:344
8059 msgid ""
8060 "An important aspect of this approach is that it is possible to commit a "
8061 "changeset on a case sensitive (typically Linux or Unix) filesystem that will "
8062 "cause trouble for users on case insensitive (usually Windows and MacOS) "
8063 "users. If a Linux user commits changes to two files, one named "
8064 "<filename>myfile.c</filename> and the other named <filename>MyFile.C</"
8065 "filename>, they will be stored correctly in the repository. And in the "
8066 "working directories of other Linux users, they will be correctly represented "
8067 "as separate files."
8068 msgstr ""
8070 #. type: Content of: <book><chapter><sect1><sect2><para>
8071 #: ../en/ch07-filenames.xml:355
8072 msgid ""
8073 "If a Windows or Mac user pulls this change, they will not initially have a "
8074 "problem, because Mercurial's repository storage mechanism is case safe. "
8075 "However, once they try to <command role=\"hg-cmd\">hg update</command> the "
8076 "working directory to that changeset, or <command role=\"hg-cmd\">hg merge</"
8077 "command> with that changeset, Mercurial will spot the conflict between the "
8078 "two file names that the filesystem would treat as the same, and forbid the "
8079 "update or merge from occurring."
8080 msgstr ""
8082 #. type: Content of: <book><chapter><sect1><sect2><title>
8083 #: ../en/ch07-filenames.xml:367
8084 msgid "Fixing a case conflict"
8085 msgstr "修正大小写冲突"
8087 #. type: Content of: <book><chapter><sect1><sect2><para>
8088 #: ../en/ch07-filenames.xml:369
8089 msgid ""
8090 "If you are using Windows or a Mac in a mixed environment where some of your "
8091 "collaborators are using Linux or Unix, and Mercurial reports a case folding "
8092 "conflict when you try to <command role=\"hg-cmd\">hg update</command> or "
8093 "<command role=\"hg-cmd\">hg merge</command>, the procedure to fix the problem "
8094 "is simple."
8095 msgstr ""
8097 #. type: Content of: <book><chapter><sect1><sect2><para>
8098 #: ../en/ch07-filenames.xml:376
8099 msgid ""
8100 "Just find a nearby Linux or Unix box, clone the problem repository onto it, "
8101 "and use Mercurial's <command role=\"hg-cmd\">hg rename</command> command to "
8102 "change the names of any offending files or directories so that they will no "
8103 "longer cause case folding conflicts. Commit this change, <command role=\"hg-"
8104 "cmd\">hg pull</command> or <command role=\"hg-cmd\">hg push</command> it "
8105 "across to your Windows or MacOS system, and <command role=\"hg-cmd\">hg "
8106 "update</command> to the revision with the non-conflicting names."
8107 msgstr ""
8109 #. type: Content of: <book><chapter><sect1><sect2><para>
8110 #: ../en/ch07-filenames.xml:386
8111 msgid ""
8112 "The changeset with case-conflicting names will remain in your project's "
8113 "history, and you still won't be able to <command role=\"hg-cmd\">hg update</"
8114 "command> your working directory to that changeset on a Windows or MacOS "
8115 "system, but you can continue development unimpeded."
8116 msgstr ""
8118 #. type: Content of: <book><chapter><sect1><sect2><note><para>
8119 #: ../en/ch07-filenames.xml:393
8120 msgid ""
8121 "Prior to version 0.9.3, Mercurial did not use a case safe repository storage "
8122 "mechanism, and did not detect case folding conflicts. If you are using an "
8123 "older version of Mercurial on Windows or MacOS, I strongly recommend that you "
8124 "upgrade."
8125 msgstr ""
8127 #. type: Content of: <book><chapter><title>
8128 #: ../en/ch08-branch.xml:5
8129 msgid "Managing releases and branchy development"
8130 msgstr "发布管理与分支开发"
8132 #. type: Content of: <book><chapter><para>
8133 #: ../en/ch08-branch.xml:7
8134 msgid ""
8135 "Mercurial provides several mechanisms for you to manage a project that is "
8136 "making progress on multiple fronts at once. To understand these mechanisms, "
8137 "let's first take a brief look at a fairly normal software project structure."
8138 msgstr ""
8140 #. type: Content of: <book><chapter><para>
8141 #: ../en/ch08-branch.xml:12
8142 msgid ""
8143 "Many software projects issue periodic <quote>major</quote> releases that "
8144 "contain substantial new features. In parallel, they may issue <quote>minor</"
8145 "quote> releases. These are usually identical to the major releases off which "
8146 "they're based, but with a few bugs fixed."
8147 msgstr ""
8149 #. type: Content of: <book><chapter><para>
8150 #: ../en/ch08-branch.xml:18
8151 msgid ""
8152 "In this chapter, we'll start by talking about how to keep records of project "
8153 "milestones such as releases. We'll then continue on to talk about the flow "
8154 "of work between different phases of a project, and how Mercurial can help you "
8155 "to isolate and manage this work."
8156 msgstr ""
8158 #. type: Content of: <book><chapter><sect1><title>
8159 #: ../en/ch08-branch.xml:25
8160 msgid "Giving a persistent name to a revision"
8161 msgstr "给版本指定一个永久的名称"
8163 #. type: Content of: <book><chapter><sect1><para>
8164 #: ../en/ch08-branch.xml:27
8165 msgid ""
8166 "Once you decide that you'd like to call a particular revision a "
8167 "<quote>release</quote>, it's a good idea to record the identity of that "
8168 "revision. This will let you reproduce that release at a later date, for "
8169 "whatever purpose you might need at the time (reproducing a bug, porting to a "
8170 "new platform, etc). &interaction.tag.init;"
8171 msgstr ""
8173 #
8174 #. type: Content of: <book><chapter><sect1><para>
8175 #: ../en/ch08-branch.xml:34
8176 msgid ""
8177 "Mercurial lets you give a permanent name to any revision using the <command "
8178 "role=\"hg-cmd\">hg tag</command> command. Not surprisingly, these names are "
8179 "called <quote>tags</quote>."
8180 msgstr ""
8182 #. type: Content of: <book><chapter><sect1><para>
8183 #: ../en/ch08-branch.xml:40
8184 msgid ""
8185 "A tag is nothing more than a <quote>symbolic name</quote> for a revision. "
8186 "Tags exist purely for your convenience, so that you have a handy permanent "
8187 "way to refer to a revision; Mercurial doesn't interpret the tag names you use "
8188 "in any way. Neither does Mercurial place any restrictions on the name of a "
8189 "tag, beyond a few that are necessary to ensure that a tag can be parsed "
8190 "unambiguously. A tag name cannot contain any of the following characters:"
8191 msgstr ""
8193 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8194 #: ../en/ch08-branch.xml:49
8195 msgid "Colon (ASCII 58, <quote><literal>:</literal></quote>)"
8196 msgstr ""
8198 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8199 #: ../en/ch08-branch.xml:52
8200 msgid "Carriage return (ASCII 13, <quote><literal>\\r</literal></quote>)"
8201 msgstr ""
8203 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8204 #: ../en/ch08-branch.xml:55
8205 msgid "Newline (ASCII 10, <quote><literal>\\n</literal></quote>)"
8206 msgstr ""
8208 #. type: Content of: <book><chapter><sect1><para>
8209 #: ../en/ch08-branch.xml:59
8210 msgid ""
8211 "You can use the <command role=\"hg-cmd\">hg tags</command> command to display "
8212 "the tags present in your repository. In the output, each tagged revision is "
8213 "identified first by its name, then by revision number, and finally by the "
8214 "unique hash of the revision."
8215 msgstr ""
8217 #. type: Content of: <book><chapter><sect1><para>
8218 #: ../en/ch08-branch.xml:67
8219 msgid ""
8220 "Notice that <literal>tip</literal> is listed in the output of <command role="
8221 "\"hg-cmd\">hg tags</command>. The <literal>tip</literal> tag is a special "
8222 "<quote>floating</quote> tag, which always identifies the newest revision in "
8223 "the repository."
8224 msgstr ""
8226 #. type: Content of: <book><chapter><sect1><para>
8227 #: ../en/ch08-branch.xml:73
8228 msgid ""
8229 "In the output of the <command role=\"hg-cmd\">hg tags</command> command, tags "
8230 "are listed in reverse order, by revision number. This usually means that "
8231 "recent tags are listed before older tags. It also means that <literal>tip</"
8232 "literal> is always going to be the first tag listed in the output of <command "
8233 "role=\"hg-cmd\">hg tags</command>."
8234 msgstr ""
8236 #. type: Content of: <book><chapter><sect1><para>
8237 #: ../en/ch08-branch.xml:80
8238 msgid ""
8239 "When you run <command role=\"hg-cmd\">hg log</command>, if it displays a "
8240 "revision that has tags associated with it, it will print those tags."
8241 msgstr ""
8243 #
8244 #. type: Content of: <book><chapter><sect1><para>
8245 #: ../en/ch08-branch.xml:86
8246 msgid ""
8247 "Any time you need to provide a revision ID to a Mercurial command, the "
8248 "command will accept a tag name in its place. Internally, Mercurial will "
8249 "translate your tag name into the corresponding revision ID, then use that."
8250 msgstr ""
8252 #. type: Content of: <book><chapter><sect1><para>
8253 #: ../en/ch08-branch.xml:93
8254 msgid ""
8255 "There's no limit on the number of tags you can have in a repository, or on "
8256 "the number of tags that a single revision can have. As a practical matter, "
8257 "it's not a great idea to have <quote>too many</quote> (a number which will "
8258 "vary from project to project), simply because tags are supposed to help you "
8259 "to find revisions. If you have lots of tags, the ease of using them to "
8260 "identify revisions diminishes rapidly."
8261 msgstr ""
8263 #. type: Content of: <book><chapter><sect1><para>
8264 #: ../en/ch08-branch.xml:101
8265 msgid ""
8266 "For example, if your project has milestones as frequent as every few days, "
8267 "it's perfectly reasonable to tag each one of those. But if you have a "
8268 "continuous build system that makes sure every revision can be built cleanly, "
8269 "you'd be introducing a lot of noise if you were to tag every clean build. "
8270 "Instead, you could tag failed builds (on the assumption that they're rare!), "
8271 "or simply not use tags to track buildability."
8272 msgstr ""
8274 #. type: Content of: <book><chapter><sect1><para>
8275 #: ../en/ch08-branch.xml:109
8276 msgid ""
8277 "If you want to remove a tag that you no longer want, use <command role=\"hg-"
8278 "cmd\">hg tag --remove</command>."
8279 msgstr ""
8281 #. type: Content of: <book><chapter><sect1><para>
8282 #: ../en/ch08-branch.xml:114
8283 msgid ""
8284 "You can also modify a tag at any time, so that it identifies a different "
8285 "revision, by simply issuing a new <command role=\"hg-cmd\">hg tag</command> "
8286 "command. You'll have to use the <option role=\"hg-opt-tag\">-f</option> "
8287 "option to tell Mercurial that you <emphasis>really</emphasis> want to update "
8288 "the tag."
8289 msgstr ""
8291 #. type: Content of: <book><chapter><sect1><para>
8292 #: ../en/ch08-branch.xml:123
8293 msgid ""
8294 "There will still be a permanent record of the previous identity of the tag, "
8295 "but Mercurial will no longer use it. There's thus no penalty to tagging the "
8296 "wrong revision; all you have to do is turn around and tag the correct "
8297 "revision once you discover your error."
8298 msgstr ""
8300 #
8301 #. type: Content of: <book><chapter><sect1><para>
8302 #: ../en/ch08-branch.xml:129
8303 msgid ""
8304 "Mercurial stores tags in a normal revision-controlled file in your "
8305 "repository. If you've created any tags, you'll find them in a file named "
8306 "<filename role=\"special\">.hgtags</filename>. When you run the <command "
8307 "role=\"hg-cmd\">hg tag</command> command, Mercurial modifies this file, then "
8308 "automatically commits the change to it. This means that every time you run "
8309 "<command role=\"hg-cmd\">hg tag</command>, you'll see a corresponding "
8310 "changeset in the output of <command role=\"hg-cmd\">hg log</command>."
8311 msgstr ""
8313 #. type: Content of: <book><chapter><sect1><sect2><title>
8314 #: ../en/ch08-branch.xml:142
8315 msgid "Handling tag conflicts during a merge"
8316 msgstr "在合并期间处理标签冲突"
8318 #. type: Content of: <book><chapter><sect1><sect2><para>
8319 #: ../en/ch08-branch.xml:144
8320 msgid ""
8321 "You won't often need to care about the <filename role=\"special\">.hgtags</"
8322 "filename> file, but it sometimes makes its presence known during a merge. "
8323 "The format of the file is simple: it consists of a series of lines. Each "
8324 "line starts with a changeset hash, followed by a space, followed by the name "
8325 "of a tag."
8326 msgstr ""
8328 #. type: Content of: <book><chapter><sect1><sect2><para>
8329 #: ../en/ch08-branch.xml:151
8330 msgid ""
8331 "If you're resolving a conflict in the <filename role=\"special\">.hgtags</"
8332 "filename> file during a merge, there's one twist to modifying the <filename "
8333 "role=\"special\">.hgtags</filename> file: when Mercurial is parsing the tags "
8334 "in a repository, it <emphasis>never</emphasis> reads the working copy of the "
8335 "<filename role=\"special\">.hgtags</filename> file. Instead, it reads the "
8336 "<emphasis>most recently committed</emphasis> revision of the file."
8337 msgstr ""
8339 #. type: Content of: <book><chapter><sect1><sect2><para>
8340 #: ../en/ch08-branch.xml:161
8341 msgid ""
8342 "An unfortunate consequence of this design is that you can't actually verify "
8343 "that your merged <filename role=\"special\">.hgtags</filename> file is "
8344 "correct until <emphasis>after</emphasis> you've committed a change. So if "
8345 "you find yourself resolving a conflict on <filename role=\"special\">.hgtags</"
8346 "filename> during a merge, be sure to run <command role=\"hg-cmd\">hg tags</"
8347 "command> after you commit. If it finds an error in the <filename role="
8348 "\"special\">.hgtags</filename> file, it will report the location of the "
8349 "error, which you can then fix and commit. You should then run <command role="
8350 "\"hg-cmd\">hg tags</command> again, just to be sure that your fix is correct."
8351 msgstr ""
8353 #. type: Content of: <book><chapter><sect1><sect2><title>
8354 #: ../en/ch08-branch.xml:176
8355 msgid "Tags and cloning"
8356 msgstr "标签与克隆"
8358 #. type: Content of: <book><chapter><sect1><sect2><para>
8359 #: ../en/ch08-branch.xml:178
8360 msgid ""
8361 "You may have noticed that the <command role=\"hg-cmd\">hg clone</command> "
8362 "command has a <option role=\"hg-opt-clone\">-r</option> option that lets you "
8363 "clone an exact copy of the repository as of a particular changeset. The new "
8364 "clone will not contain any project history that comes after the revision you "
8365 "specified. This has an interaction with tags that can surprise the unwary."
8366 msgstr ""
8368 #. type: Content of: <book><chapter><sect1><sect2><para>
8369 #: ../en/ch08-branch.xml:186
8370 msgid ""
8371 "Recall that a tag is stored as a revision to the <filename role=\"special\">."
8372 "hgtags</filename> file, so that when you create a tag, the changeset in which "
8373 "it's recorded necessarily refers to an older changeset. When you run "
8374 "<command role=\"hg-cmd\">hg clone -r foo</command> to clone a repository as "
8375 "of tag <literal>foo</literal>, the new clone <emphasis>will not contain the "
8376 "history that created the tag</emphasis> that you used to clone the "
8377 "repository. The result is that you'll get exactly the right subset of the "
8378 "project's history in the new repository, but <emphasis>not</emphasis> the tag "
8379 "you might have expected."
8380 msgstr ""
8382 #. type: Content of: <book><chapter><sect1><sect2><title>
8383 #: ../en/ch08-branch.xml:201
8384 msgid "When permanent tags are too much"
8385 msgstr "当永久标签太多的时候"
8387 #. type: Content of: <book><chapter><sect1><sect2><para>
8388 #: ../en/ch08-branch.xml:203
8389 msgid ""
8390 "Since Mercurial's tags are revision controlled and carried around with a "
8391 "project's history, everyone you work with will see the tags you create. But "
8392 "giving names to revisions has uses beyond simply noting that revision "
8393 "<literal>4237e45506ee</literal> is really <literal>v2.0.2</literal>. If "
8394 "you're trying to track down a subtle bug, you might want a tag to remind you "
8395 "of something like <quote>Anne saw the symptoms with this revision</quote>."
8396 msgstr ""
8398 #. type: Content of: <book><chapter><sect1><sect2><para>
8399 #: ../en/ch08-branch.xml:213
8400 msgid ""
8401 "For cases like this, what you might want to use are <emphasis>local</"
8402 "emphasis> tags. You can create a local tag with the <option role=\"hg-opt-tag"
8403 "\">-l</option> option to the <command role=\"hg-cmd\">hg tag</command> "
8404 "command. This will store the tag in a file called <filename role=\"special"
8405 "\">.hg/localtags</filename>. Unlike <filename role=\"special\">.hgtags</"
8406 "filename>, <filename role=\"special\">.hg/localtags</filename> is not "
8407 "revision controlled. Any tags you create using <option role=\"hg-opt-tag\">-"
8408 "l</option> remain strictly local to the repository you're currently working "
8409 "in."
8410 msgstr ""
8412 #. type: Content of: <book><chapter><sect1><title>
8413 #: ../en/ch08-branch.xml:228
8414 msgid "The flow of changes&emdash;big picture vs. little"
8415 msgstr "修改流程&emdash;宏观与微观"
8417 #. type: Content of: <book><chapter><sect1><para>
8418 #: ../en/ch08-branch.xml:230
8419 msgid ""
8420 "To return to the outline I sketched at the beginning of a chapter, let's "
8421 "think about a project that has multiple concurrent pieces of work under "
8422 "development at once."
8423 msgstr ""
8425 #. type: Content of: <book><chapter><sect1><para>
8426 #: ../en/ch08-branch.xml:234
8427 msgid ""
8428 "There might be a push for a new <quote>main</quote> release; a new minor "
8429 "bugfix release to the last main release; and an unexpected <quote>hot fix</"
8430 "quote> to an old release that is now in maintenance mode."
8431 msgstr ""
8433 #. type: Content of: <book><chapter><sect1><para>
8434 #: ../en/ch08-branch.xml:239
8435 msgid ""
8436 "The usual way people refer to these different concurrent directions of "
8437 "development is as <quote>branches</quote>. However, we've already seen "
8438 "numerous times that Mercurial treats <emphasis>all of history</emphasis> as a "
8439 "series of branches and merges. Really, what we have here is two ideas that "
8440 "are peripherally related, but which happen to share a name."
8441 msgstr ""
8443 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8444 #: ../en/ch08-branch.xml:246
8445 msgid ""
8446 "<quote>Big picture</quote> branches represent the sweep of a project's "
8447 "evolution; people give them names, and talk about them in conversation."
8448 msgstr ""
8450 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8451 #: ../en/ch08-branch.xml:250
8452 msgid ""
8453 "<quote>Little picture</quote> branches are artefacts of the day-to-day "
8454 "activity of developing and merging changes. They expose the narrative of how "
8455 "the code was developed."
8456 msgstr ""
8458 #. type: Content of: <book><chapter><sect1><title>
8459 #: ../en/ch08-branch.xml:258
8460 msgid "Managing big-picture branches in repositories"
8461 msgstr "在版本库中管理分支"
8463 #. type: Content of: <book><chapter><sect1><para>
8464 #: ../en/ch08-branch.xml:260
8465 msgid ""
8466 "The easiest way to isolate a <quote>big picture</quote> branch in Mercurial "
8467 "is in a dedicated repository. If you have an existing shared "
8468 "repository&emdash;let's call it <literal>myproject</literal>&emdash;that "
8469 "reaches a <quote>1.0</quote> milestone, you can start to prepare for future "
8470 "maintenance releases on top of version 1.0 by tagging the revision from which "
8471 "you prepared the 1.0 release."
8472 msgstr ""
8474 #. type: Content of: <book><chapter><sect1><para>
8475 #: ../en/ch08-branch.xml:270
8476 msgid ""
8477 "You can then clone a new shared <literal>myproject-1.0.1</literal> repository "
8478 "as of that tag."
8479 msgstr ""
8481 #. type: Content of: <book><chapter><sect1><para>
8482 #: ../en/ch08-branch.xml:276
8483 msgid ""
8484 "Afterwards, if someone needs to work on a bug fix that ought to go into an "
8485 "upcoming 1.0.1 minor release, they clone the <literal>myproject-1.0.1</"
8486 "literal> repository, make their changes, and push them back."
8487 msgstr ""
8489 #. type: Content of: <book><chapter><sect1><para>
8490 #: ../en/ch08-branch.xml:283
8491 msgid ""
8492 "Meanwhile, development for the next major release can continue, isolated and "
8493 "unabated, in the <literal>myproject</literal> repository."
8494 msgstr ""
8496 #. type: Content of: <book><chapter><sect1><title>
8497 #: ../en/ch08-branch.xml:291
8498 msgid "Don't repeat yourself: merging across branches"
8499 msgstr "不要重复劳动：在分支间合并"
8501 #. type: Content of: <book><chapter><sect1><para>
8502 #: ../en/ch08-branch.xml:293
8503 msgid ""
8504 "In many cases, if you have a bug to fix on a maintenance branch, the chances "
8505 "are good that the bug exists on your project's main branch (and possibly "
8506 "other maintenance branches, too). It's a rare developer who wants to fix the "
8507 "same bug multiple times, so let's look at a few ways that Mercurial can help "
8508 "you to manage these bugfixes without duplicating your work."
8509 msgstr ""
8511 #. type: Content of: <book><chapter><sect1><para>
8512 #: ../en/ch08-branch.xml:301
8513 msgid ""
8514 "In the simplest instance, all you need to do is pull changes from your "
8515 "maintenance branch into your local clone of the target branch."
8516 msgstr ""
8518 #. type: Content of: <book><chapter><sect1><para>
8519 #: ../en/ch08-branch.xml:307
8520 msgid ""
8521 "You'll then need to merge the heads of the two branches, and push back to the "
8522 "main branch."
8523 msgstr ""
8525 #. type: Content of: <book><chapter><sect1><title>
8526 #: ../en/ch08-branch.xml:314
8527 msgid "Naming branches within one repository"
8528 msgstr "版本库中的命名分支"
8530 #. type: Content of: <book><chapter><sect1><para>
8531 #: ../en/ch08-branch.xml:316
8532 msgid ""
8533 "In most instances, isolating branches in repositories is the right approach. "
8534 "Its simplicity makes it easy to understand; and so it's hard to make "
8535 "mistakes. There's a one-to-one relationship between branches you're working "
8536 "in and directories on your system. This lets you use normal (non-Mercurial-"
8537 "aware) tools to work on files within a branch/repository."
8538 msgstr ""
8540 #. type: Content of: <book><chapter><sect1><para>
8541 #: ../en/ch08-branch.xml:323
8542 msgid ""
8543 "If you're more in the <quote>power user</quote> category (<emphasis>and</"
8544 "emphasis> your collaborators are too), there is an alternative way of "
8545 "handling branches that you can consider. I've already mentioned the human-"
8546 "level distinction between <quote>small picture</quote> and <quote>big "
8547 "picture</quote> branches. While Mercurial works with multiple <quote>small "
8548 "picture</quote> branches in a repository all the time (for example after you "
8549 "pull changes in, but before you merge them), it can <emphasis>also</emphasis> "
8550 "work with multiple <quote>big picture</quote> branches."
8551 msgstr ""
8553 #. type: Content of: <book><chapter><sect1><para>
8554 #: ../en/ch08-branch.xml:334
8555 msgid ""
8556 "The key to working this way is that Mercurial lets you assign a persistent "
8557 "<emphasis>name</emphasis> to a branch. There always exists a branch named "
8558 "<literal>default</literal>. Even before you start naming branches yourself, "
8559 "you can find traces of the <literal>default</literal> branch if you look for "
8560 "them."
8561 msgstr ""
8563 #. type: Content of: <book><chapter><sect1><para>
8564 #: ../en/ch08-branch.xml:341
8565 msgid ""
8566 "As an example, when you run the <command role=\"hg-cmd\">hg commit</command> "
8567 "command, and it pops up your editor so that you can enter a commit message, "
8568 "look for a line that contains the text <quote><literal>HG: branch default</"
8569 "literal></quote> at the bottom. This is telling you that your commit will "
8570 "occur on the branch named <literal>default</literal>."
8571 msgstr ""
8573 #. type: Content of: <book><chapter><sect1><para>
8574 #: ../en/ch08-branch.xml:348
8575 msgid ""
8576 "To start working with named branches, use the <command role=\"hg-cmd\">hg "
8577 "branches</command> command. This command lists the named branches already "
8578 "present in your repository, telling you which changeset is the tip of each."
8579 msgstr ""
8581 #. type: Content of: <book><chapter><sect1><para>
8582 #: ../en/ch08-branch.xml:355
8583 msgid ""
8584 "Since you haven't created any named branches yet, the only one that exists is "
8585 "<literal>default</literal>."
8586 msgstr ""
8588 #. type: Content of: <book><chapter><sect1><para>
8589 #: ../en/ch08-branch.xml:358
8590 msgid ""
8591 "To find out what the <quote>current</quote> branch is, run the <command role="
8592 "\"hg-cmd\">hg branch</command> command, giving it no arguments. This tells "
8593 "you what branch the parent of the current changeset is on."
8594 msgstr ""
8596 #
8597 #. type: Content of: <book><chapter><sect1><para>
8598 #: ../en/ch08-branch.xml:365
8599 msgid ""
8600 "To create a new branch, run the <command role=\"hg-cmd\">hg branch</command> "
8601 "command again. This time, give it one argument: the name of the branch you "
8602 "want to create."
8603 msgstr ""
8605 #. type: Content of: <book><chapter><sect1><para>
8606 #: ../en/ch08-branch.xml:371
8607 msgid ""
8608 "After you've created a branch, you might wonder what effect the <command role="
8609 "\"hg-cmd\">hg branch</command> command has had. What do the <command role="
8610 "\"hg-cmd\">hg status</command> and <command role=\"hg-cmd\">hg tip</command> "
8611 "commands report?"
8612 msgstr ""
8614 #. type: Content of: <book><chapter><sect1><para>
8615 #: ../en/ch08-branch.xml:378
8616 msgid ""
8617 "Nothing has changed in the working directory, and there's been no new history "
8618 "created. As this suggests, running the <command role=\"hg-cmd\">hg branch</"
8619 "command> command has no permanent effect; it only tells Mercurial what branch "
8620 "name to use the <emphasis>next</emphasis> time you commit a changeset."
8621 msgstr ""
8623 #. type: Content of: <book><chapter><sect1><para>
8624 #: ../en/ch08-branch.xml:385
8625 msgid ""
8626 "When you commit a change, Mercurial records the name of the branch on which "
8627 "you committed. Once you've switched from the <literal>default</literal> "
8628 "branch to another and committed, you'll see the name of the new branch show "
8629 "up in the output of <command role=\"hg-cmd\">hg log</command>, <command role="
8630 "\"hg-cmd\">hg tip</command>, and other commands that display the same kind of "
8631 "output."
8632 msgstr ""
8634 #. type: Content of: <book><chapter><sect1><para>
8635 #: ../en/ch08-branch.xml:395
8636 msgid ""
8637 "The <command role=\"hg-cmd\">hg log</command>-like commands will print the "
8638 "branch name of every changeset that's not on the <literal>default</literal> "
8639 "branch. As a result, if you never use named branches, you'll never see this "
8640 "information."
8641 msgstr ""
8643 #. type: Content of: <book><chapter><sect1><para>
8644 #: ../en/ch08-branch.xml:400
8645 msgid ""
8646 "Once you've named a branch and committed a change with that name, every "
8647 "subsequent commit that descends from that change will inherit the same branch "
8648 "name. You can change the name of a branch at any time, using the <command "
8649 "role=\"hg-cmd\">hg branch</command> command."
8650 msgstr ""
8652 #. type: Content of: <book><chapter><sect1><para>
8653 #: ../en/ch08-branch.xml:408
8654 msgid ""
8655 "In practice, this is something you won't do very often, as branch names tend "
8656 "to have fairly long lifetimes. (This isn't a rule, just an observation.)"
8657 msgstr ""
8659 #. type: Content of: <book><chapter><sect1><title>
8660 #: ../en/ch08-branch.xml:414
8661 msgid "Dealing with multiple named branches in a repository"
8662 msgstr "在版本库中处理多个命名分支"
8664 #. type: Content of: <book><chapter><sect1><para>
8665 #: ../en/ch08-branch.xml:417
8666 msgid ""
8667 "If you have more than one named branch in a repository, Mercurial will "
8668 "remember the branch that your working directory on when you start a command "
8669 "like <command role=\"hg-cmd\">hg update</command> or <command role=\"hg-cmd"
8670 "\">hg pull -u</command>. It will update the working directory to the tip of "
8671 "this branch, no matter what the <quote>repo-wide</quote> tip is. To update "
8672 "to a revision that's on a different named branch, you may need to use the "
8673 "<option role=\"hg-opt-update\">-C</option> option to <command role=\"hg-cmd"
8674 "\">hg update</command>."
8675 msgstr ""
8677 #. type: Content of: <book><chapter><sect1><para>
8678 #: ../en/ch08-branch.xml:427
8679 msgid ""
8680 "This behaviour is a little subtle, so let's see it in action. First, let's "
8681 "remind ourselves what branch we're currently on, and what branches are in our "
8682 "repository."
8683 msgstr ""
8685 #. type: Content of: <book><chapter><sect1><para>
8686 #: ../en/ch08-branch.xml:433
8687 msgid ""
8688 "We're on the <literal>bar</literal> branch, but there also exists an older "
8689 "<command role=\"hg-cmd\">hg foo</command> branch."
8690 msgstr ""
8692 #. type: Content of: <book><chapter><sect1><para>
8693 #: ../en/ch08-branch.xml:437
8694 msgid ""
8695 "We can <command role=\"hg-cmd\">hg update</command> back and forth between "
8696 "the tips of the <literal>foo</literal> and <literal>bar</literal> branches "
8697 "without needing to use the <option role=\"hg-opt-update\">-C</option> option, "
8698 "because this only involves going backwards and forwards linearly through our "
8699 "change history."
8700 msgstr ""
8702 #
8703 #. type: Content of: <book><chapter><sect1><para>
8704 #: ../en/ch08-branch.xml:446
8705 msgid ""
8706 "If we go back to the <literal>foo</literal> branch and then run <command role="
8707 "\"hg-cmd\">hg update</command>, it will keep us on <literal>foo</literal>, "
8708 "not move us to the tip of <literal>bar</literal>."
8709 msgstr ""
8711 #
8712 #. type: Content of: <book><chapter><sect1><para>
8713 #: ../en/ch08-branch.xml:453
8714 msgid ""
8715 "Committing a new change on the <literal>foo</literal> branch introduces a new "
8716 "head."
8717 msgstr ""
8719 #. type: Content of: <book><chapter><sect1><title>
8720 #: ../en/ch08-branch.xml:460
8721 msgid "Branch names and merging"
8722 msgstr "分支名称与合并"
8724 #. type: Content of: <book><chapter><sect1><para>
8725 #: ../en/ch08-branch.xml:462
8726 msgid ""
8727 "As you've probably noticed, merges in Mercurial are not symmetrical. Let's "
8728 "say our repository has two heads, 17 and 23. If I <command role=\"hg-cmd"
8729 "\">hg update</command> to 17 and then <command role=\"hg-cmd\">hg merge</"
8730 "command> with 23, Mercurial records 17 as the first parent of the merge, and "
8731 "23 as the second. Whereas if I <command role=\"hg-cmd\">hg update</command> "
8732 "to 23 and then <command role=\"hg-cmd\">hg merge</command> with 17, it "
8733 "records 23 as the first parent, and 17 as the second."
8734 msgstr ""
8736 #. type: Content of: <book><chapter><sect1><para>
8737 #: ../en/ch08-branch.xml:472
8738 msgid ""
8739 "This affects Mercurial's choice of branch name when you merge. After a "
8740 "merge, Mercurial will retain the branch name of the first parent when you "
8741 "commit the result of the merge. If your first parent's branch name is "
8742 "<literal>foo</literal>, and you merge with <literal>bar</literal>, the branch "
8743 "name will still be <literal>foo</literal> after you merge."
8744 msgstr ""
8746 #. type: Content of: <book><chapter><sect1><para>
8747 #: ../en/ch08-branch.xml:479
8748 msgid ""
8749 "It's not unusual for a repository to contain multiple heads, each with the "
8750 "same branch name. Let's say I'm working on the <literal>foo</literal> "
8751 "branch, and so are you. We commit different changes; I pull your changes; I "
8752 "now have two heads, each claiming to be on the <literal>foo</literal> "
8753 "branch. The result of a merge will be a single head on the <literal>foo</"
8754 "literal> branch, as you might hope."
8755 msgstr ""
8757 #
8758 #. type: Content of: <book><chapter><sect1><para>
8759 #: ../en/ch08-branch.xml:487
8760 msgid ""
8761 "But if I'm working on the <literal>bar</literal> branch, and I merge work "
8762 "from the <literal>foo</literal> branch, the result will remain on the "
8763 "<literal>bar</literal> branch."
8764 msgstr ""
8766 #. type: Content of: <book><chapter><sect1><para>
8767 #: ../en/ch08-branch.xml:493
8768 msgid ""
8769 "To give a more concrete example, if I'm working on the <literal>bleeding-"
8770 "edge</literal> branch, and I want to bring in the latest fixes from the "
8771 "<literal>stable</literal> branch, Mercurial will choose the <quote>right</"
8772 "quote> (<literal>bleeding-edge</literal>) branch name when I pull and merge "
8773 "from <literal>stable</literal>."
8774 msgstr ""
8776 #. type: Content of: <book><chapter><sect1><title>
8777 #: ../en/ch08-branch.xml:502
8778 msgid "Branch naming is generally useful"
8779 msgstr "分支名称通常都很有用"
8781 #. type: Content of: <book><chapter><sect1><para>
8782 #: ../en/ch08-branch.xml:504
8783 msgid ""
8784 "You shouldn't think of named branches as applicable only to situations where "
8785 "you have multiple long-lived branches cohabiting in a single repository. "
8786 "They're very useful even in the one-branch-per-repository case."
8787 msgstr ""
8789 #. type: Content of: <book><chapter><sect1><para>
8790 #: ../en/ch08-branch.xml:509
8791 msgid ""
8792 "In the simplest case, giving a name to each branch gives you a permanent "
8793 "record of which branch a changeset originated on. This gives you more "
8794 "context when you're trying to follow the history of a long-lived branchy "
8795 "project."
8796 msgstr ""
8798 #. type: Content of: <book><chapter><sect1><para>
8799 #: ../en/ch08-branch.xml:514
8800 msgid ""
8801 "If you're working with shared repositories, you can set up a <literal role="
8802 "\"hook\">pretxnchangegroup</literal> hook on each that will block incoming "
8803 "changes that have the <quote>wrong</quote> branch name. This provides a "
8804 "simple, but effective, defence against people accidentally pushing changes "
8805 "from a <quote>bleeding edge</quote> branch to a <quote>stable</quote> "
8806 "branch. Such a hook might look like this inside the shared repo's <filename "
8807 "role=\"special\"> /.hgrc</filename>."
8808 msgstr ""
8810 #. type: Content of: <book><chapter><title>
8811 #: ../en/ch09-undo.xml:5
8812 msgid "Finding and fixing mistakes"
8813 msgstr "查找和修改错误"
8815 #. type: Content of: <book><chapter><para>
8816 #: ../en/ch09-undo.xml:7
8817 msgid ""
8818 "To err might be human, but to really handle the consequences well takes a top-"
8819 "notch revision control system. In this chapter, we'll discuss some of the "
8820 "techniques you can use when you find that a problem has crept into your "
8821 "project. Mercurial has some highly capable features that will help you to "
8822 "isolate the sources of problems, and to handle them appropriately."
8823 msgstr ""
8825 #. type: Content of: <book><chapter><sect1><title>
8826 #: ../en/ch09-undo.xml:15
8827 msgid "Erasing local history"
8828 msgstr "销毁本地历史"
8830 #. type: Content of: <book><chapter><sect1><sect2><title>
8831 #: ../en/ch09-undo.xml:18
8832 msgid "The accidental commit"
8833 msgstr "意外的提交"
8835 #. type: Content of: <book><chapter><sect1><sect2><para>
8836 #: ../en/ch09-undo.xml:20
8837 msgid ""
8838 "I have the occasional but persistent problem of typing rather more quickly "
8839 "than I can think, which sometimes results in me committing a changeset that "
8840 "is either incomplete or plain wrong. In my case, the usual kind of "
8841 "incomplete changeset is one in which I've created a new source file, but "
8842 "forgotten to <command role=\"hg-cmd\">hg add</command> it. A <quote>plain "
8843 "wrong</quote> changeset is not as common, but no less annoying."
8844 msgstr ""
8846 #. type: Content of: <book><chapter><sect1><sect2><title>
8847 #: ../en/ch09-undo.xml:31
8848 msgid "Rolling back a transaction"
8849 msgstr "回滚一个事务"
8851 #. type: Content of: <book><chapter><sect1><sect2><para>
8852 #: ../en/ch09-undo.xml:33
8853 msgid ""
8854 "In section <xref linkend=\"sec.concepts.txn\"/>, I mentioned that Mercurial "
8855 "treats each modification of a repository as a <emphasis>transaction</"
8856 "emphasis>. Every time you commit a changeset or pull changes from another "
8857 "repository, Mercurial remembers what you did. You can undo, or "
8858 "<emphasis>roll back</emphasis>, exactly one of these actions using the "
8859 "<command role=\"hg-cmd\">hg rollback</command> command. (See section <xref "
8860 "linkend=\"sec.undo.rollback-after-push\"/> for an important caveat about the "
8861 "use of this command.)"
8862 msgstr ""
8864 #. type: Content of: <book><chapter><sect1><sect2><para>
8865 #: ../en/ch09-undo.xml:43
8866 msgid ""
8867 "Here's a mistake that I often find myself making: committing a change in "
8868 "which I've created a new file, but forgotten to <command role=\"hg-cmd\">hg "
8869 "add</command> it."
8870 msgstr ""
8872 #. type: Content of: <book><chapter><sect1><sect2><para>
8873 #: ../en/ch09-undo.xml:50
8874 msgid ""
8875 "Looking at the output of <command role=\"hg-cmd\">hg status</command> after "
8876 "the commit immediately confirms the error."
8877 msgstr ""
8879 #. type: Content of: <book><chapter><sect1><sect2><para>
8880 #: ../en/ch09-undo.xml:56
8881 msgid ""
8882 "The commit captured the changes to the file <filename>a</filename>, but not "
8883 "the new file <filename>b</filename>. If I were to push this changeset to a "
8884 "repository that I shared with a colleague, the chances are high that "
8885 "something in <filename>a</filename> would refer to <filename>b</filename>, "
8886 "which would not be present in their repository when they pulled my changes. "
8887 "I would thus become the object of some indignation."
8888 msgstr ""
8890 #. type: Content of: <book><chapter><sect1><sect2><para>
8891 #: ../en/ch09-undo.xml:65
8892 msgid ""
8893 "However, luck is with me&emdash;I've caught my error before I pushed the "
8894 "changeset. I use the <command role=\"hg-cmd\">hg rollback</command> command, "
8895 "and Mercurial makes that last changeset vanish."
8896 msgstr ""
8898 #. type: Content of: <book><chapter><sect1><sect2><para>
8899 #: ../en/ch09-undo.xml:72
8900 msgid ""
8901 "Notice that the changeset is no longer present in the repository's history, "
8902 "and the working directory once again thinks that the file <filename>a</"
8903 "filename> is modified. The commit and rollback have left the working "
8904 "directory exactly as it was prior to the commit; the changeset has been "
8905 "completely erased. I can now safely <command role=\"hg-cmd\">hg add</"
8906 "command> the file <filename>b</filename>, and rerun my commit."
8907 msgstr ""
8909 #. type: Content of: <book><chapter><sect1><sect2><title>
8910 #: ../en/ch09-undo.xml:85
8911 msgid "The erroneous pull"
8912 msgstr "错误的抓取"
8914 #. type: Content of: <book><chapter><sect1><sect2><para>
8915 #: ../en/ch09-undo.xml:87
8916 msgid ""
8917 "It's common practice with Mercurial to maintain separate development branches "
8918 "of a project in different repositories. Your development team might have one "
8919 "shared repository for your project's <quote>0.9</quote> release, and another, "
8920 "containing different changes, for the <quote>1.0</quote> release."
8921 msgstr ""
8923 #. type: Content of: <book><chapter><sect1><sect2><para>
8924 #: ../en/ch09-undo.xml:94
8925 msgid ""
8926 "Given this, you can imagine that the consequences could be messy if you had a "
8927 "local <quote>0.9</quote> repository, and accidentally pulled changes from the "
8928 "shared <quote>1.0</quote> repository into it. At worst, you could be paying "
8929 "insufficient attention, and push those changes into the shared <quote>0.9</"
8930 "quote> tree, confusing your entire team (but don't worry, we'll return to "
8931 "this horror scenario later). However, it's more likely that you'll notice "
8932 "immediately, because Mercurial will display the URL it's pulling from, or you "
8933 "will see it pull a suspiciously large number of changes into the repository."
8934 msgstr ""
8936 #. type: Content of: <book><chapter><sect1><sect2><para>
8937 #: ../en/ch09-undo.xml:106
8938 msgid ""
8939 "The <command role=\"hg-cmd\">hg rollback</command> command will work nicely "
8940 "to expunge all of the changesets that you just pulled. Mercurial groups all "
8941 "changes from one <command role=\"hg-cmd\">hg pull</command> into a single "
8942 "transaction, so one <command role=\"hg-cmd\">hg rollback</command> is all you "
8943 "need to undo this mistake."
8944 msgstr ""
8946 #. type: Content of: <book><chapter><sect1><sect2><title>
8947 #: ../en/ch09-undo.xml:115
8948 msgid "Rolling back is useless once you've pushed"
8949 msgstr "当完成推送后，回滚是无效的"
8951 #. type: Content of: <book><chapter><sect1><sect2><para>
8952 #: ../en/ch09-undo.xml:117
8953 msgid ""
8954 "The value of the <command role=\"hg-cmd\">hg rollback</command> command drops "
8955 "to zero once you've pushed your changes to another repository. Rolling back "
8956 "a change makes it disappear entirely, but <emphasis>only</emphasis> in the "
8957 "repository in which you perform the <command role=\"hg-cmd\">hg rollback</"
8958 "command>. Because a rollback eliminates history, there's no way for the "
8959 "disappearance of a change to propagate between repositories."
8960 msgstr ""
8962 #. type: Content of: <book><chapter><sect1><sect2><para>
8963 #: ../en/ch09-undo.xml:126
8964 msgid ""
8965 "If you've pushed a change to another repository&emdash;particularly if it's a "
8966 "shared repository&emdash;it has essentially <quote>escaped into the wild,</"
8967 "quote> and you'll have to recover from your mistake in a different way. What "
8968 "will happen if you push a changeset somewhere, then roll it back, then pull "
8969 "from the repository you pushed to, is that the changeset will reappear in "
8970 "your repository."
8971 msgstr ""
8973 #. type: Content of: <book><chapter><sect1><sect2><para>
8974 #: ../en/ch09-undo.xml:135
8975 msgid ""
8976 "(If you absolutely know for sure that the change you want to roll back is the "
8977 "most recent change in the repository that you pushed to, <emphasis>and</"
8978 "emphasis> you know that nobody else could have pulled it from that "
8979 "repository, you can roll back the changeset there, too, but you really should "
8980 "really not rely on this working reliably. If you do this, sooner or later a "
8981 "change really will make it into a repository that you don't directly control "
8982 "(or have forgotten about), and come back to bite you.)"
8983 msgstr ""
8985 #. type: Content of: <book><chapter><sect1><sect2><title>
8986 #: ../en/ch09-undo.xml:147
8987 msgid "You can only roll back once"
8988 msgstr "你只能回滚一次"
8990 #. type: Content of: <book><chapter><sect1><sect2><para>
8991 #: ../en/ch09-undo.xml:149
8992 msgid ""
8993 "Mercurial stores exactly one transaction in its transaction log; that "
8994 "transaction is the most recent one that occurred in the repository. This "
8995 "means that you can only roll back one transaction. If you expect to be able "
8996 "to roll back one transaction, then its predecessor, this is not the behaviour "
8997 "you will get."
8998 msgstr ""
9000 #. type: Content of: <book><chapter><sect1><sect2><para>
9001 #: ../en/ch09-undo.xml:158
9002 msgid ""
9003 "Once you've rolled back one transaction in a repository, you can't roll back "
9004 "again in that repository until you perform another commit or pull."
9005 msgstr ""
9007 #. type: Content of: <book><chapter><sect1><title>
9008 #: ../en/ch09-undo.xml:165
9009 msgid "Reverting the mistaken change"
9010 msgstr "撤销错误的修改"
9012 #. type: Content of: <book><chapter><sect1><para>
9013 #: ../en/ch09-undo.xml:167
9014 msgid ""
9015 "If you make a modification to a file, and decide that you really didn't want "
9016 "to change the file at all, and you haven't yet committed your changes, the "
9017 "<command role=\"hg-cmd\">hg revert</command> command is the one you'll need. "
9018 "It looks at the changeset that's the parent of the working directory, and "
9019 "restores the contents of the file to their state as of that changeset. "
9020 "(That's a long-winded way of saying that, in the normal case, it undoes your "
9021 "modifications.)"
9022 msgstr ""
9024 #. type: Content of: <book><chapter><sect1><para>
9025 #: ../en/ch09-undo.xml:176
9026 msgid ""
9027 "Let's illustrate how the <command role=\"hg-cmd\">hg revert</command> command "
9028 "works with yet another small example. We'll begin by modifying a file that "
9029 "Mercurial is already tracking."
9030 msgstr ""
9032 #. type: Content of: <book><chapter><sect1><para>
9033 #: ../en/ch09-undo.xml:183
9034 msgid ""
9035 "If we don't want that change, we can simply <command role=\"hg-cmd\">hg "
9036 "revert</command> the file."
9037 msgstr ""
9039 #. type: Content of: <book><chapter><sect1><para>
9040 #: ../en/ch09-undo.xml:189
9041 msgid ""
9042 "The <command role=\"hg-cmd\">hg revert</command> command provides us with an "
9043 "extra degree of safety by saving our modified file with a <filename>.orig</"
9044 "filename> extension."
9045 msgstr ""
9047 #. type: Content of: <book><chapter><sect1><para>
9048 #: ../en/ch09-undo.xml:196
9049 msgid ""
9050 "Here is a summary of the cases that the <command role=\"hg-cmd\">hg revert</"
9051 "command> command can deal with. We will describe each of these in more "
9052 "detail in the section that follows."
9053 msgstr ""
9055 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9056 #: ../en/ch09-undo.xml:201
9057 msgid "If you modify a file, it will restore the file to its unmodified state."
9058 msgstr ""
9060 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9061 #: ../en/ch09-undo.xml:204
9062 msgid ""
9063 "If you <command role=\"hg-cmd\">hg add</command> a file, it will undo the "
9064 "<quote>added</quote> state of the file, but leave the file itself untouched."
9065 msgstr ""
9067 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9068 #: ../en/ch09-undo.xml:208
9069 msgid ""
9070 "If you delete a file without telling Mercurial, it will restore the file to "
9071 "its unmodified contents."
9072 msgstr ""
9074 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9075 #: ../en/ch09-undo.xml:211
9076 msgid ""
9077 "If you use the <command role=\"hg-cmd\">hg remove</command> command to remove "
9078 "a file, it will undo the <quote>removed</quote> state of the file, and "
9079 "restore the file to its unmodified contents."
9080 msgstr ""
9082 #. type: Content of: <book><chapter><sect1><sect2><title>
9083 #: ../en/ch09-undo.xml:218
9084 msgid "File management errors"
9085 msgstr "文件管理错误"
9087 #. type: Content of: <book><chapter><sect1><sect2><para>
9088 #: ../en/ch09-undo.xml:220
9089 msgid ""
9090 "The <command role=\"hg-cmd\">hg revert</command> command is useful for more "
9091 "than just modified files. It lets you reverse the results of all of "
9092 "Mercurial's file management commands&emdash;<command role=\"hg-cmd\">hg add</"
9093 "command>, <command role=\"hg-cmd\">hg remove</command>, and so on."
9094 msgstr ""
9096 #
9097 #. type: Content of: <book><chapter><sect1><sect2><para>
9098 #: ../en/ch09-undo.xml:226
9099 msgid ""
9100 "If you <command role=\"hg-cmd\">hg add</command> a file, then decide that in "
9101 "fact you don't want Mercurial to track it, use <command role=\"hg-cmd\">hg "
9102 "revert</command> to undo the add. Don't worry; Mercurial will not modify the "
9103 "file in any way. It will just <quote>unmark</quote> the file."
9104 msgstr ""
9106 #. type: Content of: <book><chapter><sect1><sect2><para>
9107 #: ../en/ch09-undo.xml:234
9108 msgid ""
9109 "Similarly, if you ask Mercurial to <command role=\"hg-cmd\">hg remove</"
9110 "command> a file, you can use <command role=\"hg-cmd\">hg revert</command> to "
9111 "restore it to the contents it had as of the parent of the working directory. "
9112 "&interaction.daily.revert.remove; This works just as well for a file that you "
9113 "deleted by hand, without telling Mercurial (recall that in Mercurial "
9114 "terminology, this kind of file is called <quote>missing</quote>)."
9115 msgstr ""
9117 #
9118 #. type: Content of: <book><chapter><sect1><sect2><para>
9119 #: ../en/ch09-undo.xml:245
9120 msgid ""
9121 "If you revert a <command role=\"hg-cmd\">hg copy</command>, the copied-to "
9122 "file remains in your working directory afterwards, untracked. Since a copy "
9123 "doesn't affect the copied-from file in any way, Mercurial doesn't do anything "
9124 "with the copied-from file."
9125 msgstr ""
9127 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
9128 #: ../en/ch09-undo.xml:254
9129 msgid "A slightly special case: reverting a rename"
9130 msgstr "一个稍微特别的案例：撤销改名"
9132 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9133 #: ../en/ch09-undo.xml:256
9134 msgid ""
9135 "If you <command role=\"hg-cmd\">hg rename</command> a file, there is one "
9136 "small detail that you should remember. When you <command role=\"hg-cmd\">hg "
9137 "revert</command> a rename, it's not enough to provide the name of the renamed-"
9138 "to file, as you can see here."
9139 msgstr ""
9141 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9142 #: ../en/ch09-undo.xml:264
9143 msgid ""
9144 "As you can see from the output of <command role=\"hg-cmd\">hg status</"
9145 "command>, the renamed-to file is no longer identified as added, but the "
9146 "renamed-<emphasis>from</emphasis> file is still removed! This is counter-"
9147 "intuitive (at least to me), but at least it's easy to deal with."
9148 msgstr ""
9150 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9151 #: ../en/ch09-undo.xml:273
9152 msgid ""
9153 "So remember, to revert a <command role=\"hg-cmd\">hg rename</command>, you "
9154 "must provide <emphasis>both</emphasis> the source and destination names."
9155 msgstr ""
9157 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9158 #: ../en/ch09-undo.xml:278
9159 msgid "% TODO: the output doesn't look like it will be removed!"
9160 msgstr ""
9162 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9163 #: ../en/ch09-undo.xml:281
9164 msgid ""
9165 "(By the way, if you rename a file, then modify the renamed-to file, then "
9166 "revert both components of the rename, when Mercurial restores the file that "
9167 "was removed as part of the rename, it will be unmodified. If you need the "
9168 "modifications in the renamed-to file to show up in the renamed-from file, "
9169 "don't forget to copy them over.)"
9170 msgstr ""
9172 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9173 #: ../en/ch09-undo.xml:288
9174 msgid ""
9175 "These fiddly aspects of reverting a rename arguably constitute a small bug in "
9176 "Mercurial."
9177 msgstr ""
9179 #. type: Content of: <book><chapter><sect1><title>
9180 #: ../en/ch09-undo.xml:295
9181 msgid "Dealing with committed changes"
9182 msgstr "处理已经提交的修改"
9184 #. type: Content of: <book><chapter><sect1><para>
9185 #: ../en/ch09-undo.xml:297
9186 msgid ""
9187 "Consider a case where you have committed a change $a$, and another change $b$ "
9188 "on top of it; you then realise that change $a$ was incorrect. Mercurial lets "
9189 "you <quote>back out</quote> an entire changeset automatically, and building "
9190 "blocks that let you reverse part of a changeset by hand."
9191 msgstr ""
9193 #. type: Content of: <book><chapter><sect1><para>
9194 #: ../en/ch09-undo.xml:303
9195 msgid ""
9196 "Before you read this section, here's something to keep in mind: the <command "
9197 "role=\"hg-cmd\">hg backout</command> command undoes changes by "
9198 "<emphasis>adding</emphasis> history, not by modifying or erasing it. It's "
9199 "the right tool to use if you're fixing bugs, but not if you're trying to undo "
9200 "some change that has catastrophic consequences. To deal with those, see "
9201 "section <xref linkend=\"sec.undo.aaaiiieee\"/>."
9202 msgstr ""
9204 #. type: Content of: <book><chapter><sect1><sect2><title>
9205 #: ../en/ch09-undo.xml:312
9206 msgid "Backing out a changeset"
9207 msgstr "恢复一个修改集"
9209 #. type: Content of: <book><chapter><sect1><sect2><para>
9210 #: ../en/ch09-undo.xml:314
9211 msgid ""
9212 "The <command role=\"hg-cmd\">hg backout</command> command lets you "
9213 "<quote>undo</quote> the effects of an entire changeset in an automated "
9214 "fashion. Because Mercurial's history is immutable, this command "
9215 "<emphasis>does not</emphasis> get rid of the changeset you want to undo. "
9216 "Instead, it creates a new changeset that <emphasis>reverses</emphasis> the "
9217 "effect of the to-be-undone changeset."
9218 msgstr ""
9220 #
9221 #. type: Content of: <book><chapter><sect1><sect2><para>
9222 #: ../en/ch09-undo.xml:323
9223 msgid ""
9224 "The operation of the <command role=\"hg-cmd\">hg backout</command> command is "
9225 "a little intricate, so let's illustrate it with some examples. First, we'll "
9226 "create a repository with some simple changes."
9227 msgstr ""
9229 #. type: Content of: <book><chapter><sect1><sect2><para>
9230 #: ../en/ch09-undo.xml:330
9231 msgid ""
9232 "The <command role=\"hg-cmd\">hg backout</command> command takes a single "
9233 "changeset ID as its argument; this is the changeset to back out. Normally, "
9234 "<command role=\"hg-cmd\">hg backout</command> will drop you into a text "
9235 "editor to write a commit message, so you can record why you're backing the "
9236 "change out. In this example, we provide a commit message on the command line "
9237 "using the <option role=\"hg-opt-backout\">-m</option> option."
9238 msgstr ""
9240 #. type: Content of: <book><chapter><sect1><sect2><title>
9241 #: ../en/ch09-undo.xml:341
9242 msgid "Backing out the tip changeset"
9243 msgstr "恢复顶点修改集"
9245 #. type: Content of: <book><chapter><sect1><sect2><para>
9246 #: ../en/ch09-undo.xml:343
9247 msgid "We're going to start by backing out the last changeset we committed."
9248 msgstr ""
9250 #. type: Content of: <book><chapter><sect1><sect2><para>
9251 #: ../en/ch09-undo.xml:348
9252 msgid ""
9253 "You can see that the second line from <filename>myfile</filename> is no "
9254 "longer present. Taking a look at the output of <command role=\"hg-cmd\">hg "
9255 "log</command> gives us an idea of what the <command role=\"hg-cmd\">hg "
9256 "backout</command> command has done. &interaction.backout.simple.log; Notice "
9257 "that the new changeset that <command role=\"hg-cmd\">hg backout</command> has "
9258 "created is a child of the changeset we backed out. It's easier to see this "
9259 "in figure <xref endterm=\"fig.undo.backout.caption\" linkend=\"fig.undo."
9260 "backout\"/>, which presents a graphical view of the change history. As you "
9261 "can see, the history is nice and linear."
9262 msgstr ""
9264 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9265 #: ../en/ch09-undo.xml:364
9266 msgid ""
9267 "<imageobject><imagedata fileref=\"images/undo-simple.png\"/> </imageobject>"
9268 msgstr ""
9270 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
9271 #: ../en/ch09-undo.xml:367 ../en/ch09-undo.xml:486
9272 msgid ""
9273 "Backing out a change using the <command role=\"hg-cmd\">hg backout</command> "
9274 "command"
9275 msgstr ""
9277 #. type: Content of: <book><chapter><sect1><sect2><title>
9278 #: ../en/ch09-undo.xml:376
9279 msgid "Backing out a non-tip change"
9280 msgstr "恢复非顶点的修改"
9282 #. type: Content of: <book><chapter><sect1><sect2><para>
9283 #: ../en/ch09-undo.xml:378
9284 msgid ""
9285 "If you want to back out a change other than the last one you committed, pass "
9286 "the <option role=\"hg-opt-backout\">--merge</option> option to the <command "
9287 "role=\"hg-cmd\">hg backout</command> command."
9288 msgstr ""
9290 #. type: Content of: <book><chapter><sect1><sect2><para>
9291 #: ../en/ch09-undo.xml:385
9292 msgid ""
9293 "This makes backing out any changeset a <quote>one-shot</quote> operation "
9294 "that's usually simple and fast."
9295 msgstr ""
9297 #. type: Content of: <book><chapter><sect1><sect2><para>
9298 #: ../en/ch09-undo.xml:391
9299 msgid ""
9300 "If you take a look at the contents of <filename>myfile</filename> after the "
9301 "backout finishes, you'll see that the first and third changes are present, "
9302 "but not the second."
9303 msgstr ""
9305 #. type: Content of: <book><chapter><sect1><sect2><para>
9306 #: ../en/ch09-undo.xml:398
9307 msgid ""
9308 "As the graphical history in figure <xref endterm=\"fig.undo.backout-non-tip."
9309 "caption\" linkend=\"fig.undo.backout-non-tip\"/> illustrates, Mercurial "
9310 "actually commits <emphasis>two</emphasis> changes in this kind of situation "
9311 "(the box-shaped nodes are the ones that Mercurial commits automatically). "
9312 "Before Mercurial begins the backout process, it first remembers what the "
9313 "current parent of the working directory is. It then backs out the target "
9314 "changeset, and commits that as a changeset. Finally, it merges back to the "
9315 "previous parent of the working directory, and commits the result of the merge."
9316 msgstr ""
9318 #. type: Content of: <book><chapter><sect1><sect2><para>
9319 #: ../en/ch09-undo.xml:410
9320 msgid ""
9321 "% TODO: to me it looks like mercurial doesn't commit the second merge "
9322 "automatically!"
9323 msgstr ""
9325 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9326 #: ../en/ch09-undo.xml:415
9327 msgid ""
9328 "<imageobject><imagedata fileref=\"images/undo-non-tip.png\"/> </imageobject>"
9329 msgstr ""
9331 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
9332 #: ../en/ch09-undo.xml:418
9333 msgid ""
9334 "Automated backout of a non-tip change using the <command role=\"hg-cmd\">hg "
9335 "backout</command> command"
9336 msgstr ""
9338 #. type: Content of: <book><chapter><sect1><sect2><para>
9339 #: ../en/ch09-undo.xml:424
9340 msgid ""
9341 "The result is that you end up <quote>back where you were</quote>, only with "
9342 "some extra history that undoes the effect of the changeset you wanted to back "
9343 "out."
9344 msgstr ""
9346 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
9347 #: ../en/ch09-undo.xml:429
9348 msgid "Always use the <option role=\"hg-opt-backout\">--merge</option> option"
9349 msgstr "始终使用选项 <option role=\"hg-opt-backout\">--merge</option>"
9351 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9352 #: ../en/ch09-undo.xml:432
9353 msgid ""
9354 "In fact, since the <option role=\"hg-opt-backout\">--merge</option> option "
9355 "will do the <quote>right thing</quote> whether or not the changeset you're "
9356 "backing out is the tip (i.e. it won't try to merge if it's backing out the "
9357 "tip, since there's no need), you should <emphasis>always</emphasis> use this "
9358 "option when you run the <command role=\"hg-cmd\">hg backout</command> command."
9359 msgstr ""
9361 #. type: Content of: <book><chapter><sect1><sect2><title>
9362 #: ../en/ch09-undo.xml:443
9363 msgid "Gaining more control of the backout process"
9364 msgstr "在恢复处理中获得更多控制"
9366 #. type: Content of: <book><chapter><sect1><sect2><para>
9367 #: ../en/ch09-undo.xml:445
9368 msgid ""
9369 "While I've recommended that you always use the <option role=\"hg-opt-backout"
9370 "\">--merge</option> option when backing out a change, the <command role=\"hg-"
9371 "cmd\">hg backout</command> command lets you decide how to merge a backout "
9372 "changeset. Taking control of the backout process by hand is something you "
9373 "will rarely need to do, but it can be useful to understand what the <command "
9374 "role=\"hg-cmd\">hg backout</command> command is doing for you automatically. "
9375 "To illustrate this, let's clone our first repository, but omit the backout "
9376 "change that it contains."
9377 msgstr ""
9379 #. type: Content of: <book><chapter><sect1><sect2><para>
9380 #: ../en/ch09-undo.xml:458
9381 msgid ""
9382 "As with our earlier example, We'll commit a third changeset, then back out "
9383 "its parent, and see what happens."
9384 msgstr ""
9386 #. type: Content of: <book><chapter><sect1><sect2><para>
9387 #: ../en/ch09-undo.xml:464
9388 msgid ""
9389 "Our new changeset is again a descendant of the changeset we backout out; it's "
9390 "thus a new head, <emphasis>not</emphasis> a descendant of the changeset that "
9391 "was the tip. The <command role=\"hg-cmd\">hg backout</command> command was "
9392 "quite explicit in telling us this."
9393 msgstr ""
9395 #. type: Content of: <book><chapter><sect1><sect2><para>
9396 #: ../en/ch09-undo.xml:472
9397 msgid ""
9398 "Again, it's easier to see what has happened by looking at a graph of the "
9399 "revision history, in figure <xref endterm=\"fig.undo.backout-manual.caption\" "
9400 "linkend=\"fig.undo.backout-manual\"/>. This makes it clear that when we use "
9401 "<command role=\"hg-cmd\">hg backout</command> to back out a change other than "
9402 "the tip, Mercurial adds a new head to the repository (the change it committed "
9403 "is box-shaped)."
9404 msgstr ""
9406 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9407 #: ../en/ch09-undo.xml:483
9408 msgid ""
9409 "<imageobject><imagedata fileref=\"images/undo-manual.png\"/> </imageobject>"
9410 msgstr ""
9412 #. type: Content of: <book><chapter><sect1><sect2><para>
9413 #: ../en/ch09-undo.xml:492
9414 msgid ""
9415 "After the <command role=\"hg-cmd\">hg backout</command> command has "
9416 "completed, it leaves the new <quote>backout</quote> changeset as the parent "
9417 "of the working directory."
9418 msgstr ""
9420 #. type: Content of: <book><chapter><sect1><sect2><para>
9421 #: ../en/ch09-undo.xml:499
9422 msgid "Now we have two isolated sets of changes."
9423 msgstr ""
9425 #. type: Content of: <book><chapter><sect1><sect2><para>
9426 #: ../en/ch09-undo.xml:503
9427 msgid ""
9428 "Let's think about what we expect to see as the contents of <filename>myfile</"
9429 "filename> now. The first change should be present, because we've never "
9430 "backed it out. The second change should be missing, as that's the change we "
9431 "backed out. Since the history graph shows the third change as a separate "
9432 "head, we <emphasis>don't</emphasis> expect to see the third change present in "
9433 "<filename>myfile</filename>."
9434 msgstr ""
9436 #. type: Content of: <book><chapter><sect1><sect2><para>
9437 #: ../en/ch09-undo.xml:513
9438 msgid ""
9439 "To get the third change back into the file, we just do a normal merge of our "
9440 "two heads."
9441 msgstr ""
9443 #. type: Content of: <book><chapter><sect1><sect2><para>
9444 #: ../en/ch09-undo.xml:518
9445 msgid ""
9446 "Afterwards, the graphical history of our repository looks like figure <xref "
9447 "endterm=\"fig.undo.backout-manual-merge.caption\" linkend=\"fig.undo.backout-"
9448 "manual-merge\"/>."
9449 msgstr ""
9451 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9452 #: ../en/ch09-undo.xml:525
9453 msgid ""
9454 "<imageobject><imagedata fileref=\"images/undo-manual-merge.png\"/> </"
9455 "imageobject>"
9456 msgstr ""
9458 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
9459 #: ../en/ch09-undo.xml:528
9460 msgid "Manually merging a backout change"
9461 msgstr ""
9463 #. type: Content of: <book><chapter><sect1><sect2><title>
9464 #: ../en/ch09-undo.xml:535
9465 msgid "Why <command role=\"hg-cmd\">hg backout</command> works as it does"
9466 msgstr "<command role=\"hg-cmd\">hg backout</command> 的内幕"
9468 #. type: Content of: <book><chapter><sect1><sect2><para>
9469 #: ../en/ch09-undo.xml:538
9470 msgid ""
9471 "Here's a brief description of how the <command role=\"hg-cmd\">hg backout</"
9472 "command> command works."
9473 msgstr ""
9475 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9476 #: ../en/ch09-undo.xml:541
9477 msgid ""
9478 "It ensures that the working directory is <quote>clean</quote>, i.e. that the "
9479 "output of <command role=\"hg-cmd\">hg status</command> would be empty."
9480 msgstr ""
9482 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9483 #: ../en/ch09-undo.xml:545
9484 msgid ""
9485 "It remembers the current parent of the working directory. Let's call this "
9486 "changeset <literal>orig</literal>"
9487 msgstr ""
9489 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9490 #: ../en/ch09-undo.xml:549
9491 msgid ""
9492 "It does the equivalent of a <command role=\"hg-cmd\">hg update</command> to "
9493 "sync the working directory to the changeset you want to back out. Let's call "
9494 "this changeset <literal>backout</literal>"
9495 msgstr ""
9497 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9498 #: ../en/ch09-undo.xml:554
9499 msgid ""
9500 "It finds the parent of that changeset. Let's call that changeset "
9501 "<literal>parent</literal>."
9502 msgstr ""
9504 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9505 #: ../en/ch09-undo.xml:557
9506 msgid ""
9507 "For each file that the <literal>backout</literal> changeset affected, it does "
9508 "the equivalent of a <command role=\"hg-cmd\">hg revert -r parent</command> on "
9509 "that file, to restore it to the contents it had before that changeset was "
9510 "committed."
9511 msgstr ""
9513 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9514 #: ../en/ch09-undo.xml:564
9515 msgid ""
9516 "It commits the result as a new changeset. This changeset has "
9517 "<literal>backout</literal> as its parent."
9518 msgstr ""
9520 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9521 #: ../en/ch09-undo.xml:568
9522 msgid ""
9523 "If you specify <option role=\"hg-opt-backout\">--merge</option> on the "
9524 "command line, it merges with <literal>orig</literal>, and commits the result "
9525 "of the merge."
9526 msgstr ""
9528 #. type: Content of: <book><chapter><sect1><sect2><para>
9529 #: ../en/ch09-undo.xml:574
9530 msgid ""
9531 "An alternative way to implement the <command role=\"hg-cmd\">hg backout</"
9532 "command> command would be to <command role=\"hg-cmd\">hg export</command> the "
9533 "to-be-backed-out changeset as a diff, then use the <option role=\"cmd-opt-"
9534 "patch\">--reverse</option> option to the <command>patch</command> command to "
9535 "reverse the effect of the change without fiddling with the working "
9536 "directory. This sounds much simpler, but it would not work nearly as well."
9537 msgstr ""
9539 #. type: Content of: <book><chapter><sect1><sect2><para>
9540 #: ../en/ch09-undo.xml:584
9541 msgid ""
9542 "The reason that <command role=\"hg-cmd\">hg backout</command> does an update, "
9543 "a commit, a merge, and another commit is to give the merge machinery the best "
9544 "chance to do a good job when dealing with all the changes <emphasis>between</"
9545 "emphasis> the change you're backing out and the current tip."
9546 msgstr ""
9548 #. type: Content of: <book><chapter><sect1><sect2><para>
9549 #: ../en/ch09-undo.xml:591
9550 msgid ""
9551 "If you're backing out a changeset that's 100 revisions back in your project's "
9552 "history, the chances that the <command>patch</command> command will be able "
9553 "to apply a reverse diff cleanly are not good, because intervening changes are "
9554 "likely to have <quote>broken the context</quote> that <command>patch</"
9555 "command> uses to determine whether it can apply a patch (if this sounds like "
9556 "gibberish, see <xref linkend=\"sec.mq.patch\"/> for a discussion of the "
9557 "<command>patch</command> command). Also, Mercurial's merge machinery will "
9558 "handle files and directories being renamed, permission changes, and "
9559 "modifications to binary files, none of which <command>patch</command> can "
9560 "deal with."
9561 msgstr ""
9563 #. type: Content of: <book><chapter><sect1><title>
9564 #: ../en/ch09-undo.xml:608
9565 msgid "Changes that should never have been"
9566 msgstr "不该发生的修改"
9568 #. type: Content of: <book><chapter><sect1><para>
9569 #: ../en/ch09-undo.xml:610
9570 msgid ""
9571 "Most of the time, the <command role=\"hg-cmd\">hg backout</command> command "
9572 "is exactly what you need if you want to undo the effects of a change. It "
9573 "leaves a permanent record of exactly what you did, both when committing the "
9574 "original changeset and when you cleaned up after it."
9575 msgstr ""
9577 #. type: Content of: <book><chapter><sect1><para>
9578 #: ../en/ch09-undo.xml:616
9579 msgid ""
9580 "On rare occasions, though, you may find that you've committed a change that "
9581 "really should not be present in the repository at all. For example, it would "
9582 "be very unusual, and usually considered a mistake, to commit a software "
9583 "project's object files as well as its source files. Object files have almost "
9584 "no intrinsic value, and they're <emphasis>big</emphasis>, so they increase "
9585 "the size of the repository and the amount of time it takes to clone or pull "
9586 "changes."
9587 msgstr ""
9589 #. type: Content of: <book><chapter><sect1><para>
9590 #: ../en/ch09-undo.xml:625
9591 msgid ""
9592 "Before I discuss the options that you have if you commit a <quote>brown paper "
9593 "bag</quote> change (the kind that's so bad that you want to pull a brown "
9594 "paper bag over your head), let me first discuss some approaches that probably "
9595 "won't work."
9596 msgstr ""
9598 #. type: Content of: <book><chapter><sect1><para>
9599 #: ../en/ch09-undo.xml:630
9600 msgid ""
9601 "Since Mercurial treats history as accumulative&emdash;every change builds on "
9602 "top of all changes that preceded it&emdash;you generally can't just make "
9603 "disastrous changes disappear. The one exception is when you've just "
9604 "committed a change, and it hasn't been pushed or pulled into another "
9605 "repository. That's when you can safely use the <command role=\"hg-cmd\">hg "
9606 "rollback</command> command, as I detailed in section <xref linkend=\"sec.undo."
9607 "rollback\"/>."
9608 msgstr ""
9610 #. type: Content of: <book><chapter><sect1><para>
9611 #: ../en/ch09-undo.xml:639
9612 msgid ""
9613 "After you've pushed a bad change to another repository, you <emphasis>could</"
9614 "emphasis> still use <command role=\"hg-cmd\">hg rollback</command> to make "
9615 "your local copy of the change disappear, but it won't have the consequences "
9616 "you want. The change will still be present in the remote repository, so it "
9617 "will reappear in your local repository the next time you pull."
9618 msgstr ""
9620 #. type: Content of: <book><chapter><sect1><para>
9621 #: ../en/ch09-undo.xml:647
9622 msgid ""
9623 "If a situation like this arises, and you know which repositories your bad "
9624 "change has propagated into, you can <emphasis>try</emphasis> to get rid of "
9625 "the changeefrom <emphasis>every</emphasis> one of those repositories. This "
9626 "is, of course, not a satisfactory solution: if you miss even a single "
9627 "repository while you're expunging, the change is still <quote>in the wild</"
9628 "quote>, and could propagate further."
9629 msgstr ""
9631 #. type: Content of: <book><chapter><sect1><para>
9632 #: ../en/ch09-undo.xml:655
9633 msgid ""
9634 "If you've committed one or more changes <emphasis>after</emphasis> the change "
9635 "that you'd like to see disappear, your options are further reduced. Mercurial "
9636 "doesn't provide a way to <quote>punch a hole</quote> in history, leaving "
9637 "changesets intact."
9638 msgstr ""
9640 #. type: Content of: <book><chapter><sect1><para>
9641 #: ../en/ch09-undo.xml:661
9642 msgid ""
9643 "XXX This needs filling out. The <literal>hg-replay</literal> script in the "
9644 "<literal>examples</literal> directory works, but doesn't handle merge "
9645 "changesets. Kind of an important omission."
9646 msgstr ""
9648 #. type: Content of: <book><chapter><sect1><sect2><title>
9649 #: ../en/ch09-undo.xml:667
9650 msgid "Protect yourself from <quote>escaped</quote> changes"
9651 msgstr "使用<quote>校验</quote>修改来保护你自己"
9653 #. type: Content of: <book><chapter><sect1><sect2><para>
9654 #: ../en/ch09-undo.xml:670
9655 msgid ""
9656 "If you've committed some changes to your local repository and they've been "
9657 "pushed or pulled somewhere else, this isn't necessarily a disaster. You can "
9658 "protect yourself ahead of time against some classes of bad changeset. This "
9659 "is particularly easy if your team usually pulls changes from a central "
9660 "repository."
9661 msgstr ""
9663 #. type: Content of: <book><chapter><sect1><sect2><para>
9664 #: ../en/ch09-undo.xml:677
9665 msgid ""
9666 "By configuring some hooks on that repository to validate incoming changesets "
9667 "(see chapter <xref linkend=\"chap.hook\"/>), you can automatically prevent "
9668 "some kinds of bad changeset from being pushed to the central repository at "
9669 "all. With such a configuration in place, some kinds of bad changeset will "
9670 "naturally tend to <quote>die out</quote> because they can't propagate into "
9671 "the central repository. Better yet, this happens without any need for "
9672 "explicit intervention."
9673 msgstr ""
9675 #. type: Content of: <book><chapter><sect1><sect2><para>
9676 #: ../en/ch09-undo.xml:687
9677 msgid ""
9678 "For instance, an incoming change hook that verifies that a changeset will "
9679 "actually compile can prevent people from inadvertantly <quote>breaking the "
9680 "build</quote>."
9681 msgstr ""
9683 #. type: Content of: <book><chapter><sect1><title>
9684 #: ../en/ch09-undo.xml:694
9685 msgid "Finding the source of a bug"
9686 msgstr "查找问题的根源"
9688 #. type: Content of: <book><chapter><sect1><para>
9689 #: ../en/ch09-undo.xml:696
9690 msgid ""
9691 "While it's all very well to be able to back out a changeset that introduced a "
9692 "bug, this requires that you know which changeset to back out. Mercurial "
9693 "provides an invaluable command, called <command role=\"hg-cmd\">hg bisect</"
9694 "command>, that helps you to automate this process and accomplish it very "
9695 "efficiently."
9696 msgstr ""
9698 #. type: Content of: <book><chapter><sect1><para>
9699 #: ../en/ch09-undo.xml:703
9700 msgid ""
9701 "The idea behind the <command role=\"hg-cmd\">hg bisect</command> command is "
9702 "that a changeset has introduced some change of behaviour that you can "
9703 "identify with a simple binary test. You don't know which piece of code "
9704 "introduced the change, but you know how to test for the presence of the bug. "
9705 "The <command role=\"hg-cmd\">hg bisect</command> command uses your test to "
9706 "direct its search for the changeset that introduced the code that caused the "
9707 "bug."
9708 msgstr ""
9710 #. type: Content of: <book><chapter><sect1><para>
9711 #: ../en/ch09-undo.xml:712
9712 msgid ""
9713 "Here are a few scenarios to help you understand how you might apply this "
9714 "command."
9715 msgstr ""
9717 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9718 #: ../en/ch09-undo.xml:715
9719 msgid ""
9720 "The most recent version of your software has a bug that you remember wasn't "
9721 "present a few weeks ago, but you don't know when it was introduced. Here, "
9722 "your binary test checks for the presence of that bug."
9723 msgstr ""
9725 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9726 #: ../en/ch09-undo.xml:720
9727 msgid ""
9728 "You fixed a bug in a rush, and now it's time to close the entry in your "
9729 "team's bug database. The bug database requires a changeset ID when you close "
9730 "an entry, but you don't remember which changeset you fixed the bug in. Once "
9731 "again, your binary test checks for the presence of the bug."
9732 msgstr ""
9734 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9735 #: ../en/ch09-undo.xml:727
9736 msgid ""
9737 "Your software works correctly, but runs 15% slower than the last time you "
9738 "measured it. You want to know which changeset introduced the performance "
9739 "regression. In this case, your binary test measures the performance of your "
9740 "software, to see whether it's <quote>fast</quote> or <quote>slow</quote>."
9741 msgstr ""
9743 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9744 #: ../en/ch09-undo.xml:734
9745 msgid ""
9746 "The sizes of the components of your project that you ship exploded recently, "
9747 "and you suspect that something changed in the way you build your project."
9748 msgstr ""
9750 #. type: Content of: <book><chapter><sect1><para>
9751 #: ../en/ch09-undo.xml:739
9752 msgid ""
9753 "From these examples, it should be clear that the <command role=\"hg-cmd\">hg "
9754 "bisect</command> command is not useful only for finding the sources of bugs. "
9755 "You can use it to find any <quote>emergent property</quote> of a repository "
9756 "(anything that you can't find from a simple text search of the files in the "
9757 "tree) for which you can write a binary test."
9758 msgstr ""
9760 #. type: Content of: <book><chapter><sect1><para>
9761 #: ../en/ch09-undo.xml:746
9762 msgid ""
9763 "We'll introduce a little bit of terminology here, just to make it clear which "
9764 "parts of the search process are your responsibility, and which are "
9765 "Mercurial's. A <emphasis>test</emphasis> is something that <emphasis>you</"
9766 "emphasis> run when <command role=\"hg-cmd\">hg bisect</command> chooses a "
9767 "changeset. A <emphasis>probe</emphasis> is what <command role=\"hg-cmd\">hg "
9768 "bisect</command> runs to tell whether a revision is good. Finally, we'll use "
9769 "the word <quote>bisect</quote>, as both a noun and a verb, to stand in for "
9770 "the phrase <quote>search using the <command role=\"hg-cmd\">hg bisect</"
9771 "command> command</quote>."
9772 msgstr ""
9774 #. type: Content of: <book><chapter><sect1><para>
9775 #: ../en/ch09-undo.xml:759
9776 msgid ""
9777 "One simple way to automate the searching process would be simply to probe "
9778 "every changeset. However, this scales poorly. If it took ten minutes to "
9779 "test a single changeset, and you had 10,000 changesets in your repository, "
9780 "the exhaustive approach would take on average 35 <emphasis>days</emphasis> to "
9781 "find the changeset that introduced a bug. Even if you knew that the bug was "
9782 "introduced by one of the last 500 changesets, and limited your search to "
9783 "those, you'd still be looking at over 40 hours to find the changeset that "
9784 "introduced your bug."
9785 msgstr ""
9787 #. type: Content of: <book><chapter><sect1><para>
9788 #: ../en/ch09-undo.xml:769
9789 msgid ""
9790 "What the <command role=\"hg-cmd\">hg bisect</command> command does is use its "
9791 "knowledge of the <quote>shape</quote> of your project's revision history to "
9792 "perform a search in time proportional to the <emphasis>logarithm</emphasis> "
9793 "of the number of changesets to check (the kind of search it performs is "
9794 "called a dichotomic search). With this approach, searching through 10,000 "
9795 "changesets will take less than three hours, even at ten minutes per test (the "
9796 "search will require about 14 tests). Limit your search to the last hundred "
9797 "changesets, and it will take only about an hour (roughly seven tests)."
9798 msgstr ""
9800 #. type: Content of: <book><chapter><sect1><para>
9801 #: ../en/ch09-undo.xml:780
9802 msgid ""
9803 "The <command role=\"hg-cmd\">hg bisect</command> command is aware of the "
9804 "<quote>branchy</quote> nature of a Mercurial project's revision history, so "
9805 "it has no problems dealing with branches, merges, or multiple heads in a "
9806 "repository. It can prune entire branches of history with a single probe, "
9807 "which is how it operates so efficiently."
9808 msgstr ""
9810 #. type: Content of: <book><chapter><sect1><sect2><title>
9811 #: ../en/ch09-undo.xml:788
9812 msgid "Using the <command role=\"hg-cmd\">hg bisect</command> command"
9813 msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>"
9815 #. type: Content of: <book><chapter><sect1><sect2><para>
9816 #: ../en/ch09-undo.xml:791
9817 msgid ""
9818 "Here's an example of <command role=\"hg-cmd\">hg bisect</command> in action."
9819 msgstr ""
9821 #. type: Content of: <book><chapter><sect1><sect2><note><para>
9822 #: ../en/ch09-undo.xml:795
9823 msgid ""
9824 "In versions 0.9.5 and earlier of Mercurial, <command role=\"hg-cmd\">hg "
9825 "bisect</command> was not a core command: it was distributed with Mercurial as "
9826 "an extension. This section describes the built-in command, not the old "
9827 "extension."
9828 msgstr ""
9830 #. type: Content of: <book><chapter><sect1><sect2><para>
9831 #: ../en/ch09-undo.xml:802
9832 msgid ""
9833 "Now let's create a repository, so that we can try out the <command role=\"hg-"
9834 "cmd\">hg bisect</command> command in isolation."
9835 msgstr ""
9837 #. type: Content of: <book><chapter><sect1><sect2><para>
9838 #: ../en/ch09-undo.xml:808
9839 msgid ""
9840 "We'll simulate a project that has a bug in it in a simple-minded way: create "
9841 "trivial changes in a loop, and nominate one specific change that will have "
9842 "the <quote>bug</quote>. This loop creates 35 changesets, each adding a "
9843 "single file to the repository. We'll represent our <quote>bug</quote> with a "
9844 "file that contains the text <quote>i have a gub</quote>."
9845 msgstr ""
9847 #. type: Content of: <book><chapter><sect1><sect2><para>
9848 #: ../en/ch09-undo.xml:818
9849 msgid ""
9850 "The next thing that we'd like to do is figure out how to use the <command "
9851 "role=\"hg-cmd\">hg bisect</command> command. We can use Mercurial's normal "
9852 "built-in help mechanism for this."
9853 msgstr ""
9855 #. type: Content of: <book><chapter><sect1><sect2><para>
9856 #: ../en/ch09-undo.xml:825
9857 msgid ""
9858 "The <command role=\"hg-cmd\">hg bisect</command> command works in steps. "
9859 "Each step proceeds as follows."
9860 msgstr ""
9862 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9863 #: ../en/ch09-undo.xml:828
9864 msgid "You run your binary test."
9865 msgstr ""
9867 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
9868 #: ../en/ch09-undo.xml:830
9869 msgid ""
9870 "If the test succeeded, you tell <command role=\"hg-cmd\">hg bisect</command> "
9871 "by running the <command role=\"hg-cmd\">hg bisect good</command> command."
9872 msgstr ""
9874 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
9875 #: ../en/ch09-undo.xml:835
9876 msgid ""
9877 "If it failed, run the <command role=\"hg-cmd\">hg bisect bad</command> "
9878 "command."
9879 msgstr ""
9881 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9882 #: ../en/ch09-undo.xml:839
9883 msgid ""
9884 "The command uses your information to decide which changeset to test next."
9885 msgstr ""
9887 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9888 #: ../en/ch09-undo.xml:842
9889 msgid ""
9890 "It updates the working directory to that changeset, and the process begins "
9891 "again."
9892 msgstr ""
9894 #. type: Content of: <book><chapter><sect1><sect2><para>
9895 #: ../en/ch09-undo.xml:845
9896 msgid ""
9897 "The process ends when <command role=\"hg-cmd\">hg bisect</command> identifies "
9898 "a unique changeset that marks the point where your test transitioned from "
9899 "<quote>succeeding</quote> to <quote>failing</quote>."
9900 msgstr ""
9902 #
9903 #. type: Content of: <book><chapter><sect1><sect2><para>
9904 #: ../en/ch09-undo.xml:850
9905 msgid ""
9906 "To start the search, we must run the <command role=\"hg-cmd\">hg bisect --"
9907 "reset</command> command."
9908 msgstr ""
9910 #. type: Content of: <book><chapter><sect1><sect2><para>
9911 #: ../en/ch09-undo.xml:855
9912 msgid ""
9913 "In our case, the binary test we use is simple: we check to see if any file in "
9914 "the repository contains the string <quote>i have a gub</quote>. If it does, "
9915 "this changeset contains the change that <quote>caused the bug</quote>. By "
9916 "convention, a changeset that has the property we're searching for is "
9917 "<quote>bad</quote>, while one that doesn't is <quote>good</quote>."
9918 msgstr ""
9920 #. type: Content of: <book><chapter><sect1><sect2><para>
9921 #: ../en/ch09-undo.xml:863
9922 msgid ""
9923 "Most of the time, the revision to which the working directory is synced "
9924 "(usually the tip) already exhibits the problem introduced by the buggy "
9925 "change, so we'll mark it as <quote>bad</quote>."
9926 msgstr ""
9928 #
9929 #. type: Content of: <book><chapter><sect1><sect2><para>
9930 #: ../en/ch09-undo.xml:870
9931 msgid ""
9932 "Our next task is to nominate a changeset that we know <emphasis>doesn't</"
9933 "emphasis> have the bug; the <command role=\"hg-cmd\">hg bisect</command> "
9934 "command will <quote>bracket</quote> its search between the first pair of good "
9935 "and bad changesets. In our case, we know that revision 10 didn't have the "
9936 "bug. (I'll have more words about choosing the first <quote>good</quote> "
9937 "changeset later.)"
9938 msgstr ""
9940 #. type: Content of: <book><chapter><sect1><sect2><para>
9941 #: ../en/ch09-undo.xml:880
9942 msgid "Notice that this command printed some output."
9943 msgstr ""
9945 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
9946 #: ../en/ch09-undo.xml:882
9947 msgid ""
9948 "It told us how many changesets it must consider before it can identify the "
9949 "one that introduced the bug, and how many tests that will require."
9950 msgstr ""
9952 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
9953 #: ../en/ch09-undo.xml:886
9954 msgid ""
9955 "It updated the working directory to the next changeset to test, and told us "
9956 "which changeset it's testing."
9957 msgstr ""
9959 #. type: Content of: <book><chapter><sect1><sect2><para>
9960 #: ../en/ch09-undo.xml:891
9961 msgid ""
9962 "We now run our test in the working directory. We use the <command>grep</"
9963 "command> command to see if our <quote>bad</quote> file is present in the "
9964 "working directory. If it is, this revision is bad; if not, this revision is "
9965 "good. &interaction.bisect.search.step1;"
9966 msgstr ""
9968 #. type: Content of: <book><chapter><sect1><sect2><para>
9969 #: ../en/ch09-undo.xml:897
9970 msgid ""
9971 "This test looks like a perfect candidate for automation, so let's turn it "
9972 "into a shell function."
9973 msgstr ""
9975 #. type: Content of: <book><chapter><sect1><sect2><para>
9976 #: ../en/ch09-undo.xml:901
9977 msgid ""
9978 "We can now run an entire test step with a single command, <literal>mytest</"
9979 "literal>."
9980 msgstr ""
9982 #. type: Content of: <book><chapter><sect1><sect2><para>
9983 #: ../en/ch09-undo.xml:906
9984 msgid "A few more invocations of our canned test step command, and we're done."
9985 msgstr ""
9987 #. type: Content of: <book><chapter><sect1><sect2><para>
9988 #: ../en/ch09-undo.xml:911
9989 msgid ""
9990 "Even though we had 40 changesets to search through, the <command role=\"hg-cmd"
9991 "\">hg bisect</command> command let us find the changeset that introduced our "
9992 "<quote>bug</quote> with only five tests. Because the number of tests that "
9993 "the <command role=\"hg-cmd\">hg bisect</command> command performs grows "
9994 "logarithmically with the number of changesets to search, the advantage that "
9995 "it has over the <quote>brute force</quote> search approach increases with "
9996 "every changeset you add."
9997 msgstr ""
9999 #. type: Content of: <book><chapter><sect1><sect2><title>
10000 #: ../en/ch09-undo.xml:922
10001 msgid "Cleaning up after your search"
10002 msgstr "搜索后的清理"
10004 #
10005 #. type: Content of: <book><chapter><sect1><sect2><para>
10006 #: ../en/ch09-undo.xml:924
10007 msgid ""
10008 "When you're finished using the <command role=\"hg-cmd\">hg bisect</command> "
10009 "command in a repository, you can use the <command role=\"hg-cmd\">hg bisect "
10010 "reset</command> command to drop the information it was using to drive your "
10011 "search. The command doesn't use much space, so it doesn't matter if you "
10012 "forget to run this command. However, <command role=\"hg-cmd\">hg bisect</"
10013 "command> won't let you start a new search in that repository until you do a "
10014 "<command role=\"hg-cmd\">hg bisect reset</command>."
10015 msgstr ""
10017 #. type: Content of: <book><chapter><sect1><title>
10018 #: ../en/ch09-undo.xml:939
10019 msgid "Tips for finding bugs effectively"
10020 msgstr "有效查找问题的技巧"
10022 #. type: Content of: <book><chapter><sect1><sect2><title>
10023 #: ../en/ch09-undo.xml:942
10024 msgid "Give consistent input"
10025 msgstr "给出一致的输入"
10027 #. type: Content of: <book><chapter><sect1><sect2><para>
10028 #: ../en/ch09-undo.xml:944
10029 msgid ""
10030 "The <command role=\"hg-cmd\">hg bisect</command> command requires that you "
10031 "correctly report the result of every test you perform. If you tell it that a "
10032 "test failed when it really succeeded, it <emphasis>might</emphasis> be able "
10033 "to detect the inconsistency. If it can identify an inconsistency in your "
10034 "reports, it will tell you that a particular changeset is both good and bad. "
10035 "However, it can't do this perfectly; it's about as likely to report the wrong "
10036 "changeset as the source of the bug."
10037 msgstr ""
10039 #. type: Content of: <book><chapter><sect1><sect2><title>
10040 #: ../en/ch09-undo.xml:956
10041 msgid "Automate as much as possible"
10042 msgstr "尽量自动"
10044 #. type: Content of: <book><chapter><sect1><sect2><para>
10045 #: ../en/ch09-undo.xml:958
10046 msgid ""
10047 "When I started using the <command role=\"hg-cmd\">hg bisect</command> "
10048 "command, I tried a few times to run my tests by hand, on the command line. "
10049 "This is an approach that I, at least, am not suited to. After a few tries, I "
10050 "found that I was making enough mistakes that I was having to restart my "
10051 "searches several times before finally getting correct results."
10052 msgstr ""
10054 #. type: Content of: <book><chapter><sect1><sect2><para>
10055 #: ../en/ch09-undo.xml:966
10056 msgid ""
10057 "My initial problems with driving the <command role=\"hg-cmd\">hg bisect</"
10058 "command> command by hand occurred even with simple searches on small "
10059 "repositories; if the problem you're looking for is more subtle, or the number "
10060 "of tests that <command role=\"hg-cmd\">hg bisect</command> must perform "
10061 "increases, the likelihood of operator error ruining the search is much "
10062 "higher. Once I started automating my tests, I had much better results."
10063 msgstr ""
10065 #. type: Content of: <book><chapter><sect1><sect2><para>
10066 #: ../en/ch09-undo.xml:975
10067 msgid "The key to automated testing is twofold:"
10068 msgstr ""
10070 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10071 #: ../en/ch09-undo.xml:977
10072 msgid "always test for the same symptom, and"
10073 msgstr ""
10075 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10076 #: ../en/ch09-undo.xml:979
10077 msgid ""
10078 "always feed consistent input to the <command role=\"hg-cmd\">hg bisect</"
10079 "command> command."
10080 msgstr ""
10082 #. type: Content of: <book><chapter><sect1><sect2><para>
10083 #: ../en/ch09-undo.xml:982
10084 msgid ""
10085 "In my tutorial example above, the <command>grep</command> command tests for "
10086 "the symptom, and the <literal>if</literal> statement takes the result of this "
10087 "check and ensures that we always feed the same input to the <command role="
10088 "\"hg-cmd\">hg bisect</command> command. The <literal>mytest</literal> "
10089 "function marries these together in a reproducible way, so that every test is "
10090 "uniform and consistent."
10091 msgstr ""
10093 #. type: Content of: <book><chapter><sect1><sect2><title>
10094 #: ../en/ch09-undo.xml:992
10095 msgid "Check your results"
10096 msgstr "检查你的结果"
10098 #. type: Content of: <book><chapter><sect1><sect2><para>
10099 #: ../en/ch09-undo.xml:994
10100 msgid ""
10101 "Because the output of a <command role=\"hg-cmd\">hg bisect</command> search "
10102 "is only as good as the input you give it, don't take the changeset it reports "
10103 "as the absolute truth. A simple way to cross-check its report is to manually "
10104 "run your test at each of the following changesets:"
10105 msgstr ""
10107 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10108 #: ../en/ch09-undo.xml:1000
10109 msgid ""
10110 "The changeset that it reports as the first bad revision. Your test should "
10111 "still report this as bad."
10112 msgstr ""
10114 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10115 #: ../en/ch09-undo.xml:1004
10116 msgid ""
10117 "The parent of that changeset (either parent, if it's a merge). Your test "
10118 "should report this changeset as good."
10119 msgstr ""
10121 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10122 #: ../en/ch09-undo.xml:1008
10123 msgid ""
10124 "A child of that changeset. Your test should report this changeset as bad."
10125 msgstr ""
10127 #. type: Content of: <book><chapter><sect1><sect2><title>
10128 #: ../en/ch09-undo.xml:1014
10129 msgid "Beware interference between bugs"
10130 msgstr "谨防问题之间的冲突"
10132 #. type: Content of: <book><chapter><sect1><sect2><para>
10133 #: ../en/ch09-undo.xml:1016
10134 msgid ""
10135 "It's possible that your search for one bug could be disrupted by the presence "
10136 "of another. For example, let's say your software crashes at revision 100, "
10137 "and worked correctly at revision 50. Unknown to you, someone else introduced "
10138 "a different crashing bug at revision 60, and fixed it at revision 80. This "
10139 "could distort your results in one of several ways."
10140 msgstr ""
10142 #. type: Content of: <book><chapter><sect1><sect2><para>
10143 #: ../en/ch09-undo.xml:1024
10144 msgid ""
10145 "It is possible that this other bug completely <quote>masks</quote> yours, "
10146 "which is to say that it occurs before your bug has a chance to manifest "
10147 "itself. If you can't avoid that other bug (for example, it prevents your "
10148 "project from building), and so can't tell whether your bug is present in a "
10149 "particular changeset, the <command role=\"hg-cmd\">hg bisect</command> "
10150 "command cannot help you directly. Instead, you can mark a changeset as "
10151 "untested by running <command role=\"hg-cmd\">hg bisect --skip</command>."
10152 msgstr ""
10154 #. type: Content of: <book><chapter><sect1><sect2><para>
10155 #: ../en/ch09-undo.xml:1034
10156 msgid ""
10157 "A different problem could arise if your test for a bug's presence is not "
10158 "specific enough. If you check for <quote>my program crashes</quote>, then "
10159 "both your crashing bug and an unrelated crashing bug that masks it will look "
10160 "like the same thing, and mislead <command role=\"hg-cmd\">hg bisect</command>."
10161 msgstr ""
10163 #. type: Content of: <book><chapter><sect1><sect2><para>
10164 #: ../en/ch09-undo.xml:1041
10165 msgid ""
10166 "Another useful situation in which to use <command role=\"hg-cmd\">hg bisect --"
10167 "skip</command> is if you can't test a revision because your project was in a "
10168 "broken and hence untestable state at that revision, perhaps because someone "
10169 "checked in a change that prevented the project from building."
10170 msgstr ""
10172 #. type: Content of: <book><chapter><sect1><sect2><title>
10173 #: ../en/ch09-undo.xml:1050
10174 msgid "Bracket your search lazily"
10175 msgstr "减少你的查找工作"
10177 #. type: Content of: <book><chapter><sect1><sect2><para>
10178 #: ../en/ch09-undo.xml:1052
10179 msgid ""
10180 "Choosing the first <quote>good</quote> and <quote>bad</quote> changesets that "
10181 "will mark the end points of your search is often easy, but it bears a little "
10182 "discussion nevertheless. From the perspective of <command role=\"hg-cmd\">hg "
10183 "bisect</command>, the <quote>newest</quote> changeset is conventionally "
10184 "<quote>bad</quote>, and the older changeset is <quote>good</quote>."
10185 msgstr ""
10187 #. type: Content of: <book><chapter><sect1><sect2><para>
10188 #: ../en/ch09-undo.xml:1060
10189 msgid ""
10190 "If you're having trouble remembering when a suitable <quote>good</quote> "
10191 "change was, so that you can tell <command role=\"hg-cmd\">hg bisect</"
10192 "command>, you could do worse than testing changesets at random. Just "
10193 "remember to eliminate contenders that can't possibly exhibit the bug (perhaps "
10194 "because the feature with the bug isn't present yet) and those where another "
10195 "problem masks the bug (as I discussed above)."
10196 msgstr ""
10198 #. type: Content of: <book><chapter><sect1><sect2><para>
10199 #: ../en/ch09-undo.xml:1069
10200 msgid ""
10201 "Even if you end up <quote>early</quote> by thousands of changesets or months "
10202 "of history, you will only add a handful of tests to the total number that "
10203 "<command role=\"hg-cmd\">hg bisect</command> must perform, thanks to its "
10204 "logarithmic behaviour."
10205 msgstr ""
10207 #. type: Content of: <book><chapter><title>
10208 #: ../en/ch10-hook.xml:5
10209 msgid "Handling repository events with hooks"
10210 msgstr "使用钩子处理版本库事件"
10212 #. type: Content of: <book><chapter><para>
10213 #: ../en/ch10-hook.xml:7
10214 msgid ""
10215 "Mercurial offers a powerful mechanism to let you perform automated actions in "
10216 "response to events that occur in a repository. In some cases, you can even "
10217 "control Mercurial's response to those events."
10218 msgstr ""
10220 #. type: Content of: <book><chapter><para>
10221 #: ../en/ch10-hook.xml:12
10222 msgid ""
10223 "The name Mercurial uses for one of these actions is a <emphasis>hook</"
10224 "emphasis>. Hooks are called <quote>triggers</quote> in some revision control "
10225 "systems, but the two names refer to the same idea."
10226 msgstr ""
10228 #. type: Content of: <book><chapter><sect1><title>
10229 #: ../en/ch10-hook.xml:18
10230 msgid "An overview of hooks in Mercurial"
10231 msgstr "Mercurial 钩子概述"
10233 #. type: Content of: <book><chapter><sect1><para>
10234 #: ../en/ch10-hook.xml:20
10235 msgid ""
10236 "Here is a brief list of the hooks that Mercurial supports. We will revisit "
10237 "each of these hooks in more detail later, in section <xref linkend=\"sec.hook."
10238 "ref\"/>."
10239 msgstr ""
10241 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10242 #: ../en/ch10-hook.xml:25
10243 msgid ""
10244 "<literal role=\"hook\">changegroup</literal>: This is run after a group of "
10245 "changesets has been brought into the repository from elsewhere."
10246 msgstr ""
10248 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10249 #: ../en/ch10-hook.xml:29
10250 msgid ""
10251 "<literal role=\"hook\">commit</literal>: This is run after a new changeset "
10252 "has been created in the local repository."
10253 msgstr ""
10255 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10256 #: ../en/ch10-hook.xml:33
10257 msgid ""
10258 "<literal role=\"hook\">incoming</literal>: This is run once for each new "
10259 "changeset that is brought into the repository from elsewhere. Notice the "
10260 "difference from <literal role=\"hook\">changegroup</literal>, which is run "
10261 "once per <emphasis>group</emphasis> of changesets brought in."
10262 msgstr ""
10264 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10265 #: ../en/ch10-hook.xml:40
10266 msgid ""
10267 "<literal role=\"hook\">outgoing</literal>: This is run after a group of "
10268 "changesets has been transmitted from this repository."
10269 msgstr ""
10271 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10272 #: ../en/ch10-hook.xml:44
10273 msgid ""
10274 "<literal role=\"hook\">prechangegroup</literal>: This is run before starting "
10275 "to bring a group of changesets into the repository."
10276 msgstr ""
10278 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10279 #: ../en/ch10-hook.xml:49
10280 msgid ""
10281 "<literal role=\"hook\">precommit</literal>: Controlling. This is run before "
10282 "starting a commit."
10283 msgstr ""
10285 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10286 #: ../en/ch10-hook.xml:53
10287 msgid ""
10288 "<literal role=\"hook\">preoutgoing</literal>: Controlling. This is run before "
10289 "starting to transmit a group of changesets from this repository."
10290 msgstr ""
10292 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10293 #: ../en/ch10-hook.xml:58
10294 msgid ""
10295 "<literal role=\"hook\">pretag</literal>: Controlling. This is run before "
10296 "creating a tag."
10297 msgstr ""
10299 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10300 #: ../en/ch10-hook.xml:62
10301 msgid ""
10302 "<literal role=\"hook\">pretxnchangegroup</literal>: Controlling. This is run "
10303 "after a group of changesets has been brought into the local repository from "
10304 "another, but before the transaction completes that will make the changes "
10305 "permanent in the repository."
10306 msgstr ""
10308 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10309 #: ../en/ch10-hook.xml:70
10310 msgid ""
10311 "<literal role=\"hook\">pretxncommit</literal>: Controlling. This is run after "
10312 "a new changeset has been created in the local repository, but before the "
10313 "transaction completes that will make it permanent."
10314 msgstr ""
10316 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10317 #: ../en/ch10-hook.xml:76
10318 msgid ""
10319 "<literal role=\"hook\">preupdate</literal>: Controlling. This is run before "
10320 "starting an update or merge of the working directory."
10321 msgstr ""
10323 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10324 #: ../en/ch10-hook.xml:81
10325 msgid ""
10326 "<literal role=\"hook\">tag</literal>: This is run after a tag is created."
10327 msgstr ""
10329 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10330 #: ../en/ch10-hook.xml:85
10331 msgid ""
10332 "<literal role=\"hook\">update</literal>: This is run after an update or merge "
10333 "of the working directory has finished."
10334 msgstr ""
10336 #. type: Content of: <book><chapter><sect1><para>
10337 #: ../en/ch10-hook.xml:90
10338 msgid ""
10339 "Each of the hooks whose description begins with the word <quote>Controlling</"
10340 "quote> has the ability to determine whether an activity can proceed. If the "
10341 "hook succeeds, the activity may proceed; if it fails, the activity is either "
10342 "not permitted or undone, depending on the hook."
10343 msgstr ""
10345 #. type: Content of: <book><chapter><sect1><title>
10346 #: ../en/ch10-hook.xml:99
10347 msgid "Hooks and security"
10348 msgstr "钩子与安全性"
10350 #. type: Content of: <book><chapter><sect1><sect2><title>
10351 #: ../en/ch10-hook.xml:102
10352 msgid "Hooks are run with your privileges"
10353 msgstr "钩子以你的特权执行"
10355 #. type: Content of: <book><chapter><sect1><sect2><para>
10356 #: ../en/ch10-hook.xml:104
10357 msgid ""
10358 "When you run a Mercurial command in a repository, and the command causes a "
10359 "hook to run, that hook runs on <emphasis>your</emphasis> system, under "
10360 "<emphasis>your</emphasis> user account, with <emphasis>your</emphasis> "
10361 "privilege level. Since hooks are arbitrary pieces of executable code, you "
10362 "should treat them with an appropriate level of suspicion. Do not install a "
10363 "hook unless you are confident that you know who created it and what it does."
10364 msgstr ""
10366 #. type: Content of: <book><chapter><sect1><sect2><para>
10367 #: ../en/ch10-hook.xml:115
10368 msgid ""
10369 "In some cases, you may be exposed to hooks that you did not install "
10370 "yourself. If you work with Mercurial on an unfamiliar system, Mercurial will "
10371 "run hooks defined in that system's global <filename role=\"special\"> /.hgrc</"
10372 "filename>\\ file."
10373 msgstr ""
10375 #. type: Content of: <book><chapter><sect1><sect2><para>
10376 #: ../en/ch10-hook.xml:122
10377 msgid ""
10378 "If you are working with a repository owned by another user, Mercurial can run "
10379 "hooks defined in that user's repository, but it will still run them as "
10380 "<quote>you</quote>. For example, if you <command role=\"hg-cmd\">hg pull</"
10381 "command> from that repository, and its <filename role=\"special\">.hg/hgrc</"
10382 "filename> defines a local <literal role=\"hook\">outgoing</literal> hook, "
10383 "that hook will run under your user account, even though you don't own that "
10384 "repository."
10385 msgstr ""
10387 #. type: Content of: <book><chapter><sect1><sect2><note><para>
10388 #: ../en/ch10-hook.xml:134
10389 msgid ""
10390 "This only applies if you are pulling from a repository on a local or network "
10391 "filesystem. If you're pulling over http or ssh, any <literal role=\"hook"
10392 "\">outgoing</literal> hook will run under whatever account is executing the "
10393 "server process, on the server."
10394 msgstr ""
10396 #. type: Content of: <book><chapter><sect1><sect2><para>
10397 #: ../en/ch10-hook.xml:142
10398 msgid ""
10399 "XXX To see what hooks are defined in a repository, use the <command role=\"hg-"
10400 "cmd\">hg config hooks</command> command. If you are working in one "
10401 "repository, but talking to another that you do not own (e.g. using <command "
10402 "role=\"hg-cmd\">hg pull</command> or <command role=\"hg-cmd\">hg incoming</"
10403 "command>), remember that it is the other repository's hooks you should be "
10404 "checking, not your own."
10405 msgstr ""
10407 #. type: Content of: <book><chapter><sect1><sect2><title>
10408 #: ../en/ch10-hook.xml:153
10409 msgid "Hooks do not propagate"
10410 msgstr "钩子不会传播"
10412 #. type: Content of: <book><chapter><sect1><sect2><para>
10413 #: ../en/ch10-hook.xml:155
10414 msgid ""
10415 "In Mercurial, hooks are not revision controlled, and do not propagate when "
10416 "you clone, or pull from, a repository. The reason for this is simple: a hook "
10417 "is a completely arbitrary piece of executable code. It runs under your user "
10418 "identity, with your privilege level, on your machine."
10419 msgstr ""
10421 #. type: Content of: <book><chapter><sect1><sect2><para>
10422 #: ../en/ch10-hook.xml:162
10423 msgid ""
10424 "It would be extremely reckless for any distributed revision control system to "
10425 "implement revision-controlled hooks, as this would offer an easily "
10426 "exploitable way to subvert the accounts of users of the revision control "
10427 "system."
10428 msgstr ""
10430 #. type: Content of: <book><chapter><sect1><sect2><para>
10431 #: ../en/ch10-hook.xml:168
10432 msgid ""
10433 "Since Mercurial does not propagate hooks, if you are collaborating with other "
10434 "people on a common project, you should not assume that they are using the "
10435 "same Mercurial hooks as you are, or that theirs are correctly configured. "
10436 "You should document the hooks you expect people to use."
10437 msgstr ""
10439 #. type: Content of: <book><chapter><sect1><sect2><para>
10440 #: ../en/ch10-hook.xml:175
10441 msgid ""
10442 "In a corporate intranet, this is somewhat easier to control, as you can for "
10443 "example provide a <quote>standard</quote> installation of Mercurial on an NFS "
10444 "filesystem, and use a site-wide <filename role=\"special\"> /.hgrc</filename>"
10445 "\\ file to define hooks that all users will see. However, this too has its "
10446 "limits; see below."
10447 msgstr ""
10449 #. type: Content of: <book><chapter><sect1><sect2><title>
10450 #: ../en/ch10-hook.xml:185
10451 msgid "Hooks can be overridden"
10452 msgstr "钩子可以被覆盖"
10454 #. type: Content of: <book><chapter><sect1><sect2><para>
10455 #: ../en/ch10-hook.xml:187
10456 msgid ""
10457 "Mercurial allows you to override a hook definition by redefining the hook. "
10458 "You can disable it by setting its value to the empty string, or change its "
10459 "behaviour as you wish."
10460 msgstr ""
10462 #. type: Content of: <book><chapter><sect1><sect2><para>
10463 #: ../en/ch10-hook.xml:192
10464 msgid ""
10465 "If you deploy a system- or site-wide <filename role=\"special\"> /.hgrc</"
10466 "filename>\\ file that defines some hooks, you should thus understand that "
10467 "your users can disable or override those hooks."
10468 msgstr ""
10470 #. type: Content of: <book><chapter><sect1><sect2><title>
10471 #: ../en/ch10-hook.xml:200
10472 msgid "Ensuring that critical hooks are run"
10473 msgstr "确保关键钩子的执行"
10475 #. type: Content of: <book><chapter><sect1><sect2><para>
10476 #: ../en/ch10-hook.xml:202
10477 msgid ""
10478 "Sometimes you may want to enforce a policy that you do not want others to be "
10479 "able to work around. For example, you may have a requirement that every "
10480 "changeset must pass a rigorous set of tests. Defining this requirement via a "
10481 "hook in a site-wide <filename role=\"special\"> /.hgrc</filename>\\ won't "
10482 "work for remote users on laptops, and of course local users can subvert it at "
10483 "will by overriding the hook."
10484 msgstr ""
10486 #. type: Content of: <book><chapter><sect1><sect2><para>
10487 #: ../en/ch10-hook.xml:211
10488 msgid ""
10489 "Instead, you can set up your policies for use of Mercurial so that people are "
10490 "expected to propagate changes through a well-known <quote>canonical</quote> "
10491 "server that you have locked down and configured appropriately."
10492 msgstr ""
10494 #. type: Content of: <book><chapter><sect1><sect2><para>
10495 #: ../en/ch10-hook.xml:217
10496 msgid ""
10497 "One way to do this is via a combination of social engineering and "
10498 "technology. Set up a restricted-access account; users can push changes over "
10499 "the network to repositories managed by this account, but they cannot log into "
10500 "the account and run normal shell commands. In this scenario, a user can "
10501 "commit a changeset that contains any old garbage they want."
10502 msgstr ""
10504 #. type: Content of: <book><chapter><sect1><sect2><para>
10505 #: ../en/ch10-hook.xml:226
10506 msgid ""
10507 "When someone pushes a changeset to the server that everyone pulls from, the "
10508 "server will test the changeset before it accepts it as permanent, and reject "
10509 "it if it fails to pass the test suite. If people only pull changes from this "
10510 "filtering server, it will serve to ensure that all changes that people pull "
10511 "have been automatically vetted."
10512 msgstr ""
10514 #. type: Content of: <book><chapter><sect1><title>
10515 #: ../en/ch10-hook.xml:237
10516 msgid "Care with <literal>pretxn</literal> hooks in a shared-access repository"
10517 msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子"
10519 #. type: Content of: <book><chapter><sect1><para>
10520 #: ../en/ch10-hook.xml:240
10521 msgid ""
10522 "If you want to use hooks to do some automated work in a repository that a "
10523 "number of people have shared access to, you need to be careful in how you do "
10524 "this."
10525 msgstr ""
10527 #. type: Content of: <book><chapter><sect1><para>
10528 #: ../en/ch10-hook.xml:245
10529 msgid ""
10530 "Mercurial only locks a repository when it is writing to the repository, and "
10531 "only the parts of Mercurial that write to the repository pay attention to "
10532 "locks. Write locks are necessary to prevent multiple simultaneous writers "
10533 "from scribbling on each other's work, corrupting the repository."
10534 msgstr ""
10536 #. type: Content of: <book><chapter><sect1><para>
10537 #: ../en/ch10-hook.xml:252
10538 msgid ""
10539 "Because Mercurial is careful with the order in which it reads and writes "
10540 "data, it does not need to acquire a lock when it wants to read data from the "
10541 "repository. The parts of Mercurial that read from the repository never pay "
10542 "attention to locks. This lockless reading scheme greatly increases "
10543 "performance and concurrency."
10544 msgstr ""
10546 #. type: Content of: <book><chapter><sect1><para>
10547 #: ../en/ch10-hook.xml:260
10548 msgid ""
10549 "With great performance comes a trade-off, though, one which has the potential "
10550 "to cause you trouble unless you're aware of it. To describe this requires a "
10551 "little detail about how Mercurial adds changesets to a repository and reads "
10552 "those changes."
10553 msgstr ""
10555 #. type: Content of: <book><chapter><sect1><para>
10556 #: ../en/ch10-hook.xml:267
10557 msgid ""
10558 "When Mercurial <emphasis>writes</emphasis> metadata, it writes it straight "
10559 "into the destination file. It writes file data first, then manifest data "
10560 "(which contains pointers to the new file data), then changelog data (which "
10561 "contains pointers to the new manifest data). Before the first write to each "
10562 "file, it stores a record of where the end of the file was in its transaction "
10563 "log. If the transaction must be rolled back, Mercurial simply truncates each "
10564 "file back to the size it was before the transaction began."
10565 msgstr ""
10567 #. type: Content of: <book><chapter><sect1><para>
10568 #: ../en/ch10-hook.xml:278
10569 msgid ""
10570 "When Mercurial <emphasis>reads</emphasis> metadata, it reads the changelog "
10571 "first, then everything else. Since a reader will only access parts of the "
10572 "manifest or file metadata that it can see in the changelog, it can never see "
10573 "partially written data."
10574 msgstr ""
10576 #. type: Content of: <book><chapter><sect1><para>
10577 #: ../en/ch10-hook.xml:284
10578 msgid ""
10579 "Some controlling hooks (<literal role=\"hook\">pretxncommit</literal> and "
10580 "<literal role=\"hook\">pretxnchangegroup</literal>) run when a transaction is "
10581 "almost complete. All of the metadata has been written, but Mercurial can "
10582 "still roll the transaction back and cause the newly-written data to disappear."
10583 msgstr ""
10585 #. type: Content of: <book><chapter><sect1><para>
10586 #: ../en/ch10-hook.xml:292
10587 msgid ""
10588 "If one of these hooks runs for long, it opens a window of time during which a "
10589 "reader can see the metadata for changesets that are not yet permanent, and "
10590 "should not be thought of as <quote>really there</quote>. The longer the hook "
10591 "runs, the longer that window is open."
10592 msgstr ""
10594 #. type: Content of: <book><chapter><sect1><sect2><title>
10595 #: ../en/ch10-hook.xml:300
10596 msgid "The problem illustrated"
10597 msgstr "问题的演示"
10599 #. type: Content of: <book><chapter><sect1><sect2><para>
10600 #: ../en/ch10-hook.xml:302
10601 msgid ""
10602 "In principle, a good use for the <literal role=\"hook\">pretxnchangegroup</"
10603 "literal> hook would be to automatically build and test incoming changes "
10604 "before they are accepted into a central repository. This could let you "
10605 "guarantee that nobody can push changes to this repository that <quote>break "
10606 "the build</quote>. But if a client can pull changes while they're being "
10607 "tested, the usefulness of the test is zero; an unsuspecting someone can pull "
10608 "untested changes, potentially breaking their build."
10609 msgstr ""
10611 #. type: Content of: <book><chapter><sect1><sect2><para>
10612 #: ../en/ch10-hook.xml:313
10613 msgid ""
10614 "The safest technological answer to this challenge is to set up such a "
10615 "<quote>gatekeeper</quote> repository as <emphasis>unidirectional</emphasis>. "
10616 "Let it take changes pushed in from the outside, but do not allow anyone to "
10617 "pull changes from it (use the <literal role=\"hook\">preoutgoing</literal> "
10618 "hook to lock it down). Configure a <literal role=\"hook\">changegroup</"
10619 "literal> hook so that if a build or test succeeds, the hook will push the new "
10620 "changes out to another repository that people <emphasis>can</emphasis> pull "
10621 "from."
10622 msgstr ""
10624 #. type: Content of: <book><chapter><sect1><sect2><para>
10625 #: ../en/ch10-hook.xml:325
10626 msgid ""
10627 "In practice, putting a centralised bottleneck like this in place is not often "
10628 "a good idea, and transaction visibility has nothing to do with the problem. "
10629 "As the size of a project&emdash;and the time it takes to build and "
10630 "test&emdash;grows, you rapidly run into a wall with this <quote>try before "
10631 "you buy</quote> approach, where you have more changesets to test than time in "
10632 "which to deal with them. The inevitable result is frustration on the part of "
10633 "all involved."
10634 msgstr ""
10636 #. type: Content of: <book><chapter><sect1><sect2><para>
10637 #: ../en/ch10-hook.xml:336
10638 msgid ""
10639 "An approach that scales better is to get people to build and test before they "
10640 "push, then run automated builds and tests centrally <emphasis>after</"
10641 "emphasis> a push, to be sure all is well. The advantage of this approach is "
10642 "that it does not impose a limit on the rate at which the repository can "
10643 "accept changes."
10644 msgstr ""
10646 #. type: Content of: <book><chapter><sect1><title>
10647 #: ../en/ch10-hook.xml:347
10648 msgid "A short tutorial on using hooks"
10649 msgstr "使用钩子的简短指南"
10651 #. type: Content of: <book><chapter><sect1><para>
10652 #: ../en/ch10-hook.xml:349
10653 msgid ""
10654 "It is easy to write a Mercurial hook. Let's start with a hook that runs when "
10655 "you finish a <command role=\"hg-cmd\">hg commit</command>, and simply prints "
10656 "the hash of the changeset you just created. The hook is called <literal role="
10657 "\"hook\">commit</literal>."
10658 msgstr ""
10660 #. type: Content of: <book><chapter><sect1><para>
10661 #: ../en/ch10-hook.xml:356
10662 msgid "All hooks follow the pattern in this example."
10663 msgstr ""
10665 #. type: Content of: <book><chapter><sect1><para>
10666 #: ../en/ch10-hook.xml:360
10667 msgid ""
10668 "You add an entry to the <literal role=\"rc-hooks\">hooks</literal> section of "
10669 "your <filename role=\"special\"> /.hgrc</filename>. On the left is the name "
10670 "of the event to trigger on; on the right is the action to take. As you can "
10671 "see, you can run an arbitrary shell command in a hook. Mercurial passes "
10672 "extra information to the hook using environment variables (look for "
10673 "<envar>HG_NODE</envar> in the example)."
10674 msgstr ""
10676 #. type: Content of: <book><chapter><sect1><sect2><title>
10677 #: ../en/ch10-hook.xml:370
10678 msgid "Performing multiple actions per event"
10679 msgstr "每个事件执行多个操作"
10681 #. type: Content of: <book><chapter><sect1><sect2><para>
10682 #: ../en/ch10-hook.xml:372
10683 msgid ""
10684 "Quite often, you will want to define more than one hook for a particular kind "
10685 "of event, as shown below."
10686 msgstr ""
10688 #. type: Content of: <book><chapter><sect1><sect2><para>
10689 #: ../en/ch10-hook.xml:377
10690 msgid ""
10691 "Mercurial lets you do this by adding an <emphasis>extension</emphasis> to the "
10692 "end of a hook's name. You extend a hook's name by giving the name of the "
10693 "hook, followed by a full stop (the <quote><literal>.</literal></quote> "
10694 "character), followed by some more text of your choosing. For example, "
10695 "Mercurial will run both <literal>commit.foo</literal> and <literal>commit."
10696 "bar</literal> when the <literal>commit</literal> event occurs."
10697 msgstr ""
10699 #. type: Content of: <book><chapter><sect1><sect2><para>
10700 #: ../en/ch10-hook.xml:388
10701 msgid ""
10702 "To give a well-defined order of execution when there are multiple hooks "
10703 "defined for an event, Mercurial sorts hooks by extension, and executes the "
10704 "hook commands in this sorted order. In the above example, it will execute "
10705 "<literal>commit.bar</literal> before <literal>commit.foo</literal>, and "
10706 "<literal>commit</literal> before both."
10707 msgstr ""
10709 #. type: Content of: <book><chapter><sect1><sect2><para>
10710 #: ../en/ch10-hook.xml:397
10711 msgid ""
10712 "It is a good idea to use a somewhat descriptive extension when you define a "
10713 "new hook. This will help you to remember what the hook was for. If the hook "
10714 "fails, you'll get an error message that contains the hook name and extension, "
10715 "so using a descriptive extension could give you an immediate hint as to why "
10716 "the hook failed (see section <xref linkend=\"sec.hook.perm\"/> for an "
10717 "example)."
10718 msgstr ""
10720 #. type: Content of: <book><chapter><sect1><sect2><title>
10721 #: ../en/ch10-hook.xml:408
10722 msgid "Controlling whether an activity can proceed"
10723 msgstr "控制处理的活动"
10725 #. type: Content of: <book><chapter><sect1><sect2><para>
10726 #: ../en/ch10-hook.xml:410
10727 msgid ""
10728 "In our earlier examples, we used the <literal role=\"hook\">commit</literal> "
10729 "hook, which is run after a commit has completed. This is one of several "
10730 "Mercurial hooks that run after an activity finishes. Such hooks have no way "
10731 "of influencing the activity itself."
10732 msgstr ""
10734 #. type: Content of: <book><chapter><sect1><sect2><para>
10735 #: ../en/ch10-hook.xml:417
10736 msgid ""
10737 "Mercurial defines a number of events that occur before an activity starts; or "
10738 "after it starts, but before it finishes. Hooks that trigger on these events "
10739 "have the added ability to choose whether the activity can continue, or will "
10740 "abort."
10741 msgstr ""
10743 #. type: Content of: <book><chapter><sect1><sect2><para>
10744 #: ../en/ch10-hook.xml:423
10745 msgid ""
10746 "The <literal role=\"hook\">pretxncommit</literal> hook runs after a commit "
10747 "has all but completed. In other words, the metadata representing the "
10748 "changeset has been written out to disk, but the transaction has not yet been "
10749 "allowed to complete. The <literal role=\"hook\">pretxncommit</literal> hook "
10750 "has the ability to decide whether the transaction can complete, or must be "
10751 "rolled back."
10752 msgstr ""
10754 #. type: Content of: <book><chapter><sect1><sect2><para>
10755 #: ../en/ch10-hook.xml:432
10756 msgid ""
10757 "If the <literal role=\"hook\">pretxncommit</literal> hook exits with a status "
10758 "code of zero, the transaction is allowed to complete; the commit finishes; "
10759 "and the <literal role=\"hook\">commit</literal> hook is run. If the <literal "
10760 "role=\"hook\">pretxncommit</literal> hook exits with a non-zero status code, "
10761 "the transaction is rolled back; the metadata representing the changeset is "
10762 "erased; and the <literal role=\"hook\">commit</literal> hook is not run."
10763 msgstr ""
10765 #. type: Content of: <book><chapter><sect1><sect2><para>
10766 #: ../en/ch10-hook.xml:444
10767 msgid ""
10768 "The hook in the example above checks that a commit comment contains a bug "
10769 "ID. If it does, the commit can complete. If not, the commit is rolled back."
10770 msgstr ""
10772 #. type: Content of: <book><chapter><sect1><title>
10773 #: ../en/ch10-hook.xml:452
10774 msgid "Writing your own hooks"
10775 msgstr "编写钩子"
10777 #. type: Content of: <book><chapter><sect1><para>
10778 #: ../en/ch10-hook.xml:454
10779 msgid ""
10780 "When you are writing a hook, you might find it useful to run Mercurial either "
10781 "with the <option role=\"hg-opt-global\">-v</option> option, or the <envar "
10782 "role=\"rc-item-ui\">verbose</envar> config item set to <quote>true</quote>. "
10783 "When you do so, Mercurial will print a message before it calls each hook."
10784 msgstr ""
10786 #. type: Content of: <book><chapter><sect1><sect2><title>
10787 #: ../en/ch10-hook.xml:463
10788 msgid "Choosing how your hook should run"
10789 msgstr "选择钩子的执行方式"
10791 #. type: Content of: <book><chapter><sect1><sect2><para>
10792 #: ../en/ch10-hook.xml:465
10793 msgid ""
10794 "You can write a hook either as a normal program&emdash;typically a shell "
10795 "script&emdash;or as a Python function that is executed within the Mercurial "
10796 "process."
10797 msgstr ""
10799 #. type: Content of: <book><chapter><sect1><sect2><para>
10800 #: ../en/ch10-hook.xml:470
10801 msgid ""
10802 "Writing a hook as an external program has the advantage that it requires no "
10803 "knowledge of Mercurial's internals. You can call normal Mercurial commands "
10804 "to get any added information you need. The trade-off is that external hooks "
10805 "are slower than in-process hooks."
10806 msgstr ""
10808 #. type: Content of: <book><chapter><sect1><sect2><para>
10809 #: ../en/ch10-hook.xml:477
10810 msgid ""
10811 "An in-process Python hook has complete access to the Mercurial API, and does "
10812 "not <quote>shell out</quote> to another process, so it is inherently faster "
10813 "than an external hook. It is also easier to obtain much of the information "
10814 "that a hook requires by using the Mercurial API than by running Mercurial "
10815 "commands."
10816 msgstr ""
10818 #. type: Content of: <book><chapter><sect1><sect2><para>
10819 #: ../en/ch10-hook.xml:485
10820 msgid ""
10821 "If you are comfortable with Python, or require high performance, writing your "
10822 "hooks in Python may be a good choice. However, when you have a "
10823 "straightforward hook to write and you don't need to care about performance "
10824 "(probably the majority of hooks), a shell script is perfectly fine."
10825 msgstr ""
10827 #. type: Content of: <book><chapter><sect1><sect2><title>
10828 #: ../en/ch10-hook.xml:494
10829 msgid "Hook parameters"
10830 msgstr "钩子的参数"
10832 #. type: Content of: <book><chapter><sect1><sect2><para>
10833 #: ../en/ch10-hook.xml:496
10834 msgid ""
10835 "Mercurial calls each hook with a set of well-defined parameters. In Python, "
10836 "a parameter is passed as a keyword argument to your hook function. For an "
10837 "external program, a parameter is passed as an environment variable."
10838 msgstr ""
10840 #. type: Content of: <book><chapter><sect1><sect2><para>
10841 #: ../en/ch10-hook.xml:502
10842 msgid ""
10843 "Whether your hook is written in Python or as a shell script, the hook-"
10844 "specific parameter names and values will be the same. A boolean parameter "
10845 "will be represented as a boolean value in Python, but as the number 1 (for "
10846 "<quote>true</quote>) or 0 (for <quote>false</quote>) as an environment "
10847 "variable for an external hook. If a hook parameter is named <literal>foo</"
10848 "literal>, the keyword argument for a Python hook will also be named "
10849 "<literal>foo</literal>, while the environment variable for an external hook "
10850 "will be named <literal>HG_FOO</literal>."
10851 msgstr ""
10853 #. type: Content of: <book><chapter><sect1><sect2><title>
10854 #: ../en/ch10-hook.xml:516
10855 msgid "Hook return values and activity control"
10856 msgstr "钩子的返回值与活动控制"
10858 #. type: Content of: <book><chapter><sect1><sect2><para>
10859 #: ../en/ch10-hook.xml:518
10860 msgid ""
10861 "A hook that executes successfully must exit with a status of zero if "
10862 "external, or return boolean <quote>false</quote> if in-process. Failure is "
10863 "indicated with a non-zero exit status from an external hook, or an in-process "
10864 "hook returning boolean <quote>true</quote>. If an in-process hook raises an "
10865 "exception, the hook is considered to have failed."
10866 msgstr ""
10868 #. type: Content of: <book><chapter><sect1><sect2><para>
10869 #: ../en/ch10-hook.xml:526
10870 msgid ""
10871 "For a hook that controls whether an activity can proceed, zero/false means "
10872 "<quote>allow</quote>, while non-zero/true/exception means <quote>deny</quote>."
10873 msgstr ""
10875 #. type: Content of: <book><chapter><sect1><sect2><title>
10876 #: ../en/ch10-hook.xml:533
10877 msgid "Writing an external hook"
10878 msgstr "编写外部钩子"
10880 #. type: Content of: <book><chapter><sect1><sect2><para>
10881 #: ../en/ch10-hook.xml:535
10882 msgid ""
10883 "When you define an external hook in your <filename role=\"special\"> /.hgrc</"
10884 "filename>\\ and the hook is run, its value is passed to your shell, which "
10885 "interprets it. This means that you can use normal shell constructs in the "
10886 "body of the hook."
10887 msgstr ""
10889 #. type: Content of: <book><chapter><sect1><sect2><para>
10890 #: ../en/ch10-hook.xml:542
10891 msgid ""
10892 "An executable hook is always run with its current directory set to a "
10893 "repository's root directory."
10894 msgstr ""
10896 #. type: Content of: <book><chapter><sect1><sect2><para>
10897 #: ../en/ch10-hook.xml:546
10898 msgid ""
10899 "Each hook parameter is passed in as an environment variable; the name is "
10900 "upper-cased, and prefixed with the string <quote><literal>HG_</literal></"
10901 "quote>."
10902 msgstr ""
10904 #. type: Content of: <book><chapter><sect1><sect2><para>
10905 #: ../en/ch10-hook.xml:551
10906 msgid ""
10907 "With the exception of hook parameters, Mercurial does not set or modify any "
10908 "environment variables when running a hook. This is useful to remember if you "
10909 "are writing a site-wide hook that may be run by a number of different users "
10910 "with differing environment variables set. In multi-user situations, you "
10911 "should not rely on environment variables being set to the values you have in "
10912 "your environment when testing the hook."
10913 msgstr ""
10915 #. type: Content of: <book><chapter><sect1><sect2><title>
10916 #: ../en/ch10-hook.xml:562
10917 msgid "Telling Mercurial to use an in-process hook"
10918 msgstr "让 Mercurial 使用进程内钩子"
10920 #. type: Content of: <book><chapter><sect1><sect2><para>
10921 #: ../en/ch10-hook.xml:564
10922 msgid ""
10923 "The <filename role=\"special\"> /.hgrc</filename>\\ syntax for defining an in-"
10924 "process hook is slightly different than for an executable hook. The value of "
10925 "the hook must start with the text <quote><literal>python:</literal></quote>, "
10926 "and continue with the fully-qualified name of a callable object to use as the "
10927 "hook's value."
10928 msgstr ""
10930 #. type: Content of: <book><chapter><sect1><sect2><para>
10931 #: ../en/ch10-hook.xml:572
10932 msgid ""
10933 "The module in which a hook lives is automatically imported when a hook is "
10934 "run. So long as you have the module name and <envar>PYTHONPATH</envar> "
10935 "right, it should <quote>just work</quote>."
10936 msgstr ""
10938 #. type: Content of: <book><chapter><sect1><sect2><para>
10939 #: ../en/ch10-hook.xml:578
10940 msgid ""
10941 "The following <filename role=\"special\"> /.hgrc</filename>\\ example snippet "
10942 "illustrates the syntax and meaning of the notions we just described."
10943 msgstr ""
10945 #. type: Content of: <book><chapter><sect1><sect2><para>
10946 #: ../en/ch10-hook.xml:584
10947 msgid ""
10948 "When Mercurial runs the <literal>commit.example</literal> hook, it imports "
10949 "<literal>mymodule.submodule</literal>, looks for the callable object named "
10950 "<literal>myhook</literal>, and calls it."
10951 msgstr ""
10953 #. type: Content of: <book><chapter><sect1><sect2><title>
10954 #: ../en/ch10-hook.xml:592
10955 msgid "Writing an in-process hook"
10956 msgstr "编写进程内钩子"
10958 #. type: Content of: <book><chapter><sect1><sect2><para>
10959 #: ../en/ch10-hook.xml:594
10960 msgid ""
10961 "The simplest in-process hook does nothing, but illustrates the basic shape of "
10962 "the hook API:"
10963 msgstr ""
10965 #. type: Content of: <book><chapter><sect1><sect2><para>
10966 #: ../en/ch10-hook.xml:599
10967 msgid ""
10968 "The first argument to a Python hook is always a <literal role=\"py-mod-"
10969 "mercurial.ui\">ui</literal> object. The second is a repository object; at "
10970 "the moment, it is always an instance of <literal role=\"py-mod-mercurial."
10971 "localrepo\">localrepository</literal>. Following these two arguments are "
10972 "other keyword arguments. Which ones are passed in depends on the hook being "
10973 "called, but a hook can ignore arguments it doesn't care about by dropping "
10974 "them into a keyword argument dict, as with <literal>**kwargs</literal> above."
10975 msgstr ""
10977 #. type: Content of: <book><chapter><sect1><title>
10978 #: ../en/ch10-hook.xml:614
10979 msgid "Some hook examples"
10980 msgstr "钩子样例"
10982 #. type: Content of: <book><chapter><sect1><sect2><title>
10983 #: ../en/ch10-hook.xml:617
10984 msgid "Writing meaningful commit messages"
10985 msgstr "编写有意义的提交日志"
10987 #. type: Content of: <book><chapter><sect1><sect2><para>
10988 #: ../en/ch10-hook.xml:619
10989 msgid ""
10990 "It's hard to imagine a useful commit message being very short. The simple "
10991 "<literal role=\"hook\">pretxncommit</literal> hook of the example below will "
10992 "prevent you from committing a changeset with a message that is less than ten "
10993 "bytes long."
10994 msgstr ""
10996 #. type: Content of: <book><chapter><sect1><sect2><title>
10997 #: ../en/ch10-hook.xml:629
10998 msgid "Checking for trailing whitespace"
10999 msgstr "检查行尾空格"
11001 #. type: Content of: <book><chapter><sect1><sect2><para>
11002 #: ../en/ch10-hook.xml:631
11003 msgid ""
11004 "An interesting use of a commit-related hook is to help you to write cleaner "
11005 "code. A simple example of <quote>cleaner code</quote> is the dictum that a "
11006 "change should not add any new lines of text that contain <quote>trailing "
11007 "whitespace</quote>. Trailing whitespace is a series of space and tab "
11008 "characters at the end of a line of text. In most cases, trailing whitespace "
11009 "is unnecessary, invisible noise, but it is occasionally problematic, and "
11010 "people often prefer to get rid of it."
11011 msgstr ""
11013 #. type: Content of: <book><chapter><sect1><sect2><para>
11014 #: ../en/ch10-hook.xml:642
11015 msgid ""
11016 "You can use either the <literal role=\"hook\">precommit</literal> or <literal "
11017 "role=\"hook\">pretxncommit</literal> hook to tell whether you have a trailing "
11018 "whitespace problem. If you use the <literal role=\"hook\">precommit</"
11019 "literal> hook, the hook will not know which files you are committing, so it "
11020 "will have to check every modified file in the repository for trailing white "
11021 "space. If you want to commit a change to just the file <filename>foo</"
11022 "filename>, but the file <filename>bar</filename> contains trailing "
11023 "whitespace, doing a check in the <literal role=\"hook\">precommit</literal> "
11024 "hook will prevent you from committing <filename>foo</filename> due to the "
11025 "problem with <filename>bar</filename>. This doesn't seem right."
11026 msgstr ""
11028 #. type: Content of: <book><chapter><sect1><sect2><para>
11029 #: ../en/ch10-hook.xml:658
11030 msgid ""
11031 "Should you choose the <literal role=\"hook\">pretxncommit</literal> hook, the "
11032 "check won't occur until just before the transaction for the commit "
11033 "completes. This will allow you to check for problems only the exact files "
11034 "that are being committed. However, if you entered the commit message "
11035 "interactively and the hook fails, the transaction will roll back; you'll have "
11036 "to re-enter the commit message after you fix the trailing whitespace and run "
11037 "<command role=\"hg-cmd\">hg commit</command> again."
11038 msgstr ""
11040 #. type: Content of: <book><chapter><sect1><sect2><para>
11041 #: ../en/ch10-hook.xml:671
11042 msgid ""
11043 "In this example, we introduce a simple <literal role=\"hook\">pretxncommit</"
11044 "literal> hook that checks for trailing whitespace. This hook is short, but "
11045 "not very helpful. It exits with an error status if a change adds a line with "
11046 "trailing whitespace to any file, but does not print any information that "
11047 "might help us to identify the offending file or line. It also has the nice "
11048 "property of not paying attention to unmodified lines; only lines that "
11049 "introduce new trailing whitespace cause problems."
11050 msgstr ""
11052 #. type: Content of: <book><chapter><sect1><sect2><para>
11053 #: ../en/ch10-hook.xml:682
11054 msgid ""
11055 "The above version is much more complex, but also more useful. It parses a "
11056 "unified diff to see if any lines add trailing whitespace, and prints the name "
11057 "of the file and the line number of each such occurrence. Even better, if the "
11058 "change adds trailing whitespace, this hook saves the commit comment and "
11059 "prints the name of the save file before exiting and telling Mercurial to roll "
11060 "the transaction back, so you can use the <option role=\"hg-opt-commit\">-l "
11061 "filename</option> option to <command role=\"hg-cmd\">hg commit</command> to "
11062 "reuse the saved commit message once you've corrected the problem."
11063 msgstr ""
11065 #. type: Content of: <book><chapter><sect1><sect2><para>
11066 #: ../en/ch10-hook.xml:696
11067 msgid ""
11068 "As a final aside, note in the example above the use of <command>perl</"
11069 "command>'s in-place editing feature to get rid of trailing whitespace from a "
11070 "file. This is concise and useful enough that I will reproduce it here."
11071 msgstr ""
11073 #. type: Content of: <book><chapter><sect1><title>
11074 #: ../en/ch10-hook.xml:706
11075 msgid "Bundled hooks"
11076 msgstr "内置的钩子"
11078 #. type: Content of: <book><chapter><sect1><para>
11079 #: ../en/ch10-hook.xml:708
11080 msgid ""
11081 "Mercurial ships with several bundled hooks. You can find them in the "
11082 "<filename class=\"directory\">hgext</filename> directory of a Mercurial "
11083 "source tree. If you are using a Mercurial binary package, the hooks will be "
11084 "located in the <filename class=\"directory\">hgext</filename> directory of "
11085 "wherever your package installer put Mercurial."
11086 msgstr ""
11088 #. type: Content of: <book><chapter><sect1><sect2><title>
11089 #: ../en/ch10-hook.xml:717
11090 msgid ""
11091 "<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a "
11092 "repository"
11093 msgstr "<literal role=\"hg-ext\">acl</literal>&emdash;版本库的访问控制"
11095 #. type: Content of: <book><chapter><sect1><sect2><para>
11096 #: ../en/ch10-hook.xml:720
11097 msgid ""
11098 "The <literal role=\"hg-ext\">acl</literal> extension lets you control which "
11099 "remote users are allowed to push changesets to a networked server. You can "
11100 "protect any portion of a repository (including the entire repo), so that a "
11101 "specific remote user can push changes that do not affect the protected "
11102 "portion."
11103 msgstr ""
11105 #. type: Content of: <book><chapter><sect1><sect2><para>
11106 #: ../en/ch10-hook.xml:728
11107 msgid ""
11108 "This extension implements access control based on the identity of the user "
11109 "performing a push, <emphasis>not</emphasis> on who committed the changesets "
11110 "they're pushing. It makes sense to use this hook only if you have a locked-"
11111 "down server environment that authenticates remote users, and you want to be "
11112 "sure that only specific users are allowed to push changes to that server."
11113 msgstr ""
11115 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11116 #: ../en/ch10-hook.xml:738
11117 msgid "Configuring the <literal role=\"hook\">acl</literal> hook"
11118 msgstr "配置 <literal role=\"hook\">acl</literal> 钩子"
11120 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11121 #: ../en/ch10-hook.xml:741
11122 msgid ""
11123 "In order to manage incoming changesets, the <literal role=\"hg-ext\">acl</"
11124 "literal> hook must be used as a <literal role=\"hook\">pretxnchangegroup</"
11125 "literal> hook. This lets it see which files are modified by each incoming "
11126 "changeset, and roll back a group of changesets if they modify "
11127 "<quote>forbidden</quote> files. Example:"
11128 msgstr ""
11130 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11131 #: ../en/ch10-hook.xml:751
11132 msgid ""
11133 "The <literal role=\"hg-ext\">acl</literal> extension is configured using "
11134 "three sections."
11135 msgstr ""
11137 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11138 #: ../en/ch10-hook.xml:755
11139 msgid ""
11140 "The <literal role=\"rc-acl\">acl</literal> section has only one entry, <envar "
11141 "role=\"rc-item-acl\">sources</envar>, which lists the sources of incoming "
11142 "changesets that the hook should pay attention to. You don't normally need to "
11143 "configure this section."
11144 msgstr ""
11146 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11147 #: ../en/ch10-hook.xml:762
11148 msgid ""
11149 "<envar role=\"rc-item-acl\">serve</envar>: Control incoming changesets that "
11150 "are arriving from a remote repository over http or ssh. This is the default "
11151 "value of <envar role=\"rc-item-acl\">sources</envar>, and usually the only "
11152 "setting you'll need for this configuration item."
11153 msgstr ""
11155 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11156 #: ../en/ch10-hook.xml:770
11157 msgid ""
11158 "<envar role=\"rc-item-acl\">pull</envar>: Control incoming changesets that "
11159 "are arriving via a pull from a local repository."
11160 msgstr ""
11162 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11163 #: ../en/ch10-hook.xml:775
11164 msgid ""
11165 "<envar role=\"rc-item-acl\">push</envar>: Control incoming changesets that "
11166 "are arriving via a push from a local repository."
11167 msgstr ""
11169 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11170 #: ../en/ch10-hook.xml:780
11171 msgid ""
11172 "<envar role=\"rc-item-acl\">bundle</envar>: Control incoming changesets that "
11173 "are arriving from another repository via a bundle."
11174 msgstr ""
11176 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11177 #: ../en/ch10-hook.xml:786
11178 msgid ""
11179 "The <literal role=\"rc-acl.allow\">acl.allow</literal> section controls the "
11180 "users that are allowed to add changesets to the repository. If this section "
11181 "is not present, all users that are not explicitly denied are allowed. If "
11182 "this section is present, all users that are not explicitly allowed are denied "
11183 "(so an empty section means that all users are denied)."
11184 msgstr ""
11186 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11187 #: ../en/ch10-hook.xml:795
11188 msgid ""
11189 "The <literal role=\"rc-acl.deny\">acl.deny</literal> section determines which "
11190 "users are denied from adding changesets to the repository. If this section "
11191 "is not present or is empty, no users are denied."
11192 msgstr ""
11194 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11195 #: ../en/ch10-hook.xml:801
11196 msgid ""
11197 "The syntaxes for the <literal role=\"rc-acl.allow\">acl.allow</literal> and "
11198 "<literal role=\"rc-acl.deny\">acl.deny</literal> sections are identical. On "
11199 "the left of each entry is a glob pattern that matches files or directories, "
11200 "relative to the root of the repository; on the right, a user name."
11201 msgstr ""
11203 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11204 #: ../en/ch10-hook.xml:809
11205 msgid ""
11206 "In the following example, the user <literal>docwriter</literal> can only push "
11207 "changes to the <filename class=\"directory\">docs</filename> subtree of the "
11208 "repository, while <literal>intern</literal> can push changes to any file or "
11209 "directory except <filename class=\"directory\">source/sensitive</filename>."
11210 msgstr ""
11212 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11213 #: ../en/ch10-hook.xml:821 ../en/ch10-hook.xml:1095 ../en/ch10-hook.xml:1308
11214 msgid "Testing and troubleshooting"
11215 msgstr "测试与问题处理"
11217 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11218 #: ../en/ch10-hook.xml:823
11219 msgid ""
11220 "If you want to test the <literal role=\"hg-ext\">acl</literal> hook, run it "
11221 "with Mercurial's debugging output enabled. Since you'll probably be running "
11222 "it on a server where it's not convenient (or sometimes possible) to pass in "
11223 "the <option role=\"hg-opt-global\">--debug</option> option, don't forget that "
11224 "you can enable debugging output in your <filename role=\"special\"> /.hgrc</"
11225 "filename>:"
11226 msgstr ""
11228 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11229 #: ../en/ch10-hook.xml:833
11230 msgid ""
11231 "With this enabled, the <literal role=\"hg-ext\">acl</literal> hook will print "
11232 "enough information to let you figure out why it is allowing or forbidding "
11233 "pushes from specific users."
11234 msgstr ""
11236 #. type: Content of: <book><chapter><sect1><sect2><title>
11237 #: ../en/ch10-hook.xml:842
11238 msgid ""
11239 "<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla"
11240 msgstr "<literal role=\"hg-ext\">bugzilla</literal>&emdash;与 Bugzilla 的集成"
11242 #. type: Content of: <book><chapter><sect1><sect2><para>
11243 #: ../en/ch10-hook.xml:846
11244 msgid ""
11245 "The <literal role=\"hg-ext\">bugzilla</literal> extension adds a comment to a "
11246 "Bugzilla bug whenever it finds a reference to that bug ID in a commit "
11247 "comment. You can install this hook on a shared server, so that any time a "
11248 "remote user pushes changes to this server, the hook gets run."
11249 msgstr ""
11251 #. type: Content of: <book><chapter><sect1><sect2><para>
11252 #: ../en/ch10-hook.xml:853
11253 msgid ""
11254 "It adds a comment to the bug that looks like this (you can configure the "
11255 "contents of the comment&emdash;see below):"
11256 msgstr ""
11258 #. type: Content of: <book><chapter><sect1><sect2><para>
11259 #: ../en/ch10-hook.xml:862
11260 msgid ""
11261 "The value of this hook is that it automates the process of updating a bug any "
11262 "time a changeset refers to it. If you configure the hook properly, it makes "
11263 "it easy for people to browse straight from a Bugzilla bug to a changeset that "
11264 "refers to that bug."
11265 msgstr ""
11267 #. type: Content of: <book><chapter><sect1><sect2><para>
11268 #: ../en/ch10-hook.xml:869
11269 msgid ""
11270 "You can use the code in this hook as a starting point for some more exotic "
11271 "Bugzilla integration recipes. Here are a few possibilities:"
11272 msgstr ""
11274 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11275 #: ../en/ch10-hook.xml:874
11276 msgid ""
11277 "Require that every changeset pushed to the server have a valid bug ID in its "
11278 "commit comment. In this case, you'd want to configure the hook as a <literal "
11279 "role=\"hook\">pretxncommit</literal> hook. This would allow the hook to "
11280 "reject changes that didn't contain bug IDs."
11281 msgstr ""
11283 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11284 #: ../en/ch10-hook.xml:882
11285 msgid ""
11286 "Allow incoming changesets to automatically modify the <emphasis>state</"
11287 "emphasis> of a bug, as well as simply adding a comment. For example, the "
11288 "hook could recognise the string <quote>fixed bug 31337</quote> as indicating "
11289 "that it should update the state of bug 31337 to <quote>requires testing</"
11290 "quote>."
11291 msgstr ""
11293 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11294 #: ../en/ch10-hook.xml:892
11295 msgid "Configuring the <literal role=\"hook\">bugzilla</literal> hook"
11296 msgstr "配置 <literal role=\"hook\">bugzilla</literal> 钩子"
11298 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11299 #: ../en/ch10-hook.xml:895
11300 msgid ""
11301 "You should configure this hook in your server's <filename role=\"special\"> /."
11302 "hgrc</filename>\\ as an <literal role=\"hook\">incoming</literal> hook, for "
11303 "example as follows:"
11304 msgstr ""
11306 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11307 #: ../en/ch10-hook.xml:903
11308 msgid ""
11309 "Because of the specialised nature of this hook, and because Bugzilla was not "
11310 "written with this kind of integration in mind, configuring this hook is a "
11311 "somewhat involved process."
11312 msgstr ""
11314 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11315 #: ../en/ch10-hook.xml:909
11316 msgid ""
11317 "Before you begin, you must install the MySQL bindings for Python on the host"
11318 "(s) where you'll be running the hook. If this is not available as a binary "
11319 "package for your system, you can download it from <citation>web:mysql-python</"
11320 "citation>."
11321 msgstr ""
11323 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11324 #: ../en/ch10-hook.xml:916
11325 msgid ""
11326 "Configuration information for this hook lives in the <literal role=\"rc-"
11327 "bugzilla\">bugzilla</literal> section of your <filename role=\"special\"> /."
11328 "hgrc</filename>."
11329 msgstr ""
11331 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11332 #: ../en/ch10-hook.xml:921
11333 msgid ""
11334 "<envar role=\"rc-item-bugzilla\">version</envar>: The version of Bugzilla "
11335 "installed on the server. The database schema that Bugzilla uses changes "
11336 "occasionally, so this hook has to know exactly which schema to use. At the "
11337 "moment, the only version supported is <literal>2.16</literal>."
11338 msgstr ""
11340 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11341 #: ../en/ch10-hook.xml:930
11342 msgid ""
11343 "<envar role=\"rc-item-bugzilla\">host</envar>: The hostname of the MySQL "
11344 "server that stores your Bugzilla data. The database must be configured to "
11345 "allow connections from whatever host you are running the <literal role=\"hook"
11346 "\">bugzilla</literal> hook on."
11347 msgstr ""
11349 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11350 #: ../en/ch10-hook.xml:937
11351 msgid ""
11352 "<envar role=\"rc-item-bugzilla\">user</envar>: The username with which to "
11353 "connect to the MySQL server. The database must be configured to allow this "
11354 "user to connect from whatever host you are running the <literal role=\"hook"
11355 "\">bugzilla</literal> hook on. This user must be able to access and modify "
11356 "Bugzilla tables. The default value of this item is <literal>bugs</literal>, "
11357 "which is the standard name of the Bugzilla user in a MySQL database."
11358 msgstr ""
11360 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11361 #: ../en/ch10-hook.xml:948
11362 msgid ""
11363 "<envar role=\"rc-item-bugzilla\">password</envar>: The MySQL password for the "
11364 "user you configured above. This is stored as plain text, so you should make "
11365 "sure that unauthorised users cannot read the <filename role=\"special\"> /."
11366 "hgrc</filename>\\ file where you store this information."
11367 msgstr ""
11369 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11370 #: ../en/ch10-hook.xml:957
11371 msgid ""
11372 "<envar role=\"rc-item-bugzilla\">db</envar>: The name of the Bugzilla "
11373 "database on the MySQL server. The default value of this item is "
11374 "<literal>bugs</literal>, which is the standard name of the MySQL database "
11375 "where Bugzilla stores its data."
11376 msgstr ""
11378 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11379 #: ../en/ch10-hook.xml:964
11380 msgid ""
11381 "<envar role=\"rc-item-bugzilla\">notify</envar>: If you want Bugzilla to send "
11382 "out a notification email to subscribers after this hook has added a comment "
11383 "to a bug, you will need this hook to run a command whenever it updates the "
11384 "database. The command to run depends on where you have installed Bugzilla, "
11385 "but it will typically look something like this, if you have Bugzilla "
11386 "installed in <filename class=\"directory\">/var/www/html/bugzilla</filename>:"
11387 msgstr ""
11389 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11390 #: ../en/ch10-hook.xml:977
11391 msgid ""
11392 "The Bugzilla <literal>processmail</literal> program expects to be given a bug "
11393 "ID (the hook replaces <quote><literal>%s</literal></quote> with the bug ID) "
11394 "and an email address. It also expects to be able to write to some files in "
11395 "the directory that it runs in. If Bugzilla and this hook are not installed "
11396 "on the same machine, you will need to find a way to run <literal>processmail</"
11397 "literal> on the server where Bugzilla is installed."
11398 msgstr ""
11400 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11401 #: ../en/ch10-hook.xml:992
11402 msgid "Mapping committer names to Bugzilla user names"
11403 msgstr "提交者的名称与 Bugzilla 用户名称的映射"
11405 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11406 #: ../en/ch10-hook.xml:994
11407 msgid ""
11408 "By default, the <literal role=\"hg-ext\">bugzilla</literal> hook tries to use "
11409 "the email address of a changeset's committer as the Bugzilla user name with "
11410 "which to update a bug. If this does not suit your needs, you can map "
11411 "committer email addresses to Bugzilla user names using a <literal role=\"rc-"
11412 "usermap\">usermap</literal> section."
11413 msgstr ""
11415 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11416 #: ../en/ch10-hook.xml:1003
11417 msgid ""
11418 "Each item in the <literal role=\"rc-usermap\">usermap</literal> section "
11419 "contains an email address on the left, and a Bugzilla user name on the right."
11420 msgstr ""
11422 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11423 #: ../en/ch10-hook.xml:1010
11424 msgid ""
11425 "You can either keep the <literal role=\"rc-usermap\">usermap</literal> data "
11426 "in a normal <filename role=\"special\">~/.hgrc</filename>, or tell the "
11427 "<literal role=\"hg-ext\">bugzilla</literal> hook to read the information from "
11428 "an external <filename>usermap</filename> file. In the latter case, you can "
11429 "store <filename>usermap</filename> data by itself in (for example) a user-"
11430 "modifiable repository. This makes it possible to let your users maintain "
11431 "their own <envar role=\"rc-item-bugzilla\">usermap</envar> entries. The main "
11432 "<filename role=\"special\"> /.hgrc</filename>\\ file might look like this:"
11433 msgstr ""
11435 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11436 #: ../en/ch10-hook.xml:1026
11437 msgid ""
11438 "While the <filename>usermap</filename> file that it refers to might look like "
11439 "this:"
11440 msgstr ""
11442 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11443 #: ../en/ch10-hook.xml:1035
11444 msgid "Configuring the text that gets added to a bug"
11445 msgstr "配置增加到问题中的正文"
11447 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11448 #: ../en/ch10-hook.xml:1037
11449 msgid ""
11450 "You can configure the text that this hook adds as a comment; you specify it "
11451 "in the form of a Mercurial template. Several <filename role=\"special\"> /."
11452 "hgrc</filename>\\ entries (still in the <literal role=\"rc-bugzilla"
11453 "\">bugzilla</literal> section) control this behaviour."
11454 msgstr ""
11456 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11457 #: ../en/ch10-hook.xml:1044
11458 msgid ""
11459 "<literal>strip</literal>: The number of leading path elements to strip from a "
11460 "repository's path name to construct a partial path for a URL. For example, if "
11461 "the repositories on your server live under <filename class=\"directory\">/"
11462 "home/hg/repos</filename>, and you have a repository whose path is <filename "
11463 "class=\"directory\">/home/hg/repos/app/tests</filename>, then setting "
11464 "<literal>strip</literal> to <literal>4</literal> will give a partial path of "
11465 "<filename class=\"directory\">app/tests</filename>. The hook will make this "
11466 "partial path available when expanding a template, as <literal>webroot</"
11467 "literal>."
11468 msgstr ""
11470 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11471 #: ../en/ch10-hook.xml:1058
11472 msgid ""
11473 "<literal>template</literal>: The text of the template to use. In addition to "
11474 "the usual changeset-related variables, this template can use <literal>hgweb</"
11475 "literal> (the value of the <literal>hgweb</literal> configuration item above) "
11476 "and <literal>webroot</literal> (the path constructed using <literal>strip</"
11477 "literal> above)."
11478 msgstr ""
11480 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11481 #: ../en/ch10-hook.xml:1068
11482 msgid ""
11483 "In addition, you can add a <envar role=\"rc-item-web\">baseurl</envar> item "
11484 "to the <literal role=\"rc-web\">web</literal> section of your <filename role="
11485 "\"special\"> /.hgrc</filename>. The <literal role=\"hg-ext\">bugzilla</"
11486 "literal> hook will make this available when expanding a template, as the base "
11487 "string to use when constructing a URL that will let users browse from a "
11488 "Bugzilla comment to view a changeset. Example:"
11489 msgstr ""
11491 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11492 #: ../en/ch10-hook.xml:1080
11493 msgid ""
11494 "Here is an example set of <literal role=\"hg-ext\">bugzilla</literal> hook "
11495 "config information."
11496 msgstr ""
11498 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11499 #: ../en/ch10-hook.xml:1097
11500 msgid ""
11501 "The most common problems with configuring the <literal role=\"hg-ext"
11502 "\">bugzilla</literal> hook relate to running Bugzilla's "
11503 "<filename>processmail</filename> script and mapping committer names to user "
11504 "names."
11505 msgstr ""
11507 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11508 #: ../en/ch10-hook.xml:1103
11509 msgid ""
11510 "Recall from section <xref linkend=\"sec.hook.bugzilla.config\"/> above that "
11511 "the user that runs the Mercurial process on the server is also the one that "
11512 "will run the <filename>processmail</filename> script. The "
11513 "<filename>processmail</filename> script sometimes causes Bugzilla to write to "
11514 "files in its configuration directory, and Bugzilla's configuration files are "
11515 "usually owned by the user that your web server runs under."
11516 msgstr ""
11518 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11519 #: ../en/ch10-hook.xml:1114
11520 msgid ""
11521 "You can cause <filename>processmail</filename> to be run with the suitable "
11522 "user's identity using the <command>sudo</command> command. Here is an "
11523 "example entry for a <filename>sudoers</filename> file."
11524 msgstr ""
11526 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11527 #: ../en/ch10-hook.xml:1122
11528 msgid ""
11529 "This allows the <literal>hg_user</literal> user to run a "
11530 "<filename>processmail-wrapper</filename> program under the identity of "
11531 "<literal>httpd_user</literal>."
11532 msgstr ""
11534 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11535 #: ../en/ch10-hook.xml:1127
11536 msgid ""
11537 "This indirection through a wrapper script is necessary, because "
11538 "<filename>processmail</filename> expects to be run with its current directory "
11539 "set to wherever you installed Bugzilla; you can't specify that kind of "
11540 "constraint in a <filename>sudoers</filename> file. The contents of the "
11541 "wrapper script are simple:"
11542 msgstr ""
11544 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11545 #: ../en/ch10-hook.xml:1136
11546 msgid ""
11547 "It doesn't seem to matter what email address you pass to "
11548 "<filename>processmail</filename>."
11549 msgstr ""
11551 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11552 #: ../en/ch10-hook.xml:1140
11553 msgid ""
11554 "If your <literal role=\"rc-usermap\">usermap</literal> is not set up "
11555 "correctly, users will see an error message from the <literal role=\"hg-ext"
11556 "\">bugzilla</literal> hook when they push changes to the server. The error "
11557 "message will look like this:"
11558 msgstr ""
11560 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11561 #: ../en/ch10-hook.xml:1148
11562 msgid ""
11563 "What this means is that the committer's address, <literal>john.q."
11564 "public@example.com</literal>, is not a valid Bugzilla user name, nor does it "
11565 "have an entry in your <literal role=\"rc-usermap\">usermap</literal> that "
11566 "maps it to a valid Bugzilla user name."
11567 msgstr ""
11569 #. type: Content of: <book><chapter><sect1><sect2><title>
11570 #: ../en/ch10-hook.xml:1158
11571 msgid ""
11572 "<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications"
11573 msgstr "<literal role=\"hg-ext\">notify</literal>&emdash;邮件通知"
11575 #. type: Content of: <book><chapter><sect1><sect2><para>
11576 #: ../en/ch10-hook.xml:1161
11577 msgid ""
11578 "Although Mercurial's built-in web server provides RSS feeds of changes in "
11579 "every repository, many people prefer to receive change notifications via "
11580 "email. The <literal role=\"hg-ext\">notify</literal> hook lets you send out "
11581 "notifications to a set of email addresses whenever changesets arrive that "
11582 "those subscribers are interested in."
11583 msgstr ""
11585 #. type: Content of: <book><chapter><sect1><sect2><para>
11586 #: ../en/ch10-hook.xml:1169
11587 msgid ""
11588 "As with the <literal role=\"hg-ext\">bugzilla</literal> hook, the <literal "
11589 "role=\"hg-ext\">notify</literal> hook is template-driven, so you can "
11590 "customise the contents of the notification messages that it sends."
11591 msgstr ""
11593 #. type: Content of: <book><chapter><sect1><sect2><para>
11594 #: ../en/ch10-hook.xml:1175
11595 msgid ""
11596 "By default, the <literal role=\"hg-ext\">notify</literal> hook includes a "
11597 "diff of every changeset that it sends out; you can limit the size of the "
11598 "diff, or turn this feature off entirely. It is useful for letting "
11599 "subscribers review changes immediately, rather than clicking to follow a URL."
11600 msgstr ""
11602 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11603 #: ../en/ch10-hook.xml:1183
11604 msgid "Configuring the <literal role=\"hg-ext\">notify</literal> hook"
11605 msgstr "配置 <literal role=\"hg-ext\">notify</literal> 钩子"
11607 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11608 #: ../en/ch10-hook.xml:1186
11609 msgid ""
11610 "You can set up the <literal role=\"hg-ext\">notify</literal> hook to send one "
11611 "email message per incoming changeset, or one per incoming group of changesets "
11612 "(all those that arrived in a single pull or push)."
11613 msgstr ""
11615 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11616 #: ../en/ch10-hook.xml:1197
11617 msgid ""
11618 "Configuration information for this hook lives in the <literal role=\"rc-notify"
11619 "\">notify</literal> section of a <filename role=\"special\"> /.hgrc</filename>"
11620 "\\ file."
11621 msgstr ""
11623 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11624 #: ../en/ch10-hook.xml:1202
11625 msgid ""
11626 "<envar role=\"rc-item-notify\">test</envar>: By default, this hook does not "
11627 "send out email at all; instead, it prints the message that it "
11628 "<emphasis>would</emphasis> send. Set this item to <literal>false</literal> "
11629 "to allow email to be sent. The reason that sending of email is turned off by "
11630 "default is that it takes several tries to configure this extension exactly as "
11631 "you would like, and it would be bad form to spam subscribers with a number of "
11632 "<quote>broken</quote> notifications while you debug your configuration."
11633 msgstr ""
11635 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11636 #: ../en/ch10-hook.xml:1214
11637 msgid ""
11638 "<envar role=\"rc-item-notify\">config</envar>: The path to a configuration "
11639 "file that contains subscription information. This is kept separate from the "
11640 "main <filename role=\"special\"> /.hgrc</filename>\\ so that you can maintain "
11641 "it in a repository of its own. People can then clone that repository, update "
11642 "their subscriptions, and push the changes back to your server."
11643 msgstr ""
11645 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11646 #: ../en/ch10-hook.xml:1223
11647 msgid ""
11648 "<envar role=\"rc-item-notify\">strip</envar>: The number of leading path "
11649 "separator characters to strip from a repository's path, when deciding whether "
11650 "a repository has subscribers. For example, if the repositories on your "
11651 "server live in <filename class=\"directory\">/home/hg/repos</filename>, and "
11652 "<literal role=\"hg-ext\">notify</literal> is considering a repository named "
11653 "<filename class=\"directory\">/home/hg/repos/shared/test</filename>, setting "
11654 "<envar role=\"rc-item-notify\">strip</envar> to <literal>4</literal> will "
11655 "cause <literal role=\"hg-ext\">notify</literal> to trim the path it considers "
11656 "down to <filename class=\"directory\">shared/test</filename>, and it will "
11657 "match subscribers against that."
11658 msgstr ""
11660 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11661 #: ../en/ch10-hook.xml:1240
11662 msgid ""
11663 "<envar role=\"rc-item-notify\">template</envar>: The template text to use "
11664 "when sending messages. This specifies both the contents of the message "
11665 "header and its body."
11666 msgstr ""
11668 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11669 #: ../en/ch10-hook.xml:1246
11670 msgid ""
11671 "<envar role=\"rc-item-notify\">maxdiff</envar>: The maximum number of lines "
11672 "of diff data to append to the end of a message. If a diff is longer than "
11673 "this, it is truncated. By default, this is set to 300. Set this to "
11674 "<literal>0</literal> to omit diffs from notification emails."
11675 msgstr ""
11677 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11678 #: ../en/ch10-hook.xml:1255
11679 msgid ""
11680 "<envar role=\"rc-item-notify\">sources</envar>: A list of sources of "
11681 "changesets to consider. This lets you limit <literal role=\"hg-ext\">notify</"
11682 "literal> to only sending out email about changes that remote users pushed "
11683 "into this repository via a server, for example. See section <xref linkend="
11684 "\"sec.hook.sources\"/> for the sources you can specify here."
11685 msgstr ""
11687 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11688 #: ../en/ch10-hook.xml:1267
11689 msgid ""
11690 "If you set the <envar role=\"rc-item-web\">baseurl</envar> item in the "
11691 "<literal role=\"rc-web\">web</literal> section, you can use it in a template; "
11692 "it will be available as <literal>webroot</literal>."
11693 msgstr ""
11695 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11696 #: ../en/ch10-hook.xml:1273
11697 msgid ""
11698 "Here is an example set of <literal role=\"hg-ext\">notify</literal> "
11699 "configuration information."
11700 msgstr ""
11702 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11703 #: ../en/ch10-hook.xml:1289
11704 msgid "This will produce a message that looks like the following:"
11705 msgstr ""
11707 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11708 #: ../en/ch10-hook.xml:1310
11709 msgid ""
11710 "Do not forget that by default, the <literal role=\"hg-ext\">notify</literal> "
11711 "extension <emphasis>will not send any mail</emphasis> until you explicitly "
11712 "configure it to do so, by setting <envar role=\"rc-item-notify\">test</envar> "
11713 "to <literal>false</literal>. Until you do that, it simply prints the message "
11714 "it <emphasis>would</emphasis> send."
11715 msgstr ""
11717 #. type: Content of: <book><chapter><sect1><title>
11718 #: ../en/ch10-hook.xml:1322
11719 msgid "Information for writers of hooks"
11720 msgstr "编写钩子的信息"
11722 #. type: Content of: <book><chapter><sect1><sect2><title>
11723 #: ../en/ch10-hook.xml:1325
11724 msgid "In-process hook execution"
11725 msgstr "进程内钩子的执行"
11727 #. type: Content of: <book><chapter><sect1><sect2><para>
11728 #: ../en/ch10-hook.xml:1327
11729 msgid "An in-process hook is called with arguments of the following form:"
11730 msgstr ""
11732 #. type: Content of: <book><chapter><sect1><sect2><para>
11733 #: ../en/ch10-hook.xml:1333
11734 msgid ""
11735 "The <literal>ui</literal> parameter is a <literal role=\"py-mod-mercurial.ui"
11736 "\">ui</literal> object. The <literal>repo</literal> parameter is a <literal "
11737 "role=\"py-mod-mercurial.localrepo\">localrepository</literal> object. The "
11738 "names and values of the <literal>**kwargs</literal> parameters depend on the "
11739 "hook being invoked, with the following common features:"
11740 msgstr ""
11742 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11743 #: ../en/ch10-hook.xml:1342
11744 msgid ""
11745 "If a parameter is named <literal>node</literal> or <literal>parentN</"
11746 "literal>, it will contain a hexadecimal changeset ID. The empty string is "
11747 "used to represent <quote>null changeset ID</quote> instead of a string of "
11748 "zeroes."
11749 msgstr ""
11751 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11752 #: ../en/ch10-hook.xml:1349
11753 msgid ""
11754 "If a parameter is named <literal>url</literal>, it will contain the URL of a "
11755 "remote repository, if that can be determined."
11756 msgstr ""
11758 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11759 #: ../en/ch10-hook.xml:1354
11760 msgid ""
11761 "Boolean-valued parameters are represented as Python <literal>bool</literal> "
11762 "objects."
11763 msgstr ""
11765 #. type: Content of: <book><chapter><sect1><sect2><para>
11766 #: ../en/ch10-hook.xml:1359
11767 msgid ""
11768 "An in-process hook is called without a change to the process's working "
11769 "directory (unlike external hooks, which are run in the root of the "
11770 "repository). It must not change the process's working directory, or it will "
11771 "cause any calls it makes into the Mercurial API to fail."
11772 msgstr ""
11774 #. type: Content of: <book><chapter><sect1><sect2><para>
11775 #: ../en/ch10-hook.xml:1366
11776 msgid ""
11777 "If a hook returns a boolean <quote>false</quote> value, it is considered to "
11778 "have succeeded. If it returns a boolean <quote>true</quote> value or raises "
11779 "an exception, it is considered to have failed. A useful way to think of the "
11780 "calling convention is <quote>tell me if you fail</quote>."
11781 msgstr ""
11783 #. type: Content of: <book><chapter><sect1><sect2><para>
11784 #: ../en/ch10-hook.xml:1373
11785 msgid ""
11786 "Note that changeset IDs are passed into Python hooks as hexadecimal strings, "
11787 "not the binary hashes that Mercurial's APIs normally use. To convert a hash "
11788 "from hex to binary, use the \\pymodfunc{mercurial.node}{bin} function."
11789 msgstr ""
11791 #. type: Content of: <book><chapter><sect1><sect2><title>
11792 #: ../en/ch10-hook.xml:1381
11793 msgid "External hook execution"
11794 msgstr "外部钩子的执行"
11796 #. type: Content of: <book><chapter><sect1><sect2><para>
11797 #: ../en/ch10-hook.xml:1383
11798 msgid ""
11799 "An external hook is passed to the shell of the user running Mercurial. "
11800 "Features of that shell, such as variable substitution and command "
11801 "redirection, are available. The hook is run in the root directory of the "
11802 "repository (unlike in-process hooks, which are run in the same directory that "
11803 "Mercurial was run in)."
11804 msgstr ""
11806 #. type: Content of: <book><chapter><sect1><sect2><para>
11807 #: ../en/ch10-hook.xml:1391
11808 msgid ""
11809 "Hook parameters are passed to the hook as environment variables. Each "
11810 "environment variable's name is converted in upper case and prefixed with the "
11811 "string <quote><literal>HG_</literal></quote>. For example, if the name of a "
11812 "parameter is <quote><literal>node</literal></quote>, the name of the "
11813 "environment variable representing that parameter will be "
11814 "<quote><literal>HG_NODE</literal></quote>."
11815 msgstr ""
11817 #. type: Content of: <book><chapter><sect1><sect2><para>
11818 #: ../en/ch10-hook.xml:1400
11819 msgid ""
11820 "A boolean parameter is represented as the string <quote><literal>1</literal></"
11821 "quote> for <quote>true</quote>, <quote><literal>0</literal></quote> for "
11822 "<quote>false</quote>. If an environment variable is named <envar>HG_NODE</"
11823 "envar>, <envar>HG_PARENT1</envar> or <envar>HG_PARENT2</envar>, it contains a "
11824 "changeset ID represented as a hexadecimal string. The empty string is used "
11825 "to represent <quote>null changeset ID</quote> instead of a string of zeroes. "
11826 "If an environment variable is named <envar>HG_URL</envar>, it will contain "
11827 "the URL of a remote repository, if that can be determined."
11828 msgstr ""
11830 #. type: Content of: <book><chapter><sect1><sect2><para>
11831 #: ../en/ch10-hook.xml:1412
11832 msgid ""
11833 "If a hook exits with a status of zero, it is considered to have succeeded. "
11834 "If it exits with a non-zero status, it is considered to have failed."
11835 msgstr ""
11837 #. type: Content of: <book><chapter><sect1><sect2><title>
11838 #: ../en/ch10-hook.xml:1419
11839 msgid "Finding out where changesets come from"
11840 msgstr "检查修改集来自何处"
11842 #. type: Content of: <book><chapter><sect1><sect2><para>
11843 #: ../en/ch10-hook.xml:1421
11844 msgid ""
11845 "A hook that involves the transfer of changesets between a local repository "
11846 "and another may be able to find out information about the <quote>far side</"
11847 "quote>. Mercurial knows <emphasis>how</emphasis> changes are being "
11848 "transferred, and in many cases <emphasis>where</emphasis> they are being "
11849 "transferred to or from."
11850 msgstr ""
11852 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11853 #: ../en/ch10-hook.xml:1430
11854 msgid "Sources of changesets"
11855 msgstr "修改集的来源"
11857 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11858 #: ../en/ch10-hook.xml:1432
11859 msgid ""
11860 "Mercurial will tell a hook what means are, or were, used to transfer "
11861 "changesets between repositories. This is provided by Mercurial in a Python "
11862 "parameter named <literal>source</literal>, or an environment variable named "
11863 "<envar>HG_SOURCE</envar>."
11864 msgstr ""
11866 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11867 #: ../en/ch10-hook.xml:1440
11868 msgid ""
11869 "<literal>serve</literal>: Changesets are transferred to or from a remote "
11870 "repository over http or ssh."
11871 msgstr ""
11873 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11874 #: ../en/ch10-hook.xml:1445
11875 msgid ""
11876 "<literal>pull</literal>: Changesets are being transferred via a pull from one "
11877 "repository into another."
11878 msgstr ""
11880 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11881 #: ../en/ch10-hook.xml:1450
11882 msgid ""
11883 "<literal>push</literal>: Changesets are being transferred via a push from one "
11884 "repository into another."
11885 msgstr ""
11887 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11888 #: ../en/ch10-hook.xml:1455
11889 msgid ""
11890 "<literal>bundle</literal>: Changesets are being transferred to or from a "
11891 "bundle."
11892 msgstr ""
11894 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11895 #: ../en/ch10-hook.xml:1462
11896 msgid "Where changes are going&emdash;remote repository URLs"
11897 msgstr "修改集要到哪里&emdash;远程版本库的地址"
11899 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11900 #: ../en/ch10-hook.xml:1465
11901 msgid ""
11902 "When possible, Mercurial will tell a hook the location of the <quote>far "
11903 "side</quote> of an activity that transfers changeset data between "
11904 "repositories. This is provided by Mercurial in a Python parameter named "
11905 "<literal>url</literal>, or an environment variable named <envar>HG_URL</"
11906 "envar>."
11907 msgstr ""
11909 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11910 #: ../en/ch10-hook.xml:1473
11911 msgid ""
11912 "This information is not always known. If a hook is invoked in a repository "
11913 "that is being served via http or ssh, Mercurial cannot tell where the remote "
11914 "repository is, but it may know where the client is connecting from. In such "
11915 "cases, the URL will take one of the following forms:"
11916 msgstr ""
11918 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11919 #: ../en/ch10-hook.xml:1480
11920 msgid ""
11921 "<literal>remote:ssh:1.2.3.4</literal>&emdash;remote ssh client, at the IP "
11922 "address <literal>1.2.3.4</literal>."
11923 msgstr ""
11925 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11926 #: ../en/ch10-hook.xml:1485
11927 msgid ""
11928 "<literal>remote:http:1.2.3.4</literal>&emdash;remote http client, at the IP "
11929 "address <literal>1.2.3.4</literal>. If the client is using SSL, this will be "
11930 "of the form <literal>remote:https:1.2.3.4</literal>."
11931 msgstr ""
11933 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11934 #: ../en/ch10-hook.xml:1492
11935 msgid "Empty&emdash;no information could be discovered about the remote client."
11936 msgstr ""
11938 #. type: Content of: <book><chapter><sect1><title>
11939 #: ../en/ch10-hook.xml:1501
11940 msgid "Hook reference"
11941 msgstr "钩子参考"
11943 #. type: Content of: <book><chapter><sect1><sect2><title>
11944 #: ../en/ch10-hook.xml:1504
11945 msgid ""
11946 "<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets "
11947 "added"
11948 msgstr "<literal role=\"hook\">changegroup</literal>&emdash;增加远程修改集之后"
11950 #. type: Content of: <book><chapter><sect1><sect2><para>
11951 #: ../en/ch10-hook.xml:1507
11952 msgid ""
11953 "This hook is run after a group of pre-existing changesets has been added to "
11954 "the repository, for example via a <command role=\"hg-cmd\">hg pull</command> "
11955 "or <command role=\"hg-cmd\">hg unbundle</command>. This hook is run once per "
11956 "operation that added one or more changesets. This is in contrast to the "
11957 "<literal role=\"hook\">incoming</literal> hook, which is run once per "
11958 "changeset, regardless of whether the changesets arrive in a group."
11959 msgstr ""
11961 #. type: Content of: <book><chapter><sect1><sect2><para>
11962 #: ../en/ch10-hook.xml:1517
11963 msgid ""
11964 "Some possible uses for this hook include kicking off an automated build or "
11965 "test of the added changesets, updating a bug database, or notifying "
11966 "subscribers that a repository contains new changes."
11967 msgstr ""
11969 #. type: Content of: <book><chapter><sect1><sect2><para>
11970 #: ../en/ch10-hook.xml:1523 ../en/ch10-hook.xml:1564 ../en/ch10-hook.xml:1607
11971 #: ../en/ch10-hook.xml:1649 ../en/ch10-hook.xml:1704 ../en/ch10-hook.xml:1744
11972 #: ../en/ch10-hook.xml:1780 ../en/ch10-hook.xml:1815 ../en/ch10-hook.xml:1877
11973 #: ../en/ch10-hook.xml:1935 ../en/ch10-hook.xml:1969 ../en/ch10-hook.xml:1997
11974 msgid "Parameters to this hook:"
11975 msgstr ""
11977 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11978 #: ../en/ch10-hook.xml:1526 ../en/ch10-hook.xml:1880
11979 msgid ""
11980 "<literal>node</literal>: A changeset ID. The changeset ID of the first "
11981 "changeset in the group that was added. All changesets between this and "
11982 "\\index{tags!<literal>tip</literal>}<literal>tip</literal>, inclusive, were "
11983 "added by a single <command role=\"hg-cmd\">hg pull</command>, <command role="
11984 "\"hg-cmd\">hg push</command> or <command role=\"hg-cmd\">hg unbundle</"
11985 "command>."
11986 msgstr ""
11988 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11989 #: ../en/ch10-hook.xml:1536 ../en/ch10-hook.xml:1614 ../en/ch10-hook.xml:1707
11990 #: ../en/ch10-hook.xml:1890
11991 msgid ""
11992 "<literal>source</literal>: A string. The source of these changes. See "
11993 "section <xref linkend=\"sec.hook.sources\"/> for details."
11994 msgstr ""
11996 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11997 #: ../en/ch10-hook.xml:1541 ../en/ch10-hook.xml:1619 ../en/ch10-hook.xml:1670
11998 #: ../en/ch10-hook.xml:1712 ../en/ch10-hook.xml:1794 ../en/ch10-hook.xml:1895
11999 msgid ""
12000 "<literal>url</literal>: A URL. The location of the remote repository, if "
12001 "known. See section <xref linkend=\"sec.hook.url\"/> for more information."
12002 msgstr ""
12004 #. type: Content of: <book><chapter><sect1><sect2><para>
12005 #: ../en/ch10-hook.xml:1548
12006 msgid ""
12007 "See also: <literal role=\"hook\">incoming</literal> (section <xref linkend="
12008 "\"sec.hook.incoming\"/>), <literal role=\"hook\">prechangegroup</literal> "
12009 "(section <xref linkend=\"sec.hook.prechangegroup\"/>), <literal role=\"hook"
12010 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
12011 "pretxnchangegroup\"/>)"
12012 msgstr ""
12014 #. type: Content of: <book><chapter><sect1><sect2><title>
12015 #: ../en/ch10-hook.xml:1558
12016 msgid ""
12017 "<literal role=\"hook\">commit</literal>&emdash;after a new changeset is "
12018 "created"
12019 msgstr "<literal role=\"hook\">commit</literal>&emdash;创建新修改集之后"
12021 #. type: Content of: <book><chapter><sect1><sect2><para>
12022 #: ../en/ch10-hook.xml:1561
12023 msgid "This hook is run after a new changeset has been created."
12024 msgstr ""
12026 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12027 #: ../en/ch10-hook.xml:1567 ../en/ch10-hook.xml:1938
12028 msgid ""
12029 "<literal>node</literal>: A changeset ID. The changeset ID of the newly "
12030 "committed changeset."
12031 msgstr ""
12033 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12034 #: ../en/ch10-hook.xml:1571 ../en/ch10-hook.xml:1942
12035 msgid ""
12036 "<literal>parent1</literal>: A changeset ID. The changeset ID of the first "
12037 "parent of the newly committed changeset."
12038 msgstr ""
12040 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12041 #: ../en/ch10-hook.xml:1576 ../en/ch10-hook.xml:1947
12042 msgid ""
12043 "<literal>parent2</literal>: A changeset ID. The changeset ID of the second "
12044 "parent of the newly committed changeset."
12045 msgstr ""
12047 #. type: Content of: <book><chapter><sect1><sect2><para>
12048 #: ../en/ch10-hook.xml:1582
12049 msgid ""
12050 "See also: <literal role=\"hook\">precommit</literal> (section <xref linkend="
12051 "\"sec.hook.precommit\"/>), <literal role=\"hook\">pretxncommit</literal> "
12052 "(section <xref linkend=\"sec.hook.pretxncommit\"/>)"
12053 msgstr ""
12055 #. type: Content of: <book><chapter><sect1><sect2><title>
12056 #: ../en/ch10-hook.xml:1590
12057 msgid ""
12058 "<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset "
12059 "is added"
12060 msgstr "<literal role=\"hook\">incoming</literal>&emdash;增加远程修改集之后"
12062 #. type: Content of: <book><chapter><sect1><sect2><para>
12063 #: ../en/ch10-hook.xml:1593
12064 msgid ""
12065 "This hook is run after a pre-existing changeset has been added to the "
12066 "repository, for example via a <command role=\"hg-cmd\">hg push</command>. If "
12067 "a group of changesets was added in a single operation, this hook is called "
12068 "once for each added changeset."
12069 msgstr ""
12071 #. type: Content of: <book><chapter><sect1><sect2><para>
12072 #: ../en/ch10-hook.xml:1600
12073 msgid ""
12074 "You can use this hook for the same purposes as the <literal role=\"hook"
12075 "\">changegroup</literal> hook (section <xref linkend=\"sec.hook.changegroup\"/"
12076 ">); it's simply more convenient sometimes to run a hook once per group of "
12077 "changesets, while other times it's handier once per changeset."
12078 msgstr ""
12080 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12081 #: ../en/ch10-hook.xml:1610
12082 msgid ""
12083 "<literal>node</literal>: A changeset ID. The ID of the newly added changeset."
12084 msgstr ""
12086 #. type: Content of: <book><chapter><sect1><sect2><para>
12087 #: ../en/ch10-hook.xml:1626
12088 msgid ""
12089 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
12090 "\"sec.hook.changegroup\"/>) <literal role=\"hook\">prechangegroup</literal> "
12091 "(section <xref linkend=\"sec.hook.prechangegroup\"/>), <literal role=\"hook"
12092 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
12093 "pretxnchangegroup\"/>)"
12094 msgstr ""
12096 #. type: Content of: <book><chapter><sect1><sect2><title>
12097 #: ../en/ch10-hook.xml:1636
12098 msgid ""
12099 "<literal role=\"hook\">outgoing</literal>&emdash;after changesets are "
12100 "propagated"
12101 msgstr "<literal role=\"hook\">outgoing</literal>&emdash;传播修改集之后"
12103 #. type: Content of: <book><chapter><sect1><sect2><para>
12104 #: ../en/ch10-hook.xml:1639
12105 msgid ""
12106 "This hook is run after a group of changesets has been propagated out of this "
12107 "repository, for example by a <command role=\"hg-cmd\">hg push</command> or "
12108 "<command role=\"hg-cmd\">hg bundle</command> command."
12109 msgstr ""
12111 #. type: Content of: <book><chapter><sect1><sect2><para>
12112 #: ../en/ch10-hook.xml:1645
12113 msgid ""
12114 "One possible use for this hook is to notify administrators that changes have "
12115 "been pulled."
12116 msgstr ""
12118 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12119 #: ../en/ch10-hook.xml:1652
12120 msgid ""
12121 "<literal>node</literal>: A changeset ID. The changeset ID of the first "
12122 "changeset of the group that was sent."
12123 msgstr ""
12125 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12126 #: ../en/ch10-hook.xml:1657
12127 msgid ""
12128 "<literal>source</literal>: A string. The source of the of the operation (see "
12129 "section <xref linkend=\"sec.hook.sources\"/>). If a remote client pulled "
12130 "changes from this repository, <literal>source</literal> will be "
12131 "<literal>serve</literal>. If the client that obtained changes from this "
12132 "repository was local, <literal>source</literal> will be <literal>bundle</"
12133 "literal>, <literal>pull</literal>, or <literal>push</literal>, depending on "
12134 "the operation the client performed."
12135 msgstr ""
12137 #. type: Content of: <book><chapter><sect1><sect2><para>
12138 #: ../en/ch10-hook.xml:1677
12139 msgid ""
12140 "See also: <literal role=\"hook\">preoutgoing</literal> (section <xref linkend="
12141 "\"sec.hook.preoutgoing\"/>)"
12142 msgstr ""
12144 #. type: Content of: <book><chapter><sect1><sect2><title>
12145 #: ../en/ch10-hook.xml:1683
12146 msgid ""
12147 "<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add "
12148 "remote changesets"
12149 msgstr ""
12150 "<literal role=\"hook\">prechangegroup</literal>&emdash;增加远程修改集之前"
12152 #. type: Content of: <book><chapter><sect1><sect2><para>
12153 #: ../en/ch10-hook.xml:1687
12154 msgid ""
12155 "This controlling hook is run before Mercurial begins to add a group of "
12156 "changesets from another repository."
12157 msgstr ""
12159 #. type: Content of: <book><chapter><sect1><sect2><para>
12160 #: ../en/ch10-hook.xml:1691
12161 msgid ""
12162 "This hook does not have any information about the changesets to be added, "
12163 "because it is run before transmission of those changesets is allowed to "
12164 "begin. If this hook fails, the changesets will not be transmitted."
12165 msgstr ""
12167 #. type: Content of: <book><chapter><sect1><sect2><para>
12168 #: ../en/ch10-hook.xml:1697
12169 msgid ""
12170 "One use for this hook is to prevent external changes from being added to a "
12171 "repository. For example, you could use this to <quote>freeze</quote> a "
12172 "server-hosted branch temporarily or permanently so that users cannot push to "
12173 "it, while still allowing a local administrator to modify the repository."
12174 msgstr ""
12176 #. type: Content of: <book><chapter><sect1><sect2><para>
12177 #: ../en/ch10-hook.xml:1719
12178 msgid ""
12179 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
12180 "\"sec.hook.changegroup\"/>), <literal role=\"hook\">incoming</literal> "
12181 "(section <xref linkend=\"sec.hook.incoming\"/>), , <literal role=\"hook"
12182 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
12183 "pretxnchangegroup\"/>)"
12184 msgstr ""
12186 #. type: Content of: <book><chapter><sect1><sect2><title>
12187 #: ../en/ch10-hook.xml:1729
12188 msgid ""
12189 "<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a "
12190 "changeset"
12191 msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前"
12193 #. type: Content of: <book><chapter><sect1><sect2><para>
12194 #: ../en/ch10-hook.xml:1732
12195 msgid ""
12196 "This hook is run before Mercurial begins to commit a new changeset. It is run "
12197 "before Mercurial has any of the metadata for the commit, such as the files to "
12198 "be committed, the commit message, or the commit date."
12199 msgstr ""
12201 #. type: Content of: <book><chapter><sect1><sect2><para>
12202 #: ../en/ch10-hook.xml:1738
12203 msgid ""
12204 "One use for this hook is to disable the ability to commit new changesets, "
12205 "while still allowing incoming changesets. Another is to run a build or test, "
12206 "and only allow the commit to begin if the build or test succeeds."
12207 msgstr ""
12209 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12210 #: ../en/ch10-hook.xml:1747
12211 msgid ""
12212 "<literal>parent1</literal>: A changeset ID. The changeset ID of the first "
12213 "parent of the working directory."
12214 msgstr ""
12216 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12217 #: ../en/ch10-hook.xml:1752
12218 msgid ""
12219 "<literal>parent2</literal>: A changeset ID. The changeset ID of the second "
12220 "parent of the working directory."
12221 msgstr ""
12223 #. type: Content of: <book><chapter><sect1><sect2><para>
12224 #: ../en/ch10-hook.xml:1757
12225 msgid ""
12226 "If the commit proceeds, the parents of the working directory will become the "
12227 "parents of the new changeset."
12228 msgstr ""
12230 #. type: Content of: <book><chapter><sect1><sect2><para>
12231 #: ../en/ch10-hook.xml:1761
12232 msgid ""
12233 "See also: <literal role=\"hook\">commit</literal> (section <xref linkend="
12234 "\"sec.hook.commit\"/>), <literal role=\"hook\">pretxncommit</literal> "
12235 "(section <xref linkend=\"sec.hook.pretxncommit\"/>)"
12236 msgstr ""
12238 #. type: Content of: <book><chapter><sect1><sect2><title>
12239 #: ../en/ch10-hook.xml:1769
12240 msgid ""
12241 "<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to "
12242 "propagate changesets"
12243 msgstr "<literal role=\"hook\">preoutgoing</literal>&emdash;传播修改集之前"
12245 #. type: Content of: <book><chapter><sect1><sect2><para>
12246 #: ../en/ch10-hook.xml:1772
12247 msgid ""
12248 "This hook is invoked before Mercurial knows the identities of the changesets "
12249 "to be transmitted."
12250 msgstr ""
12252 #. type: Content of: <book><chapter><sect1><sect2><para>
12253 #: ../en/ch10-hook.xml:1776
12254 msgid ""
12255 "One use for this hook is to prevent changes from being transmitted to another "
12256 "repository."
12257 msgstr ""
12259 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12260 #: ../en/ch10-hook.xml:1783
12261 msgid ""
12262 "<literal>source</literal>: A string. The source of the operation that is "
12263 "attempting to obtain changes from this repository (see section <xref linkend="
12264 "\"sec.hook.sources\"/>). See the documentation for the <literal>source</"
12265 "literal> parameter to the <literal role=\"hook\">outgoing</literal> hook, in "
12266 "section <xref linkend=\"sec.hook.outgoing\"/>, for possible values of this "
12267 "parameter."
12268 msgstr ""
12270 #. type: Content of: <book><chapter><sect1><sect2><para>
12271 #: ../en/ch10-hook.xml:1801
12272 msgid ""
12273 "See also: <literal role=\"hook\">outgoing</literal> (section <xref linkend="
12274 "\"sec.hook.outgoing\"/>)"
12275 msgstr ""
12277 #. type: Content of: <book><chapter><sect1><sect2><title>
12278 #: ../en/ch10-hook.xml:1807
12279 msgid ""
12280 "<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset"
12281 msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前"
12283 #. type: Content of: <book><chapter><sect1><sect2><para>
12284 #: ../en/ch10-hook.xml:1810
12285 msgid ""
12286 "This controlling hook is run before a tag is created. If the hook succeeds, "
12287 "creation of the tag proceeds. If the hook fails, the tag is not created."
12288 msgstr ""
12290 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12291 #: ../en/ch10-hook.xml:1818
12292 msgid ""
12293 "<literal>local</literal>: A boolean. Whether the tag is local to this "
12294 "repository instance (i.e. stored in <filename role=\"special\">.hg/localtags</"
12295 "filename>) or managed by Mercurial (stored in <filename role=\"special\">."
12296 "hgtags</filename>)."
12297 msgstr ""
12299 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12300 #: ../en/ch10-hook.xml:1825
12301 msgid ""
12302 "<literal>node</literal>: A changeset ID. The ID of the changeset to be "
12303 "tagged."
12304 msgstr ""
12306 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12307 #: ../en/ch10-hook.xml:1829
12308 msgid "<literal>tag</literal>: A string. The name of the tag to be created."
12309 msgstr ""
12311 #. type: Content of: <book><chapter><sect1><sect2><para>
12312 #: ../en/ch10-hook.xml:1834
12313 msgid ""
12314 "If the tag to be created is revision-controlled, the <literal role=\"hook"
12315 "\">precommit</literal> and <literal role=\"hook\">pretxncommit</literal> "
12316 "hooks (sections <xref linkend=\"sec.hook.commit\"/> and <xref linkend=\"sec."
12317 "hook.pretxncommit\"/>) will also be run."
12318 msgstr ""
12320 #. type: Content of: <book><chapter><sect1><sect2><para>
12321 #: ../en/ch10-hook.xml:1841
12322 msgid ""
12323 "See also: <literal role=\"hook\">tag</literal> (section <xref linkend=\"sec."
12324 "hook.tag\"/>)"
12325 msgstr ""
12327 #. type: Content of: <book><chapter><sect1><sect2><title>
12328 #: ../en/ch10-hook.xml:1846
12329 msgid ""
12330 "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing "
12331 "addition of remote changesets"
12332 msgstr ""
12333 "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;完成增加远程修改集之"
12334 "前"
12336 #. type: Content of: <book><chapter><sect1><sect2><para>
12337 #: ../en/ch10-hook.xml:1850
12338 msgid ""
12339 "This controlling hook is run before a transaction&emdash;that manages the "
12340 "addition of a group of new changesets from outside the repository&emdash;"
12341 "completes. If the hook succeeds, the transaction completes, and all of the "
12342 "changesets become permanent within this repository. If the hook fails, the "
12343 "transaction is rolled back, and the data for the changesets is erased."
12344 msgstr ""
12346 #. type: Content of: <book><chapter><sect1><sect2><para>
12347 #: ../en/ch10-hook.xml:1859
12348 msgid ""
12349 "This hook can access the metadata associated with the almost-added "
12350 "changesets, but it should not do anything permanent with this data. It must "
12351 "also not modify the working directory."
12352 msgstr ""
12354 #. type: Content of: <book><chapter><sect1><sect2><para>
12355 #: ../en/ch10-hook.xml:1865
12356 msgid ""
12357 "While this hook is running, if other Mercurial processes access this "
12358 "repository, they will be able to see the almost-added changesets as if they "
12359 "are permanent. This may lead to race conditions if you do not take steps to "
12360 "avoid them."
12361 msgstr ""
12363 #. type: Content of: <book><chapter><sect1><sect2><para>
12364 #: ../en/ch10-hook.xml:1872
12365 msgid ""
12366 "This hook can be used to automatically vet a group of changesets. If the "
12367 "hook fails, all of the changesets are <quote>rejected</quote> when the "
12368 "transaction rolls back."
12369 msgstr ""
12371 #. type: Content of: <book><chapter><sect1><sect2><para>
12372 #: ../en/ch10-hook.xml:1902
12373 msgid ""
12374 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
12375 "\"sec.hook.changegroup\"/>), <literal role=\"hook\">incoming</literal> "
12376 "(section <xref linkend=\"sec.hook.incoming\"/>), <literal role=\"hook"
12377 "\">prechangegroup</literal> (section <xref linkend=\"sec.hook.prechangegroup"
12378 "\"/>)"
12379 msgstr ""
12381 #. type: Content of: <book><chapter><sect1><sect2><title>
12382 #: ../en/ch10-hook.xml:1912
12383 msgid ""
12384 "<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit "
12385 "of new changeset"
12386 msgstr "<literal role=\"hook\">pretxncommit</literal>&emdash;完成提交之前"
12388 #. type: Content of: <book><chapter><sect1><sect2><para>
12389 #: ../en/ch10-hook.xml:1915
12390 msgid ""
12391 "This controlling hook is run before a transaction&emdash;that manages a new "
12392 "commit&emdash;completes. If the hook succeeds, the transaction completes and "
12393 "the changeset becomes permanent within this repository. If the hook fails, "
12394 "the transaction is rolled back, and the commit data is erased."
12395 msgstr ""
12397 #. type: Content of: <book><chapter><sect1><sect2><para>
12398 #: ../en/ch10-hook.xml:1923
12399 msgid ""
12400 "This hook can access the metadata associated with the almost-new changeset, "
12401 "but it should not do anything permanent with this data. It must also not "
12402 "modify the working directory."
12403 msgstr ""
12405 #. type: Content of: <book><chapter><sect1><sect2><para>
12406 #: ../en/ch10-hook.xml:1929
12407 msgid ""
12408 "While this hook is running, if other Mercurial processes access this "
12409 "repository, they will be able to see the almost-new changeset as if it is "
12410 "permanent. This may lead to race conditions if you do not take steps to "
12411 "avoid them."
12412 msgstr ""
12414 #. type: Content of: <book><chapter><sect1><sect2><para>
12415 #: ../en/ch10-hook.xml:1953
12416 msgid ""
12417 "See also: <literal role=\"hook\">precommit</literal> (section <xref linkend="
12418 "\"sec.hook.precommit\"/>)"
12419 msgstr ""
12421 #. type: Content of: <book><chapter><sect1><sect2><title>
12422 #: ../en/ch10-hook.xml:1959
12423 msgid ""
12424 "<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging "
12425 "working directory"
12426 msgstr ""
12427 "<literal role=\"hook\">preupdate</literal>&emdash;更新或合并工作目录之前"
12429 #. type: Content of: <book><chapter><sect1><sect2><para>
12430 #: ../en/ch10-hook.xml:1962
12431 msgid ""
12432 "This controlling hook is run before an update or merge of the working "
12433 "directory begins. It is run only if Mercurial's normal pre-update checks "
12434 "determine that the update or merge can proceed. If the hook succeeds, the "
12435 "update or merge may proceed; if it fails, the update or merge does not start."
12436 msgstr ""
12438 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12439 #: ../en/ch10-hook.xml:1972
12440 msgid ""
12441 "<literal>parent1</literal>: A changeset ID. The ID of the parent that the "
12442 "working directory is to be updated to. If the working directory is being "
12443 "merged, it will not change this parent."
12444 msgstr ""
12446 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12447 #: ../en/ch10-hook.xml:1978
12448 msgid ""
12449 "<literal>parent2</literal>: A changeset ID. Only set if the working "
12450 "directory is being merged. The ID of the revision that the working directory "
12451 "is being merged with."
12452 msgstr ""
12454 #. type: Content of: <book><chapter><sect1><sect2><para>
12455 #: ../en/ch10-hook.xml:1985
12456 msgid ""
12457 "See also: <literal role=\"hook\">update</literal> (section <xref linkend="
12458 "\"sec.hook.update\"/>)"
12459 msgstr ""
12461 #. type: Content of: <book><chapter><sect1><sect2><title>
12462 #: ../en/ch10-hook.xml:1991
12463 msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset"
12464 msgstr "<literal role=\"hook\">tag</literal>&emdash;创建标签之后"
12466 #. type: Content of: <book><chapter><sect1><sect2><para>
12467 #: ../en/ch10-hook.xml:1994
12468 msgid "This hook is run after a tag has been created."
12469 msgstr ""
12471 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12472 #: ../en/ch10-hook.xml:2000
12473 msgid ""
12474 "<literal>local</literal>: A boolean. Whether the new tag is local to this "
12475 "repository instance (i.e. stored in <filename role=\"special\">.hg/"
12476 "localtags</filename>) or managed by Mercurial (stored in <filename role="
12477 "\"special\">.hgtags</filename>)."
12478 msgstr ""
12480 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12481 #: ../en/ch10-hook.xml:2008
12482 msgid ""
12483 "<literal>node</literal>: A changeset ID. The ID of the changeset that was "
12484 "tagged."
12485 msgstr ""
12487 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12488 #: ../en/ch10-hook.xml:2012
12489 msgid "<literal>tag</literal>: A string. The name of the tag that was created."
12490 msgstr ""
12492 #. type: Content of: <book><chapter><sect1><sect2><para>
12493 #: ../en/ch10-hook.xml:2017
12494 msgid ""
12495 "If the created tag is revision-controlled, the <literal role=\"hook\">commit</"
12496 "literal> hook (section <xref linkend=\"sec.hook.commit\"/>) is run before "
12497 "this hook."
12498 msgstr ""
12500 #. type: Content of: <book><chapter><sect1><sect2><para>
12501 #: ../en/ch10-hook.xml:2022
12502 msgid ""
12503 "See also: <literal role=\"hook\">pretag</literal> (section <xref linkend="
12504 "\"sec.hook.pretag\"/>)"
12505 msgstr ""
12507 #. type: Content of: <book><chapter><sect1><sect2><title>
12508 #: ../en/ch10-hook.xml:2028
12509 msgid ""
12510 "<literal role=\"hook\">update</literal>&emdash;after updating or merging "
12511 "working directory"
12512 msgstr "<literal role=\"hook\">update</literal>&emdash;更新或合并工作目录之后"
12514 #. type: Content of: <book><chapter><sect1><sect2><para>
12515 #: ../en/ch10-hook.xml:2031
12516 msgid ""
12517 "This hook is run after an update or merge of the working directory "
12518 "completes. Since a merge can fail (if the external <command>hgmerge</"
12519 "command> command fails to resolve conflicts in a file), this hook "
12520 "communicates whether the update or merge completed cleanly."
12521 msgstr ""
12523 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12524 #: ../en/ch10-hook.xml:2039
12525 msgid ""
12526 "<literal>error</literal>: A boolean. Indicates whether the update or merge "
12527 "completed successfully."
12528 msgstr ""
12530 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12531 #: ../en/ch10-hook.xml:2044
12532 msgid ""
12533 "<literal>parent1</literal>: A changeset ID. The ID of the parent that the "
12534 "working directory was updated to. If the working directory was merged, it "
12535 "will not have changed this parent."
12536 msgstr ""
12538 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12539 #: ../en/ch10-hook.xml:2050
12540 msgid ""
12541 "<literal>parent2</literal>: A changeset ID. Only set if the working "
12542 "directory was merged. The ID of the revision that the working directory was "
12543 "merged with."
12544 msgstr ""
12546 #. type: Content of: <book><chapter><sect1><sect2><para>
12547 #: ../en/ch10-hook.xml:2056
12548 msgid ""
12549 "See also: <literal role=\"hook\">preupdate</literal> (section <xref linkend="
12550 "\"sec.hook.preupdate\"/>)"
12551 msgstr ""
12553 #. type: Content of: <book><chapter><title>
12554 #: ../en/ch11-template.xml:5
12555 msgid "Customising the output of Mercurial"
12556 msgstr "定制 Mercurial 的输出"
12558 #. type: Content of: <book><chapter><para>
12559 #: ../en/ch11-template.xml:7
12560 msgid ""
12561 "Mercurial provides a powerful mechanism to let you control how it displays "
12562 "information. The mechanism is based on templates. You can use templates to "
12563 "generate specific output for a single command, or to customise the entire "
12564 "appearance of the built-in web interface."
12565 msgstr ""
12567 #. type: Content of: <book><chapter><sect1><title>
12568 #: ../en/ch11-template.xml:14
12569 msgid "Using precanned output styles"
12570 msgstr "使用预定义的输出样式"
12572 #. type: Content of: <book><chapter><sect1><para>
12573 #: ../en/ch11-template.xml:16
12574 msgid ""
12575 "Packaged with Mercurial are some output styles that you can use immediately. "
12576 "A style is simply a precanned template that someone wrote and installed "
12577 "somewhere that Mercurial can find."
12578 msgstr ""
12580 #. type: Content of: <book><chapter><sect1><para>
12581 #: ../en/ch11-template.xml:21
12582 msgid ""
12583 "Before we take a look at Mercurial's bundled styles, let's review its normal "
12584 "output."
12585 msgstr ""
12587 #. type: Content of: <book><chapter><sect1><para>
12588 #: ../en/ch11-template.xml:26
12589 msgid ""
12590 "This is somewhat informative, but it takes up a lot of space&emdash;five "
12591 "lines of output per changeset. The <literal>compact</literal> style reduces "
12592 "this to three lines, presented in a sparse manner."
12593 msgstr ""
12595 #. type: Content of: <book><chapter><sect1><para>
12596 #: ../en/ch11-template.xml:33
12597 msgid ""
12598 "The <literal>changelog</literal> style hints at the expressive power of "
12599 "Mercurial's templating engine. This style attempts to follow the GNU "
12600 "Project's changelog guidelines<citation>web:changelog</citation>."
12601 msgstr ""
12603 #. type: Content of: <book><chapter><sect1><para>
12604 #: ../en/ch11-template.xml:40
12605 msgid ""
12606 "You will not be shocked to learn that Mercurial's default output style is "
12607 "named <literal>default</literal>."
12608 msgstr ""
12610 #. type: Content of: <book><chapter><sect1><sect2><title>
12611 #: ../en/ch11-template.xml:44
12612 msgid "Setting a default style"
12613 msgstr "设置默认样式"
12615 #. type: Content of: <book><chapter><sect1><sect2><para>
12616 #: ../en/ch11-template.xml:46
12617 msgid ""
12618 "You can modify the output style that Mercurial will use for every command by "
12619 "editing your <filename role=\"special\"> /.hgrc</filename>\\ file, naming the "
12620 "style you would prefer to use."
12621 msgstr ""
12623 #. type: Content of: <book><chapter><sect1><sect2><para>
12624 #: ../en/ch11-template.xml:53
12625 msgid ""
12626 "If you write a style of your own, you can use it by either providing the path "
12627 "to your style file, or copying your style file into a location where "
12628 "Mercurial can find it (typically the <literal>templates</literal> "
12629 "subdirectory of your Mercurial install directory)."
12630 msgstr ""
12632 #. type: Content of: <book><chapter><sect1><title>
12633 #: ../en/ch11-template.xml:62
12634 msgid "Commands that support styles and templates"
12635 msgstr "支持样式和模版的命令"
12637 #. type: Content of: <book><chapter><sect1><para>
12638 #: ../en/ch11-template.xml:64
12639 msgid ""
12640 "All of Mercurial's <quote><literal>log</literal>-like</quote> commands let "
12641 "you use styles and templates: <command role=\"hg-cmd\">hg incoming</command>, "
12642 "<command role=\"hg-cmd\">hg log</command>, <command role=\"hg-cmd\">hg "
12643 "outgoing</command>, and <command role=\"hg-cmd\">hg tip</command>."
12644 msgstr ""
12646 #. type: Content of: <book><chapter><sect1><para>
12647 #: ../en/ch11-template.xml:71
12648 msgid ""
12649 "As I write this manual, these are so far the only commands that support "
12650 "styles and templates. Since these are the most important commands that need "
12651 "customisable output, there has been little pressure from the Mercurial user "
12652 "community to add style and template support to other commands."
12653 msgstr ""
12655 #. type: Content of: <book><chapter><sect1><title>
12656 #: ../en/ch11-template.xml:79
12657 msgid "The basics of templating"
12658 msgstr "模版基础"
12660 #. type: Content of: <book><chapter><sect1><para>
12661 #: ../en/ch11-template.xml:81
12662 msgid ""
12663 "At its simplest, a Mercurial template is a piece of text. Some of the text "
12664 "never changes, while other parts are <emphasis>expanded</emphasis>, or "
12665 "replaced with new text, when necessary."
12666 msgstr ""
12668 #. type: Content of: <book><chapter><sect1><para>
12669 #: ../en/ch11-template.xml:86
12670 msgid ""
12671 "Before we continue, let's look again at a simple example of Mercurial's "
12672 "normal output."
12673 msgstr ""
12675 #. type: Content of: <book><chapter><sect1><para>
12676 #: ../en/ch11-template.xml:91
12677 msgid ""
12678 "Now, let's run the same command, but using a template to change its output."
12679 msgstr ""
12681 #. type: Content of: <book><chapter><sect1><para>
12682 #: ../en/ch11-template.xml:96
12683 msgid ""
12684 "The example above illustrates the simplest possible template; it's just a "
12685 "piece of static text, printed once for each changeset. The <option role=\"hg-"
12686 "opt-log\">--template</option> option to the <command role=\"hg-cmd\">hg log</"
12687 "command> command tells Mercurial to use the given text as the template when "
12688 "printing each changeset."
12689 msgstr ""
12691 #. type: Content of: <book><chapter><sect1><para>
12692 #: ../en/ch11-template.xml:104
12693 msgid ""
12694 "Notice that the template string above ends with the text <quote><literal>\\n</"
12695 "literal></quote>. This is an <emphasis>escape sequence</emphasis>, telling "
12696 "Mercurial to print a newline at the end of each template item. If you omit "
12697 "this newline, Mercurial will run each piece of output together. See section "
12698 "<xref linkend=\"sec.template.escape\"/> for more details of escape sequences."
12699 msgstr ""
12701 #. type: Content of: <book><chapter><sect1><para>
12702 #: ../en/ch11-template.xml:112
12703 msgid ""
12704 "A template that prints a fixed string of text all the time isn't very useful; "
12705 "let's try something a bit more complex."
12706 msgstr ""
12708 #. type: Content of: <book><chapter><sect1><para>
12709 #: ../en/ch11-template.xml:118
12710 msgid ""
12711 "As you can see, the string <quote><literal>{desc}</literal></quote> in the "
12712 "template has been replaced in the output with the description of each "
12713 "changeset. Every time Mercurial finds text enclosed in curly braces "
12714 "(<quote><literal>{</literal></quote> and <quote><literal>}</literal></"
12715 "quote>), it will try to replace the braces and text with the expansion of "
12716 "whatever is inside. To print a literal curly brace, you must escape it, as "
12717 "described in section <xref linkend=\"sec.template.escape\"/>."
12718 msgstr ""
12720 #. type: Content of: <book><chapter><sect1><title>
12721 #: ../en/ch11-template.xml:131
12722 msgid "Common template keywords"
12723 msgstr "模版关键字"
12725 #. type: Content of: <book><chapter><sect1><para>
12726 #: ../en/ch11-template.xml:133
12727 msgid ""
12728 "You can start writing simple templates immediately using the keywords below."
12729 msgstr ""
12731 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12732 #: ../en/ch11-template.xml:137
12733 msgid ""
12734 "<literal role=\"template-keyword\">author</literal>: String. The unmodified "
12735 "author of the changeset."
12736 msgstr ""
12738 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12739 #: ../en/ch11-template.xml:141
12740 msgid ""
12741 "<literal role=\"template-keyword\">branches</literal>: String. The name of "
12742 "the branch on which the changeset was committed. Will be empty if the branch "
12743 "name was <literal>default</literal>."
12744 msgstr ""
12746 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12747 #: ../en/ch11-template.xml:147
12748 msgid ""
12749 "<literal role=\"template-keyword\">date</literal>: Date information. The "
12750 "date when the changeset was committed. This is <emphasis>not</emphasis> "
12751 "human-readable; you must pass it through a filter that will render it "
12752 "appropriately. See section <xref linkend=\"sec.template.filter\"/> for more "
12753 "information on filters. The date is expressed as a pair of numbers. The "
12754 "first number is a Unix UTC timestamp (seconds since January 1, 1970); the "
12755 "second is the offset of the committer's timezone from UTC, in seconds."
12756 msgstr ""
12758 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12759 #: ../en/ch11-template.xml:158
12760 msgid ""
12761 "<literal role=\"template-keyword\">desc</literal>: String. The text of the "
12762 "changeset description."
12763 msgstr ""
12765 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12766 #: ../en/ch11-template.xml:161
12767 msgid ""
12768 "<literal role=\"template-keyword\">files</literal>: List of strings. All "
12769 "files modified, added, or removed by this changeset."
12770 msgstr ""
12772 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12773 #: ../en/ch11-template.xml:166
12774 msgid ""
12775 "<literal role=\"template-keyword\">file_adds</literal>: List of strings. "
12776 "Files added by this changeset."
12777 msgstr ""
12779 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12780 #: ../en/ch11-template.xml:170
12781 msgid ""
12782 "<literal role=\"template-keyword\">file_dels</literal>: List of strings. "
12783 "Files removed by this changeset."
12784 msgstr ""
12786 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12787 #: ../en/ch11-template.xml:174
12788 msgid ""
12789 "<literal role=\"template-keyword\">node</literal>: String. The changeset "
12790 "identification hash, as a 40-character hexadecimal string."
12791 msgstr ""
12793 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12794 #: ../en/ch11-template.xml:178
12795 msgid ""
12796 "<literal role=\"template-keyword\">parents</literal>: List of strings. The "
12797 "parents of the changeset."
12798 msgstr ""
12800 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12801 #: ../en/ch11-template.xml:182
12802 msgid ""
12803 "<literal role=\"template-keyword\">rev</literal>: Integer. The repository-"
12804 "local changeset revision number."
12805 msgstr ""
12807 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12808 #: ../en/ch11-template.xml:186
12809 msgid ""
12810 "<literal role=\"template-keyword\">tags</literal>: List of strings. Any tags "
12811 "associated with the changeset."
12812 msgstr ""
12814 #. type: Content of: <book><chapter><sect1><para>
12815 #: ../en/ch11-template.xml:191
12816 msgid ""
12817 "A few simple experiments will show us what to expect when we use these "
12818 "keywords; you can see the results below."
12819 msgstr ""
12821 #. type: Content of: <book><chapter><sect1><para>
12822 #: ../en/ch11-template.xml:196
12823 msgid ""
12824 "As we noted above, the date keyword does not produce human-readable output, "
12825 "so we must treat it specially. This involves using a <emphasis>filter</"
12826 "emphasis>, about which more in section <xref linkend=\"sec.template.filter\"/"
12827 ">."
12828 msgstr ""
12830 #. type: Content of: <book><chapter><sect1><title>
12831 #: ../en/ch11-template.xml:206
12832 msgid "Escape sequences"
12833 msgstr "转义序列"
12835 #. type: Content of: <book><chapter><sect1><para>
12836 #: ../en/ch11-template.xml:208
12837 msgid ""
12838 "Mercurial's templating engine recognises the most commonly used escape "
12839 "sequences in strings. When it sees a backslash (<quote><literal>\\</"
12840 "literal></quote>) character, it looks at the following character and "
12841 "substitutes the two characters with a single replacement, as described below."
12842 msgstr ""
12844 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12845 #: ../en/ch11-template.xml:215
12846 msgid ""
12847 "<literal>\\textbackslash\\textbackslash</literal>: Backslash, <quote><literal>"
12848 "\\</literal></quote>, ASCII 134."
12849 msgstr ""
12851 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12852 #: ../en/ch11-template.xml:219
12853 msgid "<literal>\\textbackslash n</literal>: Newline, ASCII 12."
12854 msgstr ""
12856 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12857 #: ../en/ch11-template.xml:222
12858 msgid "<literal>\\textbackslash r</literal>: Carriage return, ASCII 15."
12859 msgstr ""
12861 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12862 #: ../en/ch11-template.xml:225
12863 msgid "<literal>\\textbackslash t</literal>: Tab, ASCII 11."
12864 msgstr ""
12866 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12867 #: ../en/ch11-template.xml:228
12868 msgid "<literal>\\textbackslash v</literal>: Vertical tab, ASCII 13."
12869 msgstr ""
12871 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12872 #: ../en/ch11-template.xml:231
12873 msgid ""
12874 "<literal>\\textbackslash {</literal>: Open curly brace, <quote><literal>{</"
12875 "literal></quote>, ASCII 173."
12876 msgstr ""
12878 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12879 #: ../en/ch11-template.xml:235
12880 msgid ""
12881 "<literal>\\textbackslash }</literal>: Close curly brace, <quote><literal>}</"
12882 "literal></quote>, ASCII 175."
12883 msgstr ""
12885 #. type: Content of: <book><chapter><sect1><para>
12886 #: ../en/ch11-template.xml:240
12887 msgid ""
12888 "As indicated above, if you want the expansion of a template to contain a "
12889 "literal <quote><literal>\\</literal></quote>, <quote><literal>{</literal></"
12890 "quote>, or <quote><literal>{</literal></quote> character, you must escape it."
12891 msgstr ""
12893 #. type: Content of: <book><chapter><sect1><title>
12894 #: ../en/ch11-template.xml:248
12895 msgid "Filtering keywords to change their results"
12896 msgstr "通过过滤关键字来修改输出结果"
12898 #. type: Content of: <book><chapter><sect1><para>
12899 #: ../en/ch11-template.xml:250
12900 msgid ""
12901 "Some of the results of template expansion are not immediately easy to use. "
12902 "Mercurial lets you specify an optional chain of <emphasis>filters</emphasis> "
12903 "to modify the result of expanding a keyword. You have already seen a common "
12904 "filter, <literal role=\"template-kw-filt-date\">isodate</literal>, in action "
12905 "above, to make a date readable."
12906 msgstr ""
12908 #. type: Content of: <book><chapter><sect1><para>
12909 #: ../en/ch11-template.xml:257
12910 msgid ""
12911 "Below is a list of the most commonly used filters that Mercurial supports. "
12912 "While some filters can be applied to any text, others can only be used in "
12913 "specific circumstances. The name of each filter is followed first by an "
12914 "indication of where it can be used, then a description of its effect."
12915 msgstr ""
12917 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12918 #: ../en/ch11-template.xml:264
12919 msgid ""
12920 "<literal role=\"template-filter\">addbreaks</literal>: Any text. Add an XHTML "
12921 "<quote><literal><br/></literal></quote> tag before the end of every "
12922 "line except the last. For example, <quote><literal>foo\\nbar</literal></"
12923 "quote> becomes <quote><literal>foo<br/>\\nbar</literal></quote>."
12924 msgstr ""
12926 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12927 #: ../en/ch11-template.xml:271
12928 msgid ""
12929 "<literal role=\"template-kw-filt-date\">age</literal>: <literal role="
12930 "\"template-keyword\">date</literal> keyword. Render the age of the date, "
12931 "relative to the current time. Yields a string like <quote><literal>10 "
12932 "minutes</literal></quote>."
12933 msgstr ""
12935 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12936 #: ../en/ch11-template.xml:278
12937 msgid ""
12938 "<literal role=\"template-filter\">basename</literal>: Any text, but most "
12939 "useful for the <literal role=\"template-keyword\">files</literal> keyword and "
12940 "its relatives. Treat the text as a path, and return the basename. For "
12941 "example, <quote><literal>foo/bar/baz</literal></quote> becomes "
12942 "<quote><literal>baz</literal></quote>."
12943 msgstr ""
12945 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12946 #: ../en/ch11-template.xml:287
12947 msgid ""
12948 "<literal role=\"template-kw-filt-date\">date</literal>: <literal role="
12949 "\"template-keyword\">date</literal> keyword. Render a date in a similar "
12950 "format to the Unix <literal role=\"template-keyword\">date</literal> command, "
12951 "but with timezone included. Yields a string like <quote><literal>Mon Sep 04 "
12952 "15:13:13 2006 -0700</literal></quote>."
12953 msgstr ""
12955 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12956 #: ../en/ch11-template.xml:295
12957 msgid ""
12958 "<literal role=\"template-kw-filt-author\">domain</literal>: Any text, but "
12959 "most useful for the <literal role=\"template-keyword\">author</literal> "
12960 "keyword. Finds the first string that looks like an email address, and "
12961 "extract just the domain component. For example, <quote><literal>Bryan "
12962 "O'Sullivan <bos@serpentine.com></literal></quote> becomes "
12963 "<quote><literal>serpentine.com</literal></quote>."
12964 msgstr ""
12966 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12967 #: ../en/ch11-template.xml:305
12968 msgid ""
12969 "<literal role=\"template-kw-filt-author\">email</literal>: Any text, but most "
12970 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
12971 "Extract the first string that looks like an email address. For example, "
12972 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
12973 "becomes <quote><literal>bos@serpentine.com</literal></quote>."
12974 msgstr ""
12976 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12977 #: ../en/ch11-template.xml:314
12978 msgid ""
12979 "<literal role=\"template-filter\">escape</literal>: Any text. Replace the "
12980 "special XML/XHTML characters <quote><literal>&</literal></quote>, "
12981 "<quote><literal><</literal></quote> and <quote><literal>></literal></"
12982 "quote> with XML entities."
12983 msgstr ""
12985 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12986 #: ../en/ch11-template.xml:322
12987 msgid ""
12988 "<literal role=\"template-filter\">fill68</literal>: Any text. Wrap the text "
12989 "to fit in 68 columns. This is useful before you pass text through the "
12990 "<literal role=\"template-filter\">tabindent</literal> filter, and still want "
12991 "it to fit in an 80-column fixed-font window."
12992 msgstr ""
12994 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12995 #: ../en/ch11-template.xml:330
12996 msgid ""
12997 "<literal role=\"template-filter\">fill76</literal>: Any text. Wrap the text "
12998 "to fit in 76 columns."
12999 msgstr ""
13001 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13002 #: ../en/ch11-template.xml:334
13003 msgid ""
13004 "<literal role=\"template-filter\">firstline</literal>: Any text. Yield the "
13005 "first line of text, without any trailing newlines."
13006 msgstr ""
13008 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13009 #: ../en/ch11-template.xml:339
13010 msgid ""
13011 "<literal role=\"template-kw-filt-date\">hgdate</literal>: <literal role="
13012 "\"template-keyword\">date</literal> keyword. Render the date as a pair of "
13013 "readable numbers. Yields a string like <quote><literal>1157407993 25200</"
13014 "literal></quote>."
13015 msgstr ""
13017 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13018 #: ../en/ch11-template.xml:346
13019 msgid ""
13020 "<literal role=\"template-kw-filt-date\">isodate</literal>: <literal role="
13021 "\"template-keyword\">date</literal> keyword. Render the date as a text "
13022 "string in ISO 8601 format. Yields a string like <quote><literal>2006-09-04 "
13023 "15:13:13 -0700</literal></quote>."
13024 msgstr ""
13026 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13027 #: ../en/ch11-template.xml:353
13028 msgid ""
13029 "<literal role=\"template-filter\">obfuscate</literal>: Any text, but most "
13030 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
13031 "Yield the input text rendered as a sequence of XML entities. This helps to "
13032 "defeat some particularly stupid screen-scraping email harvesting spambots."
13033 msgstr ""
13035 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13036 #: ../en/ch11-template.xml:361
13037 msgid ""
13038 "<literal role=\"template-kw-filt-author\">person</literal>: Any text, but "
13039 "most useful for the <literal role=\"template-keyword\">author</literal> "
13040 "keyword. Yield the text before an email address. For example, "
13041 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
13042 "becomes <quote><literal>Bryan O'Sullivan</literal></quote>."
13043 msgstr ""
13045 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13046 #: ../en/ch11-template.xml:370
13047 msgid ""
13048 "<literal role=\"template-kw-filt-date\">rfc822date</literal>: <literal role="
13049 "\"template-keyword\">date</literal> keyword. Render a date using the same "
13050 "format used in email headers. Yields a string like <quote><literal>Mon, 04 "
13051 "Sep 2006 15:13:13 -0700</literal></quote>."
13052 msgstr ""
13054 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13055 #: ../en/ch11-template.xml:377
13056 msgid ""
13057 "<literal role=\"template-kw-filt-node\">short</literal>: Changeset hash. "
13058 "Yield the short form of a changeset hash, i.e. a 12-character hexadecimal "
13059 "string."
13060 msgstr ""
13062 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13063 #: ../en/ch11-template.xml:382
13064 msgid ""
13065 "<literal role=\"template-kw-filt-date\">shortdate</literal>: <literal role="
13066 "\"template-keyword\">date</literal> keyword. Render the year, month, and day "
13067 "of the date. Yields a string like <quote><literal>2006-09-04</literal></"
13068 "quote>."
13069 msgstr ""
13071 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13072 #: ../en/ch11-template.xml:388
13073 msgid ""
13074 "<literal role=\"template-filter\">strip</literal>: Any text. Strip all "
13075 "leading and trailing whitespace from the string."
13076 msgstr ""
13078 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13079 #: ../en/ch11-template.xml:392
13080 msgid ""
13081 "<literal role=\"template-filter\">tabindent</literal>: Any text. Yield the "
13082 "text, with every line except the first starting with a tab character."
13083 msgstr ""
13085 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13086 #: ../en/ch11-template.xml:397
13087 msgid ""
13088 "<literal role=\"template-filter\">urlescape</literal>: Any text. Escape all "
13089 "characters that are considered <quote>special</quote> by URL parsers. For "
13090 "example, <literal>foo bar</literal> becomes <literal>foo%20bar</literal>."
13091 msgstr ""
13093 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13094 #: ../en/ch11-template.xml:404
13095 msgid ""
13096 "<literal role=\"template-kw-filt-author\">user</literal>: Any text, but most "
13097 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
13098 "Return the <quote>user</quote> portion of an email address. For example, "
13099 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
13100 "becomes <quote><literal>bos</literal></quote>."
13101 msgstr ""
13103 #. type: Content of: <book><chapter><sect1><note><para>
13104 #: ../en/ch11-template.xml:417
13105 msgid ""
13106 "If you try to apply a filter to a piece of data that it cannot process, "
13107 "Mercurial will fail and print a Python exception. For example, trying to run "
13108 "the output of the <literal role=\"template-keyword\">desc</literal> keyword "
13109 "into the <literal role=\"template-kw-filt-date\">isodate</literal> filter is "
13110 "not a good idea."
13111 msgstr ""
13113 #. type: Content of: <book><chapter><sect1><sect2><title>
13114 #: ../en/ch11-template.xml:426
13115 msgid "Combining filters"
13116 msgstr "组合过滤器"
13118 #. type: Content of: <book><chapter><sect1><sect2><para>
13119 #: ../en/ch11-template.xml:428
13120 msgid ""
13121 "It is easy to combine filters to yield output in the form you would like. "
13122 "The following chain of filters tidies up a description, then makes sure that "
13123 "it fits cleanly into 68 columns, then indents it by a further 8 characters "
13124 "(at least on Unix-like systems, where a tab is conventionally 8 characters "
13125 "wide)."
13126 msgstr ""
13128 #. type: Content of: <book><chapter><sect1><sect2><para>
13129 #: ../en/ch11-template.xml:437
13130 msgid ""
13131 "Note the use of <quote><literal>\\t</literal></quote> (a tab character) in "
13132 "the template to force the first line to be indented; this is necessary since "
13133 "<literal role=\"template-keyword\">tabindent</literal> indents all lines "
13134 "<emphasis>except</emphasis> the first."
13135 msgstr ""
13137 #. type: Content of: <book><chapter><sect1><sect2><para>
13138 #: ../en/ch11-template.xml:443
13139 msgid ""
13140 "Keep in mind that the order of filters in a chain is significant. The first "
13141 "filter is applied to the result of the keyword; the second to the result of "
13142 "the first filter; and so on. For example, using <literal>fill68|tabindent</"
13143 "literal> gives very different results from <literal>tabindent|fill68</"
13144 "literal>."
13145 msgstr ""
13147 #. type: Content of: <book><chapter><sect1><title>
13148 #: ../en/ch11-template.xml:454
13149 msgid "From templates to styles"
13150 msgstr "从模版到样式"
13152 #. type: Content of: <book><chapter><sect1><para>
13153 #: ../en/ch11-template.xml:456
13154 msgid ""
13155 "A command line template provides a quick and simple way to format some "
13156 "output. Templates can become verbose, though, and it's useful to be able to "
13157 "give a template a name. A style file is a template with a name, stored in a "
13158 "file."
13159 msgstr ""
13161 #. type: Content of: <book><chapter><sect1><para>
13162 #: ../en/ch11-template.xml:461
13163 msgid ""
13164 "More than that, using a style file unlocks the power of Mercurial's "
13165 "templating engine in ways that are not possible using the command line "
13166 "<option role=\"hg-opt-log\">--template</option> option."
13167 msgstr ""
13169 #. type: Content of: <book><chapter><sect1><sect2><title>
13170 #: ../en/ch11-template.xml:467
13171 msgid "The simplest of style files"
13172 msgstr "最简单的样式文件"
13174 #. type: Content of: <book><chapter><sect1><sect2><para>
13175 #: ../en/ch11-template.xml:469
13176 msgid "Our simple style file contains just one line:"
13177 msgstr ""
13179 #. type: Content of: <book><chapter><sect1><sect2><para>
13180 #: ../en/ch11-template.xml:473
13181 msgid ""
13182 "This tells Mercurial, <quote>if you're printing a changeset, use the text on "
13183 "the right as the template</quote>."
13184 msgstr ""
13186 #. type: Content of: <book><chapter><sect1><sect2><title>
13187 #: ../en/ch11-template.xml:479
13188 msgid "Style file syntax"
13189 msgstr "样式文件语法"
13191 #. type: Content of: <book><chapter><sect1><sect2><para>
13192 #: ../en/ch11-template.xml:481
13193 msgid "The syntax rules for a style file are simple."
13194 msgstr ""
13196 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13197 #: ../en/ch11-template.xml:484
13198 msgid "The file is processed one line at a time."
13199 msgstr ""
13201 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13202 #: ../en/ch11-template.xml:487
13203 msgid "Leading and trailing white space are ignored."
13204 msgstr ""
13206 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13207 #: ../en/ch11-template.xml:490
13208 msgid "Empty lines are skipped."
13209 msgstr ""
13211 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13212 #: ../en/ch11-template.xml:492
13213 msgid ""
13214 "If a line starts with either of the characters <quote><literal>#</literal></"
13215 "quote> or <quote><literal>;</literal></quote>, the entire line is treated as "
13216 "a comment, and skipped as if empty."
13217 msgstr ""
13219 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13220 #: ../en/ch11-template.xml:497
13221 msgid ""
13222 "A line starts with a keyword. This must start with an alphabetic character "
13223 "or underscore, and can subsequently contain any alphanumeric character or "
13224 "underscore. (In regexp notation, a keyword must match <literal>[A-Za-z_][A-"
13225 "Za-z0-9_]*</literal>.)"
13226 msgstr ""
13228 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13229 #: ../en/ch11-template.xml:503
13230 msgid ""
13231 "The next element must be an <quote><literal>=</literal></quote> character, "
13232 "which can be preceded or followed by an arbitrary amount of white space."
13233 msgstr ""
13235 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13236 #: ../en/ch11-template.xml:508
13237 msgid ""
13238 "If the rest of the line starts and ends with matching quote characters "
13239 "(either single or double quote), it is treated as a template body."
13240 msgstr ""
13242 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13243 #: ../en/ch11-template.xml:512
13244 msgid ""
13245 "If the rest of the line <emphasis>does not</emphasis> start with a quote "
13246 "character, it is treated as the name of a file; the contents of this file "
13247 "will be read and used as a template body."
13248 msgstr ""
13250 #. type: Content of: <book><chapter><sect1><title>
13251 #: ../en/ch11-template.xml:521
13252 msgid "Style files by example"
13253 msgstr "样式文件例子"
13255 #. type: Content of: <book><chapter><sect1><para>
13256 #: ../en/ch11-template.xml:523
13257 msgid ""
13258 "To illustrate how to write a style file, we will construct a few by example. "
13259 "Rather than provide a complete style file and walk through it, we'll mirror "
13260 "the usual process of developing a style file by starting with something very "
13261 "simple, and walking through a series of successively more complete examples."
13262 msgstr ""
13264 #. type: Content of: <book><chapter><sect1><sect2><title>
13265 #: ../en/ch11-template.xml:530
13266 msgid "Identifying mistakes in style files"
13267 msgstr "在样式文件中定位错误"
13269 #. type: Content of: <book><chapter><sect1><sect2><para>
13270 #: ../en/ch11-template.xml:532
13271 msgid ""
13272 "If Mercurial encounters a problem in a style file you are working on, it "
13273 "prints a terse error message that, once you figure out what it means, is "
13274 "actually quite useful."
13275 msgstr ""
13277 #. type: Content of: <book><chapter><sect1><sect2><para>
13278 #: ../en/ch11-template.xml:538
13279 msgid ""
13280 "Notice that <filename>broken.style</filename> attempts to define a "
13281 "<literal>changeset</literal> keyword, but forgets to give any content for it. "
13282 "When instructed to use this style file, Mercurial promptly complains."
13283 msgstr ""
13285 #. type: Content of: <book><chapter><sect1><sect2><para>
13286 #: ../en/ch11-template.xml:545
13287 msgid "This error message looks intimidating, but it is not too hard to follow."
13288 msgstr ""
13290 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13291 #: ../en/ch11-template.xml:549
13292 msgid ""
13293 "The first component is simply Mercurial's way of saying <quote>I am giving "
13294 "up</quote>."
13295 msgstr ""
13297 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13298 #: ../en/ch11-template.xml:554
13299 msgid "Next comes the name of the style file that contains the error."
13300 msgstr ""
13302 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13303 #: ../en/ch11-template.xml:560
13304 msgid ""
13305 "Following the file name is the line number where the error was encountered."
13306 msgstr ""
13308 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13309 #: ../en/ch11-template.xml:565
13310 msgid "Finally, a description of what went wrong."
13311 msgstr ""
13313 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13314 #: ../en/ch11-template.xml:570
13315 msgid ""
13316 "The description of the problem is not always clear (as in this case), but "
13317 "even when it is cryptic, it is almost always trivial to visually inspect the "
13318 "offending line in the style file and see what is wrong."
13319 msgstr ""
13321 #. type: Content of: <book><chapter><sect1><sect2><title>
13322 #: ../en/ch11-template.xml:578
13323 msgid "Uniquely identifying a repository"
13324 msgstr "版本库的唯一标识"
13326 #. type: Content of: <book><chapter><sect1><sect2><para>
13327 #: ../en/ch11-template.xml:580
13328 msgid ""
13329 "If you would like to be able to identify a Mercurial repository <quote>fairly "
13330 "uniquely</quote> using a short string as an identifier, you can use the first "
13331 "revision in the repository."
13332 msgstr ""
13334 #. type: Content of: <book><chapter><sect1><sect2><para>
13335 #: ../en/ch11-template.xml:587
13336 msgid ""
13337 "This is not guaranteed to be unique, but it is nevertheless useful in many "
13338 "cases."
13339 msgstr ""
13341 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13342 #: ../en/ch11-template.xml:590
13343 msgid ""
13344 "It will not work in a completely empty repository, because such a repository "
13345 "does not have a revision zero."
13346 msgstr ""
13348 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13349 #: ../en/ch11-template.xml:594
13350 msgid ""
13351 "Neither will it work in the (extremely rare) case where a repository is a "
13352 "merge of two or more formerly independent repositories, and you still have "
13353 "those repositories around."
13354 msgstr ""
13356 #. type: Content of: <book><chapter><sect1><sect2><para>
13357 #: ../en/ch11-template.xml:599
13358 msgid "Here are some uses to which you could put this identifier:"
13359 msgstr ""
13361 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13362 #: ../en/ch11-template.xml:602
13363 msgid ""
13364 "As a key into a table for a database that manages repositories on a server."
13365 msgstr ""
13367 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13368 #: ../en/ch11-template.xml:605
13369 msgid ""
13370 "As half of a {<emphasis>repository ID</emphasis>, <emphasis>revision ID</"
13371 "emphasis>} tuple. Save this information away when you run an automated build "
13372 "or other activity, so that you can <quote>replay</quote> the build later if "
13373 "necessary."
13374 msgstr ""
13376 #. type: Content of: <book><chapter><sect1><sect2><title>
13377 #: ../en/ch11-template.xml:614
13378 msgid "Mimicking Subversion's output"
13379 msgstr "模仿 Subversion 的输出"
13381 #
13382 #. type: Content of: <book><chapter><sect1><sect2><para>
13383 #: ../en/ch11-template.xml:616
13384 msgid ""
13385 "Let's try to emulate the default output format used by another revision "
13386 "control tool, Subversion."
13387 msgstr ""
13389 #
13390 #. type: Content of: <book><chapter><sect1><sect2><para>
13391 #: ../en/ch11-template.xml:621
13392 msgid ""
13393 "Since Subversion's output style is fairly simple, it is easy to copy-and-"
13394 "paste a hunk of its output into a file, and replace the text produced above "
13395 "by Subversion with the template values we'd like to see expanded."
13396 msgstr ""
13398 #. type: Content of: <book><chapter><sect1><sect2><para>
13399 #: ../en/ch11-template.xml:628
13400 msgid ""
13401 "There are a few small ways in which this template deviates from the output "
13402 "produced by Subversion."
13403 msgstr ""
13405 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13406 #: ../en/ch11-template.xml:631
13407 msgid ""
13408 "Subversion prints a <quote>readable</quote> date (the <quote><literal>Wed, 27 "
13409 "Sep 2006</literal></quote> in the example output above) in parentheses. "
13410 "Mercurial's templating engine does not provide a way to display a date in "
13411 "this format without also printing the time and time zone."
13412 msgstr ""
13414 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13415 #: ../en/ch11-template.xml:638
13416 msgid ""
13417 "We emulate Subversion's printing of <quote>separator</quote> lines full of "
13418 "<quote><literal>-</literal></quote> characters by ending the template with "
13419 "such a line. We use the templating engine's <literal role=\"template-keyword"
13420 "\">header</literal> keyword to print a separator line as the first line of "
13421 "output (see below), thus achieving similar output to Subversion."
13422 msgstr ""
13424 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13425 #: ../en/ch11-template.xml:647
13426 msgid ""
13427 "Subversion's output includes a count in the header of the number of lines in "
13428 "the commit message. We cannot replicate this in Mercurial; the templating "
13429 "engine does not currently provide a filter that counts the number of lines "
13430 "the template generates."
13431 msgstr ""
13433 #
13434 #. type: Content of: <book><chapter><sect1><sect2><para>
13435 #: ../en/ch11-template.xml:653
13436 msgid ""
13437 "It took me no more than a minute or two of work to replace literal text from "
13438 "an example of Subversion's output with some keywords and filters to give the "
13439 "template above. The style file simply refers to the template."
13440 msgstr ""
13442 #. type: Content of: <book><chapter><sect1><sect2><para>
13443 #: ../en/ch11-template.xml:660
13444 msgid ""
13445 "We could have included the text of the template file directly in the style "
13446 "file by enclosing it in quotes and replacing the newlines with "
13447 "<quote><literal>\\n</literal></quote> sequences, but it would have made the "
13448 "style file too difficult to read. Readability is a good guide when you're "
13449 "trying to decide whether some text belongs in a style file, or in a template "
13450 "file that the style file points to. If the style file will look too big or "
13451 "cluttered if you insert a literal piece of text, drop it into a template "
13452 "instead."
13453 msgstr ""
13455 #. type: Content of: <book><chapter><title>
13456 #: ../en/ch12-mq.xml:5
13457 msgid "Managing change with Mercurial Queues"
13458 msgstr "使用 MQ 管理修改"
13460 #. type: Content of: <book><chapter><sect1><title>
13461 #: ../en/ch12-mq.xml:8
13462 msgid "The patch management problem"
13463 msgstr "补丁的管理问题"
13465 #. type: Content of: <book><chapter><sect1><para>
13466 #: ../en/ch12-mq.xml:10
13467 msgid ""
13468 "Here is a common scenario: you need to install a software package from "
13469 "source, but you find a bug that you must fix in the source before you can "
13470 "start using the package. You make your changes, forget about the package for "
13471 "a while, and a few months later you need to upgrade to a newer version of the "
13472 "package. If the newer version of the package still has the bug, you must "
13473 "extract your fix from the older source tree and apply it against the newer "
13474 "version. This is a tedious task, and it's easy to make mistakes."
13475 msgstr ""
13477 #. type: Content of: <book><chapter><sect1><para>
13478 #: ../en/ch12-mq.xml:20
13479 msgid ""
13480 "This is a simple case of the <quote>patch management</quote> problem. You "
13481 "have an <quote>upstream</quote> source tree that you can't change; you need "
13482 "to make some local changes on top of the upstream tree; and you'd like to be "
13483 "able to keep those changes separate, so that you can apply them to newer "
13484 "versions of the upstream source."
13485 msgstr ""
13487 #. type: Content of: <book><chapter><sect1><para>
13488 #: ../en/ch12-mq.xml:27
13489 msgid ""
13490 "The patch management problem arises in many situations. Probably the most "
13491 "visible is that a user of an open source software project will contribute a "
13492 "bug fix or new feature to the project's maintainers in the form of a patch."
13493 msgstr ""
13495 #. type: Content of: <book><chapter><sect1><para>
13496 #: ../en/ch12-mq.xml:32
13497 msgid ""
13498 "Distributors of operating systems that include open source software often "
13499 "need to make changes to the packages they distribute so that they will build "
13500 "properly in their environments."
13501 msgstr ""
13503 #. type: Content of: <book><chapter><sect1><para>
13504 #: ../en/ch12-mq.xml:37
13505 msgid ""
13506 "When you have few changes to maintain, it is easy to manage a single patch "
13507 "using the standard <command>diff</command> and <command>patch</command> "
13508 "programs (see section <xref linkend=\"sec.mq.patch\"/> for a discussion of "
13509 "these tools). Once the number of changes grows, it starts to make sense to "
13510 "maintain patches as discrete <quote>chunks of work,</quote> so that for "
13511 "example a single patch will contain only one bug fix (the patch might modify "
13512 "several files, but it's doing <quote>only one thing</quote>), and you may "
13513 "have a number of such patches for different bugs you need fixed and local "
13514 "changes you require. In this situation, if you submit a bug fix patch to the "
13515 "upstream maintainers of a package and they include your fix in a subsequent "
13516 "release, you can simply drop that single patch when you're updating to the "
13517 "newer release."
13518 msgstr ""
13520 #. type: Content of: <book><chapter><sect1><para>
13521 #: ../en/ch12-mq.xml:52
13522 msgid ""
13523 "Maintaining a single patch against an upstream tree is a little tedious and "
13524 "error-prone, but not difficult. However, the complexity of the problem grows "
13525 "rapidly as the number of patches you have to maintain increases. With more "
13526 "than a tiny number of patches in hand, understanding which ones you have "
13527 "applied and maintaining them moves from messy to overwhelming."
13528 msgstr ""
13530 #. type: Content of: <book><chapter><sect1><para>
13531 #: ../en/ch12-mq.xml:59
13532 msgid ""
13533 "Fortunately, Mercurial includes a powerful extension, Mercurial Queues (or "
13534 "simply <quote>MQ</quote>), that massively simplifies the patch management "
13535 "problem."
13536 msgstr ""
13538 #. type: Content of: <book><chapter><sect1><title>
13539 #: ../en/ch12-mq.xml:65
13540 msgid "The prehistory of Mercurial Queues"
13541 msgstr "MQ 的历史"
13543 #. type: Content of: <book><chapter><sect1><para>
13544 #: ../en/ch12-mq.xml:67
13545 msgid ""
13546 "During the late 1990s, several Linux kernel developers started to maintain "
13547 "<quote>patch series</quote> that modified the behaviour of the Linux kernel. "
13548 "Some of these series were focused on stability, some on feature coverage, and "
13549 "others were more speculative."
13550 msgstr ""
13552 #. type: Content of: <book><chapter><sect1><para>
13553 #: ../en/ch12-mq.xml:73
13554 msgid ""
13555 "The sizes of these patch series grew rapidly. In 2002, Andrew Morton "
13556 "published some shell scripts he had been using to automate the task of "
13557 "managing his patch queues. Andrew was successfully using these scripts to "
13558 "manage hundreds (sometimes thousands) of patches on top of the Linux kernel."
13559 msgstr ""
13561 #. type: Content of: <book><chapter><sect1><sect2><title>
13562 #: ../en/ch12-mq.xml:80
13563 msgid "A patchwork quilt"
13564 msgstr ""
13566 #. type: Content of: <book><chapter><sect1><sect2><para>
13567 #: ../en/ch12-mq.xml:82
13568 msgid ""
13569 "In early 2003, Andreas Gruenbacher and Martin Quinson borrowed the approach "
13570 "of Andrew's scripts and published a tool called <quote>patchwork quilt</"
13571 "quote> <citation>web:quilt</citation>, or simply <quote>quilt</quote> (see "
13572 "<citation>gruenbacher:2005</citation> for a paper describing it). Because "
13573 "quilt substantially automated patch management, it rapidly gained a large "
13574 "following among open source software developers."
13575 msgstr ""
13577 #. type: Content of: <book><chapter><sect1><sect2><para>
13578 #: ../en/ch12-mq.xml:91
13579 msgid ""
13580 "Quilt manages a <emphasis>stack of patches</emphasis> on top of a directory "
13581 "tree. To begin, you tell quilt to manage a directory tree, and tell it which "
13582 "files you want to manage; it stores away the names and contents of those "
13583 "files. To fix a bug, you create a new patch (using a single command), edit "
13584 "the files you need to fix, then <quote>refresh</quote> the patch."
13585 msgstr ""
13587 #. type: Content of: <book><chapter><sect1><sect2><para>
13588 #: ../en/ch12-mq.xml:99
13589 msgid ""
13590 "The refresh step causes quilt to scan the directory tree; it updates the "
13591 "patch with all of the changes you have made. You can create another patch on "
13592 "top of the first, which will track the changes required to modify the tree "
13593 "from <quote>tree with one patch applied</quote> to <quote>tree with two "
13594 "patches applied</quote>."
13595 msgstr ""
13597 #. type: Content of: <book><chapter><sect1><sect2><para>
13598 #: ../en/ch12-mq.xml:106
13599 msgid ""
13600 "You can <emphasis>change</emphasis> which patches are applied to the tree. "
13601 "If you <quote>pop</quote> a patch, the changes made by that patch will vanish "
13602 "from the directory tree. Quilt remembers which patches you have popped, "
13603 "though, so you can <quote>push</quote> a popped patch again, and the "
13604 "directory tree will be restored to contain the modifications in the patch. "
13605 "Most importantly, you can run the <quote>refresh</quote> command at any time, "
13606 "and the topmost applied patch will be updated. This means that you can, at "
13607 "any time, change both which patches are applied and what modifications those "
13608 "patches make."
13609 msgstr ""
13611 #. type: Content of: <book><chapter><sect1><sect2><para>
13612 #: ../en/ch12-mq.xml:118
13613 msgid ""
13614 "Quilt knows nothing about revision control tools, so it works equally well on "
13615 "top of an unpacked tarball or a Subversion working copy."
13616 msgstr ""
13618 #. type: Content of: <book><chapter><sect1><sect2><title>
13619 #: ../en/ch12-mq.xml:124
13620 msgid "From patchwork quilt to Mercurial Queues"
13621 msgstr "从 patchwork quilt 到 MQ"
13623 #. type: Content of: <book><chapter><sect1><sect2><para>
13624 #: ../en/ch12-mq.xml:126
13625 msgid ""
13626 "In mid-2005, Chris Mason took the features of quilt and wrote an extension "
13627 "that he called Mercurial Queues, which added quilt-like behaviour to "
13628 "Mercurial."
13629 msgstr ""
13631 #. type: Content of: <book><chapter><sect1><sect2><para>
13632 #: ../en/ch12-mq.xml:130
13633 msgid ""
13634 "The key difference between quilt and MQ is that quilt knows nothing about "
13635 "revision control systems, while MQ is <emphasis>integrated</emphasis> into "
13636 "Mercurial. Each patch that you push is represented as a Mercurial "
13637 "changeset. Pop a patch, and the changeset goes away."
13638 msgstr ""
13640 #. type: Content of: <book><chapter><sect1><sect2><para>
13641 #: ../en/ch12-mq.xml:136
13642 msgid ""
13643 "Because quilt does not care about revision control tools, it is still a "
13644 "tremendously useful piece of software to know about for situations where you "
13645 "cannot use Mercurial and MQ."
13646 msgstr ""
13648 #. type: Content of: <book><chapter><sect1><title>
13649 #: ../en/ch12-mq.xml:144
13650 msgid "The huge advantage of MQ"
13651 msgstr "MQ 的巨大优势"
13653 #. type: Content of: <book><chapter><sect1><para>
13654 #: ../en/ch12-mq.xml:146
13655 msgid ""
13656 "I cannot overstate the value that MQ offers through the unification of "
13657 "patches and revision control."
13658 msgstr ""
13660 #. type: Content of: <book><chapter><sect1><para>
13661 #: ../en/ch12-mq.xml:149
13662 msgid ""
13663 "A major reason that patches have persisted in the free software and open "
13664 "source world&emdash;in spite of the availability of increasingly capable "
13665 "revision control tools over the years&emdash;is the <emphasis>agility</"
13666 "emphasis> they offer."
13667 msgstr ""
13669 #. type: Content of: <book><chapter><sect1><para>
13670 #: ../en/ch12-mq.xml:155
13671 msgid ""
13672 "Traditional revision control tools make a permanent, irreversible record of "
13673 "everything that you do. While this has great value, it's also somewhat "
13674 "stifling. If you want to perform a wild-eyed experiment, you have to be "
13675 "careful in how you go about it, or you risk leaving unneeded&emdash;or worse, "
13676 "misleading or destabilising&emdash;traces of your missteps and errors in the "
13677 "permanent revision record."
13678 msgstr ""
13680 #. type: Content of: <book><chapter><sect1><para>
13681 #: ../en/ch12-mq.xml:163
13682 msgid ""
13683 "By contrast, MQ's marriage of distributed revision control with patches makes "
13684 "it much easier to isolate your work. Your patches live on top of normal "
13685 "revision history, and you can make them disappear or reappear at will. If "
13686 "you don't like a patch, you can drop it. If a patch isn't quite as you want "
13687 "it to be, simply fix it&emdash;as many times as you need to, until you have "
13688 "refined it into the form you desire."
13689 msgstr ""
13691 #. type: Content of: <book><chapter><sect1><para>
13692 #: ../en/ch12-mq.xml:171
13693 msgid ""
13694 "As an example, the integration of patches with revision control makes "
13695 "understanding patches and debugging their effects&emdash;and their interplay "
13696 "with the code they're based on&emdash;<emphasis>enormously</emphasis> easier. "
13697 "Since every applied patch has an associated changeset, you can give <command "
13698 "role=\"hg-cmd\">hg log</command> a file name to see which changesets and "
13699 "patches affected the file. You can use the <command role=\"hg-cmd\">hg "
13700 "bisect</command> command to binary-search through all changesets and applied "
13701 "patches to see where a bug got introduced or fixed. You can use the <command "
13702 "role=\"hg-cmd\">hg annotate</command> command to see which changeset or patch "
13703 "modified a particular line of a source file. And so on."
13704 msgstr ""
13706 #. type: Content of: <book><chapter><sect1><title>
13707 #: ../en/ch12-mq.xml:187
13708 msgid "Understanding patches"
13709 msgstr "理解补丁"
13711 #. type: Content of: <book><chapter><sect1><para>
13712 #: ../en/ch12-mq.xml:189
13713 msgid ""
13714 "Because MQ doesn't hide its patch-oriented nature, it is helpful to "
13715 "understand what patches are, and a little about the tools that work with them."
13716 msgstr ""
13718 #. type: Content of: <book><chapter><sect1><para>
13719 #: ../en/ch12-mq.xml:193
13720 msgid ""
13721 "The traditional Unix <command>diff</command> command compares two files, and "
13722 "prints a list of differences between them. The <command>patch</command> "
13723 "command understands these differences as <emphasis>modifications</emphasis> "
13724 "to make to a file. Take a look below for a simple example of these commands "
13725 "in action."
13726 msgstr ""
13728 #. type: Content of: <book><chapter><sect1><para>
13729 #: ../en/ch12-mq.xml:202
13730 msgid ""
13731 "The type of file that <command>diff</command> generates (and <command>patch</"
13732 "command> takes as input) is called a <quote>patch</quote> or a <quote>diff</"
13733 "quote>; there is no difference between a patch and a diff. (We'll use the "
13734 "term <quote>patch</quote>, since it's more commonly used.)"
13735 msgstr ""
13737 #. type: Content of: <book><chapter><sect1><para>
13738 #: ../en/ch12-mq.xml:208
13739 msgid ""
13740 "A patch file can start with arbitrary text; the <command>patch</command> "
13741 "command ignores this text, but MQ uses it as the commit message when creating "
13742 "changesets. To find the beginning of the patch content, <command>patch</"
13743 "command> searches for the first line that starts with the string "
13744 "<quote><literal>diff -</literal></quote>."
13745 msgstr ""
13747 #. type: Content of: <book><chapter><sect1><para>
13748 #: ../en/ch12-mq.xml:215
13749 msgid ""
13750 "MQ works with <emphasis>unified</emphasis> diffs (<command>patch</command> "
13751 "can accept several other diff formats, but MQ doesn't). A unified diff "
13752 "contains two kinds of header. The <emphasis>file header</emphasis> describes "
13753 "the file being modified; it contains the name of the file to modify. When "
13754 "<command>patch</command> sees a new file header, it looks for a file with "
13755 "that name to start modifying."
13756 msgstr ""
13758 #. type: Content of: <book><chapter><sect1><para>
13759 #: ../en/ch12-mq.xml:223
13760 msgid ""
13761 "After the file header comes a series of <emphasis>hunks</emphasis>. Each "
13762 "hunk starts with a header; this identifies the range of line numbers within "
13763 "the file that the hunk should modify. Following the header, a hunk starts "
13764 "and ends with a few (usually three) lines of text from the unmodified file; "
13765 "these are called the <emphasis>context</emphasis> for the hunk. If there's "
13766 "only a small amount of context between successive hunks, <command>diff</"
13767 "command> doesn't print a new hunk header; it just runs the hunks together, "
13768 "with a few lines of context between modifications."
13769 msgstr ""
13771 #. type: Content of: <book><chapter><sect1><para>
13772 #: ../en/ch12-mq.xml:235
13773 msgid ""
13774 "Each line of context begins with a space character. Within the hunk, a line "
13775 "that begins with <quote><literal>-</literal></quote> means <quote>remove this "
13776 "line,</quote> while a line that begins with <quote><literal>+</literal></"
13777 "quote> means <quote>insert this line.</quote> For example, a line that is "
13778 "modified is represented by one deletion and one insertion."
13779 msgstr ""
13781 #. type: Content of: <book><chapter><sect1><para>
13782 #: ../en/ch12-mq.xml:243
13783 msgid ""
13784 "We will return to some of the more subtle aspects of patches later (in "
13785 "section <xref linkend=\"sec.mq.adv-patch\"/>), but you should have enough "
13786 "information now to use MQ."
13787 msgstr ""
13789 #. type: Content of: <book><chapter><sect1><title>
13790 #: ../en/ch12-mq.xml:250
13791 msgid "Getting started with Mercurial Queues"
13792 msgstr "开始使用 MQ"
13794 #. type: Content of: <book><chapter><sect1><para>
13795 #: ../en/ch12-mq.xml:252
13796 msgid ""
13797 "Because MQ is implemented as an extension, you must explicitly enable before "
13798 "you can use it. (You don't need to download anything; MQ ships with the "
13799 "standard Mercurial distribution.) To enable MQ, edit your <filename role="
13800 "\"home\">~/.hgrc</filename> file, and add the lines below."
13801 msgstr ""
13803 #. type: Content of: <book><chapter><sect1><para>
13804 #: ../en/ch12-mq.xml:261
13805 msgid ""
13806 "Once the extension is enabled, it will make a number of new commands "
13807 "available. To verify that the extension is working, you can use <command "
13808 "role=\"hg-cmd\">hg help</command> to see if the <command role=\"hg-ext-mq"
13809 "\">qinit</command> command is now available."
13810 msgstr ""
13812 #. type: Content of: <book><chapter><sect1><para>
13813 #: ../en/ch12-mq.xml:269
13814 msgid ""
13815 "You can use MQ with <emphasis>any</emphasis> Mercurial repository, and its "
13816 "commands only operate within that repository. To get started, simply prepare "
13817 "the repository using the <command role=\"hg-ext-mq\">qinit</command> command."
13818 msgstr ""
13820 #. type: Content of: <book><chapter><sect1><para>
13821 #: ../en/ch12-mq.xml:276
13822 msgid ""
13823 "This command creates an empty directory called <filename role=\"special\" "
13824 "class=\"directory\">.hg/patches</filename>, where MQ will keep its metadata. "
13825 "As with many Mercurial commands, the <command role=\"hg-ext-mq\">qinit</"
13826 "command> command prints nothing if it succeeds."
13827 msgstr ""
13829 #. type: Content of: <book><chapter><sect1><sect2><title>
13830 #: ../en/ch12-mq.xml:283
13831 msgid "Creating a new patch"
13832 msgstr "创建新补丁"
13834 #. type: Content of: <book><chapter><sect1><sect2><para>
13835 #: ../en/ch12-mq.xml:285
13836 msgid ""
13837 "To begin work on a new patch, use the <command role=\"hg-ext-mq\">qnew</"
13838 "command> command. This command takes one argument, the name of the patch to "
13839 "create."
13840 msgstr ""
13842 #. type: Content of: <book><chapter><sect1><sect2><para>
13843 #: ../en/ch12-mq.xml:289
13844 msgid ""
13845 "MQ will use this as the name of an actual file in the <filename role=\"special"
13846 "\" class=\"directory\">.hg/patches</filename> directory, as you can see below."
13847 msgstr ""
13849 #. type: Content of: <book><chapter><sect1><sect2><para>
13850 #: ../en/ch12-mq.xml:296
13851 msgid ""
13852 "Also newly present in the <filename role=\"special\" class=\"directory\">.hg/"
13853 "patches</filename> directory are two other files, <filename role=\"special"
13854 "\">series</filename> and <filename role=\"special\">status</filename>. The "
13855 "<filename role=\"special\">series</filename> file lists all of the patches "
13856 "that MQ knows about for this repository, with one patch per line. Mercurial "
13857 "uses the <filename role=\"special\">status</filename> file for internal book-"
13858 "keeping; it tracks all of the patches that MQ has <emphasis>applied</"
13859 "emphasis> in this repository."
13860 msgstr ""
13862 #. type: Content of: <book><chapter><sect1><sect2><note><para>
13863 #: ../en/ch12-mq.xml:308
13864 msgid ""
13865 "You may sometimes want to edit the <filename role=\"special\">series</"
13866 "filename> file by hand; for example, to change the sequence in which some "
13867 "patches are applied. However, manually editing the <filename role=\"special"
13868 "\">status</filename> file is almost always a bad idea, as it's easy to "
13869 "corrupt MQ's idea of what is happening."
13870 msgstr ""
13872 #. type: Content of: <book><chapter><sect1><sect2><para>
13873 #: ../en/ch12-mq.xml:317
13874 msgid ""
13875 "Once you have created your new patch, you can edit files in the working "
13876 "directory as you usually would. All of the normal Mercurial commands, such "
13877 "as <command role=\"hg-cmd\">hg diff</command> and <command role=\"hg-cmd\">hg "
13878 "annotate</command>, work exactly as they did before."
13879 msgstr ""
13881 #. type: Content of: <book><chapter><sect1><sect2><title>
13882 #: ../en/ch12-mq.xml:325
13883 msgid "Refreshing a patch"
13884 msgstr "刷新补丁"
13886 #. type: Content of: <book><chapter><sect1><sect2><para>
13887 #: ../en/ch12-mq.xml:327
13888 msgid ""
13889 "When you reach a point where you want to save your work, use the <command "
13890 "role=\"hg-ext-mq\">qrefresh</command> command to update the patch you are "
13891 "working on."
13892 msgstr ""
13894 #. type: Content of: <book><chapter><sect1><sect2><para>
13895 #: ../en/ch12-mq.xml:333
13896 msgid ""
13897 "This command folds the changes you have made in the working directory into "
13898 "your patch, and updates its corresponding changeset to contain those changes."
13899 msgstr ""
13901 #. type: Content of: <book><chapter><sect1><sect2><para>
13902 #: ../en/ch12-mq.xml:337
13903 msgid ""
13904 "You can run <command role=\"hg-ext-mq\">qrefresh</command> as often as you "
13905 "like, so it's a good way to <quote>checkpoint</quote> your work. Refresh "
13906 "your patch at an opportune time; try an experiment; and if the experiment "
13907 "doesn't work out, <command role=\"hg-cmd\">hg revert</command> your "
13908 "modifications back to the last time you refreshed."
13909 msgstr ""
13911 #. type: Content of: <book><chapter><sect1><sect2><title>
13912 #: ../en/ch12-mq.xml:348
13913 msgid "Stacking and tracking patches"
13914 msgstr "堆叠和跟踪补丁"
13916 #. type: Content of: <book><chapter><sect1><sect2><para>
13917 #: ../en/ch12-mq.xml:350
13918 msgid ""
13919 "Once you have finished working on a patch, or need to work on another, you "
13920 "can use the <command role=\"hg-ext-mq\">qnew</command> command again to "
13921 "create a new patch. Mercurial will apply this patch on top of your existing "
13922 "patch."
13923 msgstr ""
13925 #. type: Content of: <book><chapter><sect1><sect2><para>
13926 #: ../en/ch12-mq.xml:357
13927 msgid ""
13928 "Notice that the patch contains the changes in our prior patch as part of its "
13929 "context (you can see this more clearly in the output of <command role=\"hg-cmd"
13930 "\">hg annotate</command>)."
13931 msgstr ""
13933 #. type: Content of: <book><chapter><sect1><sect2><para>
13934 #: ../en/ch12-mq.xml:362
13935 msgid ""
13936 "So far, with the exception of <command role=\"hg-ext-mq\">qnew</command> and "
13937 "<command role=\"hg-ext-mq\">qrefresh</command>, we've been careful to only "
13938 "use regular Mercurial commands. However, MQ provides many commands that are "
13939 "easier to use when you are thinking about patches, as illustrated below."
13940 msgstr ""
13942 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13943 #: ../en/ch12-mq.xml:372
13944 msgid ""
13945 "The <command role=\"hg-ext-mq\">qseries</command> command lists every patch "
13946 "that MQ knows about in this repository, from oldest to newest (most recently "
13947 "<emphasis>created</emphasis>)."
13948 msgstr ""
13950 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13951 #: ../en/ch12-mq.xml:378
13952 msgid ""
13953 "The <command role=\"hg-ext-mq\">qapplied</command> command lists every patch "
13954 "that MQ has <emphasis>applied</emphasis> in this repository, again from "
13955 "oldest to newest (most recently applied)."
13956 msgstr ""
13958 #. type: Content of: <book><chapter><sect1><sect2><title>
13959 #: ../en/ch12-mq.xml:387
13960 msgid "Manipulating the patch stack"
13961 msgstr "操作补丁堆栈"
13963 #. type: Content of: <book><chapter><sect1><sect2><para>
13964 #: ../en/ch12-mq.xml:389
13965 msgid ""
13966 "The previous discussion implied that there must be a difference between "
13967 "<quote>known</quote> and <quote>applied</quote> patches, and there is. MQ "
13968 "can manage a patch without it being applied in the repository."
13969 msgstr ""
13971 #. type: Content of: <book><chapter><sect1><sect2><para>
13972 #: ../en/ch12-mq.xml:394
13973 msgid ""
13974 "An <emphasis>applied</emphasis> patch has a corresponding changeset in the "
13975 "repository, and the effects of the patch and changeset are visible in the "
13976 "working directory. You can undo the application of a patch using the "
13977 "<command role=\"hg-ext-mq\">qpop</command> command. MQ still <emphasis>knows "
13978 "about</emphasis>, or manages, a popped patch, but the patch no longer has a "
13979 "corresponding changeset in the repository, and the working directory does not "
13980 "contain the changes made by the patch. Figure <xref endterm=\"fig.mq.stack."
13981 "caption\" linkend=\"fig.mq.stack\"/> illustrates the difference between "
13982 "applied and tracked patches."
13983 msgstr ""
13985 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
13986 #: ../en/ch12-mq.xml:408
13987 msgid "<imageobject><imagedata fileref=\"images/mq-stack.png\"/></imageobject>"
13988 msgstr ""
13990 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
13991 #: ../en/ch12-mq.xml:410
13992 msgid "Applied and unapplied patches in the MQ patch stack"
13993 msgstr ""
13995 #. type: Content of: <book><chapter><sect1><sect2><para>
13996 #: ../en/ch12-mq.xml:415
13997 msgid ""
13998 "You can reapply an unapplied, or popped, patch using the <command role=\"hg-"
13999 "ext-mq\">qpush</command> command. This creates a new changeset to correspond "
14000 "to the patch, and the patch's changes once again become present in the "
14001 "working directory. See below for examples of <command role=\"hg-ext-mq"
14002 "\">qpop</command> and <command role=\"hg-ext-mq\">qpush</command> in action."
14003 msgstr ""
14005 #. type: Content of: <book><chapter><sect1><sect2><para>
14006 #: ../en/ch12-mq.xml:424
14007 msgid ""
14008 "Notice that once we have popped a patch or two patches, the output of "
14009 "<command role=\"hg-ext-mq\">qseries</command> remains the same, while that of "
14010 "<command role=\"hg-ext-mq\">qapplied</command> has changed."
14011 msgstr ""
14013 #. type: Content of: <book><chapter><sect1><sect2><title>
14014 #: ../en/ch12-mq.xml:432
14015 msgid "Pushing and popping many patches"
14016 msgstr "压入或弹出多个补丁"
14018 #. type: Content of: <book><chapter><sect1><sect2><para>
14019 #: ../en/ch12-mq.xml:434
14020 msgid ""
14021 "While <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-"
14022 "mq\">qpop</command> each operate on a single patch at a time by default, you "
14023 "can push and pop many patches in one go. The <option role=\"hg-ext-mq-cmd-"
14024 "qpush-opt\">hg -a</option> option to <command role=\"hg-ext-mq\">qpush</"
14025 "command> causes it to push all unapplied patches, while the <option role=\"hg-"
14026 "ext-mq-cmd-qpop-opt\">-a</option> option to <command role=\"hg-ext-mq\">qpop</"
14027 "command> causes it to pop all applied patches. (For some more ways to push "
14028 "and pop many patches, see section <xref linkend=\"sec.mq.perf\"/> below.)"
14029 msgstr ""
14031 #. type: Content of: <book><chapter><sect1><sect2><title>
14032 #: ../en/ch12-mq.xml:451
14033 msgid "Safety checks, and overriding them"
14034 msgstr "安全的检查，然后覆盖它们"
14036 #. type: Content of: <book><chapter><sect1><sect2><para>
14037 #: ../en/ch12-mq.xml:453
14038 msgid ""
14039 "Several MQ commands check the working directory before they do anything, and "
14040 "fail if they find any modifications. They do this to ensure that you won't "
14041 "lose any changes that you have made, but not yet incorporated into a patch. "
14042 "The example below illustrates this; the <command role=\"hg-ext-mq\">qnew</"
14043 "command> command will not create a new patch if there are outstanding "
14044 "changes, caused in this case by the <command role=\"hg-cmd\">hg add</command> "
14045 "of <filename>file3</filename>."
14046 msgstr ""
14048 #. type: Content of: <book><chapter><sect1><sect2><para>
14049 #: ../en/ch12-mq.xml:465
14050 msgid ""
14051 "Commands that check the working directory all take an <quote>I know what I'm "
14052 "doing</quote> option, which is always named <option>-f</option>. The exact "
14053 "meaning of <option>-f</option> depends on the command. For example, <command "
14054 "role=\"hg-cmd\">hg qnew <option role=\"hg-ext-mq-cmd-qnew-opt\">hg -f</"
14055 "option></command> will incorporate any outstanding changes into the new patch "
14056 "it creates, but <command role=\"hg-cmd\">hg qpop <option role=\"hg-ext-mq-cmd-"
14057 "qpop-opt\">hg -f</option></command> will revert modifications to any files "
14058 "affected by the patch that it is popping. Be sure to read the documentation "
14059 "for a command's <option>-f</option> option before you use it!"
14060 msgstr ""
14062 #. type: Content of: <book><chapter><sect1><sect2><title>
14063 #: ../en/ch12-mq.xml:480
14064 msgid "Working on several patches at once"
14065 msgstr "同时处理多个补丁"
14067 #. type: Content of: <book><chapter><sect1><sect2><para>
14068 #: ../en/ch12-mq.xml:482
14069 msgid ""
14070 "The <command role=\"hg-ext-mq\">qrefresh</command> command always refreshes "
14071 "the <emphasis>topmost</emphasis> applied patch. This means that you can "
14072 "suspend work on one patch (by refreshing it), pop or push to make a different "
14073 "patch the top, and work on <emphasis>that</emphasis> patch for a while."
14074 msgstr ""
14076 #. type: Content of: <book><chapter><sect1><sect2><para>
14077 #: ../en/ch12-mq.xml:489
14078 msgid ""
14079 "Here's an example that illustrates how you can use this ability. Let's say "
14080 "you're developing a new feature as two patches. The first is a change to the "
14081 "core of your software, and the second&emdash;layered on top of the "
14082 "first&emdash;changes the user interface to use the code you just added to the "
14083 "core. If you notice a bug in the core while you're working on the UI patch, "
14084 "it's easy to fix the core. Simply <command role=\"hg-ext-mq\">qrefresh</"
14085 "command> the UI patch to save your in-progress changes, and <command role="
14086 "\"hg-ext-mq\">qpop</command> down to the core patch. Fix the core bug, "
14087 "<command role=\"hg-ext-mq\">qrefresh</command> the core patch, and <command "
14088 "role=\"hg-ext-mq\">qpush</command> back to the UI patch to continue where you "
14089 "left off."
14090 msgstr ""
14092 #. type: Content of: <book><chapter><sect1><title>
14093 #: ../en/ch12-mq.xml:506
14094 msgid "More about patches"
14095 msgstr "关于补丁的更多信息"
14097 #. type: Content of: <book><chapter><sect1><para>
14098 #: ../en/ch12-mq.xml:508
14099 msgid ""
14100 "MQ uses the GNU <command>patch</command> command to apply patches, so it's "
14101 "helpful to know a few more detailed aspects of how <command>patch</command> "
14102 "works, and about patches themselves."
14103 msgstr ""
14105 #. type: Content of: <book><chapter><sect1><sect2><title>
14106 #: ../en/ch12-mq.xml:514
14107 msgid "The strip count"
14108 msgstr "修剪计数"
14110 #. type: Content of: <book><chapter><sect1><sect2><para>
14111 #: ../en/ch12-mq.xml:516
14112 msgid ""
14113 "If you look at the file headers in a patch, you will notice that the "
14114 "pathnames usually have an extra component on the front that isn't present in "
14115 "the actual path name. This is a holdover from the way that people used to "
14116 "generate patches (people still do this, but it's somewhat rare with modern "
14117 "revision control tools)."
14118 msgstr ""
14120 #. type: Content of: <book><chapter><sect1><sect2><para>
14121 #: ../en/ch12-mq.xml:523
14122 msgid ""
14123 "Alice would unpack a tarball, edit her files, then decide that she wanted to "
14124 "create a patch. So she'd rename her working directory, unpack the tarball "
14125 "again (hence the need for the rename), and use the <option role=\"cmd-opt-diff"
14126 "\">-r</option> and <option role=\"cmd-opt-diff\">-N</option> options to "
14127 "<command>diff</command> to recursively generate a patch between the "
14128 "unmodified directory and the modified one. The result would be that the name "
14129 "of the unmodified directory would be at the front of the left-hand path in "
14130 "every file header, and the name of the modified directory would be at the "
14131 "front of the right-hand path."
14132 msgstr ""
14134 #. type: Content of: <book><chapter><sect1><sect2><para>
14135 #: ../en/ch12-mq.xml:536
14136 msgid ""
14137 "Since someone receiving a patch from the Alices of the net would be unlikely "
14138 "to have unmodified and modified directories with exactly the same names, the "
14139 "<command>patch</command> command has a <option role=\"cmd-opt-patch\">-p</"
14140 "option> option that indicates the number of leading path name components to "
14141 "strip when trying to apply a patch. This number is called the "
14142 "<emphasis>strip count</emphasis>."
14143 msgstr ""
14145 #. type: Content of: <book><chapter><sect1><sect2><para>
14146 #: ../en/ch12-mq.xml:544
14147 msgid ""
14148 "An option of <quote><literal>-p1</literal></quote> means <quote>use a strip "
14149 "count of one</quote>. If <command>patch</command> sees a file name "
14150 "<filename>foo/bar/baz</filename> in a file header, it will strip "
14151 "<filename>foo</filename> and try to patch a file named <filename>bar/baz</"
14152 "filename>. (Strictly speaking, the strip count refers to the number of "
14153 "<emphasis>path separators</emphasis> (and the components that go with them ) "
14154 "to strip. A strip count of one will turn <filename>foo/bar</filename> into "
14155 "<filename>bar</filename>, but <filename>/foo/bar</filename> (notice the extra "
14156 "leading slash) into <filename>foo/bar</filename>.)"
14157 msgstr ""
14159 #. type: Content of: <book><chapter><sect1><sect2><para>
14160 #: ../en/ch12-mq.xml:557
14161 msgid ""
14162 "The <quote>standard</quote> strip count for patches is one; almost all "
14163 "patches contain one leading path name component that needs to be stripped. "
14164 "Mercurial's <command role=\"hg-cmd\">hg diff</command> command generates path "
14165 "names in this form, and the <command role=\"hg-cmd\">hg import</command> "
14166 "command and MQ expect patches to have a strip count of one."
14167 msgstr ""
14169 #. type: Content of: <book><chapter><sect1><sect2><para>
14170 #: ../en/ch12-mq.xml:565
14171 msgid ""
14172 "If you receive a patch from someone that you want to add to your patch queue, "
14173 "and the patch needs a strip count other than one, you cannot just <command "
14174 "role=\"hg-ext-mq\">qimport</command> the patch, because <command role=\"hg-"
14175 "ext-mq\">qimport</command> does not yet have a <literal>-p</literal> option "
14176 "(see <ulink role=\"hg-bug\" url=\"http://www.selenic.com/mercurial/bts/"
14177 "issue311\">issue 311</ulink>). Your best bet is to <command role=\"hg-ext-mq"
14178 "\">qnew</command> a patch of your own, then use <command>patch -pN</command> "
14179 "to apply their patch, followed by <command role=\"hg-cmd\">hg addremove</"
14180 "command> to pick up any files added or removed by the patch, followed by "
14181 "<command role=\"hg-ext-mq\">hg qrefresh</command>. This complexity may become "
14182 "unnecessary; see <ulink role=\"hg-bug\" url=\"http://www.selenic.com/"
14183 "mercurial/bts/issue311\">issue 311</ulink> for details."
14184 msgstr ""
14186 #. type: Content of: <book><chapter><sect1><sect2><title>
14187 #: ../en/ch12-mq.xml:584
14188 msgid "Strategies for applying a patch"
14189 msgstr "应用补丁的策略"
14191 #. type: Content of: <book><chapter><sect1><sect2><para>
14192 #: ../en/ch12-mq.xml:586
14193 msgid ""
14194 "When <command>patch</command> applies a hunk, it tries a handful of "
14195 "successively less accurate strategies to try to make the hunk apply. This "
14196 "falling-back technique often makes it possible to take a patch that was "
14197 "generated against an old version of a file, and apply it against a newer "
14198 "version of that file."
14199 msgstr ""
14201 #. type: Content of: <book><chapter><sect1><sect2><para>
14202 #: ../en/ch12-mq.xml:593
14203 msgid ""
14204 "First, <command>patch</command> tries an exact match, where the line numbers, "
14205 "the context, and the text to be modified must apply exactly. If it cannot "
14206 "make an exact match, it tries to find an exact match for the context, without "
14207 "honouring the line numbering information. If this succeeds, it prints a line "
14208 "of output saying that the hunk was applied, but at some <emphasis>offset</"
14209 "emphasis> from the original line number."
14210 msgstr ""
14212 #. type: Content of: <book><chapter><sect1><sect2><para>
14213 #: ../en/ch12-mq.xml:602
14214 msgid ""
14215 "If a context-only match fails, <command>patch</command> removes the first and "
14216 "last lines of the context, and tries a <emphasis>reduced</emphasis> context-"
14217 "only match. If the hunk with reduced context succeeds, it prints a message "
14218 "saying that it applied the hunk with a <emphasis>fuzz factor</emphasis> (the "
14219 "number after the fuzz factor indicates how many lines of context "
14220 "<command>patch</command> had to trim before the patch applied)."
14221 msgstr ""
14223 #. type: Content of: <book><chapter><sect1><sect2><para>
14224 #: ../en/ch12-mq.xml:611
14225 msgid ""
14226 "When neither of these techniques works, <command>patch</command> prints a "
14227 "message saying that the hunk in question was rejected. It saves rejected "
14228 "hunks (also simply called <quote>rejects</quote>) to a file with the same "
14229 "name, and an added <filename role=\"special\">.rej</filename> extension. It "
14230 "also saves an unmodified copy of the file with a <filename role=\"special\">."
14231 "orig</filename> extension; the copy of the file without any extensions will "
14232 "contain any changes made by hunks that <emphasis>did</emphasis> apply "
14233 "cleanly. If you have a patch that modifies <filename>foo</filename> with six "
14234 "hunks, and one of them fails to apply, you will have: an unmodified "
14235 "<filename>foo.orig</filename>, a <filename>foo.rej</filename> containing one "
14236 "hunk, and <filename>foo</filename>, containing the changes made by the five "
14237 "successful hunks."
14238 msgstr ""
14240 #. type: Content of: <book><chapter><sect1><sect2><title>
14241 #: ../en/ch12-mq.xml:629
14242 msgid "Some quirks of patch representation"
14243 msgstr "补丁的一些特性"
14245 #. type: Content of: <book><chapter><sect1><sect2><para>
14246 #: ../en/ch12-mq.xml:631
14247 msgid ""
14248 "There are a few useful things to know about how <command>patch</command> "
14249 "works with files."
14250 msgstr ""
14252 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14253 #: ../en/ch12-mq.xml:634
14254 msgid ""
14255 "This should already be obvious, but <command>patch</command> cannot handle "
14256 "binary files."
14257 msgstr ""
14259 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14260 #: ../en/ch12-mq.xml:638
14261 msgid ""
14262 "Neither does it care about the executable bit; it creates new files as "
14263 "readable, but not executable."
14264 msgstr ""
14266 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14267 #: ../en/ch12-mq.xml:642
14268 msgid ""
14269 "<command>patch</command> treats the removal of a file as a diff between the "
14270 "file to be removed and the empty file. So your idea of <quote>I deleted this "
14271 "file</quote> looks like <quote>every line of this file was deleted</quote> in "
14272 "a patch."
14273 msgstr ""
14275 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14276 #: ../en/ch12-mq.xml:648
14277 msgid ""
14278 "It treats the addition of a file as a diff between the empty file and the "
14279 "file to be added. So in a patch, your idea of <quote>I added this file</"
14280 "quote> looks like <quote>every line of this file was added</quote>."
14281 msgstr ""
14283 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14284 #: ../en/ch12-mq.xml:654
14285 msgid ""
14286 "It treats a renamed file as the removal of the old name, and the addition of "
14287 "the new name. This means that renamed files have a big footprint in "
14288 "patches. (Note also that Mercurial does not currently try to infer when "
14289 "files have been renamed or copied in a patch.)"
14290 msgstr ""
14292 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14293 #: ../en/ch12-mq.xml:660
14294 msgid ""
14295 "<command>patch</command> cannot represent empty files, so you cannot use a "
14296 "patch to represent the notion <quote>I added this empty file to the tree</"
14297 "quote>."
14298 msgstr ""
14300 #. type: Content of: <book><chapter><sect1><sect2><title>
14301 #: ../en/ch12-mq.xml:667
14302 msgid "Beware the fuzz"
14303 msgstr "当心毛刺"
14305 #. type: Content of: <book><chapter><sect1><sect2><para>
14306 #: ../en/ch12-mq.xml:669
14307 msgid ""
14308 "While applying a hunk at an offset, or with a fuzz factor, will often be "
14309 "completely successful, these inexact techniques naturally leave open the "
14310 "possibility of corrupting the patched file. The most common cases typically "
14311 "involve applying a patch twice, or at an incorrect location in the file. If "
14312 "<command>patch</command> or <command role=\"hg-ext-mq\">qpush</command> ever "
14313 "mentions an offset or fuzz factor, you should make sure that the modified "
14314 "files are correct afterwards."
14315 msgstr ""
14317 #. type: Content of: <book><chapter><sect1><sect2><para>
14318 #: ../en/ch12-mq.xml:679
14319 msgid ""
14320 "It's often a good idea to refresh a patch that has applied with an offset or "
14321 "fuzz factor; refreshing the patch generates new context information that will "
14322 "make it apply cleanly. I say <quote>often,</quote> not <quote>always,</"
14323 "quote> because sometimes refreshing a patch will make it fail to apply "
14324 "against a different revision of the underlying files. In some cases, such as "
14325 "when you're maintaining a patch that must sit on top of multiple versions of "
14326 "a source tree, it's acceptable to have a patch apply with some fuzz, provided "
14327 "you've verified the results of the patching process in such cases."
14328 msgstr ""
14330 #. type: Content of: <book><chapter><sect1><sect2><title>
14331 #: ../en/ch12-mq.xml:692
14332 msgid "Handling rejection"
14333 msgstr "处理拒绝"
14335 #. type: Content of: <book><chapter><sect1><sect2><para>
14336 #: ../en/ch12-mq.xml:694
14337 msgid ""
14338 "If <command role=\"hg-ext-mq\">qpush</command> fails to apply a patch, it "
14339 "will print an error message and exit. If it has left <filename role=\"special"
14340 "\">.rej</filename> files behind, it is usually best to fix up the rejected "
14341 "hunks before you push more patches or do any further work."
14342 msgstr ""
14344 #. type: Content of: <book><chapter><sect1><sect2><para>
14345 #: ../en/ch12-mq.xml:700
14346 msgid ""
14347 "If your patch <emphasis>used to</emphasis> apply cleanly, and no longer does "
14348 "because you've changed the underlying code that your patches are based on, "
14349 "Mercurial Queues can help; see section <xref linkend=\"sec.mq.merge\"/> for "
14350 "details."
14351 msgstr ""
14353 #. type: Content of: <book><chapter><sect1><sect2><para>
14354 #: ../en/ch12-mq.xml:706
14355 msgid ""
14356 "Unfortunately, there aren't any great techniques for dealing with rejected "
14357 "hunks. Most often, you'll need to view the <filename role=\"special\">.rej</"
14358 "filename> file and edit the target file, applying the rejected hunks by hand."
14359 msgstr ""
14361 #. type: Content of: <book><chapter><sect1><sect2><para>
14362 #: ../en/ch12-mq.xml:711
14363 msgid ""
14364 "If you're feeling adventurous, Neil Brown, a Linux kernel hacker, wrote a "
14365 "tool called <command>wiggle</command> <citation>web:wiggle</citation>, which "
14366 "is more vigorous than <command>patch</command> in its attempts to make a "
14367 "patch apply."
14368 msgstr ""
14370 #. type: Content of: <book><chapter><sect1><sect2><para>
14371 #: ../en/ch12-mq.xml:717
14372 msgid ""
14373 "Another Linux kernel hacker, Chris Mason (the author of Mercurial Queues), "
14374 "wrote a similar tool called <command>mpatch</command> <citation>web:mpatch</"
14375 "citation>, which takes a simple approach to automating the application of "
14376 "hunks rejected by <command>patch</command>. The <command>mpatch</command> "
14377 "command can help with four common reasons that a hunk may be rejected:"
14378 msgstr ""
14380 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14381 #: ../en/ch12-mq.xml:726
14382 msgid "The context in the middle of a hunk has changed."
14383 msgstr ""
14385 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14386 #: ../en/ch12-mq.xml:729
14387 msgid "A hunk is missing some context at the beginning or end."
14388 msgstr ""
14390 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14391 #: ../en/ch12-mq.xml:732
14392 msgid ""
14393 "A large hunk might apply better&emdash;either entirely or in part&emdash;if "
14394 "it was broken up into smaller hunks."
14395 msgstr ""
14397 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14398 #: ../en/ch12-mq.xml:736
14399 msgid ""
14400 "A hunk removes lines with slightly different content than those currently "
14401 "present in the file."
14402 msgstr ""
14404 #. type: Content of: <book><chapter><sect1><sect2><para>
14405 #: ../en/ch12-mq.xml:740
14406 msgid ""
14407 "If you use <command>wiggle</command> or <command>mpatch</command>, you should "
14408 "be doubly careful to check your results when you're done. In fact, "
14409 "<command>mpatch</command> enforces this method of double-checking the tool's "
14410 "output, by automatically dropping you into a merge program when it has done "
14411 "its job, so that you can verify its work and finish off any remaining merges."
14412 msgstr ""
14414 #. type: Content of: <book><chapter><sect1><title>
14415 #: ../en/ch12-mq.xml:752
14416 msgid "Getting the best performance out of MQ"
14417 msgstr "MQ 的性能"
14419 #. type: Content of: <book><chapter><sect1><para>
14420 #: ../en/ch12-mq.xml:754
14421 msgid ""
14422 "MQ is very efficient at handling a large number of patches. I ran some "
14423 "performance experiments in mid-2006 for a talk that I gave at the 2006 "
14424 "EuroPython conference <citation>web:europython</citation>. I used as my data "
14425 "set the Linux 2.6.17-mm1 patch series, which consists of 1,738 patches. I "
14426 "applied these on top of a Linux kernel repository containing all 27,472 "
14427 "revisions between Linux 2.6.12-rc2 and Linux 2.6.17."
14428 msgstr ""
14430 #. type: Content of: <book><chapter><sect1><para>
14431 #: ../en/ch12-mq.xml:763
14432 msgid ""
14433 "On my old, slow laptop, I was able to <command role=\"hg-cmd\">hg qpush "
14434 "<option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</option></command> all 1,738 "
14435 "patches in 3.5 minutes, and <command role=\"hg-cmd\">hg qpop <option role="
14436 "\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> them all in 30 seconds. "
14437 "(On a newer laptop, the time to push all patches dropped to two minutes.) I "
14438 "could <command role=\"hg-ext-mq\">qrefresh</command> one of the biggest "
14439 "patches (which made 22,779 lines of changes to 287 files) in 6.6 seconds."
14440 msgstr ""
14442 #. type: Content of: <book><chapter><sect1><para>
14443 #: ../en/ch12-mq.xml:774
14444 msgid ""
14445 "Clearly, MQ is well suited to working in large trees, but there are a few "
14446 "tricks you can use to get the best performance of it."
14447 msgstr ""
14449 #. type: Content of: <book><chapter><sect1><para>
14450 #: ../en/ch12-mq.xml:778
14451 msgid ""
14452 "First of all, try to <quote>batch</quote> operations together. Every time "
14453 "you run <command role=\"hg-ext-mq\">qpush</command> or <command role=\"hg-ext-"
14454 "mq\">qpop</command>, these commands scan the working directory once to make "
14455 "sure you haven't made some changes and then forgotten to run <command role="
14456 "\"hg-ext-mq\">qrefresh</command>. On a small tree, the time that this scan "
14457 "takes is unnoticeable. However, on a medium-sized tree (containing tens of "
14458 "thousands of files), it can take a second or more."
14459 msgstr ""
14461 #. type: Content of: <book><chapter><sect1><para>
14462 #: ../en/ch12-mq.xml:789
14463 msgid ""
14464 "The <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-mq"
14465 "\">qpop</command> commands allow you to push and pop multiple patches at a "
14466 "time. You can identify the <quote>destination patch</quote> that you want to "
14467 "end up at. When you <command role=\"hg-ext-mq\">qpush</command> with a "
14468 "destination specified, it will push patches until that patch is at the top of "
14469 "the applied stack. When you <command role=\"hg-ext-mq\">qpop</command> to a "
14470 "destination, MQ will pop patches until the destination patch is at the top."
14471 msgstr ""
14473 #. type: Content of: <book><chapter><sect1><para>
14474 #: ../en/ch12-mq.xml:799
14475 msgid ""
14476 "You can identify a destination patch using either the name of the patch, or "
14477 "by number. If you use numeric addressing, patches are counted from zero; "
14478 "this means that the first patch is zero, the second is one, and so on."
14479 msgstr ""
14481 #. type: Content of: <book><chapter><sect1><title>
14482 #: ../en/ch12-mq.xml:806
14483 msgid "Updating your patches when the underlying code changes"
14484 msgstr "当基础代码改变时，更新补丁的方法"
14486 #. type: Content of: <book><chapter><sect1><para>
14487 #: ../en/ch12-mq.xml:809
14488 msgid ""
14489 "It's common to have a stack of patches on top of an underlying repository "
14490 "that you don't modify directly. If you're working on changes to third-party "
14491 "code, or on a feature that is taking longer to develop than the rate of "
14492 "change of the code beneath, you will often need to sync up with the "
14493 "underlying code, and fix up any hunks in your patches that no longer apply. "
14494 "This is called <emphasis>rebasing</emphasis> your patch series."
14495 msgstr ""
14497 #. type: Content of: <book><chapter><sect1><para>
14498 #: ../en/ch12-mq.xml:818
14499 msgid ""
14500 "The simplest way to do this is to <command role=\"hg-cmd\">hg qpop <option "
14501 "role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches, then "
14502 "<command role=\"hg-cmd\">hg pull</command> changes into the underlying "
14503 "repository, and finally <command role=\"hg-cmd\">hg qpush <option role=\"hg-"
14504 "ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches again. MQ will "
14505 "stop pushing any time it runs across a patch that fails to apply during "
14506 "conflicts, allowing you to fix your conflicts, <command role=\"hg-ext-mq"
14507 "\">qrefresh</command> the affected patch, and continue pushing until you have "
14508 "fixed your entire stack."
14509 msgstr ""
14511 #. type: Content of: <book><chapter><sect1><para>
14512 #: ../en/ch12-mq.xml:830
14513 msgid ""
14514 "This approach is easy to use and works well if you don't expect changes to "
14515 "the underlying code to affect how well your patches apply. If your patch "
14516 "stack touches code that is modified frequently or invasively in the "
14517 "underlying repository, however, fixing up rejected hunks by hand quickly "
14518 "becomes tiresome."
14519 msgstr ""
14521 #. type: Content of: <book><chapter><sect1><para>
14522 #: ../en/ch12-mq.xml:837
14523 msgid ""
14524 "It's possible to partially automate the rebasing process. If your patches "
14525 "apply cleanly against some revision of the underlying repo, MQ can use this "
14526 "information to help you to resolve conflicts between your patches and a "
14527 "different revision."
14528 msgstr ""
14530 #. type: Content of: <book><chapter><sect1><para>
14531 #: ../en/ch12-mq.xml:843
14532 msgid "The process is a little involved."
14533 msgstr ""
14535 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14536 #: ../en/ch12-mq.xml:845
14537 msgid ""
14538 "To begin, <command role=\"hg-cmd\">hg qpush -a</command> all of your patches "
14539 "on top of the revision where you know that they apply cleanly."
14540 msgstr ""
14542 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14543 #: ../en/ch12-mq.xml:849
14544 msgid ""
14545 "Save a backup copy of your patch directory using <command role=\"hg-cmd\">hg "
14546 "qsave <option role=\"hg-ext-mq-cmd-qsave-opt\">hg -e</option> <option role="
14547 "\"hg-ext-mq-cmd-qsave-opt\">hg -c</option></command>. This prints the name "
14548 "of the directory that it has saved the patches in. It will save the patches "
14549 "to a directory called <filename role=\"special\" class=\"directory\">.hg/"
14550 "patches.N</filename>, where <literal>N</literal> is a small integer. It also "
14551 "commits a <quote>save changeset</quote> on top of your applied patches; this "
14552 "is for internal book-keeping, and records the states of the <filename role="
14553 "\"special\">series</filename> and <filename role=\"special\">status</"
14554 "filename> files."
14555 msgstr ""
14557 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14558 #: ../en/ch12-mq.xml:863
14559 msgid ""
14560 "Use <command role=\"hg-cmd\">hg pull</command> to bring new changes into the "
14561 "underlying repository. (Don't run <command role=\"hg-cmd\">hg pull -u</"
14562 "command>; see below for why.)"
14563 msgstr ""
14565 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14566 #: ../en/ch12-mq.xml:868
14567 msgid ""
14568 "Update to the new tip revision, using <command role=\"hg-cmd\">hg update "
14569 "<option role=\"hg-opt-update\">-C</option></command> to override the patches "
14570 "you have pushed."
14571 msgstr ""
14573 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14574 #: ../en/ch12-mq.xml:873
14575 msgid ""
14576 "Merge all patches using \\hgcmdargs{qpush}{<option role=\"hg-ext-mq-cmd-qpush-"
14577 "opt\">hg -m</option> <option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</"
14578 "option>}. The <option role=\"hg-ext-mq-cmd-qpush-opt\">hg -m</option> option "
14579 "to <command role=\"hg-ext-mq\">qpush</command> tells MQ to perform a three-"
14580 "way merge if the patch fails to apply."
14581 msgstr ""
14583 #. type: Content of: <book><chapter><sect1><para>
14584 #: ../en/ch12-mq.xml:883
14585 msgid ""
14586 "During the <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-"
14587 "qpush-opt\">hg -m</option></command>, each patch in the <filename role="
14588 "\"special\">series</filename> file is applied normally. If a patch applies "
14589 "with fuzz or rejects, MQ looks at the queue you <command role=\"hg-ext-mq"
14590 "\">qsave</command>d, and performs a three-way merge with the corresponding "
14591 "changeset. This merge uses Mercurial's normal merge machinery, so it may pop "
14592 "up a GUI merge tool to help you to resolve problems."
14593 msgstr ""
14595 #. type: Content of: <book><chapter><sect1><para>
14596 #: ../en/ch12-mq.xml:893
14597 msgid ""
14598 "When you finish resolving the effects of a patch, MQ refreshes your patch "
14599 "based on the result of the merge."
14600 msgstr ""
14602 #. type: Content of: <book><chapter><sect1><para>
14603 #: ../en/ch12-mq.xml:896
14604 msgid ""
14605 "At the end of this process, your repository will have one extra head from the "
14606 "old patch queue, and a copy of the old patch queue will be in <filename role="
14607 "\"special\" class=\"directory\">.hg/patches.N</filename>. You can remove the "
14608 "extra head using <command role=\"hg-cmd\">hg qpop -a -n patches.N</command> "
14609 "or <command role=\"hg-cmd\">hg strip</command>. You can delete <filename "
14610 "role=\"special\" class=\"directory\">.hg/patches.N</filename> once you are "
14611 "sure that you no longer need it as a backup."
14612 msgstr ""
14614 #. type: Content of: <book><chapter><sect1><title>
14615 #: ../en/ch12-mq.xml:908
14616 msgid "Identifying patches"
14617 msgstr "标识补丁"
14619 #. type: Content of: <book><chapter><sect1><para>
14620 #: ../en/ch12-mq.xml:910
14621 msgid ""
14622 "MQ commands that work with patches let you refer to a patch either by using "
14623 "its name or by a number. By name is obvious enough; pass the name "
14624 "<filename>foo.patch</filename> to <command role=\"hg-ext-mq\">qpush</"
14625 "command>, for example, and it will push patches until <filename>foo.patch</"
14626 "filename> is applied."
14627 msgstr ""
14629 #. type: Content of: <book><chapter><sect1><para>
14630 #: ../en/ch12-mq.xml:917
14631 msgid ""
14632 "As a shortcut, you can refer to a patch using both a name and a numeric "
14633 "offset; <literal>foo.patch-2</literal> means <quote>two patches before "
14634 "<literal>foo.patch</literal></quote>, while <literal>bar.patch+4</literal> "
14635 "means <quote>four patches after <literal>bar.patch</literal></quote>."
14636 msgstr ""
14638 #. type: Content of: <book><chapter><sect1><para>
14639 #: ../en/ch12-mq.xml:923
14640 msgid ""
14641 "Referring to a patch by index isn't much different. The first patch printed "
14642 "in the output of <command role=\"hg-ext-mq\">qseries</command> is patch zero "
14643 "(yes, it's one of those start-at-zero counting systems); the second is patch "
14644 "one; and so on."
14645 msgstr ""
14647 #. type: Content of: <book><chapter><sect1><para>
14648 #: ../en/ch12-mq.xml:929
14649 msgid ""
14650 "MQ also makes it easy to work with patches when you are using normal "
14651 "Mercurial commands. Every command that accepts a changeset ID will also "
14652 "accept the name of an applied patch. MQ augments the tags normally in the "
14653 "repository with an eponymous one for each applied patch. In addition, the "
14654 "special tags \\index{tags!special tag names!<literal>qbase</literal>}"
14655 "<literal>qbase</literal> and \\index{tags!special tag names!<literal>qtip</"
14656 "literal>}<literal>qtip</literal> identify the <quote>bottom-most</quote> and "
14657 "topmost applied patches, respectively."
14658 msgstr ""
14660 #. type: Content of: <book><chapter><sect1><para>
14661 #: ../en/ch12-mq.xml:941
14662 msgid ""
14663 "These additions to Mercurial's normal tagging capabilities make dealing with "
14664 "patches even more of a breeze."
14665 msgstr ""
14667 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14668 #: ../en/ch12-mq.xml:944
14669 msgid "Want to patchbomb a mailing list with your latest series of changes?"
14670 msgstr ""
14672 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14673 #: ../en/ch12-mq.xml:948
14674 msgid ""
14675 "(Don't know what <quote>patchbombing</quote> is? See section <xref linkend="
14676 "\"sec.hgext.patchbomb\"/>.)"
14677 msgstr ""
14679 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14680 #: ../en/ch12-mq.xml:951
14681 msgid ""
14682 "Need to see all of the patches since <literal>foo.patch</literal> that have "
14683 "touched files in a subdirectory of your tree?"
14684 msgstr ""
14686 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><programlisting><emphasis>
14687 #: ../en/ch12-mq.xml:955
14688 msgid "subdir"
14689 msgstr ""
14691 #. type: Content of: <book><chapter><sect1><para>
14692 #: ../en/ch12-mq.xml:960
14693 msgid ""
14694 "Because MQ makes the names of patches available to the rest of Mercurial "
14695 "through its normal internal tag machinery, you don't need to type in the "
14696 "entire name of a patch when you want to identify it by name."
14697 msgstr ""
14699 #. type: Content of: <book><chapter><sect1><para>
14700 #: ../en/ch12-mq.xml:965
14701 msgid ""
14702 "Another nice consequence of representing patch names as tags is that when you "
14703 "run the <command role=\"hg-cmd\">hg log</command> command, it will display a "
14704 "patch's name as a tag, simply as part of its normal output. This makes it "
14705 "easy to visually distinguish applied patches from underlying <quote>normal</"
14706 "quote> revisions. The following example shows a few normal Mercurial "
14707 "commands in use with applied patches."
14708 msgstr ""
14710 #. type: Content of: <book><chapter><sect1><title>
14711 #: ../en/ch12-mq.xml:978
14712 msgid "Useful things to know about"
14713 msgstr "其它需要了解的东西"
14715 #. type: Content of: <book><chapter><sect1><para>
14716 #: ../en/ch12-mq.xml:980
14717 msgid ""
14718 "There are a number of aspects of MQ usage that don't fit tidily into sections "
14719 "of their own, but that are good to know. Here they are, in one place."
14720 msgstr ""
14722 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14723 #: ../en/ch12-mq.xml:985
14724 msgid ""
14725 "Normally, when you <command role=\"hg-ext-mq\">qpop</command> a patch and "
14726 "<command role=\"hg-ext-mq\">qpush</command> it again, the changeset that "
14727 "represents the patch after the pop/push will have a <emphasis>different "
14728 "identity</emphasis> than the changeset that represented the hash beforehand. "
14729 "See section <xref linkend=\"sec.mqref.cmd.qpush\"/> for information as to why "
14730 "this is."
14731 msgstr ""
14733 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14734 #: ../en/ch12-mq.xml:994
14735 msgid ""
14736 "It's not a good idea to <command role=\"hg-cmd\">hg merge</command> changes "
14737 "from another branch with a patch changeset, at least if you want to maintain "
14738 "the <quote>patchiness</quote> of that changeset and changesets below it on "
14739 "the patch stack. If you try to do this, it will appear to succeed, but MQ "
14740 "will become confused."
14741 msgstr ""
14743 #. type: Content of: <book><chapter><sect1><title>
14744 #: ../en/ch12-mq.xml:1005
14745 msgid "Managing patches in a repository"
14746 msgstr "在版本库管理补丁"
14748 #. type: Content of: <book><chapter><sect1><para>
14749 #: ../en/ch12-mq.xml:1007
14750 msgid ""
14751 "Because MQ's <filename role=\"special\" class=\"directory\">.hg/patches</"
14752 "filename> directory resides outside a Mercurial repository's working "
14753 "directory, the <quote>underlying</quote> Mercurial repository knows nothing "
14754 "about the management or presence of patches."
14755 msgstr ""
14757 #. type: Content of: <book><chapter><sect1><para>
14758 #: ../en/ch12-mq.xml:1013
14759 msgid ""
14760 "This presents the interesting possibility of managing the contents of the "
14761 "patch directory as a Mercurial repository in its own right. This can be a "
14762 "useful way to work. For example, you can work on a patch for a while, "
14763 "<command role=\"hg-ext-mq\">qrefresh</command> it, then <command role=\"hg-cmd"
14764 "\">hg commit</command> the current state of the patch. This lets you "
14765 "<quote>roll back</quote> to that version of the patch later on."
14766 msgstr ""
14768 #. type: Content of: <book><chapter><sect1><para>
14769 #: ../en/ch12-mq.xml:1022
14770 msgid ""
14771 "You can then share different versions of the same patch stack among multiple "
14772 "underlying repositories. I use this when I am developing a Linux kernel "
14773 "feature. I have a pristine copy of my kernel sources for each of several CPU "
14774 "architectures, and a cloned repository under each that contains the patches I "
14775 "am working on. When I want to test a change on a different architecture, I "
14776 "push my current patches to the patch repository associated with that kernel "
14777 "tree, pop and push all of my patches, and build and test that kernel."
14778 msgstr ""
14780 #. type: Content of: <book><chapter><sect1><para>
14781 #: ../en/ch12-mq.xml:1032
14782 msgid ""
14783 "Managing patches in a repository makes it possible for multiple developers to "
14784 "work on the same patch series without colliding with each other, all on top "
14785 "of an underlying source base that they may or may not control."
14786 msgstr ""
14788 #. type: Content of: <book><chapter><sect1><sect2><title>
14789 #: ../en/ch12-mq.xml:1038
14790 msgid "MQ support for patch repositories"
14791 msgstr "MQ 支持补丁版本库"
14793 #. type: Content of: <book><chapter><sect1><sect2><para>
14794 #: ../en/ch12-mq.xml:1040
14795 msgid ""
14796 "MQ helps you to work with the <filename role=\"special\" class=\"directory\">."
14797 "hg/patches</filename> directory as a repository; when you prepare a "
14798 "repository for working with patches using <command role=\"hg-ext-mq\">qinit</"
14799 "command>, you can pass the <option role=\"hg-ext-mq-cmd-qinit-opt\">hg -c</"
14800 "option> option to create the <filename role=\"special\" class=\"directory\">."
14801 "hg/patches</filename> directory as a Mercurial repository."
14802 msgstr ""
14804 #. type: Content of: <book><chapter><sect1><sect2><note><para>
14805 #: ../en/ch12-mq.xml:1050
14806 msgid ""
14807 "If you forget to use the <option role=\"hg-ext-mq-cmd-qinit-opt\">hg -c</"
14808 "option> option, you can simply go into the <filename role=\"special\" class="
14809 "\"directory\">.hg/patches</filename> directory at any time and run <command "
14810 "role=\"hg-cmd\">hg init</command>. Don't forget to add an entry for the "
14811 "<filename role=\"special\">status</filename> file to the <filename role="
14812 "\"special\">.hgignore</filename> file, though"
14813 msgstr ""
14815 #. type: Content of: <book><chapter><sect1><sect2><note><para>
14816 #: ../en/ch12-mq.xml:1059
14817 msgid ""
14818 "(<command role=\"hg-cmd\">hg qinit <option role=\"hg-ext-mq-cmd-qinit-opt"
14819 "\">hg -c</option></command> does this for you automatically); you "
14820 "<emphasis>really</emphasis> don't want to manage the <filename role=\"special"
14821 "\">status</filename> file."
14822 msgstr ""
14824 #. type: Content of: <book><chapter><sect1><sect2><para>
14825 #: ../en/ch12-mq.xml:1066
14826 msgid ""
14827 "As a convenience, if MQ notices that the <filename class=\"directory\">.hg/"
14828 "patches</filename> directory is a repository, it will automatically <command "
14829 "role=\"hg-cmd\">hg add</command> every patch that you create and import."
14830 msgstr ""
14832 #. type: Content of: <book><chapter><sect1><sect2><para>
14833 #: ../en/ch12-mq.xml:1071
14834 msgid ""
14835 "MQ provides a shortcut command, <command role=\"hg-ext-mq\">qcommit</"
14836 "command>, that runs <command role=\"hg-cmd\">hg commit</command> in the "
14837 "<filename role=\"special\" class=\"directory\">.hg/patches</filename> "
14838 "directory. This saves some bothersome typing."
14839 msgstr ""
14841 #. type: Content of: <book><chapter><sect1><sect2><para>
14842 #: ../en/ch12-mq.xml:1077
14843 msgid ""
14844 "Finally, as a convenience to manage the patch directory, you can define the "
14845 "alias <command>mq</command> on Unix systems. For example, on Linux systems "
14846 "using the <command>bash</command> shell, you can include the following "
14847 "snippet in your <filename role=\"home\">~/.bashrc</filename>."
14848 msgstr ""
14850 #. type: Content of: <book><chapter><sect1><sect2><para>
14851 #: ../en/ch12-mq.xml:1087
14852 msgid ""
14853 "You can then issue commands of the form <command>mq pull</command> from the "
14854 "main repository."
14855 msgstr ""
14857 #. type: Content of: <book><chapter><sect1><sect2><title>
14858 #: ../en/ch12-mq.xml:1092
14859 msgid "A few things to watch out for"
14860 msgstr "需要注意的事情"
14862 #. type: Content of: <book><chapter><sect1><sect2><para>
14863 #: ../en/ch12-mq.xml:1094
14864 msgid ""
14865 "MQ's support for working with a repository full of patches is limited in a "
14866 "few small respects."
14867 msgstr ""
14869 #. type: Content of: <book><chapter><sect1><sect2><para>
14870 #: ../en/ch12-mq.xml:1097
14871 msgid ""
14872 "MQ cannot automatically detect changes that you make to the patch directory. "
14873 "If you <command role=\"hg-cmd\">hg pull</command>, manually edit, or <command "
14874 "role=\"hg-cmd\">hg update</command> changes to patches or the <filename role="
14875 "\"special\">series</filename> file, you will have to <command role=\"hg-cmd"
14876 "\">hg qpop <option role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> "
14877 "and then <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-qpush-"
14878 "opt\">hg -a</option></command> in the underlying repository to see those "
14879 "changes show up there. If you forget to do this, you can confuse MQ's idea "
14880 "of which patches are applied."
14881 msgstr ""
14883 #. type: Content of: <book><chapter><sect1><title>
14884 #: ../en/ch12-mq.xml:1113
14885 msgid "Third party tools for working with patches"
14886 msgstr "操作补丁的第三方工具"
14888 #. type: Content of: <book><chapter><sect1><para>
14889 #: ../en/ch12-mq.xml:1115
14890 msgid ""
14891 "Once you've been working with patches for a while, you'll find yourself "
14892 "hungry for tools that will help you to understand and manipulate the patches "
14893 "you're dealing with."
14894 msgstr ""
14896 #. type: Content of: <book><chapter><sect1><para>
14897 #: ../en/ch12-mq.xml:1119
14898 msgid ""
14899 "The <command>diffstat</command> command <citation>web:diffstat</citation> "
14900 "generates a histogram of the modifications made to each file in a patch. It "
14901 "provides a good way to <quote>get a sense of</quote> a patch&emdash;which "
14902 "files it affects, and how much change it introduces to each file and as a "
14903 "whole. (I find that it's a good idea to use <command>diffstat</command>'s "
14904 "<option role=\"cmd-opt-diffstat\">-p</option> option as a matter of course, "
14905 "as otherwise it will try to do clever things with prefixes of file names that "
14906 "inevitably confuse at least me.)"
14907 msgstr ""
14909 #. type: Content of: <book><chapter><sect1><para>
14910 #: ../en/ch12-mq.xml:1133
14911 msgid ""
14912 "The <literal role=\"package\">patchutils</literal> package <citation>web:"
14913 "patchutils</citation> is invaluable. It provides a set of small utilities "
14914 "that follow the <quote>Unix philosophy;</quote> each does one useful thing "
14915 "with a patch. The <literal role=\"package\">patchutils</literal> command I "
14916 "use most is <command>filterdiff</command>, which extracts subsets from a "
14917 "patch file. For example, given a patch that modifies hundreds of files "
14918 "across dozens of directories, a single invocation of <command>filterdiff</"
14919 "command> can generate a smaller patch that only touches files whose names "
14920 "match a particular glob pattern. See section <xref linkend=\"mq-collab.tips."
14921 "interdiff\"/> for another example."
14922 msgstr ""
14924 #. type: Content of: <book><chapter><sect1><title>
14925 #: ../en/ch12-mq.xml:1149
14926 msgid "Good ways to work with patches"
14927 msgstr "操作补丁的好习惯"
14929 #. type: Content of: <book><chapter><sect1><para>
14930 #: ../en/ch12-mq.xml:1151
14931 msgid ""
14932 "Whether you are working on a patch series to submit to a free software or "
14933 "open source project, or a series that you intend to treat as a sequence of "
14934 "regular changesets when you're done, you can use some simple techniques to "
14935 "keep your work well organised."
14936 msgstr ""
14938 #. type: Content of: <book><chapter><sect1><para>
14939 #: ../en/ch12-mq.xml:1157
14940 msgid ""
14941 "Give your patches descriptive names. A good name for a patch might be "
14942 "<filename>rework-device-alloc.patch</filename>, because it will immediately "
14943 "give you a hint what the purpose of the patch is. Long names shouldn't be a "
14944 "problem; you won't be typing the names often, but you <emphasis>will</"
14945 "emphasis> be running commands like <command role=\"hg-ext-mq\">qapplied</"
14946 "command> and <command role=\"hg-ext-mq\">qtop</command> over and over. Good "
14947 "naming becomes especially important when you have a number of patches to work "
14948 "with, or if you are juggling a number of different tasks and your patches "
14949 "only get a fraction of your attention."
14950 msgstr ""
14952 #. type: Content of: <book><chapter><sect1><para>
14953 #: ../en/ch12-mq.xml:1169
14954 msgid ""
14955 "Be aware of what patch you're working on. Use the <command role=\"hg-ext-mq"
14956 "\">qtop</command> command and skim over the text of your patches "
14957 "frequently&emdash;for example, using <command role=\"hg-cmd\">hg tip <option "
14958 "role=\"hg-opt-tip\">-p</option></command>)&emdash;to be sure of where you "
14959 "stand. I have several times worked on and <command role=\"hg-ext-mq"
14960 "\">qrefresh</command>ed a patch other than the one I intended, and it's often "
14961 "tricky to migrate changes into the right patch after making them in the wrong "
14962 "one."
14963 msgstr ""
14965 #. type: Content of: <book><chapter><sect1><para>
14966 #: ../en/ch12-mq.xml:1179
14967 msgid ""
14968 "For this reason, it is very much worth investing a little time to learn how "
14969 "to use some of the third-party tools I described in section <xref linkend="
14970 "\"sec.mq.tools\"/>, particularly <command>diffstat</command> and "
14971 "<command>filterdiff</command>. The former will give you a quick idea of what "
14972 "changes your patch is making, while the latter makes it easy to splice hunks "
14973 "selectively out of one patch and into another."
14974 msgstr ""
14976 #. type: Content of: <book><chapter><sect1><title>
14977 #: ../en/ch12-mq.xml:1190
14978 msgid "MQ cookbook"
14979 msgstr "MQ 手册"
14981 #. type: Content of: <book><chapter><sect1><sect2><title>
14982 #: ../en/ch12-mq.xml:1193
14983 msgid "Manage <quote>trivial</quote> patches"
14984 msgstr "管理<quote>琐碎的</quote>补丁"
14986 #. type: Content of: <book><chapter><sect1><sect2><para>
14987 #: ../en/ch12-mq.xml:1195
14988 msgid ""
14989 "Because the overhead of dropping files into a new Mercurial repository is so "
14990 "low, it makes a lot of sense to manage patches this way even if you simply "
14991 "want to make a few changes to a source tarball that you downloaded."
14992 msgstr ""
14994 #
14995 #. type: Content of: <book><chapter><sect1><sect2><para>
14996 #: ../en/ch12-mq.xml:1200
14997 msgid ""
14998 "Begin by downloading and unpacking the source tarball, and turning it into a "
14999 "Mercurial repository."
15000 msgstr ""
15002 #. type: Content of: <book><chapter><sect1><sect2><para>
15003 #: ../en/ch12-mq.xml:1205
15004 msgid "Continue by creating a patch stack and making your changes."
15005 msgstr ""
15007 #. type: Content of: <book><chapter><sect1><sect2><para>
15008 #: ../en/ch12-mq.xml:1210
15009 msgid ""
15010 "Let's say a few weeks or months pass, and your package author releases a new "
15011 "version. First, bring their changes into the repository."
15012 msgstr ""
15014 #. type: Content of: <book><chapter><sect1><sect2><para>
15015 #: ../en/ch12-mq.xml:1216
15016 msgid ""
15017 "The pipeline starting with <command role=\"hg-cmd\">hg locate</command> above "
15018 "deletes all files in the working directory, so that <command role=\"hg-cmd"
15019 "\">hg commit</command>'s <option role=\"hg-opt-commit\">--addremove</option> "
15020 "option can actually tell which files have really been removed in the newer "
15021 "version of the source."
15022 msgstr ""
15024 #. type: Content of: <book><chapter><sect1><sect2><para>
15025 #: ../en/ch12-mq.xml:1224
15026 msgid "Finally, you can apply your patches on top of the new tree."
15027 msgstr ""
15029 #. type: Content of: <book><chapter><sect1><sect2><title>
15030 #: ../en/ch12-mq.xml:1231
15031 msgid "Combining entire patches"
15032 msgstr "组合全部的补丁"
15034 #. type: Content of: <book><chapter><sect1><sect2><para>
15035 #: ../en/ch12-mq.xml:1233
15036 msgid ""
15037 "MQ provides a command, <command role=\"hg-ext-mq\">qfold</command> that lets "
15038 "you combine entire patches. This <quote>folds</quote> the patches you name, "
15039 "in the order you name them, into the topmost applied patch, and concatenates "
15040 "their descriptions onto the end of its description. The patches that you "
15041 "fold must be unapplied before you fold them."
15042 msgstr ""
15044 #. type: Content of: <book><chapter><sect1><sect2><para>
15045 #: ../en/ch12-mq.xml:1241
15046 msgid ""
15047 "The order in which you fold patches matters. If your topmost applied patch "
15048 "is <literal>foo</literal>, and you <command role=\"hg-ext-mq\">qfold</"
15049 "command> <literal>bar</literal> and <literal>quux</literal> into it, you will "
15050 "end up with a patch that has the same effect as if you applied first "
15051 "<literal>foo</literal>, then <literal>bar</literal>, followed by "
15052 "<literal>quux</literal>."
15053 msgstr ""
15055 #. type: Content of: <book><chapter><sect1><sect2><title>
15056 #: ../en/ch12-mq.xml:1252
15057 msgid "Merging part of one patch into another"
15058 msgstr "合并补丁的部分内容到其它补丁"
15060 #. type: Content of: <book><chapter><sect1><sect2><para>
15061 #: ../en/ch12-mq.xml:1254
15062 msgid ""
15063 "Merging <emphasis>part</emphasis> of one patch into another is more difficult "
15064 "than combining entire patches."
15065 msgstr ""
15067 #. type: Content of: <book><chapter><sect1><sect2><para>
15068 #: ../en/ch12-mq.xml:1258
15069 msgid ""
15070 "If you want to move changes to entire files, you can use <command>filterdiff</"
15071 "command>'s <option role=\"cmd-opt-filterdiff\">-i</option> and <option role="
15072 "\"cmd-opt-filterdiff\">-x</option> options to choose the modifications to "
15073 "snip out of one patch, concatenating its output onto the end of the patch you "
15074 "want to merge into. You usually won't need to modify the patch you've merged "
15075 "the changes from. Instead, MQ will report some rejected hunks when you "
15076 "<command role=\"hg-ext-mq\">qpush</command> it (from the hunks you moved into "
15077 "the other patch), and you can simply <command role=\"hg-ext-mq\">qrefresh</"
15078 "command> the patch to drop the duplicate hunks."
15079 msgstr ""
15081 #. type: Content of: <book><chapter><sect1><sect2><para>
15082 #: ../en/ch12-mq.xml:1271
15083 msgid ""
15084 "If you have a patch that has multiple hunks modifying a file, and you only "
15085 "want to move a few of those hunks, the job becomes more messy, but you can "
15086 "still partly automate it. Use <command>lsdiff -nvv</command> to print some "
15087 "metadata about the patch."
15088 msgstr ""
15090 #. type: Content of: <book><chapter><sect1><sect2><para>
15091 #: ../en/ch12-mq.xml:1279
15092 msgid "This command prints three different kinds of number:"
15093 msgstr ""
15095 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
15096 #: ../en/ch12-mq.xml:1282
15097 msgid ""
15098 "(in the first column) a <emphasis>file number</emphasis> to identify each "
15099 "file modified in the patch;"
15100 msgstr ""
15102 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
15103 #: ../en/ch12-mq.xml:1286
15104 msgid ""
15105 "(on the next line, indented) the line number within a modified file where a "
15106 "hunk starts; and"
15107 msgstr ""
15109 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
15110 #: ../en/ch12-mq.xml:1289
15111 msgid ""
15112 "(on the same line) a <emphasis>hunk number</emphasis> to identify that hunk."
15113 msgstr ""
15115 #. type: Content of: <book><chapter><sect1><sect2><para>
15116 #: ../en/ch12-mq.xml:1293
15117 msgid ""
15118 "You'll have to use some visual inspection, and reading of the patch, to "
15119 "identify the file and hunk numbers you'll want, but you can then pass them to "
15120 "to <command>filterdiff</command>'s <option role=\"cmd-opt-filterdiff\">--"
15121 "files</option> and <option role=\"cmd-opt-filterdiff\">--hunks</option> "
15122 "options, to select exactly the file and hunk you want to extract."
15123 msgstr ""
15125 #. type: Content of: <book><chapter><sect1><sect2><para>
15126 #: ../en/ch12-mq.xml:1301
15127 msgid ""
15128 "Once you have this hunk, you can concatenate it onto the end of your "
15129 "destination patch and continue with the remainder of section <xref linkend="
15130 "\"sec.mq.combine\"/>."
15131 msgstr ""
15133 #. type: Content of: <book><chapter><sect1><title>
15134 #: ../en/ch12-mq.xml:1308
15135 msgid "Differences between quilt and MQ"
15136 msgstr "MQ 与 quilt 的区别"
15138 #. type: Content of: <book><chapter><sect1><para>
15139 #: ../en/ch12-mq.xml:1310
15140 msgid ""
15141 "If you are already familiar with quilt, MQ provides a similar command set. "
15142 "There are a few differences in the way that it works."
15143 msgstr ""
15145 #. type: Content of: <book><chapter><sect1><para>
15146 #: ../en/ch12-mq.xml:1314
15147 msgid ""
15148 "You will already have noticed that most quilt commands have MQ counterparts "
15149 "that simply begin with a <quote><literal>q</literal></quote>. The exceptions "
15150 "are quilt's <literal>add</literal> and <literal>remove</literal> commands, "
15151 "the counterparts for which are the normal Mercurial <command role=\"hg-cmd"
15152 "\">hg add</command> and <command role=\"hg-cmd\">hg remove</command> "
15153 "commands. There is no MQ equivalent of the quilt <literal>edit</literal> "
15154 "command."
15155 msgstr ""
15157 #. type: Content of: <book><chapter><title>
15158 #: ../en/ch13-mq-collab.xml:5
15159 msgid "Advanced uses of Mercurial Queues"
15160 msgstr "MQ 的高级用法"
15162 #. type: Content of: <book><chapter><para>
15163 #: ../en/ch13-mq-collab.xml:7
15164 msgid ""
15165 "While it's easy to pick up straightforward uses of Mercurial Queues, use of a "
15166 "little discipline and some of MQ's less frequently used capabilities makes it "
15167 "possible to work in complicated development environments."
15168 msgstr ""
15170 #. type: Content of: <book><chapter><para>
15171 #: ../en/ch13-mq-collab.xml:12
15172 msgid ""
15173 "In this chapter, I will use as an example a technique I have used to manage "
15174 "the development of an Infiniband device driver for the Linux kernel. The "
15175 "driver in question is large (at least as drivers go), with 25,000 lines of "
15176 "code spread across 35 source files. It is maintained by a small team of "
15177 "developers."
15178 msgstr ""
15180 #. type: Content of: <book><chapter><para>
15181 #: ../en/ch13-mq-collab.xml:18
15182 msgid ""
15183 "While much of the material in this chapter is specific to Linux, the same "
15184 "principles apply to any code base for which you're not the primary owner, and "
15185 "upon which you need to do a lot of development."
15186 msgstr ""
15188 #. type: Content of: <book><chapter><sect1><title>
15189 #: ../en/ch13-mq-collab.xml:24
15190 msgid "The problem of many targets"
15191 msgstr "多个目标的问题"
15193 #. type: Content of: <book><chapter><sect1><para>
15194 #: ../en/ch13-mq-collab.xml:26
15195 msgid ""
15196 "The Linux kernel changes rapidly, and has never been internally stable; "
15197 "developers frequently make drastic changes between releases. This means that "
15198 "a version of the driver that works well with a particular released version of "
15199 "the kernel will not even <emphasis>compile</emphasis> correctly against, "
15200 "typically, any other version."
15201 msgstr ""
15203 #. type: Content of: <book><chapter><sect1><para>
15204 #: ../en/ch13-mq-collab.xml:33
15205 msgid ""
15206 "To maintain a driver, we have to keep a number of distinct versions of Linux "
15207 "in mind."
15208 msgstr ""
15210 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15211 #: ../en/ch13-mq-collab.xml:36
15212 msgid ""
15213 "One target is the main Linux kernel development tree. Maintenance of the code "
15214 "is in this case partly shared by other developers in the kernel community, "
15215 "who make <quote>drive-by</quote> modifications to the driver as they develop "
15216 "and refine kernel subsystems."
15217 msgstr ""
15219 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15220 #: ../en/ch13-mq-collab.xml:42
15221 msgid ""
15222 "We also maintain a number of <quote>backports</quote> to older versions of "
15223 "the Linux kernel, to support the needs of customers who are running older "
15224 "Linux distributions that do not incorporate our drivers. (To "
15225 "<emphasis>backport</emphasis> a piece of code is to modify it to work in an "
15226 "older version of its target environment than the version it was developed "
15227 "for.)"
15228 msgstr ""
15230 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15231 #: ../en/ch13-mq-collab.xml:50
15232 msgid ""
15233 "Finally, we make software releases on a schedule that is necessarily not "
15234 "aligned with those used by Linux distributors and kernel developers, so that "
15235 "we can deliver new features to customers without forcing them to upgrade "
15236 "their entire kernels or distributions."
15237 msgstr ""
15239 #. type: Content of: <book><chapter><sect1><sect2><title>
15240 #: ../en/ch13-mq-collab.xml:58
15241 msgid "Tempting approaches that don't work well"
15242 msgstr "工作不好的诱人方法"
15244 #. type: Content of: <book><chapter><sect1><sect2><para>
15245 #: ../en/ch13-mq-collab.xml:60
15246 msgid ""
15247 "There are two <quote>standard</quote> ways to maintain a piece of software "
15248 "that has to target many different environments."
15249 msgstr ""
15251 #. type: Content of: <book><chapter><sect1><sect2><para>
15252 #: ../en/ch13-mq-collab.xml:64
15253 msgid ""
15254 "The first is to maintain a number of branches, each intended for a single "
15255 "target. The trouble with this approach is that you must maintain iron "
15256 "discipline in the flow of changes between repositories. A new feature or bug "
15257 "fix must start life in a <quote>pristine</quote> repository, then percolate "
15258 "out to every backport repository. Backport changes are more limited in the "
15259 "branches they should propagate to; a backport change that is applied to a "
15260 "branch where it doesn't belong will probably stop the driver from compiling."
15261 msgstr ""
15263 #. type: Content of: <book><chapter><sect1><sect2><para>
15264 #: ../en/ch13-mq-collab.xml:74
15265 msgid ""
15266 "The second is to maintain a single source tree filled with conditional "
15267 "statements that turn chunks of code on or off depending on the intended "
15268 "target. Because these <quote>ifdefs</quote> are not allowed in the Linux "
15269 "kernel tree, a manual or automatic process must be followed to strip them out "
15270 "and yield a clean tree. A code base maintained in this fashion rapidly "
15271 "becomes a rat's nest of conditional blocks that are difficult to understand "
15272 "and maintain."
15273 msgstr ""
15275 #. type: Content of: <book><chapter><sect1><sect2><para>
15276 #: ../en/ch13-mq-collab.xml:83
15277 msgid ""
15278 "Neither of these approaches is well suited to a situation where you don't "
15279 "<quote>own</quote> the canonical copy of a source tree. In the case of a "
15280 "Linux driver that is distributed with the standard kernel, Linus's tree "
15281 "contains the copy of the code that will be treated by the world as "
15282 "canonical. The upstream version of <quote>my</quote> driver can be modified "
15283 "by people I don't know, without me even finding out about it until after the "
15284 "changes show up in Linus's tree."
15285 msgstr ""
15287 #. type: Content of: <book><chapter><sect1><sect2><para>
15288 #: ../en/ch13-mq-collab.xml:93
15289 msgid ""
15290 "These approaches have the added weakness of making it difficult to generate "
15291 "well-formed patches to submit upstream."
15292 msgstr ""
15294 #. type: Content of: <book><chapter><sect1><sect2><para>
15295 #: ../en/ch13-mq-collab.xml:97
15296 msgid ""
15297 "In principle, Mercurial Queues seems like a good candidate to manage a "
15298 "development scenario such as the above. While this is indeed the case, MQ "
15299 "contains a few added features that make the job more pleasant."
15300 msgstr ""
15302 #. type: Content of: <book><chapter><sect1><title>
15303 #: ../en/ch13-mq-collab.xml:105
15304 msgid "Conditionally applying patches with guards"
15305 msgstr "有条件的应用补丁"
15307 #. type: Content of: <book><chapter><sect1><para>
15308 #: ../en/ch13-mq-collab.xml:107
15309 msgid ""
15310 "Perhaps the best way to maintain sanity with so many targets is to be able to "
15311 "choose specific patches to apply for a given situation. MQ provides a "
15312 "feature called <quote>guards</quote> (which originates with quilt's "
15313 "<literal>guards</literal> command) that does just this. To start off, let's "
15314 "create a simple repository for experimenting in."
15315 msgstr ""
15317 #. type: Content of: <book><chapter><sect1><para>
15318 #: ../en/ch13-mq-collab.xml:116
15319 msgid ""
15320 "This gives us a tiny repository that contains two patches that don't have any "
15321 "dependencies on each other, because they touch different files."
15322 msgstr ""
15324 #. type: Content of: <book><chapter><sect1><para>
15325 #: ../en/ch13-mq-collab.xml:120
15326 msgid ""
15327 "The idea behind conditional application is that you can <quote>tag</quote> a "
15328 "patch with a <emphasis>guard</emphasis>, which is simply a text string of "
15329 "your choosing, then tell MQ to select specific guards to use when applying "
15330 "patches. MQ will then either apply, or skip over, a guarded patch, depending "
15331 "on the guards that you have selected."
15332 msgstr ""
15334 #. type: Content of: <book><chapter><sect1><para>
15335 #: ../en/ch13-mq-collab.xml:127
15336 msgid ""
15337 "A patch can have an arbitrary number of guards; each one is "
15338 "<emphasis>positive</emphasis> (<quote>apply this patch if this guard is "
15339 "selected</quote>) or <emphasis>negative</emphasis> (<quote>skip this patch if "
15340 "this guard is selected</quote>). A patch with no guards is always applied."
15341 msgstr ""
15343 #. type: Content of: <book><chapter><sect1><title>
15344 #: ../en/ch13-mq-collab.xml:135
15345 msgid "Controlling the guards on a patch"
15346 msgstr "控制补丁的应用条件"
15348 #. type: Content of: <book><chapter><sect1><para>
15349 #: ../en/ch13-mq-collab.xml:137
15350 msgid ""
15351 "The <command role=\"hg-ext-mq\">qguard</command> command lets you determine "
15352 "which guards should apply to a patch, or display the guards that are already "
15353 "in effect. Without any arguments, it displays the guards on the current "
15354 "topmost patch."
15355 msgstr ""
15357 #. type: Content of: <book><chapter><sect1><para>
15358 #: ../en/ch13-mq-collab.xml:144
15359 msgid ""
15360 "To set a positive guard on a patch, prefix the name of the guard with a "
15361 "<quote><literal>+</literal></quote>."
15362 msgstr ""
15364 #. type: Content of: <book><chapter><sect1><para>
15365 #: ../en/ch13-mq-collab.xml:149
15366 msgid ""
15367 "To set a negative guard on a patch, prefix the name of the guard with a "
15368 "<quote><literal>-</literal></quote>."
15369 msgstr ""
15371 #. type: Content of: <book><chapter><sect1><note><para>
15372 #: ../en/ch13-mq-collab.xml:156
15373 msgid ""
15374 "The <command role=\"hg-ext-mq\">qguard</command> command <emphasis>sets</"
15375 "emphasis> the guards on a patch; it doesn't <emphasis>modify</emphasis> "
15376 "them. What this means is that if you run <command role=\"hg-cmd\">hg qguard "
15377 "+a +b</command> on a patch, then <command role=\"hg-cmd\">hg qguard +c</"
15378 "command> on the same patch, the <emphasis>only</emphasis> guard that will be "
15379 "set on it afterwards is <literal>+c</literal>."
15380 msgstr ""
15382 #
15383 #. type: Content of: <book><chapter><sect1><para>
15384 #: ../en/ch13-mq-collab.xml:165
15385 msgid ""
15386 "Mercurial stores guards in the <filename role=\"special\">series</filename> "
15387 "file; the form in which they are stored is easy both to understand and to "
15388 "edit by hand. (In other words, you don't have to use the <command role=\"hg-"
15389 "ext-mq\">qguard</command> command if you don't want to; it's okay to simply "
15390 "edit the <filename role=\"special\">series</filename> file.)"
15391 msgstr ""
15393 #. type: Content of: <book><chapter><sect1><title>
15394 #: ../en/ch13-mq-collab.xml:177
15395 msgid "Selecting the guards to use"
15396 msgstr "选择使用的条件"
15398 #. type: Content of: <book><chapter><sect1><para>
15399 #: ../en/ch13-mq-collab.xml:179
15400 msgid ""
15401 "The <command role=\"hg-ext-mq\">qselect</command> command determines which "
15402 "guards are active at a given time. The effect of this is to determine which "
15403 "patches MQ will apply the next time you run <command role=\"hg-ext-mq"
15404 "\">qpush</command>. It has no other effect; in particular, it doesn't do "
15405 "anything to patches that are already applied."
15406 msgstr ""
15408 #. type: Content of: <book><chapter><sect1><para>
15409 #: ../en/ch13-mq-collab.xml:186
15410 msgid ""
15411 "With no arguments, the <command role=\"hg-ext-mq\">qselect</command> command "
15412 "lists the guards currently in effect, one per line of output. Each argument "
15413 "is treated as the name of a guard to apply."
15414 msgstr ""
15416 #. type: Content of: <book><chapter><sect1><para>
15417 #: ../en/ch13-mq-collab.xml:193
15418 msgid ""
15419 "In case you're interested, the currently selected guards are stored in the "
15420 "<filename role=\"special\">guards</filename> file."
15421 msgstr ""
15423 #. type: Content of: <book><chapter><sect1><para>
15424 #: ../en/ch13-mq-collab.xml:198
15425 msgid ""
15426 "We can see the effect the selected guards have when we run <command role=\"hg-"
15427 "ext-mq\">qpush</command>."
15428 msgstr ""
15430 #. type: Content of: <book><chapter><sect1><para>
15431 #: ../en/ch13-mq-collab.xml:203
15432 msgid ""
15433 "A guard cannot start with a <quote><literal>+</literal></quote> or "
15434 "<quote><literal>-</literal></quote> character. The name of a guard must not "
15435 "contain white space, but most other characters are acceptable. If you try to "
15436 "use a guard with an invalid name, MQ will complain:"
15437 msgstr ""
15439 #. type: Content of: <book><chapter><sect1><para>
15440 #: ../en/ch13-mq-collab.xml:212
15441 msgid "Changing the selected guards changes the patches that are applied."
15442 msgstr ""
15444 #. type: Content of: <book><chapter><sect1><para>
15445 #: ../en/ch13-mq-collab.xml:217
15446 msgid ""
15447 "You can see in the example below that negative guards take precedence over "
15448 "positive guards."
15449 msgstr ""
15451 #. type: Content of: <book><chapter><sect1><title>
15452 #: ../en/ch13-mq-collab.xml:224
15453 msgid "MQ's rules for applying patches"
15454 msgstr "MQ 应用补丁的规则"
15456 #. type: Content of: <book><chapter><sect1><para>
15457 #: ../en/ch13-mq-collab.xml:226
15458 msgid ""
15459 "The rules that MQ uses when deciding whether to apply a patch are as follows."
15460 msgstr ""
15462 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15463 #: ../en/ch13-mq-collab.xml:229
15464 msgid "A patch that has no guards is always applied."
15465 msgstr ""
15467 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15468 #: ../en/ch13-mq-collab.xml:232
15469 msgid ""
15470 "If the patch has any negative guard that matches any currently selected "
15471 "guard, the patch is skipped."
15472 msgstr ""
15474 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15475 #: ../en/ch13-mq-collab.xml:235
15476 msgid ""
15477 "If the patch has any positive guard that matches any currently selected "
15478 "guard, the patch is applied."
15479 msgstr ""
15481 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15482 #: ../en/ch13-mq-collab.xml:238
15483 msgid ""
15484 "If the patch has positive or negative guards, but none matches any currently "
15485 "selected guard, the patch is skipped."
15486 msgstr ""
15488 #. type: Content of: <book><chapter><sect1><title>
15489 #: ../en/ch13-mq-collab.xml:245
15490 msgid "Trimming the work environment"
15491 msgstr "修剪工作环境"
15493 #. type: Content of: <book><chapter><sect1><para>
15494 #: ../en/ch13-mq-collab.xml:247
15495 msgid ""
15496 "In working on the device driver I mentioned earlier, I don't apply the "
15497 "patches to a normal Linux kernel tree. Instead, I use a repository that "
15498 "contains only a snapshot of the source files and headers that are relevant to "
15499 "Infiniband development. This repository is 1% the size of a kernel "
15500 "repository, so it's easier to work with."
15501 msgstr ""
15503 #. type: Content of: <book><chapter><sect1><para>
15504 #: ../en/ch13-mq-collab.xml:254
15505 msgid ""
15506 "I then choose a <quote>base</quote> version on top of which the patches are "
15507 "applied. This is a snapshot of the Linux kernel tree as of a revision of my "
15508 "choosing. When I take the snapshot, I record the changeset ID from the "
15509 "kernel repository in the commit message. Since the snapshot preserves the "
15510 "<quote>shape</quote> and content of the relevant parts of the kernel tree, I "
15511 "can apply my patches on top of either my tiny repository or a normal kernel "
15512 "tree."
15513 msgstr ""
15515 #. type: Content of: <book><chapter><sect1><para>
15516 #: ../en/ch13-mq-collab.xml:263
15517 msgid ""
15518 "Normally, the base tree atop which the patches apply should be a snapshot of "
15519 "a very recent upstream tree. This best facilitates the development of "
15520 "patches that can easily be submitted upstream with few or no modifications."
15521 msgstr ""
15523 #. type: Content of: <book><chapter><sect1><title>
15524 #: ../en/ch13-mq-collab.xml:270
15525 msgid "Dividing up the <filename role=\"special\">series</filename> file"
15526 msgstr "分类补丁<filename role=\"special\">系列</filename>"
15528 #. type: Content of: <book><chapter><sect1><para>
15529 #: ../en/ch13-mq-collab.xml:273
15530 msgid ""
15531 "I categorise the patches in the <filename role=\"special\">series</filename> "
15532 "file into a number of logical groups. Each section of like patches begins "
15533 "with a block of comments that describes the purpose of the patches that "
15534 "follow."
15535 msgstr ""
15537 #. type: Content of: <book><chapter><sect1><para>
15538 #: ../en/ch13-mq-collab.xml:279
15539 msgid ""
15540 "The sequence of patch groups that I maintain follows. The ordering of these "
15541 "groups is important; I'll describe why after I introduce the groups."
15542 msgstr ""
15544 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15545 #: ../en/ch13-mq-collab.xml:283
15546 msgid ""
15547 "The <quote>accepted</quote> group. Patches that the development team has "
15548 "submitted to the maintainer of the Infiniband subsystem, and which he has "
15549 "accepted, but which are not present in the snapshot that the tiny repository "
15550 "is based on. These are <quote>read only</quote> patches, present only to "
15551 "transform the tree into a similar state as it is in the upstream maintainer's "
15552 "repository."
15553 msgstr ""
15555 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15556 #: ../en/ch13-mq-collab.xml:291
15557 msgid ""
15558 "The <quote>rework</quote> group. Patches that I have submitted, but that the "
15559 "upstream maintainer has requested modifications to before he will accept them."
15560 msgstr ""
15562 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15563 #: ../en/ch13-mq-collab.xml:296
15564 msgid ""
15565 "The <quote>pending</quote> group. Patches that I have not yet submitted to "
15566 "the upstream maintainer, but which we have finished working on. These will be "
15567 "<quote>read only</quote> for a while. If the upstream maintainer accepts "
15568 "them upon submission, I'll move them to the end of the <quote>accepted</"
15569 "quote> group. If he requests that I modify any, I'll move them to the "
15570 "beginning of the <quote>rework</quote> group."
15571 msgstr ""
15573 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15574 #: ../en/ch13-mq-collab.xml:305
15575 msgid ""
15576 "The <quote>in progress</quote> group. Patches that are actively being "
15577 "developed, and should not be submitted anywhere yet."
15578 msgstr ""
15580 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15581 #: ../en/ch13-mq-collab.xml:309
15582 msgid ""
15583 "The <quote>backport</quote> group. Patches that adapt the source tree to "
15584 "older versions of the kernel tree."
15585 msgstr ""
15587 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15588 #: ../en/ch13-mq-collab.xml:313
15589 msgid ""
15590 "The <quote>do not ship</quote> group. Patches that for some reason should "
15591 "never be submitted upstream. For example, one such patch might change "
15592 "embedded driver identification strings to make it easier to distinguish, in "
15593 "the field, between an out-of-tree version of the driver and a version shipped "
15594 "by a distribution vendor."
15595 msgstr ""
15597 #. type: Content of: <book><chapter><sect1><para>
15598 #: ../en/ch13-mq-collab.xml:321
15599 msgid ""
15600 "Now to return to the reasons for ordering groups of patches in this way. We "
15601 "would like the lowest patches in the stack to be as stable as possible, so "
15602 "that we will not need to rework higher patches due to changes in context. "
15603 "Putting patches that will never be changed first in the <filename role="
15604 "\"special\">series</filename> file serves this purpose."
15605 msgstr ""
15607 #. type: Content of: <book><chapter><sect1><para>
15608 #: ../en/ch13-mq-collab.xml:329
15609 msgid ""
15610 "We would also like the patches that we know we'll need to modify to be "
15611 "applied on top of a source tree that resembles the upstream tree as closely "
15612 "as possible. This is why we keep accepted patches around for a while."
15613 msgstr ""
15615 #. type: Content of: <book><chapter><sect1><para>
15616 #: ../en/ch13-mq-collab.xml:334
15617 msgid ""
15618 "The <quote>backport</quote> and <quote>do not ship</quote> patches float at "
15619 "the end of the <filename role=\"special\">series</filename> file. The "
15620 "backport patches must be applied on top of all other patches, and the "
15621 "<quote>do not ship</quote> patches might as well stay out of harm's way."
15622 msgstr ""
15624 #. type: Content of: <book><chapter><sect1><title>
15625 #: ../en/ch13-mq-collab.xml:343
15626 msgid "Maintaining the patch series"
15627 msgstr "维护补丁系列"
15629 #. type: Content of: <book><chapter><sect1><para>
15630 #: ../en/ch13-mq-collab.xml:345
15631 msgid ""
15632 "In my work, I use a number of guards to control which patches are to be "
15633 "applied."
15634 msgstr ""
15636 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15637 #: ../en/ch13-mq-collab.xml:349
15638 msgid ""
15639 "<quote>Accepted</quote> patches are guarded with <literal>accepted</"
15640 "literal>. I enable this guard most of the time. When I'm applying the "
15641 "patches on top of a tree where the patches are already present, I can turn "
15642 "this patch off, and the patches that follow it will apply cleanly."
15643 msgstr ""
15645 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15646 #: ../en/ch13-mq-collab.xml:356
15647 msgid ""
15648 "Patches that are <quote>finished</quote>, but not yet submitted, have no "
15649 "guards. If I'm applying the patch stack to a copy of the upstream tree, I "
15650 "don't need to enable any guards in order to get a reasonably safe source tree."
15651 msgstr ""
15653 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15654 #: ../en/ch13-mq-collab.xml:362
15655 msgid ""
15656 "Those patches that need reworking before being resubmitted are guarded with "
15657 "<literal>rework</literal>."
15658 msgstr ""
15660 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15661 #: ../en/ch13-mq-collab.xml:366
15662 msgid ""
15663 "For those patches that are still under development, I use <literal>devel</"
15664 "literal>."
15665 msgstr ""
15667 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15668 #: ../en/ch13-mq-collab.xml:369
15669 msgid ""
15670 "A backport patch may have several guards, one for each version of the kernel "
15671 "to which it applies. For example, a patch that backports a piece of code to "
15672 "2.6.9 will have a <literal>2.6.9</literal> guard."
15673 msgstr ""
15675 #. type: Content of: <book><chapter><sect1><para>
15676 #: ../en/ch13-mq-collab.xml:374
15677 msgid ""
15678 "This variety of guards gives me considerable flexibility in determining what "
15679 "kind of source tree I want to end up with. For most situations, the "
15680 "selection of appropriate guards is automated during the build process, but I "
15681 "can manually tune the guards to use for less common circumstances."
15682 msgstr ""
15684 #. type: Content of: <book><chapter><sect1><sect2><title>
15685 #: ../en/ch13-mq-collab.xml:381
15686 msgid "The art of writing backport patches"
15687 msgstr "编写向后移植补丁的艺术"
15689 #. type: Content of: <book><chapter><sect1><sect2><para>
15690 #: ../en/ch13-mq-collab.xml:383
15691 msgid ""
15692 "Using MQ, writing a backport patch is a simple process. All such a patch has "
15693 "to do is modify a piece of code that uses a kernel feature not present in the "
15694 "older version of the kernel, so that the driver continues to work correctly "
15695 "under that older version."
15696 msgstr ""
15698 #. type: Content of: <book><chapter><sect1><sect2><para>
15699 #: ../en/ch13-mq-collab.xml:389
15700 msgid ""
15701 "A useful goal when writing a good backport patch is to make your code look as "
15702 "if it was written for the older version of the kernel you're targeting. The "
15703 "less obtrusive the patch, the easier it will be to understand and maintain. "
15704 "If you're writing a collection of backport patches to avoid the <quote>rat's "
15705 "nest</quote> effect of lots of <literal>#ifdef</literal>s (hunks of source "
15706 "code that are only used conditionally) in your code, don't introduce version-"
15707 "dependent <literal>#ifdef</literal>s into the patches. Instead, write "
15708 "several patches, each of which makes unconditional changes, and control their "
15709 "application using guards."
15710 msgstr ""
15712 #. type: Content of: <book><chapter><sect1><sect2><para>
15713 #: ../en/ch13-mq-collab.xml:402
15714 msgid ""
15715 "There are two reasons to divide backport patches into a distinct group, away "
15716 "from the <quote>regular</quote> patches whose effects they modify. The first "
15717 "is that intermingling the two makes it more difficult to use a tool like the "
15718 "<literal role=\"hg-ext\">patchbomb</literal> extension to automate the "
15719 "process of submitting the patches to an upstream maintainer. The second is "
15720 "that a backport patch could perturb the context in which a subsequent regular "
15721 "patch is applied, making it impossible to apply the regular patch cleanly "
15722 "<emphasis>without</emphasis> the earlier backport patch already being applied."
15723 msgstr ""
15725 #. type: Content of: <book><chapter><sect1><title>
15726 #: ../en/ch13-mq-collab.xml:417
15727 msgid "Useful tips for developing with MQ"
15728 msgstr "使用 MQ 开发的技巧"
15730 #. type: Content of: <book><chapter><sect1><sect2><title>
15731 #: ../en/ch13-mq-collab.xml:420
15732 msgid "Organising patches in directories"
15733 msgstr "将补丁放到几个目录中"
15735 #. type: Content of: <book><chapter><sect1><sect2><para>
15736 #: ../en/ch13-mq-collab.xml:422
15737 msgid ""
15738 "If you're working on a substantial project with MQ, it's not difficult to "
15739 "accumulate a large number of patches. For example, I have one patch "
15740 "repository that contains over 250 patches."
15741 msgstr ""
15743 #. type: Content of: <book><chapter><sect1><sect2><para>
15744 #: ../en/ch13-mq-collab.xml:427
15745 msgid ""
15746 "If you can group these patches into separate logical categories, you can if "
15747 "you like store them in different directories; MQ has no problems with patch "
15748 "names that contain path separators."
15749 msgstr ""
15751 #. type: Content of: <book><chapter><sect1><sect2><title>
15752 #: ../en/ch13-mq-collab.xml:434
15753 msgid "Viewing the history of a patch"
15754 msgstr "察看补丁的历史"
15756 #. type: Content of: <book><chapter><sect1><sect2><para>
15757 #: ../en/ch13-mq-collab.xml:436
15758 msgid ""
15759 "If you're developing a set of patches over a long time, it's a good idea to "
15760 "maintain them in a repository, as discussed in section <xref linkend=\"sec.mq."
15761 "repo\"/>. If you do so, you'll quickly discover that using the <command role="
15762 "\"hg-cmd\">hg diff</command> command to look at the history of changes to a "
15763 "patch is unworkable. This is in part because you're looking at the second "
15764 "derivative of the real code (a diff of a diff), but also because MQ adds "
15765 "noise to the process by modifying time stamps and directory names when it "
15766 "updates a patch."
15767 msgstr ""
15769 #. type: Content of: <book><chapter><sect1><sect2><para>
15770 #: ../en/ch13-mq-collab.xml:448
15771 msgid ""
15772 "However, you can use the <literal role=\"hg-ext\">extdiff</literal> "
15773 "extension, which is bundled with Mercurial, to turn a diff of two versions of "
15774 "a patch into something readable. To do this, you will need a third-party "
15775 "package called <literal role=\"package\">patchutils</literal> <citation>web:"
15776 "patchutils</citation>. This provides a command named <command>interdiff</"
15777 "command>, which shows the differences between two diffs as a diff. Used on "
15778 "two versions of the same diff, it generates a diff that represents the diff "
15779 "from the first to the second version."
15780 msgstr ""
15782 #. type: Content of: <book><chapter><sect1><sect2><para>
15783 #: ../en/ch13-mq-collab.xml:459
15784 msgid ""
15785 "You can enable the <literal role=\"hg-ext\">extdiff</literal> extension in "
15786 "the usual way, by adding a line to the <literal role=\"rc-extensions"
15787 "\">extensions</literal> section of your <filename role=\"special\"> /.hgrc</"
15788 "filename>."
15789 msgstr ""
15791 #
15792 #. &example.hg-interdiff;
15793 #. type: Content of: <book><chapter><sect1><sect2><para>
15794 #: ../en/ch13-mq-collab.xml:465
15795 msgid ""
15796 "The <command>interdiff</command> command expects to be passed the names of "
15797 "two files, but the <literal role=\"hg-ext\">extdiff</literal> extension "
15798 "passes the program it runs a pair of directories, each of which can contain "
15799 "an arbitrary number of files. We thus need a small program that will run "
15800 "<command>interdiff</command> on each pair of files in these two directories. "
15801 "This program is available as <filename role=\"special\">hg-interdiff</"
15802 "filename> in the <filename class=\"directory\">examples</filename> directory "
15803 "of the source code repository that accompanies this book."
15804 msgstr ""
15806 #. type: Content of: <book><chapter><sect1><sect2><para>
15807 #: ../en/ch13-mq-collab.xml:477
15808 msgid ""
15809 "With the <filename role=\"special\">hg-interdiff</filename> program in your "
15810 "shell's search path, you can run it as follows, from inside an MQ patch "
15811 "directory:"
15812 msgstr ""
15814 #. type: Content of: <book><chapter><sect1><sect2><para>
15815 #: ../en/ch13-mq-collab.xml:482
15816 msgid ""
15817 "Since you'll probably want to use this long-winded command a lot, you can get "
15818 "<literal role=\"hg-ext\">hgext</literal> to make it available as a normal "
15819 "Mercurial command, again by editing your <filename role=\"special\"> /.hgrc</"
15820 "filename>."
15821 msgstr ""
15823 #. type: Content of: <book><chapter><sect1><sect2><para>
15824 #: ../en/ch13-mq-collab.xml:489
15825 msgid ""
15826 "This directs <literal role=\"hg-ext\">hgext</literal> to make an "
15827 "<literal>interdiff</literal> command available, so you can now shorten the "
15828 "previous invocation of <command role=\"hg-ext-extdiff\">extdiff</command> to "
15829 "something a little more wieldy."
15830 msgstr ""
15832 #. type: Content of: <book><chapter><sect1><sect2><note><para>
15833 #: ../en/ch13-mq-collab.xml:498
15834 msgid ""
15835 "The <command>interdiff</command> command works well only if the underlying "
15836 "files against which versions of a patch are generated remain the same. If "
15837 "you create a patch, modify the underlying files, and then regenerate the "
15838 "patch, <command>interdiff</command> may not produce useful output."
15839 msgstr ""
15841 #. type: Content of: <book><chapter><sect1><sect2><para>
15842 #: ../en/ch13-mq-collab.xml:506
15843 msgid ""
15844 "The <literal role=\"hg-ext\">extdiff</literal> extension is useful for more "
15845 "than merely improving the presentation of MQ patches. To read more about it, "
15846 "go to section <xref linkend=\"sec.hgext.extdiff\"/>."
15847 msgstr ""
15849 #. type: Content of: <book><chapter><title>
15850 #: ../en/ch14-hgext.xml:5
15851 msgid "Adding functionality with extensions"
15852 msgstr "使用扩展增加功能"
15854 #. type: Content of: <book><chapter><para>
15855 #: ../en/ch14-hgext.xml:7
15856 msgid ""
15857 "While the core of Mercurial is quite complete from a functionality "
15858 "standpoint, it's deliberately shorn of fancy features. This approach of "
15859 "preserving simplicity keeps the software easy to deal with for both "
15860 "maintainers and users."
15861 msgstr ""
15863 #. type: Content of: <book><chapter><para>
15864 #: ../en/ch14-hgext.xml:12
15865 msgid ""
15866 "However, Mercurial doesn't box you in with an inflexible command set: you can "
15867 "add features to it as <emphasis>extensions</emphasis> (sometimes known as "
15868 "<emphasis>plugins</emphasis>). We've already discussed a few of these "
15869 "extensions in earlier chapters."
15870 msgstr ""
15872 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15873 #: ../en/ch14-hgext.xml:18
15874 msgid ""
15875 "Section <xref linkend=\"sec.tour-merge.fetch\"/> covers the <literal role="
15876 "\"hg-ext\">fetch</literal> extension; this combines pulling new changes and "
15877 "merging them with local changes into a single command, <command role=\"hg-ext-"
15878 "fetch\">fetch</command>."
15879 msgstr ""
15881 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15882 #: ../en/ch14-hgext.xml:24
15883 msgid ""
15884 "In chapter <xref linkend=\"chap.hook\"/>, we covered several extensions that "
15885 "are useful for hook-related functionality: <literal role=\"hg-ext\">acl</"
15886 "literal> adds access control lists; <literal role=\"hg-ext\">bugzilla</"
15887 "literal> adds integration with the Bugzilla bug tracking system; and <literal "
15888 "role=\"hg-ext\">notify</literal> sends notification emails on new changes."
15889 msgstr ""
15891 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15892 #: ../en/ch14-hgext.xml:33
15893 msgid ""
15894 "The Mercurial Queues patch management extension is so invaluable that it "
15895 "merits two chapters and an appendix all to itself. Chapter <xref linkend="
15896 "\"chap.mq\"/> covers the basics; chapter <xref linkend=\"chap.mq-collab\"/> "
15897 "discusses advanced topics; and appendix <xref linkend=\"chap.mqref\"/> goes "
15898 "into detail on each command."
15899 msgstr ""
15901 #. type: Content of: <book><chapter><para>
15902 #: ../en/ch14-hgext.xml:43
15903 msgid ""
15904 "In this chapter, we'll cover some of the other extensions that are available "
15905 "for Mercurial, and briefly touch on some of the machinery you'll need to know "
15906 "about if you want to write an extension of your own."
15907 msgstr ""
15909 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15910 #: ../en/ch14-hgext.xml:48
15911 msgid ""
15912 "In section <xref linkend=\"sec.hgext.inotify\"/>, we'll discuss the "
15913 "possibility of <emphasis>huge</emphasis> performance improvements using the "
15914 "<literal role=\"hg-ext\">inotify</literal> extension."
15915 msgstr ""
15917 #. type: Content of: <book><chapter><sect1><title>
15918 #: ../en/ch14-hgext.xml:55
15919 msgid ""
15920 "Improve performance with the <literal role=\"hg-ext\">inotify</literal> "
15921 "extension"
15922 msgstr "使用扩展 <literal role=\"hg-ext\">inotify</literal> 以提高性能"
15924 #. type: Content of: <book><chapter><sect1><para>
15925 #: ../en/ch14-hgext.xml:58
15926 msgid ""
15927 "Are you interested in having some of the most common Mercurial operations run "
15928 "as much as a hundred times faster? Read on!"
15929 msgstr ""
15931 #. type: Content of: <book><chapter><sect1><para>
15932 #: ../en/ch14-hgext.xml:62
15933 msgid ""
15934 "Mercurial has great performance under normal circumstances. For example, "
15935 "when you run the <command role=\"hg-cmd\">hg status</command> command, "
15936 "Mercurial has to scan almost every directory and file in your repository so "
15937 "that it can display file status. Many other Mercurial commands need to do "
15938 "the same work behind the scenes; for example, the <command role=\"hg-cmd\">hg "
15939 "diff</command> command uses the status machinery to avoid doing an expensive "
15940 "comparison operation on files that obviously haven't changed."
15941 msgstr ""
15943 #. type: Content of: <book><chapter><sect1><para>
15944 #: ../en/ch14-hgext.xml:72
15945 msgid ""
15946 "Because obtaining file status is crucial to good performance, the authors of "
15947 "Mercurial have optimised this code to within an inch of its life. However, "
15948 "there's no avoiding the fact that when you run <command role=\"hg-cmd\">hg "
15949 "status</command>, Mercurial is going to have to perform at least one "
15950 "expensive system call for each managed file to determine whether it's changed "
15951 "since the last time Mercurial checked. For a sufficiently large repository, "
15952 "this can take a long time."
15953 msgstr ""
15955 #. type: Content of: <book><chapter><sect1><para>
15956 #: ../en/ch14-hgext.xml:82
15957 msgid ""
15958 "To put a number on the magnitude of this effect, I created a repository "
15959 "containing 150,000 managed files. I timed <command role=\"hg-cmd\">hg "
15960 "status</command> as taking ten seconds to run, even when <emphasis>none</"
15961 "emphasis> of those files had been modified."
15962 msgstr ""
15964 #. type: Content of: <book><chapter><sect1><para>
15965 #: ../en/ch14-hgext.xml:88
15966 msgid ""
15967 "Many modern operating systems contain a file notification facility. If a "
15968 "program signs up to an appropriate service, the operating system will notify "
15969 "it every time a file of interest is created, modified, or deleted. On Linux "
15970 "systems, the kernel component that does this is called <literal>inotify</"
15971 "literal>."
15972 msgstr ""
15974 #. type: Content of: <book><chapter><sect1><para>
15975 #: ../en/ch14-hgext.xml:95
15976 msgid ""
15977 "Mercurial's <literal role=\"hg-ext\">inotify</literal> extension talks to the "
15978 "kernel's <literal>inotify</literal> component to optimise <command role=\"hg-"
15979 "cmd\">hg status</command> commands. The extension has two components. A "
15980 "daemon sits in the background and receives notifications from the "
15981 "<literal>inotify</literal> subsystem. It also listens for connections from a "
15982 "regular Mercurial command. The extension modifies Mercurial's behaviour so "
15983 "that instead of scanning the filesystem, it queries the daemon. Since the "
15984 "daemon has perfect information about the state of the repository, it can "
15985 "respond with a result instantaneously, avoiding the need to scan every "
15986 "directory and file in the repository."
15987 msgstr ""
15989 #. type: Content of: <book><chapter><sect1><para>
15990 #: ../en/ch14-hgext.xml:108
15991 msgid ""
15992 "Recall the ten seconds that I measured plain Mercurial as taking to run "
15993 "<command role=\"hg-cmd\">hg status</command> on a 150,000 file repository. "
15994 "With the <literal role=\"hg-ext\">inotify</literal> extension enabled, the "
15995 "time dropped to 0.1 seconds, a factor of <emphasis>one hundred</emphasis> "
15996 "faster."
15997 msgstr ""
15999 #. type: Content of: <book><chapter><sect1><para>
16000 #: ../en/ch14-hgext.xml:115
16001 msgid "Before we continue, please pay attention to some caveats."
16002 msgstr ""
16004 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
16005 #: ../en/ch14-hgext.xml:118
16006 msgid ""
16007 "The <literal role=\"hg-ext\">inotify</literal> extension is Linux-specific. "
16008 "Because it interfaces directly to the Linux kernel's <literal>inotify</"
16009 "literal> subsystem, it does not work on other operating systems."
16010 msgstr ""
16012 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
16013 #: ../en/ch14-hgext.xml:123
16014 msgid ""
16015 "It should work on any Linux distribution that was released after early 2005. "
16016 "Older distributions are likely to have a kernel that lacks <literal>inotify</"
16017 "literal>, or a version of <literal>glibc</literal> that does not have the "
16018 "necessary interfacing support."
16019 msgstr ""
16021 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
16022 #: ../en/ch14-hgext.xml:130
16023 msgid ""
16024 "Not all filesystems are suitable for use with the <literal role=\"hg-ext"
16025 "\">inotify</literal> extension. Network filesystems such as NFS are a non-"
16026 "starter, for example, particularly if you're running Mercurial on several "
16027 "systems, all mounting the same network filesystem. The kernel's "
16028 "<literal>inotify</literal> system has no way of knowing about changes made on "
16029 "another system. Most local filesystems (e.g. ext3, XFS, ReiserFS) should "
16030 "work fine."
16031 msgstr ""
16033 #. type: Content of: <book><chapter><sect1><para>
16034 #: ../en/ch14-hgext.xml:141
16035 msgid ""
16036 "The <literal role=\"hg-ext\">inotify</literal> extension is not yet shipped "
16037 "with Mercurial as of May 2007, so it's a little more involved to set up than "
16038 "other extensions. But the performance improvement is worth it!"
16039 msgstr ""
16041 #. type: Content of: <book><chapter><sect1><para>
16042 #: ../en/ch14-hgext.xml:146
16043 msgid ""
16044 "The extension currently comes in two parts: a set of patches to the Mercurial "
16045 "source code, and a library of Python bindings to the <literal>inotify</"
16046 "literal> subsystem."
16047 msgstr ""
16049 #. type: Content of: <book><chapter><sect1><note><para>
16050 #: ../en/ch14-hgext.xml:150
16051 msgid ""
16052 "There are <emphasis>two</emphasis> Python <literal>inotify</literal> binding "
16053 "libraries. One of them is called <literal>pyinotify</literal>, and is "
16054 "packaged by some Linux distributions as <literal>python-inotify</literal>. "
16055 "This is <emphasis>not</emphasis> the one you'll need, as it is too buggy and "
16056 "inefficient to be practical."
16057 msgstr ""
16059 #. type: Content of: <book><chapter><sect1><para>
16060 #: ../en/ch14-hgext.xml:157
16061 msgid ""
16062 "To get going, it's best to already have a functioning copy of Mercurial "
16063 "installed."
16064 msgstr ""
16066 #. type: Content of: <book><chapter><sect1><note><para>
16067 #: ../en/ch14-hgext.xml:160
16068 msgid ""
16069 "If you follow the instructions below, you'll be <emphasis>replacing</"
16070 "emphasis> and overwriting any existing installation of Mercurial that you "
16071 "might already have, using the latest <quote>bleeding edge</quote> Mercurial "
16072 "code. Don't say you weren't warned!"
16073 msgstr ""
16075 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16076 #: ../en/ch14-hgext.xml:167
16077 msgid ""
16078 "Clone the Python <literal>inotify</literal> binding repository. Build and "
16079 "install it."
16080 msgstr ""
16082 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16083 #: ../en/ch14-hgext.xml:175
16084 msgid ""
16085 "Clone the <filename class=\"directory\">crew</filename> Mercurial "
16086 "repository. Clone the <literal role=\"hg-ext\">inotify</literal> patch "
16087 "repository so that Mercurial Queues will be able to apply patches to your "
16088 "cope of the <filename class=\"directory\">crew</filename> repository."
16089 msgstr ""
16091 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16092 #: ../en/ch14-hgext.xml:188
16093 msgid ""
16094 "Make sure that you have the Mercurial Queues extension, <literal role=\"hg-ext"
16095 "\">mq</literal>, enabled. If you've never used MQ, read section <xref "
16096 "linkend=\"sec.mq.start\"/> to get started quickly."
16097 msgstr ""
16099 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16100 #: ../en/ch14-hgext.xml:194
16101 msgid ""
16102 "Go into the <filename class=\"directory\">inotify</filename> repo, and apply "
16103 "all of the <literal role=\"hg-ext\">inotify</literal> patches using the "
16104 "<option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</option> option to the "
16105 "<command role=\"hg-ext-mq\">qpush</command> command."
16106 msgstr ""
16108 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16109 #: ../en/ch14-hgext.xml:204
16110 msgid ""
16111 "If you get an error message from <command role=\"hg-ext-mq\">qpush</command>, "
16112 "you should not continue. Instead, ask for help."
16113 msgstr ""
16115 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16116 #: ../en/ch14-hgext.xml:208
16117 msgid "Build and install the patched version of Mercurial."
16118 msgstr ""
16120 #. type: Content of: <book><chapter><sect1><para>
16121 #: ../en/ch14-hgext.xml:216
16122 msgid ""
16123 "Once you've build a suitably patched version of Mercurial, all you need to do "
16124 "to enable the <literal role=\"hg-ext\">inotify</literal> extension is add an "
16125 "entry to your <filename role=\"special\"> /.hgrc</filename>."
16126 msgstr ""
16128 #. type: Content of: <book><chapter><sect1><para>
16129 #: ../en/ch14-hgext.xml:221
16130 msgid ""
16131 "When the <literal role=\"hg-ext\">inotify</literal> extension is enabled, "
16132 "Mercurial will automatically and transparently start the status daemon the "
16133 "first time you run a command that needs status in a repository. It runs one "
16134 "status daemon per repository."
16135 msgstr ""
16137 #. type: Content of: <book><chapter><sect1><para>
16138 #: ../en/ch14-hgext.xml:227
16139 msgid ""
16140 "The status daemon is started silently, and runs in the background. If you "
16141 "look at a list of running processes after you've enabled the <literal role="
16142 "\"hg-ext\">inotify</literal> extension and run a few commands in different "
16143 "repositories, you'll thus see a few <literal>hg</literal> processes sitting "
16144 "around, waiting for updates from the kernel and queries from Mercurial."
16145 msgstr ""
16147 #. type: Content of: <book><chapter><sect1><para>
16148 #: ../en/ch14-hgext.xml:235
16149 msgid ""
16150 "The first time you run a Mercurial command in a repository when you have the "
16151 "<literal role=\"hg-ext\">inotify</literal> extension enabled, it will run "
16152 "with about the same performance as a normal Mercurial command. This is "
16153 "because the status daemon needs to perform a normal status scan so that it "
16154 "has a baseline against which to apply later updates from the kernel. "
16155 "However, <emphasis>every</emphasis> subsequent command that does any kind of "
16156 "status check should be noticeably faster on repositories of even fairly "
16157 "modest size. Better yet, the bigger your repository is, the greater a "
16158 "performance advantage you'll see. The <literal role=\"hg-ext\">inotify</"
16159 "literal> daemon makes status operations almost instantaneous on repositories "
16160 "of all sizes!"
16161 msgstr ""
16163 #. type: Content of: <book><chapter><sect1><para>
16164 #: ../en/ch14-hgext.xml:249
16165 msgid ""
16166 "If you like, you can manually start a status daemon using the <command role="
16167 "\"hg-ext-inotify\">inserve</command> command. This gives you slightly finer "
16168 "control over how the daemon ought to run. This command will of course only "
16169 "be available when the <literal role=\"hg-ext\">inotify</literal> extension is "
16170 "enabled."
16171 msgstr ""
16173 #. type: Content of: <book><chapter><sect1><para>
16174 #: ../en/ch14-hgext.xml:256
16175 msgid ""
16176 "When you're using the <literal role=\"hg-ext\">inotify</literal> extension, "
16177 "you should notice <emphasis>no difference at all</emphasis> in Mercurial's "
16178 "behaviour, with the sole exception of status-related commands running a whole "
16179 "lot faster than they used to. You should specifically expect that commands "
16180 "will not print different output; neither should they give different results. "
16181 "If either of these situations occurs, please report a bug."
16182 msgstr ""
16184 #. type: Content of: <book><chapter><sect1><title>
16185 #: ../en/ch14-hgext.xml:267
16186 msgid ""
16187 "Flexible diff support with the <literal role=\"hg-ext\">extdiff</literal> "
16188 "extension"
16189 msgstr "使用扩展 <literal role=\"hg-ext\">extdiff</literal> 以扩展差异支持"
16191 #. type: Content of: <book><chapter><sect1><para>
16192 #: ../en/ch14-hgext.xml:270
16193 msgid ""
16194 "Mercurial's built-in <command role=\"hg-cmd\">hg diff</command> command "
16195 "outputs plaintext unified diffs."
16196 msgstr ""
16197 "Mercurial 内置命令 <command role=\"hg-cmd\">hg diff</command> 的输出与统一差异"
16198 "不同。"
16200 #. type: Content of: <book><chapter><sect1><para>
16201 #: ../en/ch14-hgext.xml:275
16202 msgid ""
16203 "If you would like to use an external tool to display modifications, you'll "
16204 "want to use the <literal role=\"hg-ext\">extdiff</literal> extension. This "
16205 "will let you use, for example, a graphical diff tool."
16206 msgstr ""
16208 #. type: Content of: <book><chapter><sect1><para>
16209 #: ../en/ch14-hgext.xml:280
16210 msgid ""
16211 "The <literal role=\"hg-ext\">extdiff</literal> extension is bundled with "
16212 "Mercurial, so it's easy to set up. In the <literal role=\"rc-extensions"
16213 "\">extensions</literal> section of your <filename role=\"special\"> /.hgrc</"
16214 "filename>, simply add a one-line entry to enable the extension."
16215 msgstr ""
16217 #. type: Content of: <book><chapter><sect1><para>
16218 #: ../en/ch14-hgext.xml:286
16219 msgid ""
16220 "This introduces a command named <command role=\"hg-ext-extdiff\">extdiff</"
16221 "command>, which by default uses your system's <command>diff</command> command "
16222 "to generate a unified diff in the same form as the built-in <command role="
16223 "\"hg-cmd\">hg diff</command> command."
16224 msgstr ""
16226 #. type: Content of: <book><chapter><sect1><para>
16227 #: ../en/ch14-hgext.xml:294
16228 msgid ""
16229 "The result won't be exactly the same as with the built-in <command role=\"hg-"
16230 "cmd\">hg diff</command> variations, because the output of <command>diff</"
16231 "command> varies from one system to another, even when passed the same options."
16232 msgstr ""
16234 #. type: Content of: <book><chapter><sect1><para>
16235 #: ../en/ch14-hgext.xml:299
16236 msgid ""
16237 "As the <quote><literal>making snapshot</literal></quote> lines of output "
16238 "above imply, the <command role=\"hg-ext-extdiff\">extdiff</command> command "
16239 "works by creating two snapshots of your source tree. The first snapshot is "
16240 "of the source revision; the second, of the target revision or working "
16241 "directory. The <command role=\"hg-ext-extdiff\">extdiff</command> command "
16242 "generates these snapshots in a temporary directory, passes the name of each "
16243 "directory to an external diff viewer, then deletes the temporary directory. "
16244 "For efficiency, it only snapshots the directories and files that have changed "
16245 "between the two revisions."
16246 msgstr ""
16248 #. type: Content of: <book><chapter><sect1><para>
16249 #: ../en/ch14-hgext.xml:312
16250 msgid ""
16251 "Snapshot directory names have the same base name as your repository. If your "
16252 "repository path is <filename class=\"directory\">/quux/bar/foo</filename>, "
16253 "then <filename class=\"directory\">foo</filename> will be the name of each "
16254 "snapshot directory. Each snapshot directory name has its changeset ID "
16255 "appended, if appropriate. If a snapshot is of revision "
16256 "<literal>a631aca1083f</literal>, the directory will be named <filename class="
16257 "\"directory\">foo.a631aca1083f</filename>. A snapshot of the working "
16258 "directory won't have a changeset ID appended, so it would just be <filename "
16259 "class=\"directory\">foo</filename> in this example. To see what this looks "
16260 "like in practice, look again at the <command role=\"hg-ext-extdiff\">extdiff</"
16261 "command> example above. Notice that the diff has the snapshot directory "
16262 "names embedded in its header."
16263 msgstr ""
16265 #. type: Content of: <book><chapter><sect1><para>
16266 #: ../en/ch14-hgext.xml:328
16267 msgid ""
16268 "The <command role=\"hg-ext-extdiff\">extdiff</command> command accepts two "
16269 "important options. The <option role=\"hg-ext-extdiff-cmd-extdiff-opt\">hg -p</"
16270 "option> option lets you choose a program to view differences with, instead of "
16271 "<command>diff</command>. With the <option role=\"hg-ext-extdiff-cmd-extdiff-"
16272 "opt\">hg -o</option> option, you can change the options that <command role="
16273 "\"hg-ext-extdiff\">extdiff</command> passes to the program (by default, these "
16274 "options are <quote><literal>-Npru</literal></quote>, which only make sense if "
16275 "you're running <command>diff</command>). In other respects, the <command "
16276 "role=\"hg-ext-extdiff\">extdiff</command> command acts similarly to the built-"
16277 "in <command role=\"hg-cmd\">hg diff</command> command: you use the same "
16278 "option names, syntax, and arguments to specify the revisions you want, the "
16279 "files you want, and so on."
16280 msgstr ""
16282 #
16283 #. type: Content of: <book><chapter><sect1><para>
16284 #: ../en/ch14-hgext.xml:345
16285 msgid ""
16286 "As an example, here's how to run the normal system <command>diff</command> "
16287 "command, getting it to generate context diffs (using the <option role=\"cmd-"
16288 "opt-diff\">-c</option> option) instead of unified diffs, and five lines of "
16289 "context instead of the default three (passing <literal>5</literal> as the "
16290 "argument to the <option role=\"cmd-opt-diff\">-C</option> option)."
16291 msgstr ""
16293 #. type: Content of: <book><chapter><sect1><para>
16294 #: ../en/ch14-hgext.xml:354
16295 msgid ""
16296 "Launching a visual diff tool is just as easy. Here's how to launch the "
16297 "<command>kdiff3</command> viewer."
16298 msgstr ""
16300 #. type: Content of: <book><chapter><sect1><para>
16301 #: ../en/ch14-hgext.xml:358
16302 msgid ""
16303 "If your diff viewing command can't deal with directories, you can easily work "
16304 "around this with a little scripting. For an example of such scripting in "
16305 "action with the <literal role=\"hg-ext\">mq</literal> extension and the "
16306 "<command>interdiff</command> command, see section <xref linkend=\"mq-collab."
16307 "tips.interdiff\"/>."
16308 msgstr ""
16310 #. type: Content of: <book><chapter><sect1><sect2><title>
16311 #: ../en/ch14-hgext.xml:366
16312 msgid "Defining command aliases"
16313 msgstr "定义命令的别名"
16315 #. type: Content of: <book><chapter><sect1><sect2><para>
16316 #: ../en/ch14-hgext.xml:368
16317 msgid ""
16318 "It can be cumbersome to remember the options to both the <command role=\"hg-"
16319 "ext-extdiff\">extdiff</command> command and the diff viewer you want to use, "
16320 "so the <literal role=\"hg-ext\">extdiff</literal> extension lets you define "
16321 "<emphasis>new</emphasis> commands that will invoke your diff viewer with "
16322 "exactly the right options."
16323 msgstr ""
16325 #. type: Content of: <book><chapter><sect1><sect2><para>
16326 #: ../en/ch14-hgext.xml:375
16327 msgid ""
16328 "All you need to do is edit your <filename role=\"special\"> /.hgrc</"
16329 "filename>, and add a section named <literal role=\"rc-extdiff\">extdiff</"
16330 "literal>. Inside this section, you can define multiple commands. Here's how "
16331 "to add a <literal>kdiff3</literal> command. Once you've defined this, you "
16332 "can type <quote><literal>hg kdiff3</literal></quote> and the <literal role="
16333 "\"hg-ext\">extdiff</literal> extension will run <command>kdiff3</command> for "
16334 "you."
16335 msgstr ""
16337 #. type: Content of: <book><chapter><sect1><sect2><para>
16338 #: ../en/ch14-hgext.xml:384
16339 msgid ""
16340 "If you leave the right hand side of the definition empty, as above, the "
16341 "<literal role=\"hg-ext\">extdiff</literal> extension uses the name of the "
16342 "command you defined as the name of the external program to run. But these "
16343 "names don't have to be the same. Here, we define a command named "
16344 "<quote><literal>hg wibble</literal></quote>, which runs <command>kdiff3</"
16345 "command>."
16346 msgstr ""
16348 #. type: Content of: <book><chapter><sect1><sect2><para>
16349 #: ../en/ch14-hgext.xml:393
16350 msgid ""
16351 "You can also specify the default options that you want to invoke your diff "
16352 "viewing program with. The prefix to use is <quote><literal>opts.</literal></"
16353 "quote>, followed by the name of the command to which the options apply. This "
16354 "example defines a <quote><literal>hg vimdiff</literal></quote> command that "
16355 "runs the <command>vim</command> editor's <literal>DirDiff</literal> extension."
16356 msgstr ""
16358 #. type: Content of: <book><chapter><sect1><title>
16359 #: ../en/ch14-hgext.xml:406
16360 msgid ""
16361 "Cherrypicking changes with the <literal role=\"hg-ext\">transplant</literal> "
16362 "extension"
16363 msgstr "使用扩展 <literal role=\"hg-ext\">transplant</literal> 以挑选修改"
16365 #. type: Content of: <book><chapter><sect1><para>
16366 #: ../en/ch14-hgext.xml:409
16367 msgid "Need to have a long chat with Brendan about this."
16368 msgstr ""
16370 #. type: Content of: <book><chapter><sect1><title>
16371 #: ../en/ch14-hgext.xml:413
16372 msgid ""
16373 "Send changes via email with the <literal role=\"hg-ext\">patchbomb</literal> "
16374 "extension"
16375 msgstr ""
16376 "使用扩展 <literal role=\"hg-ext\">patchbomb</literal> 通过 email 发送修改"
16378 #. type: Content of: <book><chapter><sect1><para>
16379 #: ../en/ch14-hgext.xml:416
16380 msgid ""
16381 "Many projects have a culture of <quote>change review</quote>, in which people "
16382 "send their modifications to a mailing list for others to read and comment on "
16383 "before they commit the final version to a shared repository. Some projects "
16384 "have people who act as gatekeepers; they apply changes from other people to a "
16385 "repository to which those others don't have access."
16386 msgstr ""
16388 #. type: Content of: <book><chapter><sect1><para>
16389 #: ../en/ch14-hgext.xml:424
16390 msgid ""
16391 "Mercurial makes it easy to send changes over email for review or application, "
16392 "via its <literal role=\"hg-ext\">patchbomb</literal> extension. The "
16393 "extension is so named because changes are formatted as patches, and it's "
16394 "usual to send one changeset per email message. Sending a long series of "
16395 "changes by email is thus much like <quote>bombing</quote> the recipient's "
16396 "inbox, hence <quote>patchbomb</quote>."
16397 msgstr ""
16399 #. type: Content of: <book><chapter><sect1><para>
16400 #: ../en/ch14-hgext.xml:432
16401 msgid ""
16402 "As usual, the basic configuration of the <literal role=\"hg-ext\">patchbomb</"
16403 "literal> extension takes just one or two lines in your <filename role="
16404 "\"special\"> /.hgrc</filename>."
16405 msgstr ""
16407 #. type: Content of: <book><chapter><sect1><para>
16408 #: ../en/ch14-hgext.xml:437
16409 msgid ""
16410 "Once you've enabled the extension, you will have a new command available, "
16411 "named <command role=\"hg-ext-patchbomb\">email</command>."
16412 msgstr ""
16414 #. type: Content of: <book><chapter><sect1><para>
16415 #: ../en/ch14-hgext.xml:441
16416 msgid ""
16417 "The safest and best way to invoke the <command role=\"hg-ext-patchbomb"
16418 "\">email</command> command is to <emphasis>always</emphasis> run it first "
16419 "with the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -n</option> "
16420 "option. This will show you what the command <emphasis>would</emphasis> send, "
16421 "without actually sending anything. Once you've had a quick glance over the "
16422 "changes and verified that you are sending the right ones, you can rerun the "
16423 "same command, with the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -n</"
16424 "option> option removed."
16425 msgstr ""
16427 #. type: Content of: <book><chapter><sect1><para>
16428 #: ../en/ch14-hgext.xml:452
16429 msgid ""
16430 "The <command role=\"hg-ext-patchbomb\">email</command> command accepts the "
16431 "same kind of revision syntax as every other Mercurial command. For example, "
16432 "this command will send every revision between 7 and <literal>tip</literal>, "
16433 "inclusive."
16434 msgstr ""
16436 #. type: Content of: <book><chapter><sect1><para>
16437 #: ../en/ch14-hgext.xml:457
16438 msgid ""
16439 "You can also specify a <emphasis>repository</emphasis> to compare with. If "
16440 "you provide a repository but no revisions, the <command role=\"hg-ext-"
16441 "patchbomb\">email</command> command will send all revisions in the local "
16442 "repository that are not present in the remote repository. If you "
16443 "additionally specify revisions or a branch name (the latter using the <option "
16444 "role=\"hg-ext-patchbomb-cmd-email-opt\">hg -b</option> option), this will "
16445 "constrain the revisions sent."
16446 msgstr ""
16448 #. type: Content of: <book><chapter><sect1><para>
16449 #: ../en/ch14-hgext.xml:466
16450 msgid ""
16451 "It's perfectly safe to run the <command role=\"hg-ext-patchbomb\">email</"
16452 "command> command without the names of the people you want to send to: if you "
16453 "do this, it will just prompt you for those values interactively. (If you're "
16454 "using a Linux or Unix-like system, you should have enhanced "
16455 "<literal>readline</literal>-style editing capabilities when entering those "
16456 "headers, too, which is useful.)"
16457 msgstr ""
16459 #. type: Content of: <book><chapter><sect1><para>
16460 #: ../en/ch14-hgext.xml:474
16461 msgid ""
16462 "When you are sending just one revision, the <command role=\"hg-ext-patchbomb"
16463 "\">email</command> command will by default use the first line of the "
16464 "changeset description as the subject of the single email message it sends."
16465 msgstr ""
16467 #. type: Content of: <book><chapter><sect1><para>
16468 #: ../en/ch14-hgext.xml:479
16469 msgid ""
16470 "If you send multiple revisions, the <command role=\"hg-ext-patchbomb\">email</"
16471 "command> command will usually send one message per changeset. It will "
16472 "preface the series with an introductory message, in which you should describe "
16473 "the purpose of the series of changes you're sending."
16474 msgstr ""
16476 #. type: Content of: <book><chapter><sect1><sect2><title>
16477 #: ../en/ch14-hgext.xml:486
16478 msgid "Changing the behaviour of patchbombs"
16479 msgstr "修改 patchbomb 的行为"
16481 #. type: Content of: <book><chapter><sect1><sect2><para>
16482 #: ../en/ch14-hgext.xml:488
16483 msgid ""
16484 "Not every project has exactly the same conventions for sending changes in "
16485 "email; the <literal role=\"hg-ext\">patchbomb</literal> extension tries to "
16486 "accommodate a number of variations through command line options."
16487 msgstr ""
16489 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16490 #: ../en/ch14-hgext.xml:494
16491 msgid ""
16492 "You can write a subject for the introductory message on the command line "
16493 "using the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -s</option> "
16494 "option. This takes one argument, the text of the subject to use."
16495 msgstr ""
16497 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16498 #: ../en/ch14-hgext.xml:500
16499 msgid ""
16500 "To change the email address from which the messages originate, use the "
16501 "<option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -f</option> option. This "
16502 "takes one argument, the email address to use."
16503 msgstr ""
16505 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16506 #: ../en/ch14-hgext.xml:506
16507 msgid ""
16508 "The default behaviour is to send unified diffs (see section <xref linkend="
16509 "\"sec.mq.patch\"/> for a description of the format), one per message. You "
16510 "can send a binary bundle instead with the <option role=\"hg-ext-patchbomb-cmd-"
16511 "email-opt\">hg -b</option> option."
16512 msgstr ""
16514 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16515 #: ../en/ch14-hgext.xml:514
16516 msgid ""
16517 "Unified diffs are normally prefaced with a metadata header. You can omit "
16518 "this, and send unadorned diffs, with the <option role=\"hg-ext-patchbomb-cmd-"
16519 "email-opt\">hg --plain</option> option."
16520 msgstr ""
16522 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16523 #: ../en/ch14-hgext.xml:520
16524 msgid ""
16525 "Diffs are normally sent <quote>inline</quote>, in the same body part as the "
16526 "description of a patch. This makes it easiest for the largest number of "
16527 "readers to quote and respond to parts of a diff, as some mail clients will "
16528 "only quote the first MIME body part in a message. If you'd prefer to send the "
16529 "description and the diff in separate body parts, use the <option role=\"hg-"
16530 "ext-patchbomb-cmd-email-opt\">hg -a</option> option."
16531 msgstr ""
16533 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16534 #: ../en/ch14-hgext.xml:530
16535 msgid ""
16536 "Instead of sending mail messages, you can write them to an <literal>mbox</"
16537 "literal>-format mail folder using the <option role=\"hg-ext-patchbomb-cmd-"
16538 "email-opt\">hg -m</option> option. That option takes one argument, the name "
16539 "of the file to write to."
16540 msgstr ""
16542 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16543 #: ../en/ch14-hgext.xml:537
16544 msgid ""
16545 "If you would like to add a <command>diffstat</command>-format summary to each "
16546 "patch, and one to the introductory message, use the <option role=\"hg-ext-"
16547 "patchbomb-cmd-email-opt\">hg -d</option> option. The <command>diffstat</"
16548 "command> command displays a table containing the name of each file patched, "
16549 "the number of lines affected, and a histogram showing how much each file is "
16550 "modified. This gives readers a qualitative glance at how complex a patch is."
16551 msgstr ""