hgbook
view po/zh.po @ 644:3b864df20e3b
Update Chinese translation
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Wed Mar 18 18:13:05 2009 +0800 (2009-03-18) |
| parents | 61ac4138e086 |
| children | c2cefd9f9893 |
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-18 18:12+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 ""
2462 "对于每种流行的操作系统，都有已经构建的二进制软件包。这让在你的计算机上开始使"
2463 "用 Mercurial 变得很容易。"
2465 #. type: Content of: <book><chapter><sect1><sect2><title>
2466 #: ../en/ch02-tour-basic.xml:15
2467 msgid "Linux"
2468 msgstr "Linux"
2470 #. type: Content of: <book><chapter><sect1><sect2><para>
2471 #: ../en/ch02-tour-basic.xml:17
2472 msgid ""
2473 "Because each Linux distribution has its own packaging tools, policies, and "
2474 "rate of development, it's difficult to give a comprehensive set of "
2475 "instructions on how to install Mercurial binaries. The version of Mercurial "
2476 "that you will end up with can vary depending on how active the person is who "
2477 "maintains the package for your distribution."
2478 msgstr ""
2479 "由于每种 Linux 发行版都有自己的包管理工具，开发策略和进度，从而很难给出安装 "
2480 "Mercurial 二进制包的全面说明。你安装的 Mercurial 版本，在很大程度上依赖于你所"
2481 "使用的发行版的 Mercurial 维护者的活跃程度。"
2483 #. type: Content of: <book><chapter><sect1><sect2><para>
2484 #: ../en/ch02-tour-basic.xml:24
2485 msgid ""
2486 "To keep things simple, I will focus on installing Mercurial from the command "
2487 "line under the most popular Linux distributions. Most of these distributions "
2488 "provide graphical package managers that will let you install Mercurial with a "
2489 "single click; the package name to look for is <literal>mercurial</literal>."
2490 msgstr ""
2491 "为了让事情简单，我会致力于说明在最流行的 Linux 发行版中，从命令行安装 "
2492 "Mercurial 的方法。这些发行版都提供了图形界面的包管理器，让你通过点击鼠标安装 "
2493 "Mercurial；寻找的包名称是 <literal>mercurial</literal>。"
2495 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2496 #: ../en/ch02-tour-basic.xml:32
2497 msgid "Debian:"
2498 msgstr "Debian:"
2500 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2501 #: ../en/ch02-tour-basic.xml:35
2502 msgid "Fedora Core:"
2503 msgstr "Fedora Core:"
2505 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2506 #: ../en/ch02-tour-basic.xml:38
2507 msgid "Gentoo:"
2508 msgstr "Gentoo:"
2510 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2511 #: ../en/ch02-tour-basic.xml:40
2512 msgid "OpenSUSE:"
2513 msgstr "OpenSUSE:"
2515 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2516 #: ../en/ch02-tour-basic.xml:43
2517 msgid ""
2518 "Ubuntu: Ubuntu's Mercurial package is based on Debian's. To install it, run "
2519 "the following command."
2520 msgstr ""
2522 #. type: Content of: <book><chapter><sect1><sect2><title>
2523 #: ../en/ch02-tour-basic.xml:52
2524 msgid "Solaris"
2525 msgstr ""
2527 #. type: Content of: <book><chapter><sect1><sect2><para>
2528 #: ../en/ch02-tour-basic.xml:54
2529 msgid ""
2530 "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www."
2531 "sunfreeware.com</ulink>, is a good source for a large number of pre-built "
2532 "Solaris packages for 32 and 64 bit Intel and Sparc architectures, including "
2533 "current versions of Mercurial."
2534 msgstr ""
2536 #. type: Content of: <book><chapter><sect1><sect2><title>
2537 #: ../en/ch02-tour-basic.xml:62
2538 msgid "Mac OS X"
2539 msgstr ""
2541 #. type: Content of: <book><chapter><sect1><sect2><para>
2542 #: ../en/ch02-tour-basic.xml:64
2543 msgid ""
2544 "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url="
2545 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. "
2546 "This package works on both Intel- and Power-based Macs. Before you can use "
2547 "it, you must install a compatible version of Universal MacPython "
2548 "<citation>web:macpython</citation>. This is easy to do; simply follow the "
2549 "instructions on Lee's site."
2550 msgstr ""
2552 #. type: Content of: <book><chapter><sect1><sect2><para>
2553 #: ../en/ch02-tour-basic.xml:73
2554 msgid ""
2555 "It's also possible to install Mercurial using Fink or MacPorts, two popular "
2556 "free package managers for Mac OS X. If you have Fink, use <command>sudo apt-"
2557 "get install mercurial-py25</command>. If MacPorts, <command>sudo port "
2558 "install mercurial</command>."
2559 msgstr ""
2561 #. type: Content of: <book><chapter><sect1><sect2><title>
2562 #: ../en/ch02-tour-basic.xml:81
2563 msgid "Windows"
2564 msgstr ""
2566 #. type: Content of: <book><chapter><sect1><sect2><para>
2567 #: ../en/ch02-tour-basic.xml:83
2568 msgid ""
2569 "Lee Cantey publishes an installer of Mercurial for Windows at <ulink url="
2570 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. "
2571 "This package has no external dependencies; it <quote>just works</quote>."
2572 msgstr ""
2574 #. type: Content of: <book><chapter><sect1><sect2><note><para>
2575 #: ../en/ch02-tour-basic.xml:90
2576 msgid ""
2577 "The Windows version of Mercurial does not automatically convert line endings "
2578 "between Windows and Unix styles. If you want to share work with Unix users, "
2579 "you must do a little additional configuration work. XXX Flesh this out."
2580 msgstr ""
2582 #. type: Content of: <book><chapter><sect1><title>
2583 #: ../en/ch02-tour-basic.xml:100
2584 msgid "Getting started"
2585 msgstr "开始"
2587 #. type: Content of: <book><chapter><sect1><para>
2588 #: ../en/ch02-tour-basic.xml:102
2589 msgid ""
2590 "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command "
2591 "to find out whether Mercurial is actually installed properly. The actual "
2592 "version information that it prints isn't so important; it's whether it prints "
2593 "anything at all that we care about."
2594 msgstr ""
2596 #. type: Content of: <book><chapter><sect1><sect2><title>
2597 #: ../en/ch02-tour-basic.xml:111
2598 msgid "Built-in help"
2599 msgstr "内置帮助"
2601 #. type: Content of: <book><chapter><sect1><sect2><para>
2602 #: ../en/ch02-tour-basic.xml:113
2603 msgid ""
2604 "Mercurial provides a built-in help system. This is invaluable for those "
2605 "times when you find yourself stuck trying to remember how to run a command. "
2606 "If you are completely stuck, simply run <command role=\"hg-cmd\">hg help</"
2607 "command>; it will print a brief list of commands, along with a description of "
2608 "what each does. If you ask for help on a specific command (as below), it "
2609 "prints more detailed information."
2610 msgstr ""
2612 #. type: Content of: <book><chapter><sect1><sect2><para>
2613 #: ../en/ch02-tour-basic.xml:124
2614 msgid ""
2615 "For a more impressive level of detail (which you won't usually need) run "
2616 "<command role=\"hg-cmd\">hg help <option role=\"hg-opt-global\">-v</option></"
2617 "command>. The <option role=\"hg-opt-global\">-v</option> option is short for "
2618 "<option role=\"hg-opt-global\">--verbose</option>, and tells Mercurial to "
2619 "print more information than it usually would."
2620 msgstr ""
2622 #. type: Content of: <book><chapter><sect1><title>
2623 #: ../en/ch02-tour-basic.xml:135
2624 msgid "Working with a repository"
2625 msgstr "使用版本库"
2627 #. type: Content of: <book><chapter><sect1><para>
2628 #: ../en/ch02-tour-basic.xml:137
2629 msgid ""
2630 "In Mercurial, everything happens inside a <emphasis>repository</emphasis>. "
2631 "The repository for a project contains all of the files that <quote>belong to</"
2632 "quote> that project, along with a historical record of the project's files."
2633 msgstr ""
2635 #. type: Content of: <book><chapter><sect1><para>
2636 #: ../en/ch02-tour-basic.xml:143
2637 msgid ""
2638 "There's nothing particularly magical about a repository; it is simply a "
2639 "directory tree in your filesystem that Mercurial treats as special. You can "
2640 "rename or delete a repository any time you like, using either the command "
2641 "line or your file browser."
2642 msgstr ""
2644 #. type: Content of: <book><chapter><sect1><sect2><title>
2645 #: ../en/ch02-tour-basic.xml:150
2646 msgid "Making a local copy of a repository"
2647 msgstr "创建版本库的工作副本"
2649 #. type: Content of: <book><chapter><sect1><sect2><para>
2650 #: ../en/ch02-tour-basic.xml:152
2651 msgid ""
2652 "<emphasis>Copying</emphasis> a repository is just a little bit special. "
2653 "While you could use a normal file copying command to make a copy of a "
2654 "repository, it's best to use a built-in command that Mercurial provides. "
2655 "This command is called <command role=\"hg-cmd\">hg clone</command>, because "
2656 "it creates an identical copy of an existing repository."
2657 msgstr ""
2659 #. type: Content of: <book><chapter><sect1><sect2><para>
2660 #: ../en/ch02-tour-basic.xml:161
2661 msgid ""
2662 "If our clone succeeded, we should now have a local directory called <filename "
2663 "class=\"directory\">hello</filename>. This directory will contain some files."
2664 msgstr ""
2666 #. type: Content of: <book><chapter><sect1><sect2><para>
2667 #: ../en/ch02-tour-basic.xml:167
2668 msgid ""
2669 "These files have the same contents and history in our repository as they do "
2670 "in the repository we cloned."
2671 msgstr ""
2673 #. type: Content of: <book><chapter><sect1><sect2><para>
2674 #: ../en/ch02-tour-basic.xml:170
2675 msgid ""
2676 "Every Mercurial repository is complete, self-contained, and independent. It "
2677 "contains its own private copy of a project's files and history. A cloned "
2678 "repository remembers the location of the repository it was cloned from, but "
2679 "it does not communicate with that repository, or any other, unless you tell "
2680 "it to."
2681 msgstr ""
2683 #. type: Content of: <book><chapter><sect1><sect2><para>
2684 #: ../en/ch02-tour-basic.xml:177
2685 msgid ""
2686 "What this means for now is that we're free to experiment with our repository, "
2687 "safe in the knowledge that it's a private <quote>sandbox</quote> that won't "
2688 "affect anyone else."
2689 msgstr ""
2691 #. type: Content of: <book><chapter><sect1><sect2><title>
2692 #: ../en/ch02-tour-basic.xml:183
2693 msgid "What's in a repository?"
2694 msgstr "什么是版本库?"
2696 #. type: Content of: <book><chapter><sect1><sect2><para>
2697 #: ../en/ch02-tour-basic.xml:185
2698 msgid ""
2699 "When we take a more detailed look inside a repository, we can see that it "
2700 "contains a directory named <filename class=\"directory\">.hg</filename>. "
2701 "This is where Mercurial keeps all of its metadata for the repository."
2702 msgstr ""
2704 #. type: Content of: <book><chapter><sect1><sect2><para>
2705 #: ../en/ch02-tour-basic.xml:192
2706 msgid ""
2707 "The contents of the <filename class=\"directory\">.hg</filename> directory "
2708 "and its subdirectories are private to Mercurial. Every other file and "
2709 "directory in the repository is yours to do with as you please."
2710 msgstr ""
2712 #. type: Content of: <book><chapter><sect1><sect2><para>
2713 #: ../en/ch02-tour-basic.xml:198
2714 msgid ""
2715 "To introduce a little terminology, the <filename class=\"directory\">.hg</"
2716 "filename> directory is the <quote>real</quote> repository, and all of the "
2717 "files and directories that coexist with it are said to live in the "
2718 "<emphasis>working directory</emphasis>. An easy way to remember the "
2719 "distinction is that the <emphasis>repository</emphasis> contains the "
2720 "<emphasis>history</emphasis> of your project, while the <emphasis>working "
2721 "directory</emphasis> contains a <emphasis>snapshot</emphasis> of your project "
2722 "at a particular point in history."
2723 msgstr ""
2725 #. type: Content of: <book><chapter><sect1><title>
2726 #: ../en/ch02-tour-basic.xml:213
2727 msgid "A tour through history"
2728 msgstr "回溯历史"
2730 #. type: Content of: <book><chapter><sect1><para>
2731 #: ../en/ch02-tour-basic.xml:215
2732 msgid ""
2733 "One of the first things we might want to do with a new, unfamiliar repository "
2734 "is understand its history. The <command role=\"hg-cmd\">hg log</command> "
2735 "command gives us a view of history."
2736 msgstr ""
2738 #. type: Content of: <book><chapter><sect1><para>
2739 #: ../en/ch02-tour-basic.xml:222
2740 msgid ""
2741 "By default, this command prints a brief paragraph of output for each change "
2742 "to the project that was recorded. In Mercurial terminology, we call each of "
2743 "these recorded events a <emphasis>changeset</emphasis>, because it can "
2744 "contain a record of changes to several files."
2745 msgstr ""
2747 #. type: Content of: <book><chapter><sect1><para>
2748 #: ../en/ch02-tour-basic.xml:228
2749 msgid ""
2750 "The fields in a record of output from <command role=\"hg-cmd\">hg log</"
2751 "command> are as follows."
2752 msgstr ""
2754 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2755 #: ../en/ch02-tour-basic.xml:231
2756 msgid ""
2757 "<literal>changeset</literal>: This field has the format of a number, followed "
2758 "by a colon, followed by a hexadecimal string. These are "
2759 "<emphasis>identifiers</emphasis> for the changeset. There are two "
2760 "identifiers because the number is shorter and easier to type than the hex "
2761 "string."
2762 msgstr ""
2764 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2765 #: ../en/ch02-tour-basic.xml:237
2766 msgid ""
2767 "<literal>user</literal>: The identity of the person who created the "
2768 "changeset. This is a free-form field, but it most often contains a person's "
2769 "name and email address."
2770 msgstr ""
2772 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2773 #: ../en/ch02-tour-basic.xml:241
2774 msgid ""
2775 "<literal>date</literal>: The date and time on which the changeset was "
2776 "created, and the timezone in which it was created. (The date and time are "
2777 "local to that timezone; they display what time and date it was for the person "
2778 "who created the changeset.)"
2779 msgstr ""
2781 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2782 #: ../en/ch02-tour-basic.xml:246
2783 msgid ""
2784 "<literal>summary</literal>: The first line of the text message that the "
2785 "creator of the changeset entered to describe the changeset."
2786 msgstr ""
2788 #. type: Content of: <book><chapter><sect1><para>
2789 #: ../en/ch02-tour-basic.xml:249
2790 msgid ""
2791 "The default output printed by <command role=\"hg-cmd\">hg log</command> is "
2792 "purely a summary; it is missing a lot of detail."
2793 msgstr ""
2795 #. type: Content of: <book><chapter><sect1><para>
2796 #: ../en/ch02-tour-basic.xml:253
2797 msgid ""
2798 "Figure <xref endterm=\"fig.tour-basic.history.caption\" linkend=\"fig.tour-"
2799 "basic.history\"/> provides a graphical representation of the history of the "
2800 "<filename class=\"directory\">hello</filename> repository, to make it a "
2801 "little easier to see which direction history is <quote>flowing</quote> in. "
2802 "We'll be returning to this figure several times in this chapter and the "
2803 "chapter that follows."
2804 msgstr ""
2806 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
2807 #: ../en/ch02-tour-basic.xml:264
2808 msgid ""
2809 "<imageobject><imagedata fileref=\"images/tour-history.png\"/></imageobject>"
2810 msgstr ""
2812 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><textobject><phrase>
2813 #: ../en/ch02-tour-basic.xml:265 ../en/ch03-tour-merge.xml:48
2814 #: ../en/ch03-tour-merge.xml:78 ../en/ch03-tour-merge.xml:126
2815 #: ../en/ch03-tour-merge.xml:182 ../en/ch03-tour-merge.xml:254
2816 #: ../en/ch04-concepts.xml:56 ../en/ch04-concepts.xml:108
2817 #: ../en/ch04-concepts.xml:194 ../en/ch04-concepts.xml:301
2818 #: ../en/ch04-concepts.xml:353 ../en/ch04-concepts.xml:370
2819 #: ../en/ch04-concepts.xml:414 ../en/ch04-concepts.xml:436
2820 #: ../en/ch04-concepts.xml:480 ../en/ch06-collab.xml:277
2821 #: ../en/ch09-undo.xml:366 ../en/ch09-undo.xml:417 ../en/ch09-undo.xml:485
2822 #: ../en/ch09-undo.xml:527 ../en/ch12-mq.xml:409
2823 msgid "XXX add text"
2824 msgstr ""
2826 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
2827 #: ../en/ch02-tour-basic.xml:266
2828 msgid ""
2829 "Graphical history of the <filename class=\"directory\">hello</filename> "
2830 "repository"
2831 msgstr ""
2833 #. type: Content of: <book><chapter><sect1><sect2><title>
2834 #: ../en/ch02-tour-basic.xml:273
2835 msgid "Changesets, revisions, and talking to other people"
2836 msgstr "改变集，版本，与其它用户交互"
2838 #. type: Content of: <book><chapter><sect1><sect2><para>
2839 #: ../en/ch02-tour-basic.xml:276
2840 msgid ""
2841 "As English is a notoriously sloppy language, and computer science has a "
2842 "hallowed history of terminological confusion (why use one term when four will "
2843 "do?), revision control has a variety of words and phrases that mean the same "
2844 "thing. If you are talking about Mercurial history with other people, you "
2845 "will find that the word <quote>changeset</quote> is often compressed to "
2846 "<quote>change</quote> or (when written) <quote>cset</quote>, and sometimes a "
2847 "changeset is referred to as a <quote>revision</quote> or a <quote>rev</quote>."
2848 msgstr ""
2850 #. type: Content of: <book><chapter><sect1><sect2><para>
2851 #: ../en/ch02-tour-basic.xml:286
2852 msgid ""
2853 "While it doesn't matter what <emphasis>word</emphasis> you use to refer to "
2854 "the concept of <quote>a changeset</quote>, the <emphasis>identifier</"
2855 "emphasis> that you use to refer to <quote>a <emphasis>specific</emphasis> "
2856 "changeset</quote> is of great importance. Recall that the <literal>changeset</"
2857 "literal> field in the output from <command role=\"hg-cmd\">hg log</command> "
2858 "identifies a changeset using both a number and a hexadecimal string."
2859 msgstr ""
2861 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2862 #: ../en/ch02-tour-basic.xml:295
2863 msgid ""
2864 "The revision number is <emphasis>only valid in that repository</emphasis>,"
2865 msgstr ""
2867 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
2868 #: ../en/ch02-tour-basic.xml:297
2869 msgid ""
2870 "while the hex string is the <emphasis>permanent, unchanging identifier</"
2871 "emphasis> that will always identify that exact changeset in <emphasis>every</"
2872 "emphasis> copy of the repository."
2873 msgstr ""
2875 #. type: Content of: <book><chapter><sect1><sect2><para>
2876 #: ../en/ch02-tour-basic.xml:302
2877 msgid ""
2878 "This distinction is important. If you send someone an email talking about "
2879 "<quote>revision 33</quote>, there's a high likelihood that their revision 33 "
2880 "will <emphasis>not be the same</emphasis> as yours. The reason for this is "
2881 "that a revision number depends on the order in which changes arrived in a "
2882 "repository, and there is no guarantee that the same changes will happen in "
2883 "the same order in different repositories. Three changes $a,b,c$ can easily "
2884 "appear in one repository as $0,1,2$, while in another as $1,0,2$."
2885 msgstr ""
2887 #. type: Content of: <book><chapter><sect1><sect2><para>
2888 #: ../en/ch02-tour-basic.xml:312
2889 msgid ""
2890 "Mercurial uses revision numbers purely as a convenient shorthand. If you "
2891 "need to discuss a changeset with someone, or make a record of a changeset for "
2892 "some other reason (for example, in a bug report), use the hexadecimal "
2893 "identifier."
2894 msgstr ""
2896 #. type: Content of: <book><chapter><sect1><sect2><title>
2897 #: ../en/ch02-tour-basic.xml:320
2898 msgid "Viewing specific revisions"
2899 msgstr "察看指定版本"
2901 #. type: Content of: <book><chapter><sect1><sect2><para>
2902 #: ../en/ch02-tour-basic.xml:322
2903 msgid ""
2904 "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a "
2905 "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option "
2906 "role=\"hg-opt-log\">--rev</option>) option. You can use either a revision "
2907 "number or a long-form changeset identifier, and you can provide as many "
2908 "revisions as you want."
2909 msgstr ""
2911 #. type: Content of: <book><chapter><sect1><sect2><para>
2912 #: ../en/ch02-tour-basic.xml:331
2913 msgid ""
2914 "If you want to see the history of several revisions without having to list "
2915 "each one, you can use <emphasis>range notation</emphasis>; this lets you "
2916 "express the idea <quote>I want all revisions between <literal>abc</literal> "
2917 "and <literal>def</literal>, inclusive</quote>."
2918 msgstr ""
2920 #. type: Content of: <book><chapter><sect1><sect2><para>
2921 #: ../en/ch02-tour-basic.xml:339
2922 msgid ""
2923 "Mercurial also honours the order in which you specify revisions, so <command "
2924 "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command "
2925 "role=\"hg-cmd\">hg log -r 4:2</command> prints 4, 3, and 2."
2926 msgstr ""
2928 #. type: Content of: <book><chapter><sect1><sect2><title>
2929 #: ../en/ch02-tour-basic.xml:346
2930 msgid "More detailed information"
2931 msgstr "更详细的信息"
2933 #. type: Content of: <book><chapter><sect1><sect2><para>
2934 #: ../en/ch02-tour-basic.xml:348
2935 msgid ""
2936 "While the summary information printed by <command role=\"hg-cmd\">hg log</"
2937 "command> is useful if you already know what you're looking for, you may need "
2938 "to see a complete description of the change, or a list of the files changed, "
2939 "if you're trying to decide whether a changeset is the one you're looking for. "
2940 "The <command role=\"hg-cmd\">hg log</command> command's <option role=\"hg-opt-"
2941 "global\">-v</option> (or <option role=\"hg-opt-global\">--verbose</option>) "
2942 "option gives you this extra detail."
2943 msgstr ""
2945 #. type: Content of: <book><chapter><sect1><sect2><para>
2946 #: ../en/ch02-tour-basic.xml:360
2947 msgid ""
2948 "If you want to see both the description and content of a change, add the "
2949 "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--"
2950 "patch</option>) option. This displays the content of a change as a "
2951 "<emphasis>unified diff</emphasis> (if you've never seen a unified diff "
2952 "before, see section <xref linkend=\"sec.mq.patch\"/> for an overview)."
2953 msgstr ""
2955 #. type: Content of: <book><chapter><sect1><title>
2956 #: ../en/ch02-tour-basic.xml:373
2957 msgid "All about command options"
2958 msgstr "命令选项"
2960 #. type: Content of: <book><chapter><sect1><para>
2961 #: ../en/ch02-tour-basic.xml:375
2962 msgid ""
2963 "Let's take a brief break from exploring Mercurial commands to discuss a "
2964 "pattern in the way that they work; you may find this useful to keep in mind "
2965 "as we continue our tour."
2966 msgstr ""
2968 #. type: Content of: <book><chapter><sect1><para>
2969 #: ../en/ch02-tour-basic.xml:379
2970 msgid ""
2971 "Mercurial has a consistent and straightforward approach to dealing with the "
2972 "options that you can pass to commands. It follows the conventions for "
2973 "options that are common to modern Linux and Unix systems."
2974 msgstr ""
2976 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2977 #: ../en/ch02-tour-basic.xml:384
2978 msgid ""
2979 "Every option has a long name. For example, as we've already seen, the "
2980 "<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-"
2981 "opt-log\">--rev</option> option."
2982 msgstr ""
2984 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2985 #: ../en/ch02-tour-basic.xml:388
2986 msgid ""
2987 "Most options have short names, too. Instead of <option role=\"hg-opt-log\">--"
2988 "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>. (The "
2989 "reason that some options don't have short names is that the options in "
2990 "question are rarely used.)"
2991 msgstr ""
2993 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
2994 #: ../en/ch02-tour-basic.xml:393
2995 msgid ""
2996 "Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</"
2997 "option>), while short options start with one (e.g. <option role=\"hg-opt-log"
2998 "\">-r</option>)."
2999 msgstr ""
3001 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
3002 #: ../en/ch02-tour-basic.xml:397
3003 msgid ""
3004 "Option naming and usage is consistent across commands. For example, every "
3005 "command that lets you specify a changeset ID or revision number accepts both "
3006 "<option role=\"hg-opt-log\">-r</option> and <option role=\"hg-opt-log\">--"
3007 "rev</option> arguments."
3008 msgstr ""
3010 #. type: Content of: <book><chapter><sect1><para>
3011 #: ../en/ch02-tour-basic.xml:403
3012 msgid ""
3013 "In the examples throughout this book, I use short options instead of long. "
3014 "This just reflects my own preference, so don't read anything significant into "
3015 "it."
3016 msgstr ""
3018 #. type: Content of: <book><chapter><sect1><para>
3019 #: ../en/ch02-tour-basic.xml:407
3020 msgid ""
3021 "Most commands that print output of some kind will print more output when "
3022 "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-"
3023 "global\">--verbose</option>) option, and less when passed <option role=\"hg-"
3024 "opt-global\">-q</option> (or <option role=\"hg-opt-global\">--quiet</option>)."
3025 msgstr ""
3027 #. type: Content of: <book><chapter><sect1><title>
3028 #: ../en/ch02-tour-basic.xml:415
3029 msgid "Making and reviewing changes"
3030 msgstr "创建和复审修改"
3032 #. type: Content of: <book><chapter><sect1><para>
3033 #: ../en/ch02-tour-basic.xml:417
3034 msgid ""
3035 "Now that we have a grasp of viewing history in Mercurial, let's take a look "
3036 "at making some changes and examining them."
3037 msgstr ""
3039 #. type: Content of: <book><chapter><sect1><para>
3040 #: ../en/ch02-tour-basic.xml:421
3041 msgid ""
3042 "The first thing we'll do is isolate our experiment in a repository of its "
3043 "own. We use the <command role=\"hg-cmd\">hg clone</command> command, but we "
3044 "don't need to clone a copy of the remote repository. Since we already have a "
3045 "copy of it locally, we can just clone that instead. This is much faster than "
3046 "cloning over the network, and cloning a local repository uses less disk space "
3047 "in most cases, too."
3048 msgstr ""
3050 #. type: Content of: <book><chapter><sect1><para>
3051 #: ../en/ch02-tour-basic.xml:431
3052 msgid ""
3053 "As an aside, it's often good practice to keep a <quote>pristine</quote> copy "
3054 "of a remote repository around, which you can then make temporary clones of to "
3055 "create sandboxes for each task you want to work on. This lets you work on "
3056 "multiple tasks in parallel, each isolated from the others until it's complete "
3057 "and you're ready to integrate it back. Because local clones are so cheap, "
3058 "there's almost no overhead to cloning and destroying repositories whenever "
3059 "you want."
3060 msgstr ""
3062 #. type: Content of: <book><chapter><sect1><para>
3063 #: ../en/ch02-tour-basic.xml:440
3064 msgid ""
3065 "In our <filename class=\"directory\">my-hello</filename> repository, we have "
3066 "a file <filename>hello.c</filename> that contains the classic <quote>hello, "
3067 "world</quote> program. Let's use the ancient and venerable <command>sed</"
3068 "command> command to edit this file so that it prints a second line of "
3069 "output. (I'm only using <command>sed</command> to do this because it's easy "
3070 "to write a scripted example this way. Since you're not under the same "
3071 "constraint, you probably won't want to use <command>sed</command>; simply use "
3072 "your preferred text editor to do the same thing.)"
3073 msgstr ""
3075 #. type: Content of: <book><chapter><sect1><para>
3076 #: ../en/ch02-tour-basic.xml:453
3077 msgid ""
3078 "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us "
3079 "what Mercurial knows about the files in the repository."
3080 msgstr ""
3082 #. type: Content of: <book><chapter><sect1><para>
3083 #: ../en/ch02-tour-basic.xml:459
3084 msgid ""
3085 "The <command role=\"hg-cmd\">hg status</command> command prints no output for "
3086 "some files, but a line starting with <quote><literal>M</literal></quote> for "
3087 "<filename>hello.c</filename>. Unless you tell it to, <command role=\"hg-cmd"
3088 "\">hg status</command> will not print any output for files that have not been "
3089 "modified."
3090 msgstr ""
3092 #. type: Content of: <book><chapter><sect1><para>
3093 #: ../en/ch02-tour-basic.xml:466
3094 msgid ""
3095 "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed "
3096 "that we modified <filename>hello.c</filename>. We didn't need to "
3097 "<emphasis>inform</emphasis> Mercurial that we were going to modify the file "
3098 "before we started, or that we had modified the file after we were done; it "
3099 "was able to figure this out itself."
3100 msgstr ""
3102 #. type: Content of: <book><chapter><sect1><para>
3103 #: ../en/ch02-tour-basic.xml:474
3104 msgid ""
3105 "It's a little bit helpful to know that we've modified <filename>hello.c</"
3106 "filename>, but we might prefer to know exactly <emphasis>what</emphasis> "
3107 "changes we've made to it. To do this, we use the <command role=\"hg-cmd\">hg "
3108 "diff</command> command."
3109 msgstr ""
3111 #. type: Content of: <book><chapter><sect1><title>
3112 #: ../en/ch02-tour-basic.xml:484
3113 msgid "Recording changes in a new changeset"
3114 msgstr "在新修改集中记录修改"
3116 #. type: Content of: <book><chapter><sect1><para>
3117 #: ../en/ch02-tour-basic.xml:486
3118 msgid ""
3119 "We can modify files, build and test our changes, and use <command role=\"hg-"
3120 "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to "
3121 "review our changes, until we're satisfied with what we've done and arrive at "
3122 "a natural stopping point where we want to record our work in a new changeset."
3123 msgstr ""
3125 #. type: Content of: <book><chapter><sect1><para>
3126 #: ../en/ch02-tour-basic.xml:493
3127 msgid ""
3128 "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new "
3129 "changeset; we'll usually refer to this as <quote>making a commit</quote> or "
3130 "<quote>committing</quote>."
3131 msgstr ""
3133 #. type: Content of: <book><chapter><sect1><sect2><title>
3134 #: ../en/ch02-tour-basic.xml:499
3135 msgid "Setting up a username"
3136 msgstr "配置用户名称"
3138 #. type: Content of: <book><chapter><sect1><sect2><para>
3139 #: ../en/ch02-tour-basic.xml:501
3140 msgid ""
3141 "When you try to run <command role=\"hg-cmd\">hg commit</command> for the "
3142 "first time, it is not guaranteed to succeed. Mercurial records your name and "
3143 "address with each change that you commit, so that you and others will later "
3144 "be able to tell who made each change. Mercurial tries to automatically "
3145 "figure out a sensible username to commit the change with. It will attempt "
3146 "each of the following methods, in order:"
3147 msgstr ""
3149 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3150 #: ../en/ch02-tour-basic.xml:510
3151 msgid ""
3152 "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the "
3153 "<command role=\"hg-cmd\">hg commit</command> command on the command line, "
3154 "followed by a username, this is always given the highest precedence."
3155 msgstr ""
3157 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3158 #: ../en/ch02-tour-basic.xml:515
3159 msgid ""
3160 "If you have set the <envar>HGUSER</envar> environment variable, this is "
3161 "checked next."
3162 msgstr ""
3164 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3165 #: ../en/ch02-tour-basic.xml:518
3166 msgid ""
3167 "If you create a file in your home directory called <filename role=\"special"
3168 "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> "
3169 "entry, that will be used next. To see what the contents of this file should "
3170 "look like, refer to section <xref linkend=\"sec.tour-basic.username\"/> below."
3171 msgstr ""
3173 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3174 #: ../en/ch02-tour-basic.xml:525
3175 msgid ""
3176 "If you have set the <envar>EMAIL</envar> environment variable, this will be "
3177 "used next."
3178 msgstr ""
3180 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
3181 #: ../en/ch02-tour-basic.xml:528
3182 msgid ""
3183 "Mercurial will query your system to find out your local user name and host "
3184 "name, and construct a username from these components. Since this often "
3185 "results in a username that is not very useful, it will print a warning if it "
3186 "has to do this."
3187 msgstr ""
3189 #. type: Content of: <book><chapter><sect1><sect2><para>
3190 #: ../en/ch02-tour-basic.xml:535
3191 msgid ""
3192 "If all of these mechanisms fail, Mercurial will fail, printing an error "
3193 "message. In this case, it will not let you commit until you set up a "
3194 "username."
3195 msgstr ""
3197 #. type: Content of: <book><chapter><sect1><sect2><para>
3198 #: ../en/ch02-tour-basic.xml:539
3199 msgid ""
3200 "You should think of the <envar>HGUSER</envar> environment variable and the "
3201 "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-"
3202 "cmd\">hg commit</command> command as ways to <emphasis>override</emphasis> "
3203 "Mercurial's default selection of username. For normal use, the simplest and "
3204 "most robust way to set a username for yourself is by creating a <filename "
3205 "role=\"special\">.hgrc</filename> file; see below for details."
3206 msgstr ""
3208 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
3209 #: ../en/ch02-tour-basic.xml:548
3210 msgid "Creating a Mercurial configuration file"
3211 msgstr "创建 Mercurial 的配置文件"
3213 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
3214 #: ../en/ch02-tour-basic.xml:550
3215 msgid ""
3216 "To set a user name, use your favourite editor to create a file called "
3217 "<filename role=\"special\">.hgrc</filename> in your home directory. "
3218 "Mercurial will use this file to look up your personalised configuration "
3219 "settings. The initial contents of your <filename role=\"special\">.hgrc</"
3220 "filename> should look like this."
3221 msgstr ""
3223 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
3224 #: ../en/ch02-tour-basic.xml:561
3225 msgid ""
3226 "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</"
3227 "emphasis> of the config file, so you can read the <quote><literal>username "
3228 "= ...</literal></quote> line as meaning <quote>set the value of the "
3229 "<literal>username</literal> item in the <literal>ui</literal> section</"
3230 "quote>. A section continues until a new section begins, or the end of the "
3231 "file. Mercurial ignores empty lines and treats any text from "
3232 "<quote><literal>#</literal></quote> to the end of a line as a comment."
3233 msgstr ""
3235 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
3236 #: ../en/ch02-tour-basic.xml:574
3237 msgid "Choosing a user name"
3238 msgstr "选择用户名称"
3240 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
3241 #: ../en/ch02-tour-basic.xml:576
3242 msgid ""
3243 "You can use any text you like as the value of the <literal>username</literal> "
3244 "config item, since this information is for reading by other people, but for "
3245 "interpreting by Mercurial. The convention that most people follow is to use "
3246 "their name and email address, as in the example above."
3247 msgstr ""
3249 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
3250 #: ../en/ch02-tour-basic.xml:583
3251 msgid ""
3252 "Mercurial's built-in web server obfuscates email addresses, to make it more "
3253 "difficult for the email harvesting tools that spammers use. This reduces the "
3254 "likelihood that you'll start receiving more junk email if you publish a "
3255 "Mercurial repository on the web."
3256 msgstr ""
3258 #. type: Content of: <book><chapter><sect1><sect2><title>
3259 #: ../en/ch02-tour-basic.xml:593
3260 msgid "Writing a commit message"
3261 msgstr "写提交日志"
3263 #. type: Content of: <book><chapter><sect1><sect2><para>
3264 #: ../en/ch02-tour-basic.xml:595
3265 msgid ""
3266 "When we commit a change, Mercurial drops us into a text editor, to enter a "
3267 "message that will describe the modifications we've made in this changeset. "
3268 "This is called the <emphasis>commit message</emphasis>. It will be a record "
3269 "for readers of what we did and why, and it will be printed by <command role="
3270 "\"hg-cmd\">hg log</command> after we've finished committing."
3271 msgstr ""
3273 #. type: Content of: <book><chapter><sect1><sect2><para>
3274 #: ../en/ch02-tour-basic.xml:605
3275 msgid ""
3276 "The editor that the <command role=\"hg-cmd\">hg commit</command> command "
3277 "drops us into will contain an empty line, followed by a number of lines "
3278 "starting with <quote><literal>HG:</literal></quote>."
3279 msgstr ""
3281 #. type: Content of: <book><chapter><sect1><sect2><para>
3282 #: ../en/ch02-tour-basic.xml:612
3283 msgid ""
3284 "Mercurial ignores the lines that start with <quote><literal>HG:</literal></"
3285 "quote>; it uses them only to tell us which files it's recording changes to. "
3286 "Modifying or deleting these lines has no effect."
3287 msgstr ""
3289 #. type: Content of: <book><chapter><sect1><sect2><title>
3290 #: ../en/ch02-tour-basic.xml:618
3291 msgid "Writing a good commit message"
3292 msgstr "写好提交日志"
3294 #. type: Content of: <book><chapter><sect1><sect2><para>
3295 #: ../en/ch02-tour-basic.xml:620
3296 msgid ""
3297 "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of "
3298 "a commit message by default, it's best to write a commit message whose first "
3299 "line stands alone. Here's a real example of a commit message that "
3300 "<emphasis>doesn't</emphasis> follow this guideline, and hence has a summary "
3301 "that is not readable."
3302 msgstr ""
3304 #. type: Content of: <book><chapter><sect1><sect2><para>
3305 #: ../en/ch02-tour-basic.xml:634
3306 msgid ""
3307 "As far as the remainder of the contents of the commit message are concerned, "
3308 "there are no hard-and-fast rules. Mercurial itself doesn't interpret or care "
3309 "about the contents of the commit message, though your project may have "
3310 "policies that dictate a certain kind of formatting."
3311 msgstr ""
3313 #. type: Content of: <book><chapter><sect1><sect2><para>
3314 #: ../en/ch02-tour-basic.xml:640
3315 msgid ""
3316 "My personal preference is for short, but informative, commit messages that "
3317 "tell me something that I can't figure out with a quick glance at the output "
3318 "of <command role=\"hg-cmd\">hg log --patch</command>."
3319 msgstr ""
3321 #. type: Content of: <book><chapter><sect1><sect2><title>
3322 #: ../en/ch02-tour-basic.xml:647
3323 msgid "Aborting a commit"
3324 msgstr "终止提交"
3326 #. type: Content of: <book><chapter><sect1><sect2><para>
3327 #: ../en/ch02-tour-basic.xml:649
3328 msgid ""
3329 "If you decide that you don't want to commit while in the middle of editing a "
3330 "commit message, simply exit from your editor without saving the file that "
3331 "it's editing. This will cause nothing to happen to either the repository or "
3332 "the working directory."
3333 msgstr ""
3335 #. type: Content of: <book><chapter><sect1><sect2><para>
3336 #: ../en/ch02-tour-basic.xml:654
3337 msgid ""
3338 "If we run the <command role=\"hg-cmd\">hg commit</command> command without "
3339 "any arguments, it records all of the changes we've made, as reported by "
3340 "<command role=\"hg-cmd\">hg status</command> and <command role=\"hg-cmd\">hg "
3341 "diff</command>."
3342 msgstr ""
3344 #. type: Content of: <book><chapter><sect1><sect2><title>
3345 #: ../en/ch02-tour-basic.xml:661
3346 msgid "Admiring our new handiwork"
3347 msgstr "欣赏我们的新手艺"
3349 #. type: Content of: <book><chapter><sect1><sect2><para>
3350 #: ../en/ch02-tour-basic.xml:663
3351 msgid ""
3352 "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg "
3353 "tip</command> command to display the changeset we just created. This command "
3354 "produces output that is identical to <command role=\"hg-cmd\">hg log</"
3355 "command>, but it only displays the newest revision in the repository."
3356 msgstr ""
3358 #. type: Content of: <book><chapter><sect1><sect2><para>
3359 #: ../en/ch02-tour-basic.xml:672
3360 msgid ""
3361 "We refer to the newest revision in the repository as the tip revision, or "
3362 "simply the tip."
3363 msgstr ""
3365 #. type: Content of: <book><chapter><sect1><title>
3366 #: ../en/ch02-tour-basic.xml:679
3367 msgid "Sharing changes"
3368 msgstr "共享修改"
3370 #. type: Content of: <book><chapter><sect1><para>
3371 #: ../en/ch02-tour-basic.xml:681
3372 msgid ""
3373 "We mentioned earlier that repositories in Mercurial are self-contained. This "
3374 "means that the changeset we just created exists only in our <filename class="
3375 "\"directory\">my-hello</filename> repository. Let's look at a few ways that "
3376 "we can propagate this change into other repositories."
3377 msgstr ""
3379 #. type: Content of: <book><chapter><sect1><sect2><title>
3380 #: ../en/ch02-tour-basic.xml:689
3381 msgid "Pulling changes from another repository"
3382 msgstr "从其它版本库取得修改"
3384 #. type: Content of: <book><chapter><sect1><sect2><para>
3385 #: ../en/ch02-tour-basic.xml:690
3386 msgid ""
3387 "To get started, let's clone our original <filename class=\"directory\">hello</"
3388 "filename> repository, which does not contain the change we just committed. "
3389 "We'll call our temporary repository <filename class=\"directory\">hello-pull</"
3390 "filename>."
3391 msgstr ""
3393 #. type: Content of: <book><chapter><sect1><sect2><para>
3394 #: ../en/ch02-tour-basic.xml:698
3395 msgid ""
3396 "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring "
3397 "changes from <filename class=\"directory\">my-hello</filename> into <filename "
3398 "class=\"directory\">hello-pull</filename>. However, blindly pulling unknown "
3399 "changes into a repository is a somewhat scary prospect. Mercurial provides "
3400 "the <command role=\"hg-cmd\">hg incoming</command> command to tell us what "
3401 "changes the <command role=\"hg-cmd\">hg pull</command> command "
3402 "<emphasis>would</emphasis> pull into the repository, without actually pulling "
3403 "the changes in."
3404 msgstr ""
3406 #. type: Content of: <book><chapter><sect1><sect2><para>
3407 #: ../en/ch02-tour-basic.xml:711
3408 msgid ""
3409 "(Of course, someone could cause more changesets to appear in the repository "
3410 "that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get "
3411 "a chance to <command role=\"hg-cmd\">hg pull</command> the changes, so that "
3412 "we could end up pulling changes that we didn't expect.)"
3413 msgstr ""
3415 #. type: Content of: <book><chapter><sect1><sect2><para>
3416 #: ../en/ch02-tour-basic.xml:718
3417 msgid ""
3418 "Bringing changes into a repository is a simple matter of running the <command "
3419 "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to "
3420 "pull from."
3421 msgstr ""
3423 #. type: Content of: <book><chapter><sect1><sect2><para>
3424 #: ../en/ch02-tour-basic.xml:725
3425 msgid ""
3426 "As you can see from the before-and-after output of <command role=\"hg-cmd"
3427 "\">hg tip</command>, we have successfully pulled changes into our "
3428 "repository. There remains one step before we can see these changes in the "
3429 "working directory."
3430 msgstr ""
3432 #. type: Content of: <book><chapter><sect1><sect2><title>
3433 #: ../en/ch02-tour-basic.xml:733
3434 msgid "Updating the working directory"
3435 msgstr "更新工作目录"
3437 #. type: Content of: <book><chapter><sect1><sect2><para>
3438 #: ../en/ch02-tour-basic.xml:735
3439 msgid ""
3440 "We have so far glossed over the relationship between a repository and its "
3441 "working directory. The <command role=\"hg-cmd\">hg pull</command> command "
3442 "that we ran in section <xref linkend=\"sec.tour.pull\"/> brought changes into "
3443 "the repository, but if we check, there's no sign of those changes in the "
3444 "working directory. This is because <command role=\"hg-cmd\">hg pull</"
3445 "command> does not (by default) touch the working directory. Instead, we use "
3446 "the <command role=\"hg-cmd\">hg update</command> command to do this."
3447 msgstr ""
3449 #. type: Content of: <book><chapter><sect1><sect2><para>
3450 #: ../en/ch02-tour-basic.xml:747
3451 msgid ""
3452 "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> "
3453 "doesn't update the working directory automatically. There's actually a good "
3454 "reason for this: you can use <command role=\"hg-cmd\">hg update</command> to "
3455 "update the working directory to the state it was in at <emphasis>any "
3456 "revision</emphasis> in the history of the repository. If you had the working "
3457 "directory updated to an old revision---to hunt down the origin of a bug, "
3458 "say---and ran a <command role=\"hg-cmd\">hg pull</command> which "
3459 "automatically updated the working directory to a new revision, you might not "
3460 "be terribly happy."
3461 msgstr ""
3463 #. type: Content of: <book><chapter><sect1><sect2><para>
3464 #: ../en/ch02-tour-basic.xml:758
3465 msgid ""
3466 "However, since pull-then-update is such a common thing to do, Mercurial lets "
3467 "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> "
3468 "option to <command role=\"hg-cmd\">hg pull</command>."
3469 msgstr ""
3471 #. type: Content of: <book><chapter><sect1><sect2><para>
3472 #: ../en/ch02-tour-basic.xml:763
3473 msgid ""
3474 "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> "
3475 "in section <xref linkend=\"sec.tour.pull\"/> when we ran it without <option "
3476 "role=\"hg-opt-pull\">-u</option>, you can see that it printed a helpful "
3477 "reminder that we'd have to take an explicit step to update the working "
3478 "directory:"
3479 msgstr ""
3481 #. type: Content of: <book><chapter><sect1><sect2><para>
3482 #: ../en/ch02-tour-basic.xml:772
3483 msgid ""
3484 "To find out what revision the working directory is at, use the <command role="
3485 "\"hg-cmd\">hg parents</command> command."
3486 msgstr ""
3488 #. type: Content of: <book><chapter><sect1><sect2><para>
3489 #: ../en/ch02-tour-basic.xml:778
3490 msgid ""
3491 "If you look back at figure <xref endterm=\"fig.tour-basic.history.caption\" "
3492 "linkend=\"fig.tour-basic.history\"/>, you'll see arrows connecting each "
3493 "changeset. The node that the arrow leads <emphasis>from</emphasis> in each "
3494 "case is a parent, and the node that the arrow leads <emphasis>to</emphasis> "
3495 "is its child. The working directory has a parent in just the same way; this "
3496 "is the changeset that the working directory currently contains."
3497 msgstr ""
3499 #. type: Content of: <book><chapter><sect1><sect2><para>
3500 #: ../en/ch02-tour-basic.xml:788
3501 msgid ""
3502 "To update the working directory to a particular revision, give a revision "
3503 "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> "
3504 "command."
3505 msgstr ""
3507 #. type: Content of: <book><chapter><sect1><sect2><para>
3508 #: ../en/ch02-tour-basic.xml:795
3509 msgid ""
3510 "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</"
3511 "command> will update to the tip revision, as shown by the second call to "
3512 "<command role=\"hg-cmd\">hg update</command> in the example above."
3513 msgstr ""
3515 #. type: Content of: <book><chapter><sect1><sect2><title>
3516 #: ../en/ch02-tour-basic.xml:803
3517 msgid "Pushing changes to another repository"
3518 msgstr "发布修改到其它版本库"
3520 #. type: Content of: <book><chapter><sect1><sect2><para>
3521 #: ../en/ch02-tour-basic.xml:805
3522 msgid ""
3523 "Mercurial lets us push changes to another repository, from the repository "
3524 "we're currently visiting. As with the example of <command role=\"hg-cmd\">hg "
3525 "pull</command> above, we'll create a temporary repository to push our changes "
3526 "into."
3527 msgstr ""
3529 #. type: Content of: <book><chapter><sect1><sect2><para>
3530 #: ../en/ch02-tour-basic.xml:813
3531 msgid ""
3532 "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what "
3533 "changes would be pushed into another repository."
3534 msgstr ""
3536 #. type: Content of: <book><chapter><sect1><sect2><para>
3537 #: ../en/ch02-tour-basic.xml:819
3538 msgid ""
3539 "And the <command role=\"hg-cmd\">hg push</command> command does the actual "
3540 "push."
3541 msgstr ""
3543 #. type: Content of: <book><chapter><sect1><sect2><para>
3544 #: ../en/ch02-tour-basic.xml:825
3545 msgid ""
3546 "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd"
3547 "\">hg push</command> command does not update the working directory in the "
3548 "repository that it's pushing changes into. (Unlike <command role=\"hg-cmd"
3549 "\">hg pull</command>, <command role=\"hg-cmd\">hg push</command> does not "
3550 "provide a <literal>-u</literal> option that updates the other repository's "
3551 "working directory.)"
3552 msgstr ""
3554 #. type: Content of: <book><chapter><sect1><sect2><para>
3555 #: ../en/ch02-tour-basic.xml:834
3556 msgid ""
3557 "What happens if we try to pull or push changes and the receiving repository "
3558 "already has those changes? Nothing too exciting."
3559 msgstr ""
3561 #. type: Content of: <book><chapter><sect1><sect2><title>
3562 #: ../en/ch02-tour-basic.xml:841
3563 msgid "Sharing changes over a network"
3564 msgstr "通过网络共享修改"
3566 #. type: Content of: <book><chapter><sect1><sect2><para>
3567 #: ../en/ch02-tour-basic.xml:843
3568 msgid ""
3569 "The commands we have covered in the previous few sections are not limited to "
3570 "working with local repositories. Each works in exactly the same fashion over "
3571 "a network connection; simply pass in a URL instead of a local path."
3572 msgstr ""
3574 #. type: Content of: <book><chapter><sect1><sect2><para>
3575 #: ../en/ch02-tour-basic.xml:851
3576 msgid ""
3577 "In this example, we can see what changes we could push to the remote "
3578 "repository, but the repository is understandably not set up to let anonymous "
3579 "users push to it."
3580 msgstr ""
3582 #. type: Content of: <book><chapter><title>
3583 #: ../en/ch03-tour-merge.xml:5
3584 msgid "A tour of Mercurial: merging work"
3585 msgstr "Mercurial 教程: 合并工作"
3587 #. type: Content of: <book><chapter><para>
3588 #: ../en/ch03-tour-merge.xml:7
3589 msgid ""
3590 "We've now covered cloning a repository, making changes in a repository, and "
3591 "pulling or pushing changes from one repository into another. Our next step "
3592 "is <emphasis>merging</emphasis> changes from separate repositories."
3593 msgstr ""
3595 #. type: Content of: <book><chapter><sect1><title>
3596 #: ../en/ch03-tour-merge.xml:13
3597 msgid "Merging streams of work"
3598 msgstr "合并的流程"
3600 #. type: Content of: <book><chapter><sect1><para>
3601 #: ../en/ch03-tour-merge.xml:15
3602 msgid ""
3603 "Merging is a fundamental part of working with a distributed revision control "
3604 "tool."
3605 msgstr ""
3607 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
3608 #: ../en/ch03-tour-merge.xml:18
3609 msgid ""
3610 "Alice and Bob each have a personal copy of a repository for a project they're "
3611 "collaborating on. Alice fixes a bug in her repository; Bob adds a new "
3612 "feature in his. They want the shared repository to contain both the bug fix "
3613 "and the new feature."
3614 msgstr ""
3616 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
3617 #: ../en/ch03-tour-merge.xml:24
3618 msgid ""
3619 "I frequently work on several different tasks for a single project at once, "
3620 "each safely isolated in its own repository. Working this way means that I "
3621 "often need to merge one piece of my own work with another."
3622 msgstr ""
3624 #. type: Content of: <book><chapter><sect1><para>
3625 #: ../en/ch03-tour-merge.xml:30
3626 msgid ""
3627 "Because merging is such a common thing to need to do, Mercurial makes it "
3628 "easy. Let's walk through the process. We'll begin by cloning yet another "
3629 "repository (see how often they spring up?) and making a change in it."
3630 msgstr ""
3632 #. type: Content of: <book><chapter><sect1><para>
3633 #: ../en/ch03-tour-merge.xml:37
3634 msgid ""
3635 "We should now have two copies of <filename>hello.c</filename> with different "
3636 "contents. The histories of the two repositories have also diverged, as "
3637 "illustrated in figure <xref endterm=\"fig.tour-merge.sep-repos.caption\" "
3638 "linkend=\"fig.tour-merge.sep-repos\"/>."
3639 msgstr ""
3641 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
3642 #: ../en/ch03-tour-merge.xml:47
3643 msgid ""
3644 "<imageobject><imagedata fileref=\"images/tour-merge-sep-repos.png\"/></"
3645 "imageobject>"
3646 msgstr ""
3648 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
3649 #: ../en/ch03-tour-merge.xml:49
3650 msgid ""
3651 "Divergent recent histories of the <filename class=\"directory\">my-hello</"
3652 "filename> and <filename class=\"directory\">my-new-hello</filename> "
3653 "repositories"
3654 msgstr ""
3656 #. type: Content of: <book><chapter><sect1><para>
3657 #: ../en/ch03-tour-merge.xml:57
3658 msgid ""
3659 "We already know that pulling changes from our <filename class=\"directory"
3660 "\">my-hello</filename> repository will have no effect on the working "
3661 "directory."
3662 msgstr ""
3664 #. type: Content of: <book><chapter><sect1><para>
3665 #: ../en/ch03-tour-merge.xml:63
3666 msgid ""
3667 "However, the <command role=\"hg-cmd\">hg pull</command> command says "
3668 "something about <quote>heads</quote>."
3669 msgstr ""
3671 #. type: Content of: <book><chapter><sect1><sect2><title>
3672 #: ../en/ch03-tour-merge.xml:67
3673 msgid "Head changesets"
3674 msgstr "顶点改变集"
3676 #. type: Content of: <book><chapter><sect1><sect2><para>
3677 #: ../en/ch03-tour-merge.xml:69
3678 msgid ""
3679 "A head is a change that has no descendants, or children, as they're also "
3680 "known. The tip revision is thus a head, because the newest revision in a "
3681 "repository doesn't have any children, but a repository can contain more than "
3682 "one head."
3683 msgstr ""
3685 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
3686 #: ../en/ch03-tour-merge.xml:77
3687 msgid ""
3688 "<imageobject><imagedata fileref=\"images/tour-merge-pull.png\"/></imageobject>"
3689 msgstr ""
3691 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
3692 #: ../en/ch03-tour-merge.xml:79
3693 msgid ""
3694 "Repository contents after pulling from <filename class=\"directory\">my-"
3695 "hello</filename> into <filename class=\"directory\">my-new-hello</filename>"
3696 msgstr ""
3698 #. type: Content of: <book><chapter><sect1><sect2><para>
3699 #: ../en/ch03-tour-merge.xml:85
3700 msgid ""
3701 "In figure <xref endterm=\"fig.tour-merge.pull.caption\" linkend=\"fig.tour-"
3702 "merge.pull\"/>, you can see the effect of the pull from <filename class="
3703 "\"directory\">my-hello</filename> into <filename class=\"directory\">my-new-"
3704 "hello</filename>. The history that was already present in <filename class="
3705 "\"directory\">my-new-hello</filename> is untouched, but a new revision has "
3706 "been added. By referring to figure <xref endterm=\"fig.tour-merge.sep-repos."
3707 "caption\" linkend=\"fig.tour-merge.sep-repos\"/>, we can see that the "
3708 "<emphasis>changeset ID</emphasis> remains the same in the new repository, but "
3709 "the <emphasis>revision number</emphasis> has changed. (This, incidentally, "
3710 "is a fine example of why it's not safe to use revision numbers when "
3711 "discussing changesets.) We can view the heads in a repository using the "
3712 "<command role=\"hg-cmd\">hg heads</command> command."
3713 msgstr ""
3715 #. type: Content of: <book><chapter><sect1><sect2><title>
3716 #: ../en/ch03-tour-merge.xml:106
3717 msgid "Performing the merge"
3718 msgstr "执行合并"
3720 #. type: Content of: <book><chapter><sect1><sect2><para>
3721 #: ../en/ch03-tour-merge.xml:108
3722 msgid ""
3723 "What happens if we try to use the normal <command role=\"hg-cmd\">hg update</"
3724 "command> command to update to the new tip?"
3725 msgstr ""
3727 #. type: Content of: <book><chapter><sect1><sect2><para>
3728 #: ../en/ch03-tour-merge.xml:114
3729 msgid ""
3730 "Mercurial is telling us that the <command role=\"hg-cmd\">hg update</command> "
3731 "command won't do a merge; it won't update the working directory when it "
3732 "thinks we might be wanting to do a merge, unless we force it to do so. "
3733 "Instead, we use the <command role=\"hg-cmd\">hg merge</command> command to "
3734 "merge the two heads."
3735 msgstr ""
3737 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
3738 #: ../en/ch03-tour-merge.xml:125
3739 msgid ""
3740 "<imageobject><imagedata fileref=\"images/tour-merge-merge.png\"/></"
3741 "imageobject>"
3742 msgstr ""
3744 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
3745 #: ../en/ch03-tour-merge.xml:127
3746 msgid "Working directory and repository during merge, and following commit"
3747 msgstr ""
3749 #. type: Content of: <book><chapter><sect1><sect2><para>
3750 #: ../en/ch03-tour-merge.xml:132
3751 msgid ""
3752 "This updates the working directory so that it contains changes from "
3753 "<emphasis>both</emphasis> heads, which is reflected in both the output of "
3754 "<command role=\"hg-cmd\">hg parents</command> and the contents of "
3755 "<filename>hello.c</filename>."
3756 msgstr ""
3758 #. type: Content of: <book><chapter><sect1><sect2><title>
3759 #: ../en/ch03-tour-merge.xml:142
3760 msgid "Committing the results of the merge"
3761 msgstr "提交合并结果"
3763 #. type: Content of: <book><chapter><sect1><sect2><para>
3764 #: ../en/ch03-tour-merge.xml:144
3765 msgid ""
3766 "Whenever we've done a merge, <command role=\"hg-cmd\">hg parents</command> "
3767 "will display two parents until we <command role=\"hg-cmd\">hg commit</"
3768 "command> the results of the merge."
3769 msgstr ""
3771 #. type: Content of: <book><chapter><sect1><sect2><para>
3772 #: ../en/ch03-tour-merge.xml:151
3773 msgid ""
3774 "We now have a new tip revision; notice that it has <emphasis>both</emphasis> "
3775 "of our former heads as its parents. These are the same revisions that were "
3776 "previously displayed by <command role=\"hg-cmd\">hg parents</command>."
3777 msgstr ""
3779 #. type: Content of: <book><chapter><sect1><sect2><para>
3780 #: ../en/ch03-tour-merge.xml:158
3781 msgid ""
3782 "In figure <xref endterm=\"fig.tour-merge.merge.caption\" linkend=\"fig.tour-"
3783 "merge.merge\"/>, you can see a representation of what happens to the working "
3784 "directory during the merge, and how this affects the repository when the "
3785 "commit happens. During the merge, the working directory has two parent "
3786 "changesets, and these become the parents of the new changeset."
3787 msgstr ""
3789 #. type: Content of: <book><chapter><sect1><title>
3790 #: ../en/ch03-tour-merge.xml:169
3791 msgid "Merging conflicting changes"
3792 msgstr "合并有冲突的改变"
3794 #. type: Content of: <book><chapter><sect1><para>
3795 #: ../en/ch03-tour-merge.xml:171
3796 msgid ""
3797 "Most merges are simple affairs, but sometimes you'll find yourself merging "
3798 "changes where each modifies the same portions of the same files. Unless both "
3799 "modifications are identical, this results in a <emphasis>conflict</emphasis>, "
3800 "where you have to decide how to reconcile the different changes into "
3801 "something coherent."
3802 msgstr ""
3804 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
3805 #: ../en/ch03-tour-merge.xml:180
3806 msgid ""
3807 "<imageobject><imagedata fileref=\"images/tour-merge-conflict.png\"/> </"
3808 "imageobject>"
3809 msgstr ""
3811 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
3812 #: ../en/ch03-tour-merge.xml:183
3813 msgid "Conflicting changes to a document"
3814 msgstr ""
3816 #. type: Content of: <book><chapter><sect1><para>
3817 #: ../en/ch03-tour-merge.xml:188
3818 msgid ""
3819 "Figure <xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-"
3820 "merge.conflict\"/> illustrates an instance of two conflicting changes to a "
3821 "document. We started with a single version of the file; then we made some "
3822 "changes; while someone else made different changes to the same text. Our "
3823 "task in resolving the conflicting changes is to decide what the file should "
3824 "look like."
3825 msgstr ""
3827 #. type: Content of: <book><chapter><sect1><para>
3828 #: ../en/ch03-tour-merge.xml:196
3829 msgid ""
3830 "Mercurial doesn't have a built-in facility for handling conflicts. Instead, "
3831 "it runs an external program called <command>hgmerge</command>. This is a "
3832 "shell script that is bundled with Mercurial; you can change it to behave "
3833 "however you please. What it does by default is try to find one of several "
3834 "different merging tools that are likely to be installed on your system. It "
3835 "first tries a few fully automatic merging tools; if these don't succeed "
3836 "(because the resolution process requires human guidance) or aren't present, "
3837 "the script tries a few different graphical merging tools."
3838 msgstr ""
3840 #. type: Content of: <book><chapter><sect1><para>
3841 #: ../en/ch03-tour-merge.xml:207
3842 msgid ""
3843 "It's also possible to get Mercurial to run another program or script instead "
3844 "of <command>hgmerge</command>, by setting the <envar>HGMERGE</envar> "
3845 "environment variable to the name of your preferred program."
3846 msgstr ""
3848 #. type: Content of: <book><chapter><sect1><sect2><title>
3849 #: ../en/ch03-tour-merge.xml:213
3850 msgid "Using a graphical merge tool"
3851 msgstr "使用图形合并工具"
3853 #. type: Content of: <book><chapter><sect1><sect2><para>
3854 #: ../en/ch03-tour-merge.xml:215
3855 msgid ""
3856 "My preferred graphical merge tool is <command>kdiff3</command>, which I'll "
3857 "use to describe the features that are common to graphical file merging "
3858 "tools. You can see a screenshot of <command>kdiff3</command> in action in "
3859 "figure <xref endterm=\"fig.tour-merge.kdiff3.caption\" linkend=\"fig.tour-"
3860 "merge.kdiff3\"/>. The kind of merge it is performing is called a "
3861 "<emphasis>three-way merge</emphasis>, because there are three different "
3862 "versions of the file of interest to us. The tool thus splits the upper "
3863 "portion of the window into three panes:"
3864 msgstr ""
3866 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
3867 #: ../en/ch03-tour-merge.xml:226
3868 msgid ""
3869 "At the left is the <emphasis>base</emphasis> version of the file, i.e. the "
3870 "most recent version from which the two versions we're trying to merge are "
3871 "descended."
3872 msgstr ""
3874 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
3875 #: ../en/ch03-tour-merge.xml:231
3876 msgid ""
3877 "In the middle is <quote>our</quote> version of the file, with the contents "
3878 "that we modified."
3879 msgstr ""
3881 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
3882 #: ../en/ch03-tour-merge.xml:234
3883 msgid ""
3884 "On the right is <quote>their</quote> version of the file, the one that from "
3885 "the changeset that we're trying to merge with."
3886 msgstr ""
3888 #. type: Content of: <book><chapter><sect1><sect2><para>
3889 #: ../en/ch03-tour-merge.xml:238
3890 msgid ""
3891 "In the pane below these is the current <emphasis>result</emphasis> of the "
3892 "merge. Our task is to replace all of the red text, which indicates unresolved "
3893 "conflicts, with some sensible merger of the <quote>ours</quote> and "
3894 "<quote>theirs</quote> versions of the file."
3895 msgstr ""
3897 #. type: Content of: <book><chapter><sect1><sect2><para>
3898 #: ../en/ch03-tour-merge.xml:245
3899 msgid ""
3900 "All four of these panes are <emphasis>locked together</emphasis>; if we "
3901 "scroll vertically or horizontally in any of them, the others are updated to "
3902 "display the corresponding sections of their respective files."
3903 msgstr ""
3905 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
3906 #: ../en/ch03-tour-merge.xml:252
3907 msgid ""
3908 "<imageobject><imagedata width=\"100%\" fileref=\"images/kdiff3.png\"/> </"
3909 "imageobject>"
3910 msgstr ""
3912 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
3913 #: ../en/ch03-tour-merge.xml:255
3914 msgid "Using <command>kdiff3</command> to merge versions of a file"
3915 msgstr ""
3917 #. type: Content of: <book><chapter><sect1><sect2><para>
3918 #: ../en/ch03-tour-merge.xml:261
3919 msgid ""
3920 "For each conflicting portion of the file, we can choose to resolve the "
3921 "conflict using some combination of text from the base version, ours, or "
3922 "theirs. We can also manually edit the merged file at any time, in case we "
3923 "need to make further modifications."
3924 msgstr ""
3926 #. type: Content of: <book><chapter><sect1><sect2><para>
3927 #: ../en/ch03-tour-merge.xml:267
3928 msgid ""
3929 "There are <emphasis>many</emphasis> file merging tools available, too many to "
3930 "cover here. They vary in which platforms they are available for, and in "
3931 "their particular strengths and weaknesses. Most are tuned for merging files "
3932 "containing plain text, while a few are aimed at specialised file formats "
3933 "(generally XML)."
3934 msgstr ""
3936 #. type: Content of: <book><chapter><sect1><sect2><title>
3937 #: ../en/ch03-tour-merge.xml:276
3938 msgid "A worked example"
3939 msgstr "合并实例"
3941 #. type: Content of: <book><chapter><sect1><sect2><para>
3942 #: ../en/ch03-tour-merge.xml:278
3943 msgid ""
3944 "In this example, we will reproduce the file modification history of figure "
3945 "<xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-merge."
3946 "conflict\"/> above. Let's begin by creating a repository with a base version "
3947 "of our document."
3948 msgstr ""
3950 #. type: Content of: <book><chapter><sect1><sect2><para>
3951 #: ../en/ch03-tour-merge.xml:286
3952 msgid "We'll clone the repository and make a change to the file."
3953 msgstr ""
3955 #. type: Content of: <book><chapter><sect1><sect2><para>
3956 #: ../en/ch03-tour-merge.xml:291
3957 msgid ""
3958 "And another clone, to simulate someone else making a change to the file. "
3959 "(This hints at the idea that it's not all that unusual to merge with yourself "
3960 "when you isolate tasks in separate repositories, and indeed to find and "
3961 "resolve conflicts while doing so.)"
3962 msgstr ""
3964 #. type: Content of: <book><chapter><sect1><sect2><para>
3965 #: ../en/ch03-tour-merge.xml:299
3966 msgid ""
3967 "Having created two different versions of the file, we'll set up an "
3968 "environment suitable for running our merge."
3969 msgstr ""
3971 #. type: Content of: <book><chapter><sect1><sect2><para>
3972 #: ../en/ch03-tour-merge.xml:305
3973 msgid ""
3974 "In this example, I won't use Mercurial's normal <command>hgmerge</command> "
3975 "program to do the merge, because it would drop my nice automated example-"
3976 "running tool into a graphical user interface. Instead, I'll set "
3977 "<envar>HGMERGE</envar> to tell Mercurial to use the non-interactive "
3978 "<command>merge</command> command. This is bundled with many Unix-like "
3979 "systems. If you're following this example on your computer, don't bother "
3980 "setting <envar>HGMERGE</envar>."
3981 msgstr ""
3983 #. type: Content of: <book><chapter><sect1><sect2><para>
3984 #: ../en/ch03-tour-merge.xml:315
3985 msgid "<emphasis role=\"bold\">XXX FIX THIS EXAMPLE.</emphasis>"
3986 msgstr ""
3988 #. type: Content of: <book><chapter><sect1><sect2><para>
3989 #: ../en/ch03-tour-merge.xml:320
3990 msgid ""
3991 "Because <command>merge</command> can't resolve the conflicting changes, it "
3992 "leaves <emphasis>merge markers</emphasis> inside the file that has conflicts, "
3993 "indicating which lines have conflicts, and whether they came from our version "
3994 "of the file or theirs."
3995 msgstr ""
3997 #. type: Content of: <book><chapter><sect1><sect2><para>
3998 #: ../en/ch03-tour-merge.xml:326
3999 msgid ""
4000 "Mercurial can tell from the way <command>merge</command> exits that it wasn't "
4001 "able to merge successfully, so it tells us what commands we'll need to run if "
4002 "we want to redo the merging operation. This could be useful if, for example, "
4003 "we were running a graphical merge tool and quit because we were confused or "
4004 "realised we had made a mistake."
4005 msgstr ""
4007 #. type: Content of: <book><chapter><sect1><sect2><para>
4008 #: ../en/ch03-tour-merge.xml:333
4009 msgid ""
4010 "If automatic or manual merges fail, there's nothing to prevent us from "
4011 "<quote>fixing up</quote> the affected files ourselves, and committing the "
4012 "results of our merge:"
4013 msgstr ""
4015 #. type: Content of: <book><chapter><sect1><title>
4016 #: ../en/ch03-tour-merge.xml:342
4017 msgid "Simplifying the pull-merge-commit sequence"
4018 msgstr "简化拉-合并-提交程序"
4020 #. type: Content of: <book><chapter><sect1><para>
4021 #: ../en/ch03-tour-merge.xml:344
4022 msgid ""
4023 "The process of merging changes as outlined above is straightforward, but "
4024 "requires running three commands in sequence."
4025 msgstr ""
4027 #. type: Content of: <book><chapter><sect1><para>
4028 #: ../en/ch03-tour-merge.xml:350
4029 msgid ""
4030 "In the case of the final commit, you also need to enter a commit message, "
4031 "which is almost always going to be a piece of uninteresting "
4032 "<quote>boilerplate</quote> text."
4033 msgstr ""
4035 #. type: Content of: <book><chapter><sect1><para>
4036 #: ../en/ch03-tour-merge.xml:354
4037 msgid ""
4038 "It would be nice to reduce the number of steps needed, if this were "
4039 "possible. Indeed, Mercurial is distributed with an extension called <literal "
4040 "role=\"hg-ext\">fetch</literal> that does just this."
4041 msgstr ""
4043 #. type: Content of: <book><chapter><sect1><para>
4044 #: ../en/ch03-tour-merge.xml:359
4045 msgid ""
4046 "Mercurial provides a flexible extension mechanism that lets people extend its "
4047 "functionality, while keeping the core of Mercurial small and easy to deal "
4048 "with. Some extensions add new commands that you can use from the command "
4049 "line, while others work <quote>behind the scenes,</quote> for example adding "
4050 "capabilities to the server."
4051 msgstr ""
4053 #. type: Content of: <book><chapter><sect1><para>
4054 #: ../en/ch03-tour-merge.xml:366
4055 msgid ""
4056 "The <literal role=\"hg-ext\">fetch</literal> extension adds a new command "
4057 "called, not surprisingly, <command role=\"hg-cmd\">hg fetch</command>. This "
4058 "extension acts as a combination of <command role=\"hg-cmd\">hg pull</"
4059 "command>, <command role=\"hg-cmd\">hg update</command> and <command role=\"hg-"
4060 "cmd\">hg merge</command>. It begins by pulling changes from another "
4061 "repository into the current repository. If it finds that the changes added a "
4062 "new head to the repository, it begins a merge, then commits the result of the "
4063 "merge with an automatically-generated commit message. If no new heads were "
4064 "added, it updates the working directory to the new tip changeset."
4065 msgstr ""
4067 #. type: Content of: <book><chapter><sect1><para>
4068 #: ../en/ch03-tour-merge.xml:379
4069 msgid ""
4070 "Enabling the <literal role=\"hg-ext\">fetch</literal> extension is easy. "
4071 "Edit your <filename role=\"special\">.hgrc</filename>, and either go to the "
4072 "<literal role=\"rc-extensions\">extensions</literal> section or create an "
4073 "<literal role=\"rc-extensions\">extensions</literal> section. Then add a line "
4074 "that simply reads <quote><literal>fetch </literal></quote>."
4075 msgstr ""
4077 #. type: Content of: <book><chapter><sect1><para>
4078 #: ../en/ch03-tour-merge.xml:389
4079 msgid ""
4080 "(Normally, on the right-hand side of the <quote><literal>=</literal></quote> "
4081 "would appear the location of the extension, but since the <literal role=\"hg-"
4082 "ext\">fetch</literal> extension is in the standard distribution, Mercurial "
4083 "knows where to search for it.)"
4084 msgstr ""
4086 #. type: Content of: <book><chapter><title>
4087 #: ../en/ch04-concepts.xml:5
4088 msgid "Behind the scenes"
4089 msgstr "Mercurial 内幕"
4091 #. type: Content of: <book><chapter><para>
4092 #: ../en/ch04-concepts.xml:7
4093 msgid ""
4094 "Unlike many revision control systems, the concepts upon which Mercurial is "
4095 "built are simple enough that it's easy to understand how the software really "
4096 "works. Knowing this certainly isn't necessary, but I find it useful to have "
4097 "a <quote>mental model</quote> of what's going on."
4098 msgstr ""
4100 #. type: Content of: <book><chapter><para>
4101 #: ../en/ch04-concepts.xml:13
4102 msgid ""
4103 "This understanding gives me confidence that Mercurial has been carefully "
4104 "designed to be both <emphasis>safe</emphasis> and <emphasis>efficient</"
4105 "emphasis>. And just as importantly, if it's easy for me to retain a good "
4106 "idea of what the software is doing when I perform a revision control task, "
4107 "I'm less likely to be surprised by its behaviour."
4108 msgstr ""
4110 #. type: Content of: <book><chapter><para>
4111 #: ../en/ch04-concepts.xml:20
4112 msgid ""
4113 "In this chapter, we'll initially cover the core concepts behind Mercurial's "
4114 "design, then continue to discuss some of the interesting details of its "
4115 "implementation."
4116 msgstr ""
4118 #. type: Content of: <book><chapter><sect1><title>
4119 #: ../en/ch04-concepts.xml:25
4120 msgid "Mercurial's historical record"
4121 msgstr "Mercurial 的历史记录"
4123 #. type: Content of: <book><chapter><sect1><sect2><title>
4124 #: ../en/ch04-concepts.xml:28
4125 msgid "Tracking the history of a single file"
4126 msgstr "跟踪单一文件的历史"
4128 #. type: Content of: <book><chapter><sect1><sect2><para>
4129 #: ../en/ch04-concepts.xml:30
4130 msgid ""
4131 "When Mercurial tracks modifications to a file, it stores the history of that "
4132 "file in a metadata object called a <emphasis>filelog</emphasis>. Each entry "
4133 "in the filelog contains enough information to reconstruct one revision of the "
4134 "file that is being tracked. Filelogs are stored as files in the <filename "
4135 "role=\"special\" class=\"directory\">.hg/store/data</filename> directory. A "
4136 "filelog contains two kinds of information: revision data, and an index to "
4137 "help Mercurial to find a revision efficiently."
4138 msgstr ""
4140 #. type: Content of: <book><chapter><sect1><sect2><para>
4141 #: ../en/ch04-concepts.xml:41
4142 msgid ""
4143 "A file that is large, or has a lot of history, has its filelog stored in "
4144 "separate data (<quote><literal>.d</literal></quote> suffix) and index "
4145 "(<quote><literal>.i</literal></quote> suffix) files. For small files without "
4146 "much history, the revision data and index are combined in a single "
4147 "<quote><literal>.i</literal></quote> file. The correspondence between a file "
4148 "in the working directory and the filelog that tracks its history in the "
4149 "repository is illustrated in figure <xref endterm=\"fig.concepts.filelog."
4150 "caption\" linkend=\"fig.concepts.filelog\"/>."
4151 msgstr ""
4153 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4154 #: ../en/ch04-concepts.xml:55
4155 msgid "<imageobject><imagedata fileref=\"images/filelog.png\"/></imageobject>"
4156 msgstr ""
4158 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4159 #: ../en/ch04-concepts.xml:57
4160 msgid ""
4161 "Relationships between files in working directory and filelogs in repository"
4162 msgstr ""
4164 #. type: Content of: <book><chapter><sect1><sect2><title>
4165 #: ../en/ch04-concepts.xml:65
4166 msgid "Managing tracked files"
4167 msgstr "管理跟踪的文件"
4169 #. type: Content of: <book><chapter><sect1><sect2><para>
4170 #: ../en/ch04-concepts.xml:67
4171 msgid ""
4172 "Mercurial uses a structure called a <emphasis>manifest</emphasis> to collect "
4173 "together information about the files that it tracks. Each entry in the "
4174 "manifest contains information about the files present in a single changeset. "
4175 "An entry records which files are present in the changeset, the revision of "
4176 "each file, and a few other pieces of file metadata."
4177 msgstr ""
4179 #. type: Content of: <book><chapter><sect1><sect2><title>
4180 #: ../en/ch04-concepts.xml:77
4181 msgid "Recording changeset information"
4182 msgstr "记录修改集信息"
4184 #. type: Content of: <book><chapter><sect1><sect2><para>
4185 #: ../en/ch04-concepts.xml:79
4186 msgid ""
4187 "The <emphasis>changelog</emphasis> contains information about each "
4188 "changeset. Each revision records who committed a change, the changeset "
4189 "comment, other pieces of changeset-related information, and the revision of "
4190 "the manifest to use."
4191 msgstr ""
4193 #. type: Content of: <book><chapter><sect1><sect2><title>
4194 #: ../en/ch04-concepts.xml:87
4195 msgid "Relationships between revisions"
4196 msgstr "版本之间的关系"
4198 #. type: Content of: <book><chapter><sect1><sect2><para>
4199 #: ../en/ch04-concepts.xml:89
4200 msgid ""
4201 "Within a changelog, a manifest, or a filelog, each revision stores a pointer "
4202 "to its immediate parent (or to its two parents, if it's a merge revision). "
4203 "As I mentioned above, there are also relationships between revisions "
4204 "<emphasis>across</emphasis> these structures, and they are hierarchical in "
4205 "nature."
4206 msgstr ""
4208 #. type: Content of: <book><chapter><sect1><sect2><para>
4209 #: ../en/ch04-concepts.xml:96
4210 msgid ""
4211 "For every changeset in a repository, there is exactly one revision stored in "
4212 "the changelog. Each revision of the changelog contains a pointer to a single "
4213 "revision of the manifest. A revision of the manifest stores a pointer to a "
4214 "single revision of each filelog tracked when that changeset was created. "
4215 "These relationships are illustrated in figure <xref endterm=\"fig.concepts."
4216 "metadata.caption\" linkend=\"fig.concepts.metadata\"/>."
4217 msgstr ""
4219 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4220 #: ../en/ch04-concepts.xml:107
4221 msgid "<imageobject><imagedata fileref=\"images/metadata.png\"/></imageobject>"
4222 msgstr ""
4224 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4225 #: ../en/ch04-concepts.xml:109
4226 msgid "Metadata relationships"
4227 msgstr ""
4229 #. type: Content of: <book><chapter><sect1><sect2><para>
4230 #: ../en/ch04-concepts.xml:114
4231 msgid ""
4232 "As the illustration shows, there is <emphasis>not</emphasis> a <quote>one to "
4233 "one</quote> relationship between revisions in the changelog, manifest, or "
4234 "filelog. If the manifest hasn't changed between two changesets, the changelog "
4235 "entries for those changesets will point to the same revision of the "
4236 "manifest. If a file that Mercurial tracks hasn't changed between two "
4237 "changesets, the entry for that file in the two revisions of the manifest will "
4238 "point to the same revision of its filelog."
4239 msgstr ""
4241 #. type: Content of: <book><chapter><sect1><title>
4242 #: ../en/ch04-concepts.xml:127
4243 msgid "Safe, efficient storage"
4244 msgstr "安全，高效的存储"
4246 #. type: Content of: <book><chapter><sect1><para>
4247 #: ../en/ch04-concepts.xml:129
4248 msgid ""
4249 "The underpinnings of changelogs, manifests, and filelogs are provided by a "
4250 "single structure called the <emphasis>revlog</emphasis>."
4251 msgstr ""
4253 #. type: Content of: <book><chapter><sect1><sect2><title>
4254 #: ../en/ch04-concepts.xml:134
4255 msgid "Efficient storage"
4256 msgstr "高效存储"
4258 #. type: Content of: <book><chapter><sect1><sect2><para>
4259 #: ../en/ch04-concepts.xml:136
4260 msgid ""
4261 "The revlog provides efficient storage of revisions using a <emphasis>delta</"
4262 "emphasis> mechanism. Instead of storing a complete copy of a file for each "
4263 "revision, it stores the changes needed to transform an older revision into "
4264 "the new revision. For many kinds of file data, these deltas are typically a "
4265 "fraction of a percent of the size of a full copy of a file."
4266 msgstr ""
4268 #. type: Content of: <book><chapter><sect1><sect2><para>
4269 #: ../en/ch04-concepts.xml:144
4270 msgid ""
4271 "Some obsolete revision control systems can only work with deltas of text "
4272 "files. They must either store binary files as complete snapshots or encoded "
4273 "into a text representation, both of which are wasteful approaches. Mercurial "
4274 "can efficiently handle deltas of files with arbitrary binary contents; it "
4275 "doesn't need to treat text as special."
4276 msgstr ""
4278 #. type: Content of: <book><chapter><sect1><sect2><title>
4279 #: ../en/ch04-concepts.xml:153
4280 msgid "Safe operation"
4281 msgstr "安全操作"
4283 #. type: Content of: <book><chapter><sect1><sect2><para>
4284 #: ../en/ch04-concepts.xml:155
4285 msgid ""
4286 "Mercurial only ever <emphasis>appends</emphasis> data to the end of a revlog "
4287 "file. It never modifies a section of a file after it has written it. This is "
4288 "both more robust and efficient than schemes that need to modify or rewrite "
4289 "data."
4290 msgstr ""
4292 #. type: Content of: <book><chapter><sect1><sect2><para>
4293 #: ../en/ch04-concepts.xml:161
4294 msgid ""
4295 "In addition, Mercurial treats every write as part of a <emphasis>transaction</"
4296 "emphasis> that can span a number of files. A transaction is "
4297 "<emphasis>atomic</emphasis>: either the entire transaction succeeds and its "
4298 "effects are all visible to readers in one go, or the whole thing is undone. "
4299 "This guarantee of atomicity means that if you're running two copies of "
4300 "Mercurial, where one is reading data and one is writing it, the reader will "
4301 "never see a partially written result that might confuse it."
4302 msgstr ""
4304 #. type: Content of: <book><chapter><sect1><sect2><para>
4305 #: ../en/ch04-concepts.xml:171
4306 msgid ""
4307 "The fact that Mercurial only appends to files makes it easier to provide this "
4308 "transactional guarantee. The easier it is to do stuff like this, the more "
4309 "confident you should be that it's done correctly."
4310 msgstr ""
4312 #. type: Content of: <book><chapter><sect1><sect2><title>
4313 #: ../en/ch04-concepts.xml:178
4314 msgid "Fast retrieval"
4315 msgstr "快速检索"
4317 #. type: Content of: <book><chapter><sect1><sect2><para>
4318 #: ../en/ch04-concepts.xml:180
4319 msgid ""
4320 "Mercurial cleverly avoids a pitfall common to all earlier revision control "
4321 "systems: the problem of <emphasis>inefficient retrieval</emphasis>. Most "
4322 "revision control systems store the contents of a revision as an incremental "
4323 "series of modifications against a <quote>snapshot</quote>. To reconstruct a "
4324 "specific revision, you must first read the snapshot, and then every one of "
4325 "the revisions between the snapshot and your target revision. The more "
4326 "history that a file accumulates, the more revisions you must read, hence the "
4327 "longer it takes to reconstruct a particular revision."
4328 msgstr ""
4330 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4331 #: ../en/ch04-concepts.xml:193
4332 msgid "<imageobject><imagedata fileref=\"images/snapshot.png\"/></imageobject>"
4333 msgstr ""
4335 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4336 #: ../en/ch04-concepts.xml:195
4337 msgid "Snapshot of a revlog, with incremental deltas"
4338 msgstr ""
4340 #. type: Content of: <book><chapter><sect1><sect2><para>
4341 #: ../en/ch04-concepts.xml:200
4342 msgid ""
4343 "The innovation that Mercurial applies to this problem is simple but "
4344 "effective. Once the cumulative amount of delta information stored since the "
4345 "last snapshot exceeds a fixed threshold, it stores a new snapshot "
4346 "(compressed, of course), instead of another delta. This makes it possible to "
4347 "reconstruct <emphasis>any</emphasis> revision of a file quickly. This "
4348 "approach works so well that it has since been copied by several other "
4349 "revision control systems."
4350 msgstr ""
4352 #. type: Content of: <book><chapter><sect1><sect2><para>
4353 #: ../en/ch04-concepts.xml:209
4354 msgid ""
4355 "Figure <xref endterm=\"fig.concepts.snapshot.caption\" linkend=\"fig.concepts."
4356 "snapshot\"/> illustrates the idea. In an entry in a revlog's index file, "
4357 "Mercurial stores the range of entries from the data file that it must read to "
4358 "reconstruct a particular revision."
4359 msgstr ""
4361 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
4362 #: ../en/ch04-concepts.xml:216
4363 msgid "Aside: the influence of video compression"
4364 msgstr ""
4366 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4367 #: ../en/ch04-concepts.xml:218
4368 msgid ""
4369 "If you're familiar with video compression or have ever watched a TV feed "
4370 "through a digital cable or satellite service, you may know that most video "
4371 "compression schemes store each frame of video as a delta against its "
4372 "predecessor frame. In addition, these schemes use <quote>lossy</quote> "
4373 "compression techniques to increase the compression ratio, so visual errors "
4374 "accumulate over the course of a number of inter-frame deltas."
4375 msgstr ""
4377 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4378 #: ../en/ch04-concepts.xml:227
4379 msgid ""
4380 "Because it's possible for a video stream to <quote>drop out</quote> "
4381 "occasionally due to signal glitches, and to limit the accumulation of "
4382 "artefacts introduced by the lossy compression process, video encoders "
4383 "periodically insert a complete frame (called a <quote>key frame</quote>) into "
4384 "the video stream; the next delta is generated against that frame. This means "
4385 "that if the video signal gets interrupted, it will resume once the next key "
4386 "frame is received. Also, the accumulation of encoding errors restarts anew "
4387 "with each key frame."
4388 msgstr ""
4390 #. type: Content of: <book><chapter><sect1><sect2><title>
4391 #: ../en/ch04-concepts.xml:241
4392 msgid "Identification and strong integrity"
4393 msgstr "鉴别和强完整性"
4395 #. type: Content of: <book><chapter><sect1><sect2><para>
4396 #: ../en/ch04-concepts.xml:243
4397 msgid ""
4398 "Along with delta or snapshot information, a revlog entry contains a "
4399 "cryptographic hash of the data that it represents. This makes it difficult "
4400 "to forge the contents of a revision, and easy to detect accidental corruption."
4401 msgstr ""
4403 #. type: Content of: <book><chapter><sect1><sect2><para>
4404 #: ../en/ch04-concepts.xml:248
4405 msgid ""
4406 "Hashes provide more than a mere check against corruption; they are used as "
4407 "the identifiers for revisions. The changeset identification hashes that you "
4408 "see as an end user are from revisions of the changelog. Although filelogs "
4409 "and the manifest also use hashes, Mercurial only uses these behind the scenes."
4410 msgstr ""
4412 #. type: Content of: <book><chapter><sect1><sect2><para>
4413 #: ../en/ch04-concepts.xml:255
4414 msgid ""
4415 "Mercurial verifies that hashes are correct when it retrieves file revisions "
4416 "and when it pulls changes from another repository. If it encounters an "
4417 "integrity problem, it will complain and stop whatever it's doing."
4418 msgstr ""
4420 #. type: Content of: <book><chapter><sect1><sect2><para>
4421 #: ../en/ch04-concepts.xml:260
4422 msgid ""
4423 "In addition to the effect it has on retrieval efficiency, Mercurial's use of "
4424 "periodic snapshots makes it more robust against partial data corruption. If "
4425 "a revlog becomes partly corrupted due to a hardware error or system bug, it's "
4426 "often possible to reconstruct some or most revisions from the uncorrupted "
4427 "sections of the revlog, both before and after the corrupted section. This "
4428 "would not be possible with a delta-only storage model."
4429 msgstr ""
4431 #. type: Content of: <book><chapter><sect1><title>
4432 #: ../en/ch04-concepts.xml:272
4433 msgid "Revision history, branching, and merging"
4434 msgstr "修订历史，分支与合并"
4436 #. type: Content of: <book><chapter><sect1><para>
4437 #: ../en/ch04-concepts.xml:274
4438 msgid ""
4439 "Every entry in a Mercurial revlog knows the identity of its immediate "
4440 "ancestor revision, usually referred to as its <emphasis>parent</emphasis>. "
4441 "In fact, a revision contains room for not one parent, but two. Mercurial "
4442 "uses a special hash, called the <quote>null ID</quote>, to represent the idea "
4443 "<quote>there is no parent here</quote>. This hash is simply a string of "
4444 "zeroes."
4445 msgstr ""
4447 #. type: Content of: <book><chapter><sect1><para>
4448 #: ../en/ch04-concepts.xml:282
4449 msgid ""
4450 "In figure <xref endterm=\"fig.concepts.revlog.caption\" linkend=\"fig."
4451 "concepts.revlog\"/>, you can see an example of the conceptual structure of a "
4452 "revlog. Filelogs, manifests, and changelogs all have this same structure; "
4453 "they differ only in the kind of data stored in each delta or snapshot."
4454 msgstr ""
4456 #. type: Content of: <book><chapter><sect1><para>
4457 #: ../en/ch04-concepts.xml:289
4458 msgid ""
4459 "The first revision in a revlog (at the bottom of the image) has the null ID "
4460 "in both of its parent slots. For a <quote>normal</quote> revision, its first "
4461 "parent slot contains the ID of its parent revision, and its second contains "
4462 "the null ID, indicating that the revision has only one real parent. Any two "
4463 "revisions that have the same parent ID are branches. A revision that "
4464 "represents a merge between branches has two normal revision IDs in its parent "
4465 "slots."
4466 msgstr ""
4468 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
4469 #: ../en/ch04-concepts.xml:300
4470 msgid "<imageobject><imagedata fileref=\"images/revlog.png\"/></imageobject>"
4471 msgstr ""
4473 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
4474 #: ../en/ch04-concepts.xml:302
4475 msgid "Revision in revlog"
4476 msgstr ""
4478 #. type: Content of: <book><chapter><sect1><title>
4479 #: ../en/ch04-concepts.xml:309
4480 msgid "The working directory"
4481 msgstr "工作目录"
4483 #. type: Content of: <book><chapter><sect1><para>
4484 #: ../en/ch04-concepts.xml:311
4485 msgid ""
4486 "In the working directory, Mercurial stores a snapshot of the files from the "
4487 "repository as of a particular changeset."
4488 msgstr ""
4490 #. type: Content of: <book><chapter><sect1><para>
4491 #: ../en/ch04-concepts.xml:314
4492 msgid ""
4493 "The working directory <quote>knows</quote> which changeset it contains. When "
4494 "you update the working directory to contain a particular changeset, Mercurial "
4495 "looks up the appropriate revision of the manifest to find out which files it "
4496 "was tracking at the time that changeset was committed, and which revision of "
4497 "each file was then current. It then recreates a copy of each of those files, "
4498 "with the same contents it had when the changeset was committed."
4499 msgstr ""
4501 #. type: Content of: <book><chapter><sect1><para>
4502 #: ../en/ch04-concepts.xml:323
4503 msgid ""
4504 "The <emphasis>dirstate</emphasis> contains Mercurial's knowledge of the "
4505 "working directory. This details which changeset the working directory is "
4506 "updated to, and all of the files that Mercurial is tracking in the working "
4507 "directory."
4508 msgstr ""
4510 #. type: Content of: <book><chapter><sect1><para>
4511 #: ../en/ch04-concepts.xml:329
4512 msgid ""
4513 "Just as a revision of a revlog has room for two parents, so that it can "
4514 "represent either a normal revision (with one parent) or a merge of two "
4515 "earlier revisions, the dirstate has slots for two parents. When you use the "
4516 "<command role=\"hg-cmd\">hg update</command> command, the changeset that you "
4517 "update to is stored in the <quote>first parent</quote> slot, and the null ID "
4518 "in the second. When you <command role=\"hg-cmd\">hg merge</command> with "
4519 "another changeset, the first parent remains unchanged, and the second parent "
4520 "is filled in with the changeset you're merging with. The <command role=\"hg-"
4521 "cmd\">hg parents</command> command tells you what the parents of the dirstate "
4522 "are."
4523 msgstr ""
4525 #. type: Content of: <book><chapter><sect1><sect2><title>
4526 #: ../en/ch04-concepts.xml:343
4527 msgid "What happens when you commit"
4528 msgstr "当你提交时发生的事情"
4530 #. type: Content of: <book><chapter><sect1><sect2><para>
4531 #: ../en/ch04-concepts.xml:345
4532 msgid ""
4533 "The dirstate stores parent information for more than just book-keeping "
4534 "purposes. Mercurial uses the parents of the dirstate as <emphasis>the "
4535 "parents of a new changeset</emphasis> when you perform a commit."
4536 msgstr ""
4538 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4539 #: ../en/ch04-concepts.xml:352
4540 msgid "<imageobject><imagedata fileref=\"images/wdir.png\"/></imageobject>"
4541 msgstr ""
4543 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4544 #: ../en/ch04-concepts.xml:354
4545 msgid "The working directory can have two parents"
4546 msgstr ""
4548 #. type: Content of: <book><chapter><sect1><sect2><para>
4549 #: ../en/ch04-concepts.xml:359
4550 msgid ""
4551 "Figure <xref endterm=\"fig.concepts.wdir.caption\" linkend=\"fig.concepts.wdir"
4552 "\"/> shows the normal state of the working directory, where it has a single "
4553 "changeset as parent. That changeset is the <emphasis>tip</emphasis>, the "
4554 "newest changeset in the repository that has no children."
4555 msgstr ""
4557 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4558 #: ../en/ch04-concepts.xml:368
4559 msgid ""
4560 "<imageobject><imagedata fileref=\"images/wdir-after-commit.png\"/> </"
4561 "imageobject>"
4562 msgstr ""
4564 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4565 #: ../en/ch04-concepts.xml:371
4566 msgid "The working directory gains new parents after a commit"
4567 msgstr ""
4569 #. type: Content of: <book><chapter><sect1><sect2><para>
4570 #: ../en/ch04-concepts.xml:376
4571 msgid ""
4572 "It's useful to think of the working directory as <quote>the changeset I'm "
4573 "about to commit</quote>. Any files that you tell Mercurial that you've "
4574 "added, removed, renamed, or copied will be reflected in that changeset, as "
4575 "will modifications to any files that Mercurial is already tracking; the new "
4576 "changeset will have the parents of the working directory as its parents."
4577 msgstr ""
4579 #. type: Content of: <book><chapter><sect1><sect2><para>
4580 #: ../en/ch04-concepts.xml:384
4581 msgid ""
4582 "After a commit, Mercurial will update the parents of the working directory, "
4583 "so that the first parent is the ID of the new changeset, and the second is "
4584 "the null ID. This is shown in figure <xref endterm=\"fig.concepts.wdir-after-"
4585 "commit.caption\" linkend=\"fig.concepts.wdir-after-commit\"/>. Mercurial "
4586 "doesn't touch any of the files in the working directory when you commit; it "
4587 "just modifies the dirstate to note its new parents."
4588 msgstr ""
4590 #. type: Content of: <book><chapter><sect1><sect2><title>
4591 #: ../en/ch04-concepts.xml:396
4592 msgid "Creating a new head"
4593 msgstr "创建新顶点"
4595 #. type: Content of: <book><chapter><sect1><sect2><para>
4596 #: ../en/ch04-concepts.xml:398
4597 msgid ""
4598 "It's perfectly normal to update the working directory to a changeset other "
4599 "than the current tip. For example, you might want to know what your project "
4600 "looked like last Tuesday, or you could be looking through changesets to see "
4601 "which one introduced a bug. In cases like this, the natural thing to do is "
4602 "update the working directory to the changeset you're interested in, and then "
4603 "examine the files in the working directory directly to see their contents as "
4604 "they were when you committed that changeset. The effect of this is shown in "
4605 "figure <xref endterm=\"fig.concepts.wdir-pre-branch.caption\" linkend=\"fig."
4606 "concepts.wdir-pre-branch\"/>."
4607 msgstr ""
4609 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4610 #: ../en/ch04-concepts.xml:412
4611 msgid ""
4612 "<imageobject><imagedata fileref=\"images/wdir-pre-branch.png\"/> </"
4613 "imageobject>"
4614 msgstr ""
4616 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4617 #: ../en/ch04-concepts.xml:415
4618 msgid "The working directory, updated to an older changeset"
4619 msgstr ""
4621 #. type: Content of: <book><chapter><sect1><sect2><para>
4622 #: ../en/ch04-concepts.xml:420
4623 msgid ""
4624 "Having updated the working directory to an older changeset, what happens if "
4625 "you make some changes, and then commit? Mercurial behaves in the same way as "
4626 "I outlined above. The parents of the working directory become the parents of "
4627 "the new changeset. This new changeset has no children, so it becomes the new "
4628 "tip. And the repository now contains two changesets that have no children; "
4629 "we call these <emphasis>heads</emphasis>. You can see the structure that "
4630 "this creates in figure <xref endterm=\"fig.concepts.wdir-branch.caption\" "
4631 "linkend=\"fig.concepts.wdir-branch\"/>."
4632 msgstr ""
4634 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4635 #: ../en/ch04-concepts.xml:434
4636 msgid ""
4637 "<imageobject><imagedata fileref=\"images/wdir-branch.png\"/> </imageobject>"
4638 msgstr ""
4640 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4641 #: ../en/ch04-concepts.xml:437
4642 msgid "After a commit made while synced to an older changeset"
4643 msgstr ""
4645 #. type: Content of: <book><chapter><sect1><sect2><note><para>
4646 #: ../en/ch04-concepts.xml:443
4647 msgid ""
4648 "If you're new to Mercurial, you should keep in mind a common <quote>error</"
4649 "quote>, which is to use the <command role=\"hg-cmd\">hg pull</command> "
4650 "command without any options. By default, the <command role=\"hg-cmd\">hg "
4651 "pull</command> command <emphasis>does not</emphasis> update the working "
4652 "directory, so you'll bring new changesets into your repository, but the "
4653 "working directory will stay synced at the same changeset as before the pull. "
4654 "If you make some changes and commit afterwards, you'll thus create a new "
4655 "head, because your working directory isn't synced to whatever the current tip "
4656 "is."
4657 msgstr ""
4659 #. type: Content of: <book><chapter><sect1><sect2><note><para>
4660 #: ../en/ch04-concepts.xml:455
4661 msgid ""
4662 "I put the word <quote>error</quote> in quotes because all that you need to do "
4663 "to rectify this situation is <command role=\"hg-cmd\">hg merge</command>, "
4664 "then <command role=\"hg-cmd\">hg commit</command>. In other words, this "
4665 "almost never has negative consequences; it just surprises people. I'll "
4666 "discuss other ways to avoid this behaviour, and why Mercurial behaves in this "
4667 "initially surprising way, later on."
4668 msgstr ""
4670 #. type: Content of: <book><chapter><sect1><sect2><title>
4671 #: ../en/ch04-concepts.xml:467
4672 msgid "Merging heads"
4673 msgstr "合并顶点"
4675 #. type: Content of: <book><chapter><sect1><sect2><para>
4676 #: ../en/ch04-concepts.xml:469
4677 msgid ""
4678 "When you run the <command role=\"hg-cmd\">hg merge</command> command, "
4679 "Mercurial leaves the first parent of the working directory unchanged, and "
4680 "sets the second parent to the changeset you're merging with, as shown in "
4681 "figure <xref endterm=\"fig.concepts.wdir-merge.caption\" linkend=\"fig."
4682 "concepts.wdir-merge\"/>."
4683 msgstr ""
4685 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
4686 #: ../en/ch04-concepts.xml:478
4687 msgid ""
4688 "<imageobject><imagedata fileref=\"images/wdir-merge.png\"/> </imageobject>"
4689 msgstr ""
4691 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
4692 #: ../en/ch04-concepts.xml:481
4693 msgid "Merging two heads"
4694 msgstr ""
4696 #. type: Content of: <book><chapter><sect1><sect2><para>
4697 #: ../en/ch04-concepts.xml:486
4698 msgid ""
4699 "Mercurial also has to modify the working directory, to merge the files "
4700 "managed in the two changesets. Simplified a little, the merging process goes "
4701 "like this, for every file in the manifests of both changesets."
4702 msgstr ""
4704 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4705 #: ../en/ch04-concepts.xml:491
4706 msgid "If neither changeset has modified a file, do nothing with that file."
4707 msgstr ""
4709 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4710 #: ../en/ch04-concepts.xml:494
4711 msgid ""
4712 "If one changeset has modified a file, and the other hasn't, create the "
4713 "modified copy of the file in the working directory."
4714 msgstr ""
4716 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4717 #: ../en/ch04-concepts.xml:498
4718 msgid ""
4719 "If one changeset has removed a file, and the other hasn't (or has also "
4720 "deleted it), delete the file from the working directory."
4721 msgstr ""
4723 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4724 #: ../en/ch04-concepts.xml:502
4725 msgid ""
4726 "If one changeset has removed a file, but the other has modified the file, ask "
4727 "the user what to do: keep the modified file, or remove it?"
4728 msgstr ""
4730 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4731 #: ../en/ch04-concepts.xml:506
4732 msgid ""
4733 "If both changesets have modified a file, invoke an external merge program to "
4734 "choose the new contents for the merged file. This may require input from the "
4735 "user."
4736 msgstr ""
4738 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
4739 #: ../en/ch04-concepts.xml:511
4740 msgid ""
4741 "If one changeset has modified a file, and the other has renamed or copied the "
4742 "file, make sure that the changes follow the new name of the file."
4743 msgstr ""
4745 #. type: Content of: <book><chapter><sect1><sect2><para>
4746 #: ../en/ch04-concepts.xml:515
4747 msgid ""
4748 "There are more details&emdash;merging has plenty of corner cases&emdash;but "
4749 "these are the most common choices that are involved in a merge. As you can "
4750 "see, most cases are completely automatic, and indeed most merges finish "
4751 "automatically, without requiring your input to resolve any conflicts."
4752 msgstr ""
4754 #. type: Content of: <book><chapter><sect1><sect2><para>
4755 #: ../en/ch04-concepts.xml:522
4756 msgid ""
4757 "When you're thinking about what happens when you commit after a merge, once "
4758 "again the working directory is <quote>the changeset I'm about to commit</"
4759 "quote>. After the <command role=\"hg-cmd\">hg merge</command> command "
4760 "completes, the working directory has two parents; these will become the "
4761 "parents of the new changeset."
4762 msgstr ""
4764 #. type: Content of: <book><chapter><sect1><sect2><para>
4765 #: ../en/ch04-concepts.xml:529
4766 msgid ""
4767 "Mercurial lets you perform multiple merges, but you must commit the results "
4768 "of each individual merge as you go. This is necessary because Mercurial only "
4769 "tracks two parents for both revisions and the working directory. While it "
4770 "would be technically possible to merge multiple changesets at once, the "
4771 "prospect of user confusion and making a terrible mess of a merge immediately "
4772 "becomes overwhelming."
4773 msgstr ""
4775 #. type: Content of: <book><chapter><sect1><title>
4776 #: ../en/ch04-concepts.xml:540
4777 msgid "Other interesting design features"
4778 msgstr "其它有趣的设计特性"
4780 #. type: Content of: <book><chapter><sect1><para>
4781 #: ../en/ch04-concepts.xml:542
4782 msgid ""
4783 "In the sections above, I've tried to highlight some of the most important "
4784 "aspects of Mercurial's design, to illustrate that it pays careful attention "
4785 "to reliability and performance. However, the attention to detail doesn't "
4786 "stop there. There are a number of other aspects of Mercurial's construction "
4787 "that I personally find interesting. I'll detail a few of them here, separate "
4788 "from the <quote>big ticket</quote> items above, so that if you're interested, "
4789 "you can gain a better idea of the amount of thinking that goes into a well-"
4790 "designed system."
4791 msgstr ""
4793 #. type: Content of: <book><chapter><sect1><sect2><title>
4794 #: ../en/ch04-concepts.xml:553
4795 msgid "Clever compression"
4796 msgstr "智能压缩"
4798 #. type: Content of: <book><chapter><sect1><sect2><para>
4799 #: ../en/ch04-concepts.xml:555
4800 msgid ""
4801 "When appropriate, Mercurial will store both snapshots and deltas in "
4802 "compressed form. It does this by always <emphasis>trying to</emphasis> "
4803 "compress a snapshot or delta, but only storing the compressed version if it's "
4804 "smaller than the uncompressed version."
4805 msgstr ""
4807 #. type: Content of: <book><chapter><sect1><sect2><para>
4808 #: ../en/ch04-concepts.xml:561
4809 msgid ""
4810 "This means that Mercurial does <quote>the right thing</quote> when storing a "
4811 "file whose native form is compressed, such as a <literal>zip</literal> "
4812 "archive or a JPEG image. When these types of files are compressed a second "
4813 "time, the resulting file is usually bigger than the once-compressed form, and "
4814 "so Mercurial will store the plain <literal>zip</literal> or JPEG."
4815 msgstr ""
4817 #. type: Content of: <book><chapter><sect1><sect2><para>
4818 #: ../en/ch04-concepts.xml:569
4819 msgid ""
4820 "Deltas between revisions of a compressed file are usually larger than "
4821 "snapshots of the file, and Mercurial again does <quote>the right thing</"
4822 "quote> in these cases. It finds that such a delta exceeds the threshold at "
4823 "which it should store a complete snapshot of the file, so it stores the "
4824 "snapshot, again saving space compared to a naive delta-only approach."
4825 msgstr ""
4827 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
4828 #: ../en/ch04-concepts.xml:578
4829 msgid "Network recompression"
4830 msgstr "网络重新压缩"
4832 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4833 #: ../en/ch04-concepts.xml:580
4834 msgid ""
4835 "When storing revisions on disk, Mercurial uses the <quote>deflate</quote> "
4836 "compression algorithm (the same one used by the popular <literal>zip</"
4837 "literal> archive format), which balances good speed with a respectable "
4838 "compression ratio. However, when transmitting revision data over a network "
4839 "connection, Mercurial uncompresses the compressed revision data."
4840 msgstr ""
4842 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4843 #: ../en/ch04-concepts.xml:588
4844 msgid ""
4845 "If the connection is over HTTP, Mercurial recompresses the entire stream of "
4846 "data using a compression algorithm that gives a better compression ratio (the "
4847 "Burrows-Wheeler algorithm from the widely used <literal>bzip2</literal> "
4848 "compression package). This combination of algorithm and compression of the "
4849 "entire stream (instead of a revision at a time) substantially reduces the "
4850 "number of bytes to be transferred, yielding better network performance over "
4851 "almost all kinds of network."
4852 msgstr ""
4854 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4855 #: ../en/ch04-concepts.xml:598
4856 msgid ""
4857 "(If the connection is over <command>ssh</command>, Mercurial "
4858 "<emphasis>doesn't</emphasis> recompress the stream, because <command>ssh</"
4859 "command> can already do this itself.)"
4860 msgstr ""
4862 #. type: Content of: <book><chapter><sect1><sect2><title>
4863 #: ../en/ch04-concepts.xml:606
4864 msgid "Read/write ordering and atomicity"
4865 msgstr "读写顺序与原子性"
4867 #. type: Content of: <book><chapter><sect1><sect2><para>
4868 #: ../en/ch04-concepts.xml:608
4869 msgid ""
4870 "Appending to files isn't the whole story when it comes to guaranteeing that a "
4871 "reader won't see a partial write. If you recall figure <xref endterm=\"fig."
4872 "concepts.metadata.caption\" linkend=\"fig.concepts.metadata\"/>, revisions in "
4873 "the changelog point to revisions in the manifest, and revisions in the "
4874 "manifest point to revisions in filelogs. This hierarchy is deliberate."
4875 msgstr ""
4877 #. type: Content of: <book><chapter><sect1><sect2><para>
4878 #: ../en/ch04-concepts.xml:616
4879 msgid ""
4880 "A writer starts a transaction by writing filelog and manifest data, and "
4881 "doesn't write any changelog data until those are finished. A reader starts "
4882 "by reading changelog data, then manifest data, followed by filelog data."
4883 msgstr ""
4885 #. type: Content of: <book><chapter><sect1><sect2><para>
4886 #: ../en/ch04-concepts.xml:621
4887 msgid ""
4888 "Since the writer has always finished writing filelog and manifest data before "
4889 "it writes to the changelog, a reader will never read a pointer to a partially "
4890 "written manifest revision from the changelog, and it will never read a "
4891 "pointer to a partially written filelog revision from the manifest."
4892 msgstr ""
4894 #. type: Content of: <book><chapter><sect1><sect2><title>
4895 #: ../en/ch04-concepts.xml:629
4896 msgid "Concurrent access"
4897 msgstr "并发访问"
4899 #. type: Content of: <book><chapter><sect1><sect2><para>
4900 #: ../en/ch04-concepts.xml:631
4901 msgid ""
4902 "The read/write ordering and atomicity guarantees mean that Mercurial never "
4903 "needs to <emphasis>lock</emphasis> a repository when it's reading data, even "
4904 "if the repository is being written to while the read is occurring. This has a "
4905 "big effect on scalability; you can have an arbitrary number of Mercurial "
4906 "processes safely reading data from a repository safely all at once, no matter "
4907 "whether it's being written to or not."
4908 msgstr ""
4910 #. type: Content of: <book><chapter><sect1><sect2><para>
4911 #: ../en/ch04-concepts.xml:640
4912 msgid ""
4913 "The lockless nature of reading means that if you're sharing a repository on a "
4914 "multi-user system, you don't need to grant other local users permission to "
4915 "<emphasis>write</emphasis> to your repository in order for them to be able to "
4916 "clone it or pull changes from it; they only need <emphasis>read</emphasis> "
4917 "permission. (This is <emphasis>not</emphasis> a common feature among "
4918 "revision control systems, so don't take it for granted! Most require readers "
4919 "to be able to lock a repository to access it safely, and this requires write "
4920 "permission on at least one directory, which of course makes for all kinds of "
4921 "nasty and annoying security and administrative problems.)"
4922 msgstr ""
4924 #. type: Content of: <book><chapter><sect1><sect2><para>
4925 #: ../en/ch04-concepts.xml:653
4926 msgid ""
4927 "Mercurial uses locks to ensure that only one process can write to a "
4928 "repository at a time (the locking mechanism is safe even over filesystems "
4929 "that are notoriously hostile to locking, such as NFS). If a repository is "
4930 "locked, a writer will wait for a while to retry if the repository becomes "
4931 "unlocked, but if the repository remains locked for too long, the process "
4932 "attempting to write will time out after a while. This means that your daily "
4933 "automated scripts won't get stuck forever and pile up if a system crashes "
4934 "unnoticed, for example. (Yes, the timeout is configurable, from zero to "
4935 "infinity.)"
4936 msgstr ""
4938 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
4939 #: ../en/ch04-concepts.xml:665
4940 msgid "Safe dirstate access"
4941 msgstr "安全的目录状态访问"
4943 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
4944 #: ../en/ch04-concepts.xml:667
4945 msgid ""
4946 "As with revision data, Mercurial doesn't take a lock to read the dirstate "
4947 "file; it does acquire a lock to write it. To avoid the possibility of "
4948 "reading a partially written copy of the dirstate file, Mercurial writes to a "
4949 "file with a unique name in the same directory as the dirstate file, then "
4950 "renames the temporary file atomically to <filename>dirstate</filename>. The "
4951 "file named <filename>dirstate</filename> is thus guaranteed to be complete, "
4952 "not partially written."
4953 msgstr ""
4955 #. type: Content of: <book><chapter><sect1><sect2><title>
4956 #: ../en/ch04-concepts.xml:680
4957 msgid "Avoiding seeks"
4958 msgstr "避免查找"
4960 #. type: Content of: <book><chapter><sect1><sect2><para>
4961 #: ../en/ch04-concepts.xml:682
4962 msgid ""
4963 "Critical to Mercurial's performance is the avoidance of seeks of the disk "
4964 "head, since any seek is far more expensive than even a comparatively large "
4965 "read operation."
4966 msgstr ""
4968 #. type: Content of: <book><chapter><sect1><sect2><para>
4969 #: ../en/ch04-concepts.xml:686
4970 msgid ""
4971 "This is why, for example, the dirstate is stored in a single file. If there "
4972 "were a dirstate file per directory that Mercurial tracked, the disk would "
4973 "seek once per directory. Instead, Mercurial reads the entire single dirstate "
4974 "file in one step."
4975 msgstr ""
4977 #. type: Content of: <book><chapter><sect1><sect2><para>
4978 #: ../en/ch04-concepts.xml:692
4979 msgid ""
4980 "Mercurial also uses a <quote>copy on write</quote> scheme when cloning a "
4981 "repository on local storage. Instead of copying every revlog file from the "
4982 "old repository into the new repository, it makes a <quote>hard link</quote>, "
4983 "which is a shorthand way to say <quote>these two names point to the same "
4984 "file</quote>. When Mercurial is about to write to one of a revlog's files, "
4985 "it checks to see if the number of names pointing at the file is greater than "
4986 "one. If it is, more than one repository is using the file, so Mercurial "
4987 "makes a new copy of the file that is private to this repository."
4988 msgstr ""
4990 #. type: Content of: <book><chapter><sect1><sect2><para>
4991 #: ../en/ch04-concepts.xml:703
4992 msgid ""
4993 "A few revision control developers have pointed out that this idea of making a "
4994 "complete private copy of a file is not very efficient in its use of storage. "
4995 "While this is true, storage is cheap, and this method gives the highest "
4996 "performance while deferring most book-keeping to the operating system. An "
4997 "alternative scheme would most likely reduce performance and increase the "
4998 "complexity of the software, each of which is much more important to the "
4999 "<quote>feel</quote> of day-to-day use."
5000 msgstr ""
5002 #. type: Content of: <book><chapter><sect1><sect2><title>
5003 #: ../en/ch04-concepts.xml:715
5004 msgid "Other contents of the dirstate"
5005 msgstr "目录状态的其它内容"
5007 #. type: Content of: <book><chapter><sect1><sect2><para>
5008 #: ../en/ch04-concepts.xml:717
5009 msgid ""
5010 "Because Mercurial doesn't force you to tell it when you're modifying a file, "
5011 "it uses the dirstate to store some extra information so it can determine "
5012 "efficiently whether you have modified a file. For each file in the working "
5013 "directory, it stores the time that it last modified the file itself, and the "
5014 "size of the file at that time."
5015 msgstr ""
5017 #. type: Content of: <book><chapter><sect1><sect2><para>
5018 #: ../en/ch04-concepts.xml:724
5019 msgid ""
5020 "When you explicitly <command role=\"hg-cmd\">hg add</command>, <command role="
5021 "\"hg-cmd\">hg remove</command>, <command role=\"hg-cmd\">hg rename</command> "
5022 "or <command role=\"hg-cmd\">hg copy</command> files, Mercurial updates the "
5023 "dirstate so that it knows what to do with those files when you commit."
5024 msgstr ""
5026 #. type: Content of: <book><chapter><sect1><sect2><para>
5027 #: ../en/ch04-concepts.xml:731
5028 msgid ""
5029 "When Mercurial is checking the states of files in the working directory, it "
5030 "first checks a file's modification time. If that has not changed, the file "
5031 "must not have been modified. If the file's size has changed, the file must "
5032 "have been modified. If the modification time has changed, but the size has "
5033 "not, only then does Mercurial need to read the actual contents of the file to "
5034 "see if they've changed. Storing these few extra pieces of information "
5035 "dramatically reduces the amount of data that Mercurial needs to read, which "
5036 "yields large performance improvements compared to other revision control "
5037 "systems."
5038 msgstr ""
5040 #. type: Content of: <book><chapter><title>
5041 #: ../en/ch05-daily.xml:5
5042 msgid "Mercurial in daily use"
5043 msgstr "Mercurial 的日常使用"
5045 #. type: Content of: <book><chapter><sect1><title>
5046 #: ../en/ch05-daily.xml:8
5047 msgid "Telling Mercurial which files to track"
5048 msgstr "告诉 Mercurial 要跟踪哪些文件"
5050 #. type: Content of: <book><chapter><sect1><para>
5051 #: ../en/ch05-daily.xml:10
5052 msgid ""
5053 "Mercurial does not work with files in your repository unless you tell it to "
5054 "manage them. The <command role=\"hg-cmd\">hg status</command> command will "
5055 "tell you which files Mercurial doesn't know about; it uses a <quote><literal>?"
5056 "</literal></quote> to display such files."
5057 msgstr ""
5059 #
5060 #. type: Content of: <book><chapter><sect1><para>
5061 #: ../en/ch05-daily.xml:17
5062 msgid ""
5063 "To tell Mercurial to track a file, use the <command role=\"hg-cmd\">hg add</"
5064 "command> command. Once you have added a file, the entry in the output of "
5065 "<command role=\"hg-cmd\">hg status</command> for that file changes from "
5066 "<quote><literal>?</literal></quote> to <quote><literal>A</literal></quote>."
5067 msgstr ""
5069 #. type: Content of: <book><chapter><sect1><para>
5070 #: ../en/ch05-daily.xml:26
5071 msgid ""
5072 "After you run a <command role=\"hg-cmd\">hg commit</command>, the files that "
5073 "you added before the commit will no longer be listed in the output of "
5074 "<command role=\"hg-cmd\">hg status</command>. The reason for this is that "
5075 "<command role=\"hg-cmd\">hg status</command> only tells you about "
5076 "<quote>interesting</quote> files&emdash;those that you have modified or told "
5077 "Mercurial to do something with&emdash;by default. If you have a repository "
5078 "that contains thousands of files, you will rarely want to know about files "
5079 "that Mercurial is tracking, but that have not changed. (You can still get "
5080 "this information; we'll return to this later.)"
5081 msgstr ""
5083 #. type: Content of: <book><chapter><sect1><para>
5084 #: ../en/ch05-daily.xml:38
5085 msgid ""
5086 "Once you add a file, Mercurial doesn't do anything with it immediately. "
5087 "Instead, it will take a snapshot of the file's state the next time you "
5088 "perform a commit. It will then continue to track the changes you make to the "
5089 "file every time you commit, until you remove the file."
5090 msgstr ""
5092 #. type: Content of: <book><chapter><sect1><sect2><title>
5093 #: ../en/ch05-daily.xml:45
5094 msgid "Explicit versus implicit file naming"
5095 msgstr "明确与隐含文件命名"
5097 #. type: Content of: <book><chapter><sect1><sect2><para>
5098 #: ../en/ch05-daily.xml:47
5099 msgid ""
5100 "A useful behaviour that Mercurial has is that if you pass the name of a "
5101 "directory to a command, every Mercurial command will treat this as <quote>I "
5102 "want to operate on every file in this directory and its subdirectories</"
5103 "quote>."
5104 msgstr ""
5106 #. type: Content of: <book><chapter><sect1><sect2><para>
5107 #: ../en/ch05-daily.xml:54
5108 msgid ""
5109 "Notice in this example that Mercurial printed the names of the files it "
5110 "added, whereas it didn't do so when we added the file named <filename>a</"
5111 "filename> in the earlier example."
5112 msgstr ""
5114 #. type: Content of: <book><chapter><sect1><sect2><para>
5115 #: ../en/ch05-daily.xml:59
5116 msgid ""
5117 "What's going on is that in the former case, we explicitly named the file to "
5118 "add on the command line, so the assumption that Mercurial makes in such cases "
5119 "is that you know what you were doing, and it doesn't print any output."
5120 msgstr ""
5122 #. type: Content of: <book><chapter><sect1><sect2><para>
5123 #: ../en/ch05-daily.xml:64
5124 msgid ""
5125 "However, when we <emphasis>imply</emphasis> the names of files by giving the "
5126 "name of a directory, Mercurial takes the extra step of printing the name of "
5127 "each file that it does something with. This makes it more clear what is "
5128 "happening, and reduces the likelihood of a silent and nasty surprise. This "
5129 "behaviour is common to most Mercurial commands."
5130 msgstr ""
5132 #. type: Content of: <book><chapter><sect1><sect2><title>
5133 #: ../en/ch05-daily.xml:73
5134 msgid "Aside: Mercurial tracks files, not directories"
5135 msgstr "旁白: Mercurial 只跟踪文件，不跟踪目录"
5137 #. type: Content of: <book><chapter><sect1><sect2><para>
5138 #: ../en/ch05-daily.xml:75
5139 msgid ""
5140 "Mercurial does not track directory information. Instead, it tracks the path "
5141 "to a file. Before creating a file, it first creates any missing directory "
5142 "components of the path. After it deletes a file, it then deletes any empty "
5143 "directories that were in the deleted file's path. This sounds like a trivial "
5144 "distinction, but it has one minor practical consequence: it is not possible "
5145 "to represent a completely empty directory in Mercurial."
5146 msgstr ""
5148 #. type: Content of: <book><chapter><sect1><sect2><para>
5149 #: ../en/ch05-daily.xml:84
5150 msgid ""
5151 "Empty directories are rarely useful, and there are unintrusive workarounds "
5152 "that you can use to achieve an appropriate effect. The developers of "
5153 "Mercurial thus felt that the complexity that would be required to manage "
5154 "empty directories was not worth the limited benefit this feature would bring."
5155 msgstr ""
5157 #. type: Content of: <book><chapter><sect1><sect2><para>
5158 #: ../en/ch05-daily.xml:91
5159 msgid ""
5160 "If you need an empty directory in your repository, there are a few ways to "
5161 "achieve this. One is to create a directory, then <command role=\"hg-cmd\">hg "
5162 "add</command> a <quote>hidden</quote> file to that directory. On Unix-like "
5163 "systems, any file name that begins with a period (<quote><literal>.</"
5164 "literal></quote>) is treated as hidden by most commands and GUI tools. This "
5165 "approach is illustrated below."
5166 msgstr ""
5168 #. type: Content of: <book><chapter><sect1><sect2><para>
5169 #: ../en/ch05-daily.xml:102
5170 msgid ""
5171 "Another way to tackle a need for an empty directory is to simply create one "
5172 "in your automated build scripts before they will need it."
5173 msgstr ""
5175 #. type: Content of: <book><chapter><sect1><title>
5176 #: ../en/ch05-daily.xml:109
5177 msgid "How to stop tracking a file"
5178 msgstr "如何停止跟踪文件"
5180 #
5181 #. type: Content of: <book><chapter><sect1><para>
5182 #: ../en/ch05-daily.xml:111
5183 msgid ""
5184 "Once you decide that a file no longer belongs in your repository, use the "
5185 "<command role=\"hg-cmd\">hg remove</command> command; this deletes the file, "
5186 "and tells Mercurial to stop tracking it. A removed file is represented in "
5187 "the output of <command role=\"hg-cmd\">hg status</command> with a "
5188 "<quote><literal>R</literal></quote>."
5189 msgstr ""
5191 #. type: Content of: <book><chapter><sect1><para>
5192 #: ../en/ch05-daily.xml:120
5193 msgid ""
5194 "After you <command role=\"hg-cmd\">hg remove</command> a file, Mercurial will "
5195 "no longer track changes to that file, even if you recreate a file with the "
5196 "same name in your working directory. If you do recreate a file with the same "
5197 "name and want Mercurial to track the new file, simply <command role=\"hg-cmd"
5198 "\">hg add</command> it. Mercurial will know that the newly added file is not "
5199 "related to the old file of the same name."
5200 msgstr ""
5202 #. type: Content of: <book><chapter><sect1><sect2><title>
5203 #: ../en/ch05-daily.xml:129
5204 msgid "Removing a file does not affect its history"
5205 msgstr "删除文件不影响历史"
5207 #. type: Content of: <book><chapter><sect1><sect2><para>
5208 #: ../en/ch05-daily.xml:131
5209 msgid "It is important to understand that removing a file has only two effects."
5210 msgstr ""
5212 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
5213 #: ../en/ch05-daily.xml:134
5214 msgid "It removes the current version of the file from the working directory."
5215 msgstr ""
5217 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
5218 #: ../en/ch05-daily.xml:137
5219 msgid ""
5220 "It stops Mercurial from tracking changes to the file, from the time of the "
5221 "next commit."
5222 msgstr ""
5224 #. type: Content of: <book><chapter><sect1><sect2><para>
5225 #: ../en/ch05-daily.xml:140
5226 msgid ""
5227 "Removing a file <emphasis>does not</emphasis> in any way alter the "
5228 "<emphasis>history</emphasis> of the file."
5229 msgstr ""
5231 #. type: Content of: <book><chapter><sect1><sect2><para>
5232 #: ../en/ch05-daily.xml:143
5233 msgid ""
5234 "If you update the working directory to a changeset in which a file that you "
5235 "have removed was still tracked, it will reappear in the working directory, "
5236 "with the contents it had when you committed that changeset. If you then "
5237 "update the working directory to a later changeset, in which the file had been "
5238 "removed, Mercurial will once again remove the file from the working directory."
5239 msgstr ""
5241 #. type: Content of: <book><chapter><sect1><sect2><title>
5242 #: ../en/ch05-daily.xml:153
5243 msgid "Missing files"
5244 msgstr "丢失的文件"
5246 #. type: Content of: <book><chapter><sect1><sect2><para>
5247 #: ../en/ch05-daily.xml:155
5248 msgid ""
5249 "Mercurial considers a file that you have deleted, but not used <command role="
5250 "\"hg-cmd\">hg remove</command> to delete, to be <emphasis>missing</"
5251 "emphasis>. A missing file is represented with <quote><literal>!</literal></"
5252 "quote> in the output of <command role=\"hg-cmd\">hg status</command>. "
5253 "Mercurial commands will not generally do anything with missing files."
5254 msgstr ""
5256 #. type: Content of: <book><chapter><sect1><sect2><para>
5257 #: ../en/ch05-daily.xml:165
5258 msgid ""
5259 "If your repository contains a file that <command role=\"hg-cmd\">hg status</"
5260 "command> reports as missing, and you want the file to stay gone, you can run "
5261 "<command role=\"hg-cmd\">hg remove <option role=\"hg-opt-remove\">--after</"
5262 "option></command> at any time later on, to tell Mercurial that you really did "
5263 "mean to remove the file."
5264 msgstr ""
5266 #. type: Content of: <book><chapter><sect1><sect2><para>
5267 #: ../en/ch05-daily.xml:175
5268 msgid ""
5269 "On the other hand, if you deleted the missing file by accident, give <command "
5270 "role=\"hg-cmd\">hg revert</command> the name of the file to recover. It will "
5271 "reappear, in unmodified form."
5272 msgstr ""
5274 #. type: Content of: <book><chapter><sect1><sect2><title>
5275 #: ../en/ch05-daily.xml:184
5276 msgid "Aside: why tell Mercurial explicitly to remove a file?"
5277 msgstr "旁白: 为什么要明确告诉 Mercurial 删除文件?"
5279 #. type: Content of: <book><chapter><sect1><sect2><para>
5280 #: ../en/ch05-daily.xml:187
5281 msgid ""
5282 "You might wonder why Mercurial requires you to explicitly tell it that you "
5283 "are deleting a file. Early during the development of Mercurial, it let you "
5284 "delete a file however you pleased; Mercurial would notice the absence of the "
5285 "file automatically when you next ran a <command role=\"hg-cmd\">hg commit</"
5286 "command>, and stop tracking the file. In practice, this made it too easy to "
5287 "accidentally remove a file without noticing."
5288 msgstr ""
5290 #. type: Content of: <book><chapter><sect1><sect2><title>
5291 #: ../en/ch05-daily.xml:198
5292 msgid "Useful shorthand&emdash;adding and removing files in one step"
5293 msgstr "有用的速记&emdash;一个步骤添加和删除文件"
5295 #. type: Content of: <book><chapter><sect1><sect2><para>
5296 #: ../en/ch05-daily.xml:201
5297 msgid ""
5298 "Mercurial offers a combination command, <command role=\"hg-cmd\">hg "
5299 "addremove</command>, that adds untracked files and marks missing files as "
5300 "removed."
5301 msgstr ""
5303 #. type: Content of: <book><chapter><sect1><sect2><para>
5304 #: ../en/ch05-daily.xml:207
5305 msgid ""
5306 "The <command role=\"hg-cmd\">hg commit</command> command also provides a "
5307 "<option role=\"hg-opt-commit\">-A</option> option that performs this same add-"
5308 "and-remove, immediately followed by a commit."
5309 msgstr ""
5311 #. type: Content of: <book><chapter><sect1><title>
5312 #: ../en/ch05-daily.xml:217
5313 msgid "Copying files"
5314 msgstr "复制文件"
5316 #. type: Content of: <book><chapter><sect1><para>
5317 #: ../en/ch05-daily.xml:219
5318 msgid ""
5319 "Mercurial provides a <command role=\"hg-cmd\">hg copy</command> command that "
5320 "lets you make a new copy of a file. When you copy a file using this command, "
5321 "Mercurial makes a record of the fact that the new file is a copy of the "
5322 "original file. It treats these copied files specially when you merge your "
5323 "work with someone else's."
5324 msgstr ""
5326 #. type: Content of: <book><chapter><sect1><sect2><title>
5327 #: ../en/ch05-daily.xml:227
5328 msgid "The results of copying during a merge"
5329 msgstr "合并期间的复制结果"
5331 #. type: Content of: <book><chapter><sect1><sect2><para>
5332 #: ../en/ch05-daily.xml:229
5333 msgid ""
5334 "What happens during a merge is that changes <quote>follow</quote> a copy. To "
5335 "best illustrate what this means, let's create an example. We'll start with "
5336 "the usual tiny repository that contains a single file."
5337 msgstr ""
5339 #. type: Content of: <book><chapter><sect1><sect2><para>
5340 #: ../en/ch05-daily.xml:236
5341 msgid ""
5342 "We need to do some work in parallel, so that we'll have something to merge. "
5343 "So let's clone our repository."
5344 msgstr ""
5346 #. type: Content of: <book><chapter><sect1><sect2><para>
5347 #: ../en/ch05-daily.xml:242
5348 msgid ""
5349 "Back in our initial repository, let's use the <command role=\"hg-cmd\">hg "
5350 "copy</command> command to make a copy of the first file we created."
5351 msgstr ""
5353 #. type: Content of: <book><chapter><sect1><sect2><para>
5354 #: ../en/ch05-daily.xml:248
5355 msgid ""
5356 "If we look at the output of the <command role=\"hg-cmd\">hg status</command> "
5357 "command afterwards, the copied file looks just like a normal added file."
5358 msgstr ""
5360 #. type: Content of: <book><chapter><sect1><sect2><para>
5361 #: ../en/ch05-daily.xml:254
5362 msgid ""
5363 "But if we pass the <option role=\"hg-opt-status\">-C</option> option to "
5364 "<command role=\"hg-cmd\">hg status</command>, it prints another line of "
5365 "output: this is the file that our newly-added file was copied <emphasis>from</"
5366 "emphasis>."
5367 msgstr ""
5369 #. type: Content of: <book><chapter><sect1><sect2><para>
5370 #: ../en/ch05-daily.xml:262
5371 msgid ""
5372 "Now, back in the repository we cloned, let's make a change in parallel. "
5373 "We'll add a line of content to the original file that we created."
5374 msgstr ""
5376 #. type: Content of: <book><chapter><sect1><sect2><para>
5377 #: ../en/ch05-daily.xml:268
5378 msgid ""
5379 "Now we have a modified <filename>file</filename> in this repository. When we "
5380 "pull the changes from the first repository, and merge the two heads, "
5381 "Mercurial will propagate the changes that we made locally to <filename>file</"
5382 "filename> into its copy, <filename>new-file</filename>."
5383 msgstr ""
5385 #. type: Content of: <book><chapter><sect1><sect2><title>
5386 #: ../en/ch05-daily.xml:278
5387 msgid "Why should changes follow copies?"
5388 msgstr "为什么复制后需要后续修改?"
5390 #. type: Content of: <book><chapter><sect1><sect2><para>
5391 #: ../en/ch05-daily.xml:280
5392 msgid ""
5393 "This behaviour, of changes to a file propagating out to copies of the file, "
5394 "might seem esoteric, but in most cases it's highly desirable."
5395 msgstr ""
5397 #. type: Content of: <book><chapter><sect1><sect2><para>
5398 #: ../en/ch05-daily.xml:284
5399 msgid ""
5400 "First of all, remember that this propagation <emphasis>only</emphasis> "
5401 "happens when you merge. So if you <command role=\"hg-cmd\">hg copy</command> "
5402 "a file, and subsequently modify the original file during the normal course of "
5403 "your work, nothing will happen."
5404 msgstr ""
5406 #. type: Content of: <book><chapter><sect1><sect2><para>
5407 #: ../en/ch05-daily.xml:290
5408 msgid ""
5409 "The second thing to know is that modifications will only propagate across a "
5410 "copy as long as the repository that you're pulling changes from "
5411 "<emphasis>doesn't know</emphasis> about the copy."
5412 msgstr ""
5414 #. type: Content of: <book><chapter><sect1><sect2><para>
5415 #: ../en/ch05-daily.xml:295
5416 msgid ""
5417 "The reason that Mercurial does this is as follows. Let's say I make an "
5418 "important bug fix in a source file, and commit my changes. Meanwhile, you've "
5419 "decided to <command role=\"hg-cmd\">hg copy</command> the file in your "
5420 "repository, without knowing about the bug or having seen the fix, and you "
5421 "have started hacking on your copy of the file."
5422 msgstr ""
5424 #. type: Content of: <book><chapter><sect1><sect2><para>
5425 #: ../en/ch05-daily.xml:302
5426 msgid ""
5427 "If you pulled and merged my changes, and Mercurial <emphasis>didn't</"
5428 "emphasis> propagate changes across copies, your source file would now contain "
5429 "the bug, and unless you remembered to propagate the bug fix by hand, the bug "
5430 "would <emphasis>remain</emphasis> in your copy of the file."
5431 msgstr ""
5433 #. type: Content of: <book><chapter><sect1><sect2><para>
5434 #: ../en/ch05-daily.xml:308
5435 msgid ""
5436 "By automatically propagating the change that fixed the bug from the original "
5437 "file to the copy, Mercurial prevents this class of problem. To my knowledge, "
5438 "Mercurial is the <emphasis>only</emphasis> revision control system that "
5439 "propagates changes across copies like this."
5440 msgstr ""
5442 #. type: Content of: <book><chapter><sect1><sect2><para>
5443 #: ../en/ch05-daily.xml:314
5444 msgid ""
5445 "Once your change history has a record that the copy and subsequent merge "
5446 "occurred, there's usually no further need to propagate changes from the "
5447 "original file to the copied file, and that's why Mercurial only propagates "
5448 "changes across copies until this point, and no further."
5449 msgstr ""
5451 #. type: Content of: <book><chapter><sect1><sect2><title>
5452 #: ../en/ch05-daily.xml:322
5453 msgid "How to make changes <emphasis>not</emphasis> follow a copy"
5454 msgstr "如何让复制后<emphasis>不</emphasis>修改?"
5456 #. type: Content of: <book><chapter><sect1><sect2><para>
5457 #: ../en/ch05-daily.xml:325
5458 msgid ""
5459 "If, for some reason, you decide that this business of automatically "
5460 "propagating changes across copies is not for you, simply use your system's "
5461 "normal file copy command (on Unix-like systems, that's <command>cp</command>) "
5462 "to make a copy of a file, then <command role=\"hg-cmd\">hg add</command> the "
5463 "new copy by hand. Before you do so, though, please do reread section <xref "
5464 "linkend=\"sec.daily.why-copy\"/>, and make an informed decision that this "
5465 "behaviour is not appropriate to your specific case."
5466 msgstr ""
5468 #. type: Content of: <book><chapter><sect1><sect2><title>
5469 #: ../en/ch05-daily.xml:338
5470 msgid "Behaviour of the <command role=\"hg-cmd\">hg copy</command> command"
5471 msgstr "命令 <command role=\"hg-cmd\">hg copy</command> 的特性"
5473 #. type: Content of: <book><chapter><sect1><sect2><para>
5474 #: ../en/ch05-daily.xml:341
5475 msgid ""
5476 "When you use the <command role=\"hg-cmd\">hg copy</command> command, "
5477 "Mercurial makes a copy of each source file as it currently stands in the "
5478 "working directory. This means that if you make some modifications to a file, "
5479 "then <command role=\"hg-cmd\">hg copy</command> it without first having "
5480 "committed those changes, the new copy will also contain the modifications you "
5481 "have made up until that point. (I find this behaviour a little "
5482 "counterintuitive, which is why I mention it here.)"
5483 msgstr ""
5485 #. type: Content of: <book><chapter><sect1><sect2><para>
5486 #: ../en/ch05-daily.xml:351
5487 msgid ""
5488 "The <command role=\"hg-cmd\">hg copy</command> command acts similarly to the "
5489 "Unix <command>cp</command> command (you can use the <command role=\"hg-cmd"
5490 "\">hg cp</command> alias if you prefer). The last argument is the "
5491 "<emphasis>destination</emphasis>, and all prior arguments are "
5492 "<emphasis>sources</emphasis>. If you pass it a single file as the source, "
5493 "and the destination does not exist, it creates a new file with that name."
5494 msgstr ""
5496 #. type: Content of: <book><chapter><sect1><sect2><para>
5497 #: ../en/ch05-daily.xml:362
5498 msgid ""
5499 "If the destination is a directory, Mercurial copies its sources into that "
5500 "directory."
5501 msgstr ""
5503 #. type: Content of: <book><chapter><sect1><sect2><para>
5504 #: ../en/ch05-daily.xml:367
5505 msgid ""
5506 "Copying a directory is recursive, and preserves the directory structure of "
5507 "the source."
5508 msgstr ""
5510 #. type: Content of: <book><chapter><sect1><sect2><para>
5511 #: ../en/ch05-daily.xml:373
5512 msgid ""
5513 "If the source and destination are both directories, the source tree is "
5514 "recreated in the destination directory."
5515 msgstr ""
5517 #
5518 #. type: Content of: <book><chapter><sect1><sect2><para>
5519 #: ../en/ch05-daily.xml:378
5520 msgid ""
5521 "As with the <command role=\"hg-cmd\">hg rename</command> command, if you copy "
5522 "a file manually and then want Mercurial to know that you've copied the file, "
5523 "simply use the <option role=\"hg-opt-copy\">--after</option> option to "
5524 "<command role=\"hg-cmd\">hg copy</command>."
5525 msgstr ""
5527 #. type: Content of: <book><chapter><sect1><title>
5528 #: ../en/ch05-daily.xml:389
5529 msgid "Renaming files"
5530 msgstr "改名文件"
5532 #. type: Content of: <book><chapter><sect1><para>
5533 #: ../en/ch05-daily.xml:391
5534 msgid ""
5535 "It's rather more common to need to rename a file than to make a copy of it. "
5536 "The reason I discussed the <command role=\"hg-cmd\">hg copy</command> command "
5537 "before talking about renaming files is that Mercurial treats a rename in "
5538 "essentially the same way as a copy. Therefore, knowing what Mercurial does "
5539 "when you copy a file tells you what to expect when you rename a file."
5540 msgstr ""
5542 #. type: Content of: <book><chapter><sect1><para>
5543 #: ../en/ch05-daily.xml:399
5544 msgid ""
5545 "When you use the <command role=\"hg-cmd\">hg rename</command> command, "
5546 "Mercurial makes a copy of each source file, then deletes it and marks the "
5547 "file as removed."
5548 msgstr ""
5550 #. type: Content of: <book><chapter><sect1><para>
5551 #: ../en/ch05-daily.xml:405
5552 msgid ""
5553 "The <command role=\"hg-cmd\">hg status</command> command shows the newly "
5554 "copied file as added, and the copied-from file as removed."
5555 msgstr ""
5557 #. type: Content of: <book><chapter><sect1><para>
5558 #: ../en/ch05-daily.xml:411
5559 msgid ""
5560 "As with the results of a <command role=\"hg-cmd\">hg copy</command>, we must "
5561 "use the <option role=\"hg-opt-status\">-C</option> option to <command role="
5562 "\"hg-cmd\">hg status</command> to see that the added file is really being "
5563 "tracked by Mercurial as a copy of the original, now removed, file."
5564 msgstr ""
5566 #. type: Content of: <book><chapter><sect1><para>
5567 #: ../en/ch05-daily.xml:420
5568 msgid ""
5569 "As with <command role=\"hg-cmd\">hg remove</command> and <command role=\"hg-"
5570 "cmd\">hg copy</command>, you can tell Mercurial about a rename after the fact "
5571 "using the <option role=\"hg-opt-rename\">--after</option> option. In most "
5572 "other respects, the behaviour of the <command role=\"hg-cmd\">hg rename</"
5573 "command> command, and the options it accepts, are similar to the <command "
5574 "role=\"hg-cmd\">hg copy</command> command."
5575 msgstr ""
5577 #. type: Content of: <book><chapter><sect1><sect2><title>
5578 #: ../en/ch05-daily.xml:430
5579 msgid "Renaming files and merging changes"
5580 msgstr "改名文件与合并修改"
5582 #. type: Content of: <book><chapter><sect1><sect2><para>
5583 #: ../en/ch05-daily.xml:432
5584 msgid ""
5585 "Since Mercurial's rename is implemented as copy-and-remove, the same "
5586 "propagation of changes happens when you merge after a rename as after a copy."
5587 msgstr ""
5589 #. type: Content of: <book><chapter><sect1><sect2><para>
5590 #: ../en/ch05-daily.xml:436
5591 msgid ""
5592 "If I modify a file, and you rename it to a new name, and then we merge our "
5593 "respective changes, my modifications to the file under its original name will "
5594 "be propagated into the file under its new name. (This is something you might "
5595 "expect to <quote>simply work,</quote> but not all revision control systems "
5596 "actually do this.)"
5597 msgstr ""
5599 #. type: Content of: <book><chapter><sect1><sect2><para>
5600 #: ../en/ch05-daily.xml:443
5601 msgid ""
5602 "Whereas having changes follow a copy is a feature where you can perhaps nod "
5603 "and say <quote>yes, that might be useful,</quote> it should be clear that "
5604 "having them follow a rename is definitely important. Without this facility, "
5605 "it would simply be too easy for changes to become orphaned when files are "
5606 "renamed."
5607 msgstr ""
5609 #. type: Content of: <book><chapter><sect1><sect2><title>
5610 #: ../en/ch05-daily.xml:452
5611 msgid "Divergent renames and merging"
5612 msgstr "改名与合并的分歧"
5614 #. type: Content of: <book><chapter><sect1><sect2><para>
5615 #: ../en/ch05-daily.xml:454
5616 msgid ""
5617 "The case of diverging names occurs when two developers start with a "
5618 "file&emdash;let's call it <filename>foo</filename>&emdash;in their respective "
5619 "repositories."
5620 msgstr ""
5622 #. type: Content of: <book><chapter><sect1><sect2><para>
5623 #: ../en/ch05-daily.xml:461
5624 msgid "Anne renames the file to <filename>bar</filename>."
5625 msgstr ""
5627 #. type: Content of: <book><chapter><sect1><sect2><para>
5628 #: ../en/ch05-daily.xml:465
5629 msgid "Meanwhile, Bob renames it to <filename>quux</filename>."
5630 msgstr ""
5632 #. type: Content of: <book><chapter><sect1><sect2><para>
5633 #: ../en/ch05-daily.xml:470
5634 msgid ""
5635 "I like to think of this as a conflict because each developer has expressed "
5636 "different intentions about what the file ought to be named."
5637 msgstr ""
5639 #
5640 #. type: Content of: <book><chapter><sect1><sect2><para>
5641 #: ../en/ch05-daily.xml:474
5642 msgid ""
5643 "What do you think should happen when they merge their work? Mercurial's "
5644 "actual behaviour is that it always preserves <emphasis>both</emphasis> names "
5645 "when it merges changesets that contain divergent renames."
5646 msgstr ""
5648 #. type: Content of: <book><chapter><sect1><sect2><para>
5649 #: ../en/ch05-daily.xml:481
5650 msgid ""
5651 "Notice that Mercurial does warn about the divergent renames, but it leaves it "
5652 "up to you to do something about the divergence after the merge."
5653 msgstr ""
5655 #. type: Content of: <book><chapter><sect1><sect2><title>
5656 #: ../en/ch05-daily.xml:487
5657 msgid "Convergent renames and merging"
5658 msgstr "收敛改名与合并"
5660 #. type: Content of: <book><chapter><sect1><sect2><para>
5661 #: ../en/ch05-daily.xml:489
5662 msgid ""
5663 "Another kind of rename conflict occurs when two people choose to rename "
5664 "different <emphasis>source</emphasis> files to the same "
5665 "<emphasis>destination</emphasis>. In this case, Mercurial runs its normal "
5666 "merge machinery, and lets you guide it to a suitable resolution."
5667 msgstr ""
5669 #. type: Content of: <book><chapter><sect1><sect2><title>
5670 #: ../en/ch05-daily.xml:497
5671 msgid "Other name-related corner cases"
5672 msgstr "其它名称相关的角落"
5674 #. type: Content of: <book><chapter><sect1><sect2><para>
5675 #: ../en/ch05-daily.xml:499
5676 msgid ""
5677 "Mercurial has a longstanding bug in which it fails to handle a merge where "
5678 "one side has a file with a given name, while another has a directory with the "
5679 "same name. This is documented as <ulink role=\"hg-bug\" url=\"http://www."
5680 "selenic.com/mercurial/bts/issue29\">issue 29</ulink>."
5681 msgstr ""
5683 #. type: Content of: <book><chapter><sect1><title>
5684 #: ../en/ch05-daily.xml:511
5685 msgid "Recovering from mistakes"
5686 msgstr "从错误恢复"
5688 #. type: Content of: <book><chapter><sect1><para>
5689 #: ../en/ch05-daily.xml:513
5690 msgid ""
5691 "Mercurial has some useful commands that will help you to recover from some "
5692 "common mistakes."
5693 msgstr ""
5695 #. type: Content of: <book><chapter><sect1><para>
5696 #: ../en/ch05-daily.xml:516
5697 msgid ""
5698 "The <command role=\"hg-cmd\">hg revert</command> command lets you undo "
5699 "changes that you have made to your working directory. For example, if you "
5700 "<command role=\"hg-cmd\">hg add</command> a file by accident, just run "
5701 "<command role=\"hg-cmd\">hg revert</command> with the name of the file you "
5702 "added, and while the file won't be touched in any way, it won't be tracked "
5703 "for adding by Mercurial any longer, either. You can also use <command role="
5704 "\"hg-cmd\">hg revert</command> to get rid of erroneous changes to a file."
5705 msgstr ""
5707 #. type: Content of: <book><chapter><sect1><para>
5708 #: ../en/ch05-daily.xml:526
5709 msgid ""
5710 "It's useful to remember that the <command role=\"hg-cmd\">hg revert</command> "
5711 "command is useful for changes that you have not yet committed. Once you've "
5712 "committed a change, if you decide it was a mistake, you can still do "
5713 "something about it, though your options may be more limited."
5714 msgstr ""
5716 #. type: Content of: <book><chapter><sect1><para>
5717 #: ../en/ch05-daily.xml:532
5718 msgid ""
5719 "For more information about the <command role=\"hg-cmd\">hg revert</command> "
5720 "command, and details about how to deal with changes you have already "
5721 "committed, see chapter <xref linkend=\"chap.undo\"/>."
5722 msgstr ""
5724 #. type: Content of: <book><chapter><title>
5725 #: ../en/ch06-collab.xml:5
5726 msgid "Collaborating with other people"
5727 msgstr "团体协作"
5729 #. type: Content of: <book><chapter><para>
5730 #: ../en/ch06-collab.xml:7
5731 msgid ""
5732 "As a completely decentralised tool, Mercurial doesn't impose any policy on "
5733 "how people ought to work with each other. However, if you're new to "
5734 "distributed revision control, it helps to have some tools and examples in "
5735 "mind when you're thinking about possible workflow models."
5736 msgstr ""
5738 #. type: Content of: <book><chapter><sect1><title>
5739 #: ../en/ch06-collab.xml:14
5740 msgid "Mercurial's web interface"
5741 msgstr "Mercurial 的 web 接口"
5743 #. type: Content of: <book><chapter><sect1><para>
5744 #: ../en/ch06-collab.xml:16
5745 msgid ""
5746 "Mercurial has a powerful web interface that provides several useful "
5747 "capabilities."
5748 msgstr ""
5750 #. type: Content of: <book><chapter><sect1><para>
5751 #: ../en/ch06-collab.xml:19
5752 msgid ""
5753 "For interactive use, the web interface lets you browse a single repository or "
5754 "a collection of repositories. You can view the history of a repository, "
5755 "examine each change (comments and diffs), and view the contents of each "
5756 "directory and file."
5757 msgstr ""
5759 #. type: Content of: <book><chapter><sect1><para>
5760 #: ../en/ch06-collab.xml:24
5761 msgid ""
5762 "Also for human consumption, the web interface provides an RSS feed of the "
5763 "changes in a repository. This lets you <quote>subscribe</quote> to a "
5764 "repository using your favourite feed reader, and be automatically notified of "
5765 "activity in that repository as soon as it happens. I find this capability "
5766 "much more convenient than the model of subscribing to a mailing list to which "
5767 "notifications are sent, as it requires no additional configuration on the "
5768 "part of whoever is serving the repository."
5769 msgstr ""
5771 #. type: Content of: <book><chapter><sect1><para>
5772 #: ../en/ch06-collab.xml:34
5773 msgid ""
5774 "The web interface also lets remote users clone a repository, pull changes "
5775 "from it, and (when the server is configured to permit it) push changes back "
5776 "to it. Mercurial's HTTP tunneling protocol aggressively compresses data, so "
5777 "that it works efficiently even over low-bandwidth network connections."
5778 msgstr ""
5780 #. type: Content of: <book><chapter><sect1><para>
5781 #: ../en/ch06-collab.xml:40
5782 msgid ""
5783 "The easiest way to get started with the web interface is to use your web "
5784 "browser to visit an existing repository, such as the master Mercurial "
5785 "repository at <ulink url=\"http://www.selenic.com/repo/hg?style=gitweb"
5786 "\">http://www.selenic.com/repo/hg?style=gitweb</ulink>."
5787 msgstr ""
5789 #. type: Content of: <book><chapter><sect1><para>
5790 #: ../en/ch06-collab.xml:45
5791 msgid ""
5792 "If you're interested in providing a web interface to your own repositories, "
5793 "Mercurial provides two ways to do this. The first is using the <command role="
5794 "\"hg-cmd\">hg serve</command> command, which is best suited to short-term "
5795 "<quote>lightweight</quote> serving. See section <xref linkend=\"sec.collab."
5796 "serve\"/> below for details of how to use this command. If you have a long-"
5797 "lived repository that you'd like to make permanently available, Mercurial has "
5798 "built-in support for the CGI (Common Gateway Interface) standard, which all "
5799 "common web servers support. See section <xref linkend=\"sec.collab.cgi\"/> "
5800 "for details of CGI configuration."
5801 msgstr ""
5803 #. type: Content of: <book><chapter><sect1><title>
5804 #: ../en/ch06-collab.xml:60
5805 msgid "Collaboration models"
5806 msgstr "协作模型"
5808 #. type: Content of: <book><chapter><sect1><para>
5809 #: ../en/ch06-collab.xml:62
5810 msgid ""
5811 "With a suitably flexible tool, making decisions about workflow is much more "
5812 "of a social engineering challenge than a technical one. Mercurial imposes few "
5813 "limitations on how you can structure the flow of work in a project, so it's "
5814 "up to you and your group to set up and live with a model that matches your "
5815 "own particular needs."
5816 msgstr ""
5818 #. type: Content of: <book><chapter><sect1><sect2><title>
5819 #: ../en/ch06-collab.xml:70
5820 msgid "Factors to keep in mind"
5821 msgstr "要牢记的因素"
5823 #. type: Content of: <book><chapter><sect1><sect2><para>
5824 #: ../en/ch06-collab.xml:72
5825 msgid ""
5826 "The most important aspect of any model that you must keep in mind is how well "
5827 "it matches the needs and capabilities of the people who will be using it. "
5828 "This might seem self-evident; even so, you still can't afford to forget it "
5829 "for a moment."
5830 msgstr ""
5832 #. type: Content of: <book><chapter><sect1><sect2><para>
5833 #: ../en/ch06-collab.xml:78
5834 msgid ""
5835 "I once put together a workflow model that seemed to make perfect sense to me, "
5836 "but that caused a considerable amount of consternation and strife within my "
5837 "development team. In spite of my attempts to explain why we needed a complex "
5838 "set of branches, and how changes ought to flow between them, a few team "
5839 "members revolted. Even though they were smart people, they didn't want to "
5840 "pay attention to the constraints we were operating under, or face the "
5841 "consequences of those constraints in the details of the model that I was "
5842 "advocating."
5843 msgstr ""
5845 #. type: Content of: <book><chapter><sect1><sect2><para>
5846 #: ../en/ch06-collab.xml:88
5847 msgid ""
5848 "Don't sweep foreseeable social or technical problems under the rug. Whatever "
5849 "scheme you put into effect, you should plan for mistakes and problem "
5850 "scenarios. Consider adding automated machinery to prevent, or quickly "
5851 "recover from, trouble that you can anticipate. As an example, if you intend "
5852 "to have a branch with not-for-release changes in it, you'd do well to think "
5853 "early about the possibility that someone might accidentally merge those "
5854 "changes into a release branch. You could avoid this particular problem by "
5855 "writing a hook that prevents changes from being merged from an inappropriate "
5856 "branch."
5857 msgstr ""
5859 #. type: Content of: <book><chapter><sect1><sect2><title>
5860 #: ../en/ch06-collab.xml:102
5861 msgid "Informal anarchy"
5862 msgstr "无政府状态"
5864 #. type: Content of: <book><chapter><sect1><sect2><para>
5865 #: ../en/ch06-collab.xml:104
5866 msgid ""
5867 "I wouldn't suggest an <quote>anything goes</quote> approach as something "
5868 "sustainable, but it's a model that's easy to grasp, and it works perfectly "
5869 "well in a few unusual situations."
5870 msgstr ""
5872 #. type: Content of: <book><chapter><sect1><sect2><para>
5873 #: ../en/ch06-collab.xml:109
5874 msgid ""
5875 "As one example, many projects have a loose-knit group of collaborators who "
5876 "rarely physically meet each other. Some groups like to overcome the "
5877 "isolation of working at a distance by organising occasional <quote>sprints</"
5878 "quote>. In a sprint, a number of people get together in a single location (a "
5879 "company's conference room, a hotel meeting room, that kind of place) and "
5880 "spend several days more or less locked in there, hacking intensely on a "
5881 "handful of projects."
5882 msgstr ""
5884 #. type: Content of: <book><chapter><sect1><sect2><para>
5885 #: ../en/ch06-collab.xml:118
5886 msgid ""
5887 "A sprint is the perfect place to use the <command role=\"hg-cmd\">hg serve</"
5888 "command> command, since <command role=\"hg-cmd\">hg serve</command> does not "
5889 "require any fancy server infrastructure. You can get started with <command "
5890 "role=\"hg-cmd\">hg serve</command> in moments, by reading section <xref "
5891 "linkend=\"sec.collab.serve\"/> below. Then simply tell the person next to "
5892 "you that you're running a server, send the URL to them in an instant message, "
5893 "and you immediately have a quick-turnaround way to work together. They can "
5894 "type your URL into their web browser and quickly review your changes; or they "
5895 "can pull a bugfix from you and verify it; or they can clone a branch "
5896 "containing a new feature and try it out."
5897 msgstr ""
5899 #. type: Content of: <book><chapter><sect1><sect2><para>
5900 #: ../en/ch06-collab.xml:132
5901 msgid ""
5902 "The charm, and the problem, with doing things in an ad hoc fashion like this "
5903 "is that only people who know about your changes, and where they are, can see "
5904 "them. Such an informal approach simply doesn't scale beyond a handful "
5905 "people, because each individual needs to know about $n$ different "
5906 "repositories to pull from."
5907 msgstr ""
5909 #. type: Content of: <book><chapter><sect1><sect2><title>
5910 #: ../en/ch06-collab.xml:141
5911 msgid "A single central repository"
5912 msgstr "单一中央版本库"
5914 #. type: Content of: <book><chapter><sect1><sect2><para>
5915 #: ../en/ch06-collab.xml:143
5916 msgid ""
5917 "For smaller projects migrating from a centralised revision control tool, "
5918 "perhaps the easiest way to get started is to have changes flow through a "
5919 "single shared central repository. This is also the most common "
5920 "<quote>building block</quote> for more ambitious workflow schemes."
5921 msgstr ""
5923 #. type: Content of: <book><chapter><sect1><sect2><para>
5924 #: ../en/ch06-collab.xml:149
5925 msgid ""
5926 "Contributors start by cloning a copy of this repository. They can pull "
5927 "changes from it whenever they need to, and some (perhaps all) developers have "
5928 "permission to push a change back when they're ready for other people to see "
5929 "it."
5930 msgstr ""
5932 #. type: Content of: <book><chapter><sect1><sect2><para>
5933 #: ../en/ch06-collab.xml:154
5934 msgid ""
5935 "Under this model, it can still often make sense for people to pull changes "
5936 "directly from each other, without going through the central repository. "
5937 "Consider a case in which I have a tentative bug fix, but I am worried that if "
5938 "I were to publish it to the central repository, it might subsequently break "
5939 "everyone else's trees as they pull it. To reduce the potential for damage, I "
5940 "can ask you to clone my repository into a temporary repository of your own "
5941 "and test it. This lets us put off publishing the potentially unsafe change "
5942 "until it has had a little testing."
5943 msgstr ""
5945 #. type: Content of: <book><chapter><sect1><sect2><para>
5946 #: ../en/ch06-collab.xml:165
5947 msgid ""
5948 "In this kind of scenario, people usually use the <command>ssh</command> "
5949 "protocol to securely push changes to the central repository, as documented in "
5950 "section <xref linkend=\"sec.collab.ssh\"/>. It's also usual to publish a "
5951 "read-only copy of the repository over HTTP using CGI, as in section <xref "
5952 "linkend=\"sec.collab.cgi\"/>. Publishing over HTTP satisfies the needs of "
5953 "people who don't have push access, and those who want to use web browsers to "
5954 "browse the repository's history."
5955 msgstr ""
5957 #. type: Content of: <book><chapter><sect1><sect2><title>
5958 #: ../en/ch06-collab.xml:178
5959 msgid "Working with multiple branches"
5960 msgstr "使用多个分支工作"
5962 #. type: Content of: <book><chapter><sect1><sect2><para>
5963 #: ../en/ch06-collab.xml:180
5964 msgid ""
5965 "Projects of any significant size naturally tend to make progress on several "
5966 "fronts simultaneously. In the case of software, it's common for a project to "
5967 "go through periodic official releases. A release might then go into "
5968 "<quote>maintenance mode</quote> for a while after its first publication; "
5969 "maintenance releases tend to contain only bug fixes, not new features. In "
5970 "parallel with these maintenance releases, one or more future releases may be "
5971 "under development. People normally use the word <quote>branch</quote> to "
5972 "refer to one of these many slightly different directions in which development "
5973 "is proceeding."
5974 msgstr ""
5976 #. type: Content of: <book><chapter><sect1><sect2><para>
5977 #: ../en/ch06-collab.xml:193
5978 msgid ""
5979 "Mercurial is particularly well suited to managing a number of simultaneous, "
5980 "but not identical, branches. Each <quote>development direction</quote> can "
5981 "live in its own central repository, and you can merge changes from one to "
5982 "another as the need arises. Because repositories are independent of each "
5983 "other, unstable changes in a development branch will never affect a stable "
5984 "branch unless someone explicitly merges those changes in."
5985 msgstr ""
5987 #. type: Content of: <book><chapter><sect1><sect2><para>
5988 #: ../en/ch06-collab.xml:202
5989 msgid ""
5990 "Here's an example of how this can work in practice. Let's say you have one "
5991 "<quote>main branch</quote> on a central server."
5992 msgstr ""
5994 #. type: Content of: <book><chapter><sect1><sect2><para>
5995 #: ../en/ch06-collab.xml:208
5996 msgid "People clone it, make changes locally, test them, and push them back."
5997 msgstr ""
5999 #. type: Content of: <book><chapter><sect1><sect2><para>
6000 #: ../en/ch06-collab.xml:211
6001 msgid ""
6002 "Once the main branch reaches a release milestone, you can use the <command "
6003 "role=\"hg-cmd\">hg tag</command> command to give a permanent name to the "
6004 "milestone revision."
6005 msgstr ""
6007 #. type: Content of: <book><chapter><sect1><sect2><para>
6008 #: ../en/ch06-collab.xml:217
6009 msgid "Let's say some ongoing development occurs on the main branch."
6010 msgstr ""
6012 #. type: Content of: <book><chapter><sect1><sect2><para>
6013 #: ../en/ch06-collab.xml:222
6014 msgid ""
6015 "Using the tag that was recorded at the milestone, people who clone that "
6016 "repository at any time in the future can use <command role=\"hg-cmd\">hg "
6017 "update</command> to get a copy of the working directory exactly as it was "
6018 "when that tagged revision was committed."
6019 msgstr ""
6021 #
6022 #. type: Content of: <book><chapter><sect1><sect2><para>
6023 #: ../en/ch06-collab.xml:230
6024 msgid ""
6025 "In addition, immediately after the main branch is tagged, someone can then "
6026 "clone the main branch on the server to a new <quote>stable</quote> branch, "
6027 "also on the server."
6028 msgstr ""
6030 #. type: Content of: <book><chapter><sect1><sect2><para>
6031 #: ../en/ch06-collab.xml:236
6032 msgid ""
6033 "Someone who needs to make a change to the stable branch can then clone "
6034 "<emphasis>that</emphasis> repository, make their changes, commit, and push "
6035 "their changes back there."
6036 msgstr ""
6038 #. type: Content of: <book><chapter><sect1><sect2><para>
6039 #: ../en/ch06-collab.xml:242
6040 msgid ""
6041 "Because Mercurial repositories are independent, and Mercurial doesn't move "
6042 "changes around automatically, the stable and main branches are "
6043 "<emphasis>isolated</emphasis> from each other. The changes that you made on "
6044 "the main branch don't <quote>leak</quote> to the stable branch, and vice "
6045 "versa."
6046 msgstr ""
6048 #. type: Content of: <book><chapter><sect1><sect2><para>
6049 #: ../en/ch06-collab.xml:249
6050 msgid ""
6051 "You'll often want all of your bugfixes on the stable branch to show up on the "
6052 "main branch, too. Rather than rewrite a bugfix on the main branch, you can "
6053 "simply pull and merge changes from the stable to the main branch, and "
6054 "Mercurial will bring those bugfixes in for you."
6055 msgstr ""
6057 #. type: Content of: <book><chapter><sect1><sect2><para>
6058 #: ../en/ch06-collab.xml:257
6059 msgid ""
6060 "The main branch will still contain changes that are not on the stable branch, "
6061 "but it will also contain all of the bugfixes from the stable branch. The "
6062 "stable branch remains unaffected by these changes."
6063 msgstr ""
6065 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
6066 #: ../en/ch06-collab.xml:264 ../en/ch06-collab.xml:278
6067 msgid "Feature branches"
6068 msgstr "特性分支"
6070 #. type: Content of: <book><chapter><sect1><sect2><para>
6071 #: ../en/ch06-collab.xml:266
6072 msgid ""
6073 "For larger projects, an effective way to manage change is to break up a team "
6074 "into smaller groups. Each group has a shared branch of its own, cloned from "
6075 "a single <quote>master</quote> branch used by the entire project. People "
6076 "working on an individual branch are typically quite isolated from "
6077 "developments on other branches."
6078 msgstr ""
6080 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
6081 #: ../en/ch06-collab.xml:275
6082 msgid ""
6083 "<imageobject><imagedata fileref=\"images/feature-branches.png\"/> </"
6084 "imageobject>"
6085 msgstr ""
6087 #. type: Content of: <book><chapter><sect1><sect2><para>
6088 #: ../en/ch06-collab.xml:283
6089 msgid ""
6090 "When a particular feature is deemed to be in suitable shape, someone on that "
6091 "feature team pulls and merges from the master branch into the feature branch, "
6092 "then pushes back up to the master branch."
6093 msgstr ""
6095 #. type: Content of: <book><chapter><sect1><sect2><title>
6096 #: ../en/ch06-collab.xml:290
6097 msgid "The release train"
6098 msgstr "发布列车"
6100 #. type: Content of: <book><chapter><sect1><sect2><para>
6101 #: ../en/ch06-collab.xml:292
6102 msgid ""
6103 "Some projects are organised on a <quote>train</quote> basis: a release is "
6104 "scheduled to happen every few months, and whatever features are ready when "
6105 "the <quote>train</quote> is ready to leave are allowed in."
6106 msgstr ""
6108 #. type: Content of: <book><chapter><sect1><sect2><para>
6109 #: ../en/ch06-collab.xml:297
6110 msgid ""
6111 "This model resembles working with feature branches. The difference is that "
6112 "when a feature branch misses a train, someone on the feature team pulls and "
6113 "merges the changes that went out on that train release into the feature "
6114 "branch, and the team continues its work on top of that release so that their "
6115 "feature can make the next release."
6116 msgstr ""
6118 #. type: Content of: <book><chapter><sect1><sect2><title>
6119 #: ../en/ch06-collab.xml:306
6120 msgid "The Linux kernel model"
6121 msgstr "Linux 内核模型"
6123 #. type: Content of: <book><chapter><sect1><sect2><para>
6124 #: ../en/ch06-collab.xml:308
6125 msgid ""
6126 "The development of the Linux kernel has a shallow hierarchical structure, "
6127 "surrounded by a cloud of apparent chaos. Because most Linux developers use "
6128 "<command>git</command>, a distributed revision control tool with capabilities "
6129 "similar to Mercurial, it's useful to describe the way work flows in that "
6130 "environment; if you like the ideas, the approach translates well across tools."
6131 msgstr ""
6133 #. type: Content of: <book><chapter><sect1><sect2><para>
6134 #: ../en/ch06-collab.xml:316
6135 msgid ""
6136 "At the center of the community sits Linus Torvalds, the creator of Linux. He "
6137 "publishes a single source repository that is considered the "
6138 "<quote>authoritative</quote> current tree by the entire developer community. "
6139 "Anyone can clone Linus's tree, but he is very choosy about whose trees he "
6140 "pulls from."
6141 msgstr ""
6143 #. type: Content of: <book><chapter><sect1><sect2><para>
6144 #: ../en/ch06-collab.xml:323
6145 msgid ""
6146 "Linus has a number of <quote>trusted lieutenants</quote>. As a general rule, "
6147 "he pulls whatever changes they publish, in most cases without even reviewing "
6148 "those changes. Some of those lieutenants are generally agreed to be "
6149 "<quote>maintainers</quote>, responsible for specific subsystems within the "
6150 "kernel. If a random kernel hacker wants to make a change to a subsystem that "
6151 "they want to end up in Linus's tree, they must find out who the subsystem's "
6152 "maintainer is, and ask that maintainer to take their change. If the "
6153 "maintainer reviews their changes and agrees to take them, they'll pass them "
6154 "along to Linus in due course."
6155 msgstr ""
6157 #. type: Content of: <book><chapter><sect1><sect2><para>
6158 #: ../en/ch06-collab.xml:335
6159 msgid ""
6160 "Individual lieutenants have their own approaches to reviewing, accepting, and "
6161 "publishing changes; and for deciding when to feed them to Linus. In "
6162 "addition, there are several well known branches that people use for different "
6163 "purposes. For example, a few people maintain <quote>stable</quote> "
6164 "repositories of older versions of the kernel, to which they apply critical "
6165 "fixes as needed. Some maintainers publish multiple trees: one for "
6166 "experimental changes; one for changes that they are about to feed upstream; "
6167 "and so on. Others just publish a single tree."
6168 msgstr ""
6170 #. type: Content of: <book><chapter><sect1><sect2><para>
6171 #: ../en/ch06-collab.xml:346
6172 msgid ""
6173 "This model has two notable features. The first is that it's <quote>pull "
6174 "only</quote>. You have to ask, convince, or beg another developer to take a "
6175 "change from you, because there are almost no trees to which more than one "
6176 "person can push, and there's no way to push changes into a tree that someone "
6177 "else controls."
6178 msgstr ""
6180 #. type: Content of: <book><chapter><sect1><sect2><para>
6181 #: ../en/ch06-collab.xml:353
6182 msgid ""
6183 "The second is that it's based on reputation and acclaim. If you're an "
6184 "unknown, Linus will probably ignore changes from you without even "
6185 "responding. But a subsystem maintainer will probably review them, and will "
6186 "likely take them if they pass their criteria for suitability. The more "
6187 "<quote>good</quote> changes you contribute to a maintainer, the more likely "
6188 "they are to trust your judgment and accept your changes. If you're well-"
6189 "known and maintain a long-lived branch for something Linus hasn't yet "
6190 "accepted, people with similar interests may pull your changes regularly to "
6191 "keep up with your work."
6192 msgstr ""
6194 #. type: Content of: <book><chapter><sect1><sect2><para>
6195 #: ../en/ch06-collab.xml:364
6196 msgid ""
6197 "Reputation and acclaim don't necessarily cross subsystem or <quote>people</"
6198 "quote> boundaries. If you're a respected but specialised storage hacker, and "
6199 "you try to fix a networking bug, that change will receive a level of scrutiny "
6200 "from a network maintainer comparable to a change from a complete stranger."
6201 msgstr ""
6203 #. type: Content of: <book><chapter><sect1><sect2><para>
6204 #: ../en/ch06-collab.xml:371
6205 msgid ""
6206 "To people who come from more orderly project backgrounds, the comparatively "
6207 "chaotic Linux kernel development process often seems completely insane. It's "
6208 "subject to the whims of individuals; people make sweeping changes whenever "
6209 "they deem it appropriate; and the pace of development is astounding. And yet "
6210 "Linux is a highly successful, well-regarded piece of software."
6211 msgstr ""
6213 #. type: Content of: <book><chapter><sect1><sect2><title>
6214 #: ../en/ch06-collab.xml:381
6215 msgid "Pull-only versus shared-push collaboration"
6216 msgstr "只读与共享写协作"
6218 #. type: Content of: <book><chapter><sect1><sect2><para>
6219 #: ../en/ch06-collab.xml:383
6220 msgid ""
6221 "A perpetual source of heat in the open source community is whether a "
6222 "development model in which people only ever pull changes from others is "
6223 "<quote>better than</quote> one in which multiple people can push changes to a "
6224 "shared repository."
6225 msgstr ""
6227 #. type: Content of: <book><chapter><sect1><sect2><para>
6228 #: ../en/ch06-collab.xml:389
6229 msgid ""
6230 "Typically, the backers of the shared-push model use tools that actively "
6231 "enforce this approach. If you're using a centralised revision control tool "
6232 "such as Subversion, there's no way to make a choice over which model you'll "
6233 "use: the tool gives you shared-push, and if you want to do anything else, "
6234 "you'll have to roll your own approach on top (such as applying a patch by "
6235 "hand)."
6236 msgstr ""
6238 #. type: Content of: <book><chapter><sect1><sect2><para>
6239 #: ../en/ch06-collab.xml:397
6240 msgid ""
6241 "A good distributed revision control tool, such as Mercurial, will support "
6242 "both models. You and your collaborators can then structure how you work "
6243 "together based on your own needs and preferences, not on what contortions "
6244 "your tools force you into."
6245 msgstr ""
6247 #. type: Content of: <book><chapter><sect1><sect2><title>
6248 #: ../en/ch06-collab.xml:405
6249 msgid "Where collaboration meets branch management"
6250 msgstr "协作与分支管理"
6252 #. type: Content of: <book><chapter><sect1><sect2><para>
6253 #: ../en/ch06-collab.xml:407
6254 msgid ""
6255 "Once you and your team set up some shared repositories and start propagating "
6256 "changes back and forth between local and shared repos, you begin to face a "
6257 "related, but slightly different challenge: that of managing the multiple "
6258 "directions in which your team may be moving at once. Even though this "
6259 "subject is intimately related to how your team collaborates, it's dense "
6260 "enough to merit treatment of its own, in chapter <xref linkend=\"chap.branch"
6261 "\"/>."
6262 msgstr ""
6264 #. type: Content of: <book><chapter><sect1><title>
6265 #: ../en/ch06-collab.xml:419
6266 msgid "The technical side of sharing"
6267 msgstr "共享的技术因素"
6269 #. type: Content of: <book><chapter><sect1><para>
6270 #: ../en/ch06-collab.xml:421
6271 msgid ""
6272 "The remainder of this chapter is devoted to the question of serving data to "
6273 "your collaborators."
6274 msgstr ""
6276 #. type: Content of: <book><chapter><sect1><title>
6277 #: ../en/ch06-collab.xml:426
6278 msgid "Informal sharing with <command role=\"hg-cmd\">hg serve</command>"
6279 msgstr "使用 <command role=\"hg-cmd\">hg serve</command> 进行非正式共享"
6281 #. type: Content of: <book><chapter><sect1><para>
6282 #: ../en/ch06-collab.xml:429
6283 msgid ""
6284 "Mercurial's <command role=\"hg-cmd\">hg serve</command> command is "
6285 "wonderfully suited to small, tight-knit, and fast-paced group environments. "
6286 "It also provides a great way to get a feel for using Mercurial commands over "
6287 "a network."
6288 msgstr ""
6290 #. type: Content of: <book><chapter><sect1><para>
6291 #: ../en/ch06-collab.xml:434
6292 msgid ""
6293 "Run <command role=\"hg-cmd\">hg serve</command> inside a repository, and in "
6294 "under a second it will bring up a specialised HTTP server; this will accept "
6295 "connections from any client, and serve up data for that repository until you "
6296 "terminate it. Anyone who knows the URL of the server you just started, and "
6297 "can talk to your computer over the network, can then use a web browser or "
6298 "Mercurial to read data from that repository. A URL for a <command role=\"hg-"
6299 "cmd\">hg serve</command> instance running on a laptop is likely to look "
6300 "something like <literal>http://my-laptop.local:8000/</literal>."
6301 msgstr ""
6303 #. type: Content of: <book><chapter><sect1><para>
6304 #: ../en/ch06-collab.xml:445
6305 msgid ""
6306 "The <command role=\"hg-cmd\">hg serve</command> command is <emphasis>not</"
6307 "emphasis> a general-purpose web server. It can do only two things:"
6308 msgstr ""
6310 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
6311 #: ../en/ch06-collab.xml:449
6312 msgid ""
6313 "Allow people to browse the history of the repository it's serving, from their "
6314 "normal web browsers."
6315 msgstr ""
6317 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
6318 #: ../en/ch06-collab.xml:453
6319 msgid ""
6320 "Speak Mercurial's wire protocol, so that people can <command role=\"hg-cmd"
6321 "\">hg clone</command> or <command role=\"hg-cmd\">hg pull</command> changes "
6322 "from that repository."
6323 msgstr ""
6325 #. type: Content of: <book><chapter><sect1><para>
6326 #: ../en/ch06-collab.xml:458
6327 msgid ""
6328 "In particular, <command role=\"hg-cmd\">hg serve</command> won't allow remote "
6329 "users to <emphasis>modify</emphasis> your repository. It's intended for read-"
6330 "only use."
6331 msgstr ""
6333 #. type: Content of: <book><chapter><sect1><para>
6334 #: ../en/ch06-collab.xml:462
6335 msgid ""
6336 "If you're getting started with Mercurial, there's nothing to prevent you from "
6337 "using <command role=\"hg-cmd\">hg serve</command> to serve up a repository on "
6338 "your own computer, then use commands like <command role=\"hg-cmd\">hg clone</"
6339 "command>, <command role=\"hg-cmd\">hg incoming</command>, and so on to talk "
6340 "to that server as if the repository was hosted remotely. This can help you to "
6341 "quickly get acquainted with using commands on network-hosted repositories."
6342 msgstr ""
6344 #. type: Content of: <book><chapter><sect1><sect2><title>
6345 #: ../en/ch06-collab.xml:472
6346 msgid "A few things to keep in mind"
6347 msgstr "要牢记的几件事"
6349 #. type: Content of: <book><chapter><sect1><sect2><para>
6350 #: ../en/ch06-collab.xml:474
6351 msgid ""
6352 "Because it provides unauthenticated read access to all clients, you should "
6353 "only use <command role=\"hg-cmd\">hg serve</command> in an environment where "
6354 "you either don't care, or have complete control over, who can access your "
6355 "network and pull data from your repository."
6356 msgstr ""
6358 #. type: Content of: <book><chapter><sect1><sect2><para>
6359 #: ../en/ch06-collab.xml:480
6360 msgid ""
6361 "The <command role=\"hg-cmd\">hg serve</command> command knows nothing about "
6362 "any firewall software you might have installed on your system or network. It "
6363 "cannot detect or control your firewall software. If other people are unable "
6364 "to talk to a running <command role=\"hg-cmd\">hg serve</command> instance, "
6365 "the second thing you should do (<emphasis>after</emphasis> you make sure that "
6366 "they're using the correct URL) is check your firewall configuration."
6367 msgstr ""
6369 #. type: Content of: <book><chapter><sect1><sect2><para>
6370 #: ../en/ch06-collab.xml:489
6371 msgid ""
6372 "By default, <command role=\"hg-cmd\">hg serve</command> listens for incoming "
6373 "connections on port 8000. If another process is already listening on the "
6374 "port you want to use, you can specify a different port to listen on using the "
6375 "<option role=\"hg-opt-serve\">-p</option> option."
6376 msgstr ""
6378 #. type: Content of: <book><chapter><sect1><sect2><para>
6379 #: ../en/ch06-collab.xml:495
6380 msgid ""
6381 "Normally, when <command role=\"hg-cmd\">hg serve</command> starts, it prints "
6382 "no output, which can be a bit unnerving. If you'd like to confirm that it is "
6383 "indeed running correctly, and find out what URL you should send to your "
6384 "collaborators, start it with the <option role=\"hg-opt-global\">-v</option> "
6385 "option."
6386 msgstr ""
6388 #. type: Content of: <book><chapter><sect1><title>
6389 #: ../en/ch06-collab.xml:505
6390 msgid "Using the Secure Shell (ssh) protocol"
6391 msgstr "使用 ssh 协议"
6393 #. type: Content of: <book><chapter><sect1><para>
6394 #: ../en/ch06-collab.xml:507
6395 msgid ""
6396 "You can pull and push changes securely over a network connection using the "
6397 "Secure Shell (<literal>ssh</literal>) protocol. To use this successfully, "
6398 "you may have to do a little bit of configuration on the client or server "
6399 "sides."
6400 msgstr ""
6402 #. type: Content of: <book><chapter><sect1><para>
6403 #: ../en/ch06-collab.xml:512
6404 msgid ""
6405 "If you're not familiar with ssh, it's a network protocol that lets you "
6406 "securely communicate with another computer. To use it with Mercurial, you'll "
6407 "be setting up one or more user accounts on a server so that remote users can "
6408 "log in and execute commands."
6409 msgstr ""
6411 #. type: Content of: <book><chapter><sect1><para>
6412 #: ../en/ch06-collab.xml:518
6413 msgid ""
6414 "(If you <emphasis>are</emphasis> familiar with ssh, you'll probably find some "
6415 "of the material that follows to be elementary in nature.)"
6416 msgstr ""
6418 #. type: Content of: <book><chapter><sect1><sect2><title>
6419 #: ../en/ch06-collab.xml:523
6420 msgid "How to read and write ssh URLs"
6421 msgstr "如何读写 ssh 路径"
6423 #. type: Content of: <book><chapter><sect1><sect2><para>
6424 #: ../en/ch06-collab.xml:525
6425 msgid "An ssh URL tends to look like this:"
6426 msgstr ""
6428 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6429 #: ../en/ch06-collab.xml:528
6430 msgid ""
6431 "The <quote><literal>ssh://</literal></quote> part tells Mercurial to use the "
6432 "ssh protocol."
6433 msgstr ""
6435 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6436 #: ../en/ch06-collab.xml:531
6437 msgid ""
6438 "The <quote><literal>bos@</literal></quote> component indicates what username "
6439 "to log into the server as. You can leave this out if the remote username is "
6440 "the same as your local username."
6441 msgstr ""
6443 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6444 #: ../en/ch06-collab.xml:536
6445 msgid ""
6446 "The <quote><literal>hg.serpentine.com</literal></quote> gives the hostname of "
6447 "the server to log into."
6448 msgstr ""
6450 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6451 #: ../en/ch06-collab.xml:540
6452 msgid ""
6453 "The <quote>:22</quote> identifies the port number to connect to the server "
6454 "on. The default port is 22, so you only need to specify this part if you're "
6455 "<emphasis>not</emphasis> using port 22."
6456 msgstr ""
6458 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6459 #: ../en/ch06-collab.xml:545
6460 msgid ""
6461 "The remainder of the URL is the local path to the repository on the server."
6462 msgstr ""
6464 #. type: Content of: <book><chapter><sect1><sect2><para>
6465 #: ../en/ch06-collab.xml:549
6466 msgid ""
6467 "There's plenty of scope for confusion with the path component of ssh URLs, as "
6468 "there is no standard way for tools to interpret it. Some programs behave "
6469 "differently than others when dealing with these paths. This isn't an ideal "
6470 "situation, but it's unlikely to change. Please read the following paragraphs "
6471 "carefully."
6472 msgstr ""
6474 #. type: Content of: <book><chapter><sect1><sect2><para>
6475 #: ../en/ch06-collab.xml:556
6476 msgid ""
6477 "Mercurial treats the path to a repository on the server as relative to the "
6478 "remote user's home directory. For example, if user <literal>foo</literal> on "
6479 "the server has a home directory of <filename class=\"directory\">/home/foo</"
6480 "filename>, then an ssh URL that contains a path component of <filename class="
6481 "\"directory\">bar</filename> <emphasis>really</emphasis> refers to the "
6482 "directory <filename class=\"directory\">/home/foo/bar</filename>."
6483 msgstr ""
6485 #. type: Content of: <book><chapter><sect1><sect2><para>
6486 #: ../en/ch06-collab.xml:565
6487 msgid ""
6488 "If you want to specify a path relative to another user's home directory, you "
6489 "can use a path that starts with a tilde character followed by the user's name "
6490 "(let's call them <literal>otheruser</literal>), like this."
6491 msgstr ""
6493 #. type: Content of: <book><chapter><sect1><sect2><para>
6494 #: ../en/ch06-collab.xml:571
6495 msgid ""
6496 "And if you really want to specify an <emphasis>absolute</emphasis> path on "
6497 "the server, begin the path component with two slashes, as in this example."
6498 msgstr ""
6500 #. type: Content of: <book><chapter><sect1><sect2><title>
6501 #: ../en/ch06-collab.xml:578
6502 msgid "Finding an ssh client for your system"
6503 msgstr "为你的系统寻找 ssh 客户端"
6505 #. type: Content of: <book><chapter><sect1><sect2><para>
6506 #: ../en/ch06-collab.xml:580
6507 msgid ""
6508 "Almost every Unix-like system comes with OpenSSH preinstalled. If you're "
6509 "using such a system, run <literal>which ssh</literal> to find out if the "
6510 "<command>ssh</command> command is installed (it's usually in <filename class="
6511 "\"directory\">/usr/bin</filename>). In the unlikely event that it isn't "
6512 "present, take a look at your system documentation to figure out how to "
6513 "install it."
6514 msgstr ""
6516 #. type: Content of: <book><chapter><sect1><sect2><para>
6517 #: ../en/ch06-collab.xml:588
6518 msgid ""
6519 "On Windows, you'll first need to download a suitable ssh client. There are "
6520 "two alternatives."
6521 msgstr ""
6523 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6524 #: ../en/ch06-collab.xml:591
6525 msgid ""
6526 "Simon Tatham's excellent PuTTY package <citation>web:putty</citation> "
6527 "provides a complete suite of ssh client commands."
6528 msgstr ""
6530 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6531 #: ../en/ch06-collab.xml:595
6532 msgid ""
6533 "If you have a high tolerance for pain, you can use the Cygwin port of OpenSSH."
6534 msgstr ""
6536 #. type: Content of: <book><chapter><sect1><sect2><para>
6537 #: ../en/ch06-collab.xml:598
6538 msgid ""
6539 "In either case, you'll need to edit your \\hgini\\ file to tell Mercurial "
6540 "where to find the actual client command. For example, if you're using PuTTY, "
6541 "you'll need to use the <command>plink</command> command as a command-line ssh "
6542 "client."
6543 msgstr ""
6545 #. type: Content of: <book><chapter><sect1><sect2><note><para>
6546 #: ../en/ch06-collab.xml:607
6547 msgid ""
6548 "The path to <command>plink</command> shouldn't contain any whitespace "
6549 "characters, or Mercurial may not be able to run it correctly (so putting it "
6550 "in <filename class=\"directory\">C:\\\\Program Files</filename> is probably "
6551 "not a good idea)."
6552 msgstr ""
6554 #. type: Content of: <book><chapter><sect1><sect2><title>
6555 #: ../en/ch06-collab.xml:616
6556 msgid "Generating a key pair"
6557 msgstr "产生密钥对"
6559 #. type: Content of: <book><chapter><sect1><sect2><para>
6560 #: ../en/ch06-collab.xml:618
6561 msgid ""
6562 "To avoid the need to repetitively type a password every time you need to use "
6563 "your ssh client, I recommend generating a key pair. On a Unix-like system, "
6564 "the <command>ssh-keygen</command> command will do the trick. On Windows, if "
6565 "you're using PuTTY, the <command>puttygen</command> command is what you'll "
6566 "need."
6567 msgstr ""
6569 #. type: Content of: <book><chapter><sect1><sect2><para>
6570 #: ../en/ch06-collab.xml:626
6571 msgid ""
6572 "When you generate a key pair, it's usually <emphasis>highly</emphasis> "
6573 "advisable to protect it with a passphrase. (The only time that you might not "
6574 "want to do this is when you're using the ssh protocol for automated tasks on "
6575 "a secure network.)"
6576 msgstr ""
6578 #. type: Content of: <book><chapter><sect1><sect2><para>
6579 #: ../en/ch06-collab.xml:632
6580 msgid ""
6581 "Simply generating a key pair isn't enough, however. You'll need to add the "
6582 "public key to the set of authorised keys for whatever user you're logging in "
6583 "remotely as. For servers using OpenSSH (the vast majority), this will mean "
6584 "adding the public key to a list in a file called <filename role=\"special"
6585 "\">authorized_keys</filename> in their <filename role=\"special\" class="
6586 "\"directory\">.ssh</filename> directory."
6587 msgstr ""
6589 #. type: Content of: <book><chapter><sect1><sect2><para>
6590 #: ../en/ch06-collab.xml:641
6591 msgid ""
6592 "On a Unix-like system, your public key will have a <filename>.pub</filename> "
6593 "extension. If you're using <command>puttygen</command> on Windows, you can "
6594 "save the public key to a file of your choosing, or paste it from the window "
6595 "it's displayed in straight into the <filename role=\"special"
6596 "\">authorized_keys</filename> file."
6597 msgstr ""
6599 #. type: Content of: <book><chapter><sect1><sect2><title>
6600 #: ../en/ch06-collab.xml:650
6601 msgid "Using an authentication agent"
6602 msgstr "使用认证代理"
6604 #. type: Content of: <book><chapter><sect1><sect2><para>
6605 #: ../en/ch06-collab.xml:652
6606 msgid ""
6607 "An authentication agent is a daemon that stores passphrases in memory (so it "
6608 "will forget passphrases if you log out and log back in again). An ssh client "
6609 "will notice if it's running, and query it for a passphrase. If there's no "
6610 "authentication agent running, or the agent doesn't store the necessary "
6611 "passphrase, you'll have to type your passphrase every time Mercurial tries to "
6612 "communicate with a server on your behalf (e.g. whenever you pull or push "
6613 "changes)."
6614 msgstr ""
6616 #. type: Content of: <book><chapter><sect1><sect2><para>
6617 #: ../en/ch06-collab.xml:661
6618 msgid ""
6619 "The downside of storing passphrases in an agent is that it's possible for a "
6620 "well-prepared attacker to recover the plain text of your passphrases, in some "
6621 "cases even if your system has been power-cycled. You should make your own "
6622 "judgment as to whether this is an acceptable risk. It certainly saves a lot "
6623 "of repeated typing."
6624 msgstr ""
6626 #. type: Content of: <book><chapter><sect1><sect2><para>
6627 #: ../en/ch06-collab.xml:668
6628 msgid ""
6629 "On Unix-like systems, the agent is called <command>ssh-agent</command>, and "
6630 "it's often run automatically for you when you log in. You'll need to use the "
6631 "<command>ssh-add</command> command to add passphrases to the agent's store. "
6632 "On Windows, if you're using PuTTY, the <command>pageant</command> command "
6633 "acts as the agent. It adds an icon to your system tray that will let you "
6634 "manage stored passphrases."
6635 msgstr ""
6637 #. type: Content of: <book><chapter><sect1><sect2><title>
6638 #: ../en/ch06-collab.xml:679
6639 msgid "Configuring the server side properly"
6640 msgstr "正确配置服务器端"
6642 #. type: Content of: <book><chapter><sect1><sect2><para>
6643 #: ../en/ch06-collab.xml:681
6644 msgid ""
6645 "Because ssh can be fiddly to set up if you're new to it, there's a variety of "
6646 "things that can go wrong. Add Mercurial on top, and there's plenty more "
6647 "scope for head-scratching. Most of these potential problems occur on the "
6648 "server side, not the client side. The good news is that once you've gotten a "
6649 "configuration working, it will usually continue to work indefinitely."
6650 msgstr ""
6652 #. type: Content of: <book><chapter><sect1><sect2><para>
6653 #: ../en/ch06-collab.xml:689
6654 msgid ""
6655 "Before you try using Mercurial to talk to an ssh server, it's best to make "
6656 "sure that you can use the normal <command>ssh</command> or <command>putty</"
6657 "command> command to talk to the server first. If you run into problems with "
6658 "using these commands directly, Mercurial surely won't work. Worse, it will "
6659 "obscure the underlying problem. Any time you want to debug ssh-related "
6660 "Mercurial problems, you should drop back to making sure that plain ssh client "
6661 "commands work first, <emphasis>before</emphasis> you worry about whether "
6662 "there's a problem with Mercurial."
6663 msgstr ""
6665 #. type: Content of: <book><chapter><sect1><sect2><para>
6666 #: ../en/ch06-collab.xml:700
6667 msgid ""
6668 "The first thing to be sure of on the server side is that you can actually log "
6669 "in from another machine at all. If you can't use <command>ssh</command> or "
6670 "<command>putty</command> to log in, the error message you get may give you a "
6671 "few hints as to what's wrong. The most common problems are as follows."
6672 msgstr ""
6674 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6675 #: ../en/ch06-collab.xml:707
6676 msgid ""
6677 "If you get a <quote>connection refused</quote> error, either there isn't an "
6678 "SSH daemon running on the server at all, or it's inaccessible due to firewall "
6679 "configuration."
6680 msgstr ""
6682 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6683 #: ../en/ch06-collab.xml:712
6684 msgid ""
6685 "If you get a <quote>no route to host</quote> error, you either have an "
6686 "incorrect address for the server or a seriously locked down firewall that "
6687 "won't admit its existence at all."
6688 msgstr ""
6690 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6691 #: ../en/ch06-collab.xml:717
6692 msgid ""
6693 "If you get a <quote>permission denied</quote> error, you may have mistyped "
6694 "the username on the server, or you could have mistyped your key's passphrase "
6695 "or the remote user's password."
6696 msgstr ""
6698 #. type: Content of: <book><chapter><sect1><sect2><para>
6699 #: ../en/ch06-collab.xml:722
6700 msgid ""
6701 "In summary, if you're having trouble talking to the server's ssh daemon, "
6702 "first make sure that one is running at all. On many systems it will be "
6703 "installed, but disabled, by default. Once you're done with this step, you "
6704 "should then check that the server's firewall is configured to allow incoming "
6705 "connections on the port the ssh daemon is listening on (usually 22). Don't "
6706 "worry about more exotic possibilities for misconfiguration until you've "
6707 "checked these two first."
6708 msgstr ""
6710 #. type: Content of: <book><chapter><sect1><sect2><para>
6711 #: ../en/ch06-collab.xml:732
6712 msgid ""
6713 "If you're using an authentication agent on the client side to store "
6714 "passphrases for your keys, you ought to be able to log into the server "
6715 "without being prompted for a passphrase or a password. If you're prompted "
6716 "for a passphrase, there are a few possible culprits."
6717 msgstr ""
6719 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6720 #: ../en/ch06-collab.xml:738
6721 msgid ""
6722 "You might have forgotten to use <command>ssh-add</command> or "
6723 "<command>pageant</command> to store the passphrase."
6724 msgstr ""
6726 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6727 #: ../en/ch06-collab.xml:742
6728 msgid "You might have stored the passphrase for the wrong key."
6729 msgstr ""
6731 #. type: Content of: <book><chapter><sect1><sect2><para>
6732 #: ../en/ch06-collab.xml:745
6733 msgid ""
6734 "If you're being prompted for the remote user's password, there are another "
6735 "few possible problems to check."
6736 msgstr ""
6738 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6739 #: ../en/ch06-collab.xml:748
6740 msgid ""
6741 "Either the user's home directory or their <filename role=\"special\" class="
6742 "\"directory\">.ssh</filename> directory might have excessively liberal "
6743 "permissions. As a result, the ssh daemon will not trust or read their "
6744 "<filename role=\"special\">authorized_keys</filename> file. For example, a "
6745 "group-writable home or <filename role=\"special\" class=\"directory\">.ssh</"
6746 "filename> directory will often cause this symptom."
6747 msgstr ""
6749 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6750 #: ../en/ch06-collab.xml:757
6751 msgid ""
6752 "The user's <filename role=\"special\">authorized_keys</filename> file may "
6753 "have a problem. If anyone other than the user owns or can write to that file, "
6754 "the ssh daemon will not trust or read it."
6755 msgstr ""
6757 #. type: Content of: <book><chapter><sect1><sect2><para>
6758 #: ../en/ch06-collab.xml:764
6759 msgid ""
6760 "In the ideal world, you should be able to run the following command "
6761 "successfully, and it should print exactly one line of output, the current "
6762 "date and time."
6763 msgstr ""
6765 #. type: Content of: <book><chapter><sect1><sect2><para>
6766 #: ../en/ch06-collab.xml:769
6767 msgid ""
6768 "If, on your server, you have login scripts that print banners or other junk "
6769 "even when running non-interactive commands like this, you should fix them "
6770 "before you continue, so that they only print output if they're run "
6771 "interactively. Otherwise these banners will at least clutter up Mercurial's "
6772 "output. Worse, they could potentially cause problems with running Mercurial "
6773 "commands remotely. Mercurial makes tries to detect and ignore banners in non-"
6774 "interactive <command>ssh</command> sessions, but it is not foolproof. (If "
6775 "you're editing your login scripts on your server, the usual way to see if a "
6776 "login script is running in an interactive shell is to check the return code "
6777 "from the command <literal>tty -s</literal>.)"
6778 msgstr ""
6780 #. type: Content of: <book><chapter><sect1><sect2><para>
6781 #: ../en/ch06-collab.xml:783
6782 msgid ""
6783 "Once you've verified that plain old ssh is working with your server, the next "
6784 "step is to ensure that Mercurial runs on the server. The following command "
6785 "should run successfully:"
6786 msgstr ""
6788 #. type: Content of: <book><chapter><sect1><sect2><para>
6789 #: ../en/ch06-collab.xml:788
6790 msgid ""
6791 "If you see an error message instead of normal <command role=\"hg-cmd\">hg "
6792 "version</command> output, this is usually because you haven't installed "
6793 "Mercurial to <filename class=\"directory\">/usr/bin</filename>. Don't worry "
6794 "if this is the case; you don't need to do that. But you should check for a "
6795 "few possible problems."
6796 msgstr ""
6798 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6799 #: ../en/ch06-collab.xml:795
6800 msgid ""
6801 "Is Mercurial really installed on the server at all? I know this sounds "
6802 "trivial, but it's worth checking!"
6803 msgstr ""
6805 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6806 #: ../en/ch06-collab.xml:799
6807 msgid ""
6808 "Maybe your shell's search path (usually set via the <envar>PATH</envar> "
6809 "environment variable) is simply misconfigured."
6810 msgstr ""
6812 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6813 #: ../en/ch06-collab.xml:803
6814 msgid ""
6815 "Perhaps your <envar>PATH</envar> environment variable is only being set to "
6816 "point to the location of the <command>hg</command> executable if the login "
6817 "session is interactive. This can happen if you're setting the path in the "
6818 "wrong shell login script. See your shell's documentation for details."
6819 msgstr ""
6821 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
6822 #: ../en/ch06-collab.xml:810
6823 msgid ""
6824 "The <envar>PYTHONPATH</envar> environment variable may need to contain the "
6825 "path to the Mercurial Python modules. It might not be set at all; it could "
6826 "be incorrect; or it may be set only if the login is interactive."
6827 msgstr ""
6829 #. type: Content of: <book><chapter><sect1><sect2><para>
6830 #: ../en/ch06-collab.xml:817
6831 msgid ""
6832 "If you can run <command role=\"hg-cmd\">hg version</command> over an ssh "
6833 "connection, well done! You've got the server and client sorted out. You "
6834 "should now be able to use Mercurial to access repositories hosted by that "
6835 "username on that server. If you run into problems with Mercurial and ssh at "
6836 "this point, try using the <option role=\"hg-opt-global\">--debug</option> "
6837 "option to get a clearer picture of what's going on."
6838 msgstr ""
6840 #. type: Content of: <book><chapter><sect1><sect2><title>
6841 #: ../en/ch06-collab.xml:827
6842 msgid "Using compression with ssh"
6843 msgstr "通过 ssh 使用压缩"
6845 #. type: Content of: <book><chapter><sect1><sect2><para>
6846 #: ../en/ch06-collab.xml:829
6847 msgid ""
6848 "Mercurial does not compress data when it uses the ssh protocol, because the "
6849 "ssh protocol can transparently compress data. However, the default behaviour "
6850 "of ssh clients is <emphasis>not</emphasis> to request compression."
6851 msgstr ""
6853 #. type: Content of: <book><chapter><sect1><sect2><para>
6854 #: ../en/ch06-collab.xml:834
6855 msgid ""
6856 "Over any network other than a fast LAN (even a wireless network), using "
6857 "compression is likely to significantly speed up Mercurial's network "
6858 "operations. For example, over a WAN, someone measured compression as "
6859 "reducing the amount of time required to clone a particularly large repository "
6860 "from 51 minutes to 17 minutes."
6861 msgstr ""
6863 #. type: Content of: <book><chapter><sect1><sect2><para>
6864 #: ../en/ch06-collab.xml:841
6865 msgid ""
6866 "Both <command>ssh</command> and <command>plink</command> accept a <option "
6867 "role=\"cmd-opt-ssh\">-C</option> option which turns on compression. You can "
6868 "easily edit your <filename role=\"special\"> /.hgrc</filename>\\ to enable "
6869 "compression for all of Mercurial's uses of the ssh protocol."
6870 msgstr ""
6872 #. type: Content of: <book><chapter><sect1><sect2><para>
6873 #: ../en/ch06-collab.xml:848
6874 msgid ""
6875 "If you use <command>ssh</command>, you can configure it to always use "
6876 "compression when talking to your server. To do this, edit your <filename "
6877 "role=\"special\">.ssh/config</filename> file (which may not yet exist), as "
6878 "follows."
6879 msgstr ""
6881 #. type: Content of: <book><chapter><sect1><sect2><para>
6882 #: ../en/ch06-collab.xml:855
6883 msgid ""
6884 "This defines an alias, <literal>hg</literal>. When you use it on the "
6885 "<command>ssh</command> command line or in a Mercurial <literal>ssh</literal>-"
6886 "protocol URL, it will cause <command>ssh</command> to connect to <literal>hg."
6887 "example.com</literal> and use compression. This gives you both a shorter "
6888 "name to type and compression, each of which is a good thing in its own right."
6889 msgstr ""
6891 #. type: Content of: <book><chapter><sect1><title>
6892 #: ../en/ch06-collab.xml:866
6893 msgid "Serving over HTTP using CGI"
6894 msgstr "使用 CGI 通过 HTTP 提供服务"
6896 #. type: Content of: <book><chapter><sect1><para>
6897 #: ../en/ch06-collab.xml:868
6898 msgid ""
6899 "Depending on how ambitious you are, configuring Mercurial's CGI interface can "
6900 "take anything from a few moments to several hours."
6901 msgstr ""
6903 #. type: Content of: <book><chapter><sect1><para>
6904 #: ../en/ch06-collab.xml:872
6905 msgid ""
6906 "We'll begin with the simplest of examples, and work our way towards a more "
6907 "complex configuration. Even for the most basic case, you're almost certainly "
6908 "going to need to read and modify your web server's configuration."
6909 msgstr ""
6911 #. type: Content of: <book><chapter><sect1><note><para>
6912 #: ../en/ch06-collab.xml:878
6913 msgid ""
6914 "Configuring a web server is a complex, fiddly, and highly system-dependent "
6915 "activity. I can't possibly give you instructions that will cover anything "
6916 "like all of the cases you will encounter. Please use your discretion and "
6917 "judgment in following the sections below. Be prepared to make plenty of "
6918 "mistakes, and to spend a lot of time reading your server's error logs."
6919 msgstr ""
6921 #. type: Content of: <book><chapter><sect1><sect2><title>
6922 #: ../en/ch06-collab.xml:888
6923 msgid "Web server configuration checklist"
6924 msgstr "Web 服务器配置检查表"
6926 #. type: Content of: <book><chapter><sect1><sect2><para>
6927 #: ../en/ch06-collab.xml:890
6928 msgid ""
6929 "Before you continue, do take a few moments to check a few aspects of your "
6930 "system's setup."
6931 msgstr ""
6933 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6934 #: ../en/ch06-collab.xml:894
6935 msgid ""
6936 "Do you have a web server installed at all? Mac OS X ships with Apache, but "
6937 "many other systems may not have a web server installed."
6938 msgstr ""
6940 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6941 #: ../en/ch06-collab.xml:898
6942 msgid ""
6943 "If you have a web server installed, is it actually running? On most systems, "
6944 "even if one is present, it will be disabled by default."
6945 msgstr ""
6947 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
6948 #: ../en/ch06-collab.xml:902
6949 msgid ""
6950 "Is your server configured to allow you to run CGI programs in the directory "
6951 "where you plan to do so? Most servers default to explicitly disabling the "
6952 "ability to run CGI programs."
6953 msgstr ""
6955 #. type: Content of: <book><chapter><sect1><sect2><para>
6956 #: ../en/ch06-collab.xml:908
6957 msgid ""
6958 "If you don't have a web server installed, and don't have substantial "
6959 "experience configuring Apache, you should consider using the "
6960 "<literal>lighttpd</literal> web server instead of Apache. Apache has a well-"
6961 "deserved reputation for baroque and confusing configuration. While "
6962 "<literal>lighttpd</literal> is less capable in some ways than Apache, most of "
6963 "these capabilities are not relevant to serving Mercurial repositories. And "
6964 "<literal>lighttpd</literal> is undeniably <emphasis>much</emphasis> easier to "
6965 "get started with than Apache."
6966 msgstr ""
6968 #. type: Content of: <book><chapter><sect1><sect2><title>
6969 #: ../en/ch06-collab.xml:921
6970 msgid "Basic CGI configuration"
6971 msgstr "基本 CGI 配置"
6973 #. type: Content of: <book><chapter><sect1><sect2><para>
6974 #: ../en/ch06-collab.xml:923
6975 msgid ""
6976 "On Unix-like systems, it's common for users to have a subdirectory named "
6977 "something like <filename class=\"directory\">public_html</filename> in their "
6978 "home directory, from which they can serve up web pages. A file named "
6979 "<filename>foo</filename> in this directory will be accessible at a URL of the "
6980 "form <literal>http://www.example.com/\\ {</literal>username/foo}."
6981 msgstr ""
6983 #. type: Content of: <book><chapter><sect1><sect2><para>
6984 #: ../en/ch06-collab.xml:932
6985 msgid ""
6986 "To get started, find the <filename role=\"special\">hgweb.cgi</filename> "
6987 "script that should be present in your Mercurial installation. If you can't "
6988 "quickly find a local copy on your system, simply download one from the master "
6989 "Mercurial repository at <ulink url=\"http://www.selenic.com/repo/hg/raw-file/"
6990 "tip/hgweb.cgi\">http://www.selenic.com/repo/hg/raw-file/tip/hgweb.cgi</ulink>."
6991 msgstr ""
6993 #. type: Content of: <book><chapter><sect1><sect2><para>
6994 #: ../en/ch06-collab.xml:939 ../en/ch06-collab.xml:1112
6995 msgid ""
6996 "You'll need to copy this script into your <filename class=\"directory"
6997 "\">public_html</filename> directory, and ensure that it's executable."
6998 msgstr ""
7000 #. type: Content of: <book><chapter><sect1><sect2><para>
7001 #: ../en/ch06-collab.xml:944
7002 msgid ""
7003 "The <literal>755</literal> argument to <command>chmod</command> is a little "
7004 "more general than just making the script executable: it ensures that the "
7005 "script is executable by anyone, and that <quote>group</quote> and "
7006 "<quote>other</quote> write permissions are <emphasis>not</emphasis> set. If "
7007 "you were to leave those write permissions enabled, Apache's <literal>suexec</"
7008 "literal> subsystem would likely refuse to execute the script. In fact, "
7009 "<literal>suexec</literal> also insists that the <emphasis>directory</"
7010 "emphasis> in which the script resides must not be writable by others."
7011 msgstr ""
7013 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7014 #: ../en/ch06-collab.xml:958
7015 msgid "What could <emphasis>possibly</emphasis> go wrong?"
7016 msgstr "什么<emphasis>可能</emphasis>会出错?"
7018 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7019 #: ../en/ch06-collab.xml:961
7020 msgid ""
7021 "Once you've copied the CGI script into place, go into a web browser, and try "
7022 "to open the URL <ulink url=\"http://myhostname/ myuser/hgweb.cgi\">http://"
7023 "myhostname/ myuser/hgweb.cgi</ulink>, <emphasis>but</emphasis> brace yourself "
7024 "for instant failure. There's a high probability that trying to visit this "
7025 "URL will fail, and there are many possible reasons for this. In fact, you're "
7026 "likely to stumble over almost every one of the possible errors below, so "
7027 "please read carefully. The following are all of the problems I ran into on a "
7028 "system running Fedora 7, with a fresh installation of Apache, and a user "
7029 "account that I created specially to perform this exercise."
7030 msgstr ""
7032 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7033 #: ../en/ch06-collab.xml:975
7034 msgid ""
7035 "Your web server may have per-user directories disabled. If you're using "
7036 "Apache, search your config file for a <literal>UserDir</literal> directive. "
7037 "If there's none present, per-user directories will be disabled. If one "
7038 "exists, but its value is <literal>disabled</literal>, then per-user "
7039 "directories will be disabled. Otherwise, the string after <literal>UserDir</"
7040 "literal> gives the name of the subdirectory that Apache will look in under "
7041 "your home directory, for example <filename class=\"directory\">public_html</"
7042 "filename>."
7043 msgstr ""
7045 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7046 #: ../en/ch06-collab.xml:986
7047 msgid ""
7048 "Your file access permissions may be too restrictive. The web server must be "
7049 "able to traverse your home directory and directories under your <filename "
7050 "class=\"directory\">public_html</filename> directory, and read files under "
7051 "the latter too. Here's a quick recipe to help you to make your permissions "
7052 "more appropriate."
7053 msgstr ""
7055 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7056 #: ../en/ch06-collab.xml:996
7057 msgid ""
7058 "The other possibility with permissions is that you might get a completely "
7059 "empty window when you try to load the script. In this case, it's likely that "
7060 "your access permissions are <emphasis>too permissive</emphasis>. Apache's "
7061 "<literal>suexec</literal> subsystem won't execute a script that's group- or "
7062 "world-writable, for example."
7063 msgstr ""
7065 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7066 #: ../en/ch06-collab.xml:1003
7067 msgid ""
7068 "Your web server may be configured to disallow execution of CGI programs in "
7069 "your per-user web directory. Here's Apache's default per-user configuration "
7070 "from my Fedora system."
7071 msgstr ""
7073 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7074 #: ../en/ch06-collab.xml:1014
7075 msgid ""
7076 "If you find a similar-looking <literal>Directory</literal> group in your "
7077 "Apache configuration, the directive to look at inside it is <literal>Options</"
7078 "literal>. Add <literal>ExecCGI</literal> to the end of this list if it's "
7079 "missing, and restart the web server."
7080 msgstr ""
7082 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7083 #: ../en/ch06-collab.xml:1021
7084 msgid ""
7085 "If you find that Apache serves you the text of the CGI script instead of "
7086 "executing it, you may need to either uncomment (if already present) or add a "
7087 "directive like this."
7088 msgstr ""
7090 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7091 #: ../en/ch06-collab.xml:1027
7092 msgid ""
7093 "The next possibility is that you might be served with a colourful Python "
7094 "backtrace claiming that it can't import a <literal>mercurial</literal>-"
7095 "related module. This is actually progress! The server is now capable of "
7096 "executing your CGI script. This error is only likely to occur if you're "
7097 "running a private installation of Mercurial, instead of a system-wide "
7098 "version. Remember that the web server runs the CGI program without any of "
7099 "the environment variables that you take for granted in an interactive "
7100 "session. If this error happens to you, edit your copy of <filename role="
7101 "\"special\">hgweb.cgi</filename> and follow the directions inside it to "
7102 "correctly set your <envar>PYTHONPATH</envar> environment variable."
7103 msgstr ""
7105 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7106 #: ../en/ch06-collab.xml:1041
7107 msgid ""
7108 "Finally, you are <emphasis>certain</emphasis> to by served with another "
7109 "colourful Python backtrace: this one will complain that it can't find "
7110 "<filename class=\"directory\">/path/to/repository</filename>. Edit your "
7111 "<filename role=\"special\">hgweb.cgi</filename> script and replace the "
7112 "<filename class=\"directory\">/path/to/repository</filename> string with the "
7113 "complete path to the repository you want to serve up."
7114 msgstr ""
7116 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7117 #: ../en/ch06-collab.xml:1051
7118 msgid ""
7119 "At this point, when you try to reload the page, you should be presented with "
7120 "a nice HTML view of your repository's history. Whew!"
7121 msgstr ""
7123 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7124 #: ../en/ch06-collab.xml:1057
7125 msgid "Configuring lighttpd"
7126 msgstr "配置 lighttpd"
7128 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7129 #: ../en/ch06-collab.xml:1059
7130 msgid ""
7131 "To be exhaustive in my experiments, I tried configuring the increasingly "
7132 "popular <literal>lighttpd</literal> web server to serve the same repository "
7133 "as I described with Apache above. I had already overcome all of the problems "
7134 "I outlined with Apache, many of which are not server-specific. As a result, "
7135 "I was fairly sure that my file and directory permissions were good, and that "
7136 "my <filename role=\"special\">hgweb.cgi</filename> script was properly edited."
7137 msgstr ""
7139 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7140 #: ../en/ch06-collab.xml:1069
7141 msgid ""
7142 "Once I had Apache running, getting <literal>lighttpd</literal> to serve the "
7143 "repository was a snap (in other words, even if you're trying to use "
7144 "<literal>lighttpd</literal>, you should read the Apache section). I first "
7145 "had to edit the <literal>mod_access</literal> section of its config file to "
7146 "enable <literal>mod_cgi</literal> and <literal>mod_userdir</literal>, both of "
7147 "which were disabled by default on my system. I then added a few lines to the "
7148 "end of the config file, to configure these modules."
7149 msgstr ""
7151 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7152 #: ../en/ch06-collab.xml:1081
7153 msgid ""
7154 "With this done, <literal>lighttpd</literal> ran immediately for me. If I had "
7155 "configured <literal>lighttpd</literal> before Apache, I'd almost certainly "
7156 "have run into many of the same system-level configuration problems as I did "
7157 "with Apache. However, I found <literal>lighttpd</literal> to be noticeably "
7158 "easier to configure than Apache, even though I've used Apache for over a "
7159 "decade, and this was my first exposure to <literal>lighttpd</literal>."
7160 msgstr ""
7162 #. type: Content of: <book><chapter><sect1><sect2><title>
7163 #: ../en/ch06-collab.xml:1094
7164 msgid "Sharing multiple repositories with one CGI script"
7165 msgstr "使用一个 CGI 脚本共享多个版本库"
7167 #. type: Content of: <book><chapter><sect1><sect2><para>
7168 #: ../en/ch06-collab.xml:1096
7169 msgid ""
7170 "The <filename role=\"special\">hgweb.cgi</filename> script only lets you "
7171 "publish a single repository, which is an annoying restriction. If you want "
7172 "to publish more than one without wracking yourself with multiple copies of "
7173 "the same script, each with different names, a better choice is to use the "
7174 "<filename role=\"special\">hgwebdir.cgi</filename> script."
7175 msgstr ""
7177 #. type: Content of: <book><chapter><sect1><sect2><para>
7178 #: ../en/ch06-collab.xml:1104
7179 msgid ""
7180 "The procedure to configure <filename role=\"special\">hgwebdir.cgi</filename> "
7181 "is only a little more involved than for <filename role=\"special\">hgweb.cgi</"
7182 "filename>. First, you must obtain a copy of the script. If you don't have "
7183 "one handy, you can download a copy from the master Mercurial repository at "
7184 "<ulink url=\"http://www.selenic.com/repo/hg/raw-file/tip/hgwebdir.cgi"
7185 "\">http://www.selenic.com/repo/hg/raw-file/tip/hgwebdir.cgi</ulink>."
7186 msgstr ""
7188 #. type: Content of: <book><chapter><sect1><sect2><para>
7189 #: ../en/ch06-collab.xml:1117
7190 msgid ""
7191 "With basic configuration out of the way, try to visit <ulink url=\"http://"
7192 "myhostname/ myuser/hgwebdir.cgi\">http://myhostname/ myuser/hgwebdir.cgi</"
7193 "ulink> in your browser. It should display an empty list of repositories. If "
7194 "you get a blank window or error message, try walking through the list of "
7195 "potential problems in section <xref linkend=\"sec.collab.wtf\"/>."
7196 msgstr ""
7198 #. type: Content of: <book><chapter><sect1><sect2><para>
7199 #: ../en/ch06-collab.xml:1126
7200 msgid ""
7201 "The <filename role=\"special\">hgwebdir.cgi</filename> script relies on an "
7202 "external configuration file. By default, it searches for a file named "
7203 "<filename role=\"special\">hgweb.config</filename> in the same directory as "
7204 "itself. You'll need to create this file, and make it world-readable. The "
7205 "format of the file is similar to a Windows <quote>ini</quote> file, as "
7206 "understood by Python's <literal>ConfigParser</literal> <citation>web:"
7207 "configparser</citation> module."
7208 msgstr ""
7210 #. type: Content of: <book><chapter><sect1><sect2><para>
7211 #: ../en/ch06-collab.xml:1136
7212 msgid ""
7213 "The easiest way to configure <filename role=\"special\">hgwebdir.cgi</"
7214 "filename> is with a section named <literal>collections</literal>. This will "
7215 "automatically publish <emphasis>every</emphasis> repository under the "
7216 "directories you name. The section should look like this:"
7217 msgstr ""
7219 #. type: Content of: <book><chapter><sect1><sect2><para>
7220 #: ../en/ch06-collab.xml:1144
7221 msgid ""
7222 "Mercurial interprets this by looking at the directory name on the "
7223 "<emphasis>right</emphasis> hand side of the <quote><literal>=</literal></"
7224 "quote> sign; finding repositories in that directory hierarchy; and using the "
7225 "text on the <emphasis>left</emphasis> to strip off matching text from the "
7226 "names it will actually list in the web interface. The remaining component of "
7227 "a path after this stripping has occurred is called a <quote>virtual path</"
7228 "quote>."
7229 msgstr ""
7231 #. type: Content of: <book><chapter><sect1><sect2><para>
7232 #: ../en/ch06-collab.xml:1153
7233 msgid ""
7234 "Given the example above, if we have a repository whose local path is "
7235 "<filename class=\"directory\">/my/root/this/repo</filename>, the CGI script "
7236 "will strip the leading <filename class=\"directory\">/my/root</filename> from "
7237 "the name, and publish the repository with a virtual path of <filename class="
7238 "\"directory\">this/repo</filename>. If the base URL for our CGI script is "
7239 "<ulink url=\"http://myhostname/ myuser/hgwebdir.cgi\">http://myhostname/ "
7240 "myuser/hgwebdir.cgi</ulink>, the complete URL for that repository will be "
7241 "<ulink url=\"http://myhostname/ myuser/hgwebdir.cgi/this/repo\">http://"
7242 "myhostname/ myuser/hgwebdir.cgi/this/repo</ulink>."
7243 msgstr ""
7245 #. type: Content of: <book><chapter><sect1><sect2><para>
7246 #: ../en/ch06-collab.xml:1167
7247 msgid ""
7248 "If we replace <filename class=\"directory\">/my/root</filename> on the left "
7249 "hand side of this example with <filename class=\"directory\">/my</filename>, "
7250 "then <filename role=\"special\">hgwebdir.cgi</filename> will only strip off "
7251 "<filename class=\"directory\">/my</filename> from the repository name, and "
7252 "will give us a virtual path of <filename class=\"directory\">root/this/repo</"
7253 "filename> instead of <filename class=\"directory\">this/repo</filename>."
7254 msgstr ""
7256 #. type: Content of: <book><chapter><sect1><sect2><para>
7257 #: ../en/ch06-collab.xml:1177
7258 msgid ""
7259 "The <filename role=\"special\">hgwebdir.cgi</filename> script will "
7260 "recursively search each directory listed in the <literal>collections</"
7261 "literal> section of its configuration file, but it will <literal>not</"
7262 "literal> recurse into the repositories it finds."
7263 msgstr ""
7265 #. type: Content of: <book><chapter><sect1><sect2><para>
7266 #: ../en/ch06-collab.xml:1183
7267 msgid ""
7268 "The <literal>collections</literal> mechanism makes it easy to publish many "
7269 "repositories in a <quote>fire and forget</quote> manner. You only need to "
7270 "set up the CGI script and configuration file one time. Afterwards, you can "
7271 "publish or unpublish a repository at any time by simply moving it into, or "
7272 "out of, the directory hierarchy in which you've configured <filename role="
7273 "\"special\">hgwebdir.cgi</filename> to look."
7274 msgstr ""
7276 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7277 #: ../en/ch06-collab.xml:1193
7278 msgid "Explicitly specifying which repositories to publish"
7279 msgstr "明确指出要发布的版本库"
7281 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7282 #: ../en/ch06-collab.xml:1196
7283 msgid ""
7284 "In addition to the <literal>collections</literal> mechanism, the <filename "
7285 "role=\"special\">hgwebdir.cgi</filename> script allows you to publish a "
7286 "specific list of repositories. To do so, create a <literal>paths</literal> "
7287 "section, with contents of the following form."
7288 msgstr ""
7290 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7291 #: ../en/ch06-collab.xml:1204
7292 msgid ""
7293 "In this case, the virtual path (the component that will appear in a URL) is "
7294 "on the left hand side of each definition, while the path to the repository is "
7295 "on the right. Notice that there does not need to be any relationship between "
7296 "the virtual path you choose and the location of a repository in your "
7297 "filesystem."
7298 msgstr ""
7300 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7301 #: ../en/ch06-collab.xml:1211
7302 msgid ""
7303 "If you wish, you can use both the <literal>collections</literal> and "
7304 "<literal>paths</literal> mechanisms simultaneously in a single configuration "
7305 "file."
7306 msgstr ""
7308 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
7309 #: ../en/ch06-collab.xml:1217
7310 msgid ""
7311 "If multiple repositories have the same virtual path, <filename role=\"special"
7312 "\">hgwebdir.cgi</filename> will not report an error. Instead, it will behave "
7313 "unpredictably."
7314 msgstr ""
7316 #. type: Content of: <book><chapter><sect1><sect2><title>
7317 #: ../en/ch06-collab.xml:1226
7318 msgid "Downloading source archives"
7319 msgstr "下载源代码档案包"
7321 #. type: Content of: <book><chapter><sect1><sect2><para>
7322 #: ../en/ch06-collab.xml:1228
7323 msgid ""
7324 "Mercurial's web interface lets users download an archive of any revision. "
7325 "This archive will contain a snapshot of the working directory as of that "
7326 "revision, but it will not contain a copy of the repository data."
7327 msgstr ""
7329 #. type: Content of: <book><chapter><sect1><sect2><para>
7330 #: ../en/ch06-collab.xml:1233
7331 msgid ""
7332 "By default, this feature is not enabled. To enable it, you'll need to add an "
7333 "<envar role=\"rc-item-web\">allow_archive</envar> item to the <literal role="
7334 "\"rc-web\">web</literal> section of your <filename role=\"special\"> /.hgrc</"
7335 "filename>."
7336 msgstr ""
7338 #. type: Content of: <book><chapter><sect1><sect2><title>
7339 #: ../en/ch06-collab.xml:1241
7340 msgid "Web configuration options"
7341 msgstr "Web 配置选项"
7343 #. type: Content of: <book><chapter><sect1><sect2><para>
7344 #: ../en/ch06-collab.xml:1243
7345 msgid ""
7346 "Mercurial's web interfaces (the <command role=\"hg-cmd\">hg serve</command> "
7347 "command, and the <filename role=\"special\">hgweb.cgi</filename> and "
7348 "<filename role=\"special\">hgwebdir.cgi</filename> scripts) have a number of "
7349 "configuration options that you can set. These belong in a section named "
7350 "<literal role=\"rc-web\">web</literal>."
7351 msgstr ""
7353 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7354 #: ../en/ch06-collab.xml:1251
7355 msgid ""
7356 "<envar role=\"rc-item-web\">allow_archive</envar>: Determines which (if any) "
7357 "archive download mechanisms Mercurial supports. If you enable this feature, "
7358 "users of the web interface will be able to download an archive of whatever "
7359 "revision of a repository they are viewing. To enable the archive feature, "
7360 "this item must take the form of a sequence of words drawn from the list below."
7361 msgstr ""
7363 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
7364 #: ../en/ch06-collab.xml:1260
7365 msgid ""
7366 "<literal>bz2</literal>: A <command>tar</command> archive, compressed using "
7367 "<literal>bzip2</literal> compression. This has the best compression ratio, "
7368 "but uses the most CPU time on the server."
7369 msgstr ""
7371 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
7372 #: ../en/ch06-collab.xml:1266
7373 msgid ""
7374 "<literal>gz</literal>: A <command>tar</command> archive, compressed using "
7375 "<literal>gzip</literal> compression."
7376 msgstr ""
7378 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
7379 #: ../en/ch06-collab.xml:1270
7380 msgid ""
7381 "<literal>zip</literal>: A <command>zip</command> archive, compressed using "
7382 "LZW compression. This format has the worst compression ratio, but is widely "
7383 "used in the Windows world."
7384 msgstr ""
7386 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7387 #: ../en/ch06-collab.xml:1276
7388 msgid ""
7389 "If you provide an empty list, or don't have an <envar role=\"rc-item-web"
7390 "\">allow_archive</envar> entry at all, this feature will be disabled. Here "
7391 "is an example of how to enable all three supported formats."
7392 msgstr ""
7394 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7395 #: ../en/ch06-collab.xml:1283
7396 msgid ""
7397 "<envar role=\"rc-item-web\">allowpull</envar>: Boolean. Determines whether "
7398 "the web interface allows remote users to <command role=\"hg-cmd\">hg pull</"
7399 "command> and <command role=\"hg-cmd\">hg clone</command> this repository over "
7400 "HTTP. If set to <literal>no</literal> or <literal>false</literal>, only the "
7401 "<quote>human-oriented</quote> portion of the web interface is available."
7402 msgstr ""
7404 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7405 #: ../en/ch06-collab.xml:1292
7406 msgid ""
7407 "<envar role=\"rc-item-web\">contact</envar>: String. A free-form (but "
7408 "preferably brief) string identifying the person or group in charge of the "
7409 "repository. This often contains the name and email address of a person or "
7410 "mailing list. It often makes sense to place this entry in a repository's own "
7411 "<filename role=\"special\">.hg/hgrc</filename> file, but it can make sense to "
7412 "use in a global <filename role=\"special\"> /.hgrc</filename>\\ if every "
7413 "repository has a single maintainer."
7414 msgstr ""
7416 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7417 #: ../en/ch06-collab.xml:1303
7418 msgid ""
7419 "<envar role=\"rc-item-web\">maxchanges</envar>: Integer. The default maximum "
7420 "number of changesets to display in a single page of output."
7421 msgstr ""
7423 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7424 #: ../en/ch06-collab.xml:1307
7425 msgid ""
7426 "<envar role=\"rc-item-web\">maxfiles</envar>: Integer. The default maximum "
7427 "number of modified files to display in a single page of output."
7428 msgstr ""
7430 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7431 #: ../en/ch06-collab.xml:1311
7432 msgid ""
7433 "<envar role=\"rc-item-web\">stripes</envar>: Integer. If the web interface "
7434 "displays alternating <quote>stripes</quote> to make it easier to visually "
7435 "align rows when you are looking at a table, this number controls the number "
7436 "of rows in each stripe."
7437 msgstr ""
7439 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7440 #: ../en/ch06-collab.xml:1317
7441 msgid ""
7442 "<envar role=\"rc-item-web\">style</envar>: Controls the template Mercurial "
7443 "uses to display the web interface. Mercurial ships with two web templates, "
7444 "named <literal>default</literal> and <literal>gitweb</literal> (the latter is "
7445 "much more visually attractive). You can also specify a custom template of "
7446 "your own; see chapter <xref linkend=\"chap.template\"/> for details. Here, "
7447 "you can see how to enable the <literal>gitweb</literal> style."
7448 msgstr ""
7450 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
7451 #: ../en/ch06-collab.xml:1328
7452 msgid ""
7453 "<envar role=\"rc-item-web\">templates</envar>: Path. The directory in which "
7454 "to search for template files. By default, Mercurial searches in the "
7455 "directory in which it was installed."
7456 msgstr ""
7458 #. type: Content of: <book><chapter><sect1><sect2><para>
7459 #: ../en/ch06-collab.xml:1333
7460 msgid ""
7461 "If you are using <filename role=\"special\">hgwebdir.cgi</filename>, you can "
7462 "place a few configuration items in a <literal role=\"rc-web\">web</literal> "
7463 "section of the <filename role=\"special\">hgweb.config</filename> file "
7464 "instead of a <filename role=\"special\"> /.hgrc</filename>\\ file, for "
7465 "convenience. These items are <envar role=\"rc-item-web\">motd</envar> and "
7466 "<envar role=\"rc-item-web\">style</envar>."
7467 msgstr ""
7469 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7470 #: ../en/ch06-collab.xml:1344
7471 msgid "Options specific to an individual repository"
7472 msgstr "针对单个版本库的选项"
7474 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7475 #: ../en/ch06-collab.xml:1346
7476 msgid ""
7477 "A few <literal role=\"rc-web\">web</literal> configuration items ought to be "
7478 "placed in a repository's local <filename role=\"special\">.hg/hgrc</"
7479 "filename>, rather than a user's or global <filename role=\"special\"> /.hgrc</"
7480 "filename>."
7481 msgstr ""
7483 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7484 #: ../en/ch06-collab.xml:1352
7485 msgid ""
7486 "<envar role=\"rc-item-web\">description</envar>: String. A free-form (but "
7487 "preferably brief) string that describes the contents or purpose of the "
7488 "repository."
7489 msgstr ""
7491 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7492 #: ../en/ch06-collab.xml:1357
7493 msgid ""
7494 "<envar role=\"rc-item-web\">name</envar>: String. The name to use for the "
7495 "repository in the web interface. This overrides the default name, which is "
7496 "the last component of the repository's path."
7497 msgstr ""
7499 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7500 #: ../en/ch06-collab.xml:1365
7501 msgid ""
7502 "Options specific to the <command role=\"hg-cmd\">hg serve</command> command"
7503 msgstr "命令 <command role=\"hg-cmd\">hg serve</command> 的选项"
7505 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7506 #: ../en/ch06-collab.xml:1368
7507 msgid ""
7508 "Some of the items in the <literal role=\"rc-web\">web</literal> section of a "
7509 "<filename role=\"special\"> /.hgrc</filename>\\ file are only for use with "
7510 "the <command role=\"hg-cmd\">hg serve</command> command."
7511 msgstr ""
7513 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7514 #: ../en/ch06-collab.xml:1374
7515 msgid ""
7516 "<envar role=\"rc-item-web\">accesslog</envar>: Path. The name of a file into "
7517 "which to write an access log. By default, the <command role=\"hg-cmd\">hg "
7518 "serve</command> command writes this information to standard output, not to a "
7519 "file. Log entries are written in the standard <quote>combined</quote> file "
7520 "format used by almost all web servers."
7521 msgstr ""
7523 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7524 #: ../en/ch06-collab.xml:1382
7525 msgid ""
7526 "<envar role=\"rc-item-web\">address</envar>: String. The local address on "
7527 "which the server should listen for incoming connections. By default, the "
7528 "server listens on all addresses."
7529 msgstr ""
7531 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7532 #: ../en/ch06-collab.xml:1387
7533 msgid ""
7534 "<envar role=\"rc-item-web\">errorlog</envar>: Path. The name of a file into "
7535 "which to write an error log. By default, the <command role=\"hg-cmd\">hg "
7536 "serve</command> command writes this information to standard error, not to a "
7537 "file."
7538 msgstr ""
7540 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7541 #: ../en/ch06-collab.xml:1393
7542 msgid ""
7543 "<envar role=\"rc-item-web\">ipv6</envar>: Boolean. Whether to use the IPv6 "
7544 "protocol. By default, IPv6 is not used."
7545 msgstr ""
7547 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
7548 #: ../en/ch06-collab.xml:1397
7549 msgid ""
7550 "<envar role=\"rc-item-web\">port</envar>: Integer. The TCP port number on "
7551 "which the server should listen. The default port number used is 8000."
7552 msgstr ""
7554 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7555 #: ../en/ch06-collab.xml:1404
7556 msgid ""
7557 "Choosing the right <filename role=\"special\"> /.hgrc</filename>\\ file to "
7558 "add <literal role=\"rc-web\">web</literal> items to"
7559 msgstr ""
7560 "选择正确的 <filename role=\"special\"> /.hgrc</filename> 文件增加到 <literal "
7561 "role=\"rc-web\">web</literal> 条目"
7563 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7564 #: ../en/ch06-collab.xml:1408
7565 msgid ""
7566 "It is important to remember that a web server like Apache or "
7567 "<literal>lighttpd</literal> will run under a user ID that is different to "
7568 "yours. CGI scripts run by your server, such as <filename role=\"special"
7569 "\">hgweb.cgi</filename>, will usually also run under that user ID."
7570 msgstr ""
7572 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7573 #: ../en/ch06-collab.xml:1415
7574 msgid ""
7575 "If you add <literal role=\"rc-web\">web</literal> items to your own personal "
7576 "<filename role=\"special\"> /.hgrc</filename>\\ file, CGI scripts won't read "
7577 "that <filename role=\"special\"> /.hgrc</filename>\\ file. Those settings "
7578 "will thus only affect the behaviour of the <command role=\"hg-cmd\">hg serve</"
7579 "command> command when you run it. To cause CGI scripts to see your settings, "
7580 "either create a <filename role=\"special\"> /.hgrc</filename>\\ file in the "
7581 "home directory of the user ID that runs your web server, or add those "
7582 "settings to a system-wide <filename role=\"special\"> /.hgrc</filename>\\ "
7583 "file."
7584 msgstr ""
7586 #. type: Content of: <book><chapter><title>
7587 #: ../en/ch07-filenames.xml:5
7588 msgid "File names and pattern matching"
7589 msgstr "文件名称与模式匹配"
7591 #. type: Content of: <book><chapter><para>
7592 #: ../en/ch07-filenames.xml:7
7593 msgid ""
7594 "Mercurial provides mechanisms that let you work with file names in a "
7595 "consistent and expressive way."
7596 msgstr ""
7598 #. type: Content of: <book><chapter><sect1><title>
7599 #: ../en/ch07-filenames.xml:11
7600 msgid "Simple file naming"
7601 msgstr "简单文件名称"
7603 #. type: Content of: <book><chapter><sect1><para>
7604 #: ../en/ch07-filenames.xml:13
7605 msgid ""
7606 "Mercurial uses a unified piece of machinery <quote>under the hood</quote> to "
7607 "handle file names. Every command behaves uniformly with respect to file "
7608 "names. The way in which commands work with file names is as follows."
7609 msgstr ""
7611 #. type: Content of: <book><chapter><sect1><para>
7612 #: ../en/ch07-filenames.xml:18
7613 msgid ""
7614 "If you explicitly name real files on the command line, Mercurial works with "
7615 "exactly those files, as you would expect. &interaction.filenames.files;"
7616 msgstr ""
7618 #
7619 #. type: Content of: <book><chapter><sect1><para>
7620 #: ../en/ch07-filenames.xml:22
7621 msgid ""
7622 "When you provide a directory name, Mercurial will interpret this as "
7623 "<quote>operate on every file in this directory and its subdirectories</"
7624 "quote>. Mercurial traverses the files and subdirectories in a directory in "
7625 "alphabetical order. When it encounters a subdirectory, it will traverse that "
7626 "subdirectory before continuing with the current directory."
7627 msgstr ""
7629 #. type: Content of: <book><chapter><sect1><title>
7630 #: ../en/ch07-filenames.xml:33
7631 msgid "Running commands without any file names"
7632 msgstr "不提供文件名称的执行命令"
7634 #. type: Content of: <book><chapter><sect1><para>
7635 #: ../en/ch07-filenames.xml:35
7636 msgid ""
7637 "Mercurial's commands that work with file names have useful default behaviours "
7638 "when you invoke them without providing any file names or patterns. What kind "
7639 "of behaviour you should expect depends on what the command does. Here are a "
7640 "few rules of thumb you can use to predict what a command is likely to do if "
7641 "you don't give it any names to work with."
7642 msgstr ""
7644 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7645 #: ../en/ch07-filenames.xml:42
7646 msgid ""
7647 "Most commands will operate on the entire working directory. This is what the "
7648 "<command role=\"hg-cmd\">hg add</command> command does, for example."
7649 msgstr ""
7651 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7652 #: ../en/ch07-filenames.xml:46
7653 msgid ""
7654 "If the command has effects that are difficult or impossible to reverse, it "
7655 "will force you to explicitly provide at least one name or pattern (see "
7656 "below). This protects you from accidentally deleting files by running "
7657 "<command role=\"hg-cmd\">hg remove</command> with no arguments, for example."
7658 msgstr ""
7660 #
7661 #. type: Content of: <book><chapter><sect1><para>
7662 #: ../en/ch07-filenames.xml:54
7663 msgid ""
7664 "It's easy to work around these default behaviours if they don't suit you. If "
7665 "a command normally operates on the whole working directory, you can invoke it "
7666 "on just the current directory and its subdirectories by giving it the name "
7667 "<quote><filename class=\"directory\">.</filename></quote>."
7668 msgstr ""
7670 #
7671 #. type: Content of: <book><chapter><sect1><para>
7672 #: ../en/ch07-filenames.xml:62
7673 msgid ""
7674 "Along the same lines, some commands normally print file names relative to the "
7675 "root of the repository, even if you're invoking them from a subdirectory. "
7676 "Such a command will print file names relative to your subdirectory if you "
7677 "give it explicit names. Here, we're going to run <command role=\"hg-cmd\">hg "
7678 "status</command> from a subdirectory, and get it to operate on the entire "
7679 "working directory while printing file names relative to our subdirectory, by "
7680 "passing it the output of the <command role=\"hg-cmd\">hg root</command> "
7681 "command."
7682 msgstr ""
7684 #. type: Content of: <book><chapter><sect1><title>
7685 #: ../en/ch07-filenames.xml:76
7686 msgid "Telling you what's going on"
7687 msgstr "告诉你正在做什么"
7689 #. type: Content of: <book><chapter><sect1><para>
7690 #: ../en/ch07-filenames.xml:78
7691 msgid ""
7692 "The <command role=\"hg-cmd\">hg add</command> example in the preceding "
7693 "section illustrates something else that's helpful about Mercurial commands. "
7694 "If a command operates on a file that you didn't name explicitly on the "
7695 "command line, it will usually print the name of the file, so that you will "
7696 "not be surprised what's going on."
7697 msgstr ""
7699 #. type: Content of: <book><chapter><sect1><para>
7700 #: ../en/ch07-filenames.xml:85
7701 msgid ""
7702 "The principle here is of <emphasis>least surprise</emphasis>. If you've "
7703 "exactly named a file on the command line, there's no point in repeating it "
7704 "back at you. If Mercurial is acting on a file <emphasis>implicitly</"
7705 "emphasis>, because you provided no names, or a directory, or a pattern (see "
7706 "below), it's safest to tell you what it's doing."
7707 msgstr ""
7709 #. type: Content of: <book><chapter><sect1><para>
7710 #: ../en/ch07-filenames.xml:92
7711 msgid ""
7712 "For commands that behave this way, you can silence them using the <option "
7713 "role=\"hg-opt-global\">-q</option> option. You can also get them to print "
7714 "the name of every file, even those you've named explicitly, using the <option "
7715 "role=\"hg-opt-global\">-v</option> option."
7716 msgstr ""
7718 #. type: Content of: <book><chapter><sect1><title>
7719 #: ../en/ch07-filenames.xml:100
7720 msgid "Using patterns to identify files"
7721 msgstr "使用模式标识文件"
7723 #. type: Content of: <book><chapter><sect1><para>
7724 #: ../en/ch07-filenames.xml:102
7725 msgid ""
7726 "In addition to working with file and directory names, Mercurial lets you use "
7727 "<emphasis>patterns</emphasis> to identify files. Mercurial's pattern "
7728 "handling is expressive."
7729 msgstr ""
7731 #. type: Content of: <book><chapter><sect1><para>
7732 #: ../en/ch07-filenames.xml:106
7733 msgid ""
7734 "On Unix-like systems (Linux, MacOS, etc.), the job of matching file names to "
7735 "patterns normally falls to the shell. On these systems, you must explicitly "
7736 "tell Mercurial that a name is a pattern. On Windows, the shell does not "
7737 "expand patterns, so Mercurial will automatically identify names that are "
7738 "patterns, and expand them for you."
7739 msgstr ""
7741 #. type: Content of: <book><chapter><sect1><para>
7742 #: ../en/ch07-filenames.xml:113
7743 msgid ""
7744 "To provide a pattern in place of a regular name on the command line, the "
7745 "mechanism is simple:"
7746 msgstr ""
7748 #. type: Content of: <book><chapter><sect1><para>
7749 #: ../en/ch07-filenames.xml:116
7750 msgid ""
7751 "That is, a pattern is identified by a short text string that says what kind "
7752 "of pattern this is, followed by a colon, followed by the actual pattern."
7753 msgstr ""
7755 #. type: Content of: <book><chapter><sect1><para>
7756 #: ../en/ch07-filenames.xml:120
7757 msgid ""
7758 "Mercurial supports two kinds of pattern syntax. The most frequently used is "
7759 "called <literal>glob</literal>; this is the same kind of pattern matching "
7760 "used by the Unix shell, and should be familiar to Windows command prompt "
7761 "users, too."
7762 msgstr ""
7764 #. type: Content of: <book><chapter><sect1><para>
7765 #: ../en/ch07-filenames.xml:125
7766 msgid ""
7767 "When Mercurial does automatic pattern matching on Windows, it uses "
7768 "<literal>glob</literal> syntax. You can thus omit the <quote><literal>glob:</"
7769 "literal></quote> prefix on Windows, but it's safe to use it, too."
7770 msgstr ""
7772 #. type: Content of: <book><chapter><sect1><para>
7773 #: ../en/ch07-filenames.xml:130
7774 msgid ""
7775 "The <literal>re</literal> syntax is more powerful; it lets you specify "
7776 "patterns using regular expressions, also known as regexps."
7777 msgstr ""
7779 #. type: Content of: <book><chapter><sect1><para>
7780 #: ../en/ch07-filenames.xml:134
7781 msgid ""
7782 "By the way, in the examples that follow, notice that I'm careful to wrap all "
7783 "of my patterns in quote characters, so that they won't get expanded by the "
7784 "shell before Mercurial sees them."
7785 msgstr ""
7787 #. type: Content of: <book><chapter><sect1><sect2><title>
7788 #: ../en/ch07-filenames.xml:140
7789 msgid "Shell-style <literal>glob</literal> patterns"
7790 msgstr "外壳风格的 <literal>glob</literal> 模式"
7792 #. type: Content of: <book><chapter><sect1><sect2><para>
7793 #: ../en/ch07-filenames.xml:142
7794 msgid ""
7795 "This is an overview of the kinds of patterns you can use when you're matching "
7796 "on glob patterns."
7797 msgstr ""
7799 #
7800 #. type: Content of: <book><chapter><sect1><sect2><para>
7801 #: ../en/ch07-filenames.xml:145
7802 msgid ""
7803 "The <quote><literal>*</literal></quote> character matches any string, within "
7804 "a single directory."
7805 msgstr ""
7807 #
7808 #. type: Content of: <book><chapter><sect1><sect2><para>
7809 #: ../en/ch07-filenames.xml:150
7810 msgid ""
7811 "The <quote><literal>**</literal></quote> pattern matches any string, and "
7812 "crosses directory boundaries. It's not a standard Unix glob token, but it's "
7813 "accepted by several popular Unix shells, and is very useful."
7814 msgstr ""
7816 #
7817 #. type: Content of: <book><chapter><sect1><sect2><para>
7818 #: ../en/ch07-filenames.xml:157
7819 msgid ""
7820 "The <quote><literal>?</literal></quote> pattern matches any single character."
7821 msgstr ""
7823 #. type: Content of: <book><chapter><sect1><sect2><para>
7824 #: ../en/ch07-filenames.xml:162
7825 msgid ""
7826 "The <quote><literal>[</literal></quote> character begins a "
7827 "<emphasis>character class</emphasis>. This matches any single character "
7828 "within the class. The class ends with a <quote><literal>]</literal></quote> "
7829 "character. A class may contain multiple <emphasis>range</emphasis>s of the "
7830 "form <quote><literal>a-f</literal></quote>, which is shorthand for "
7831 "<quote><literal>abcdef</literal></quote>."
7832 msgstr ""
7834 #. type: Content of: <book><chapter><sect1><sect2><para>
7835 #: ../en/ch07-filenames.xml:172
7836 msgid ""
7837 "If the first character after the <quote><literal>[</literal></quote> in a "
7838 "character class is a <quote><literal>!</literal></quote>, it "
7839 "<emphasis>negates</emphasis> the class, making it match any single character "
7840 "not in the class."
7841 msgstr ""
7843 #. type: Content of: <book><chapter><sect1><sect2><para>
7844 #: ../en/ch07-filenames.xml:178
7845 msgid ""
7846 "A <quote><literal>{</literal></quote> begins a group of subpatterns, where "
7847 "the whole group matches if any subpattern in the group matches. The "
7848 "<quote><literal>,</literal></quote> character separates subpatterns, and "
7849 "<quote><literal>}</literal></quote> ends the group."
7850 msgstr ""
7852 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
7853 #: ../en/ch07-filenames.xml:187
7854 msgid "Watch out!"
7855 msgstr "千万小心！"
7857 #
7858 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
7859 #: ../en/ch07-filenames.xml:189
7860 msgid ""
7861 "Don't forget that if you want to match a pattern in any directory, you should "
7862 "not be using the <quote><literal>*</literal></quote> match-any token, as this "
7863 "will only match within one directory. Instead, use the <quote><literal>**</"
7864 "literal></quote> token. This small example illustrates the difference "
7865 "between the two."
7866 msgstr ""
7868 #. type: Content of: <book><chapter><sect1><sect2><title>
7869 #: ../en/ch07-filenames.xml:201
7870 msgid "Regular expression matching with <literal>re</literal> patterns"
7871 msgstr "使用 <literal>re</literal> 模式的正则表达式匹配"
7873 #. type: Content of: <book><chapter><sect1><sect2><para>
7874 #: ../en/ch07-filenames.xml:204
7875 msgid ""
7876 "Mercurial accepts the same regular expression syntax as the Python "
7877 "programming language (it uses Python's regexp engine internally). This is "
7878 "based on the Perl language's regexp syntax, which is the most popular dialect "
7879 "in use (it's also used in Java, for example)."
7880 msgstr ""
7882 #. type: Content of: <book><chapter><sect1><sect2><para>
7883 #: ../en/ch07-filenames.xml:210
7884 msgid ""
7885 "I won't discuss Mercurial's regexp dialect in any detail here, as regexps are "
7886 "not often used. Perl-style regexps are in any case already exhaustively "
7887 "documented on a multitude of web sites, and in many books. Instead, I will "
7888 "focus here on a few things you should know if you find yourself needing to "
7889 "use regexps with Mercurial."
7890 msgstr ""
7892 #. type: Content of: <book><chapter><sect1><sect2><para>
7893 #: ../en/ch07-filenames.xml:217
7894 msgid ""
7895 "A regexp is matched against an entire file name, relative to the root of the "
7896 "repository. In other words, even if you're already in subbdirectory "
7897 "<filename class=\"directory\">foo</filename>, if you want to match files "
7898 "under this directory, your pattern must start with <quote><literal>foo/</"
7899 "literal></quote>."
7900 msgstr ""
7902 #. type: Content of: <book><chapter><sect1><sect2><para>
7903 #: ../en/ch07-filenames.xml:224
7904 msgid ""
7905 "One thing to note, if you're familiar with Perl-style regexps, is that "
7906 "Mercurial's are <emphasis>rooted</emphasis>. That is, a regexp starts "
7907 "matching against the beginning of a string; it doesn't look for a match "
7908 "anywhere within the string. To match anywhere in a string, start your "
7909 "pattern with <quote><literal>.*</literal></quote>."
7910 msgstr ""
7912 #. type: Content of: <book><chapter><sect1><title>
7913 #: ../en/ch07-filenames.xml:234
7914 msgid "Filtering files"
7915 msgstr "过滤文件"
7917 #. type: Content of: <book><chapter><sect1><para>
7918 #: ../en/ch07-filenames.xml:236
7919 msgid ""
7920 "Not only does Mercurial give you a variety of ways to specify files; it lets "
7921 "you further winnow those files using <emphasis>filters</emphasis>. Commands "
7922 "that work with file names accept two filtering options."
7923 msgstr ""
7925 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7926 #: ../en/ch07-filenames.xml:241
7927 msgid ""
7928 "<option role=\"hg-opt-global\">-I</option>, or <option role=\"hg-opt-global"
7929 "\">--include</option>, lets you specify a pattern that file names must match "
7930 "in order to be processed."
7931 msgstr ""
7933 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7934 #: ../en/ch07-filenames.xml:246
7935 msgid ""
7936 "<option role=\"hg-opt-global\">-X</option>, or <option role=\"hg-opt-global"
7937 "\">--exclude</option>, gives you a way to <emphasis>avoid</emphasis> "
7938 "processing files, if they match this pattern."
7939 msgstr ""
7941 #. type: Content of: <book><chapter><sect1><para>
7942 #: ../en/ch07-filenames.xml:251
7943 msgid ""
7944 "You can provide multiple <option role=\"hg-opt-global\">-I</option> and "
7945 "<option role=\"hg-opt-global\">-X</option> options on the command line, and "
7946 "intermix them as you please. Mercurial interprets the patterns you provide "
7947 "using glob syntax by default (but you can use regexps if you need to)."
7948 msgstr ""
7950 #. type: Content of: <book><chapter><sect1><para>
7951 #: ../en/ch07-filenames.xml:258
7952 msgid ""
7953 "You can read a <option role=\"hg-opt-global\">-I</option> filter as "
7954 "<quote>process only the files that match this filter</quote>."
7955 msgstr ""
7957 #. type: Content of: <book><chapter><sect1><para>
7958 #: ../en/ch07-filenames.xml:264
7959 msgid ""
7960 "The <option role=\"hg-opt-global\">-X</option> filter is best read as "
7961 "<quote>process only the files that don't match this pattern</quote>."
7962 msgstr ""
7964 #. type: Content of: <book><chapter><sect1><title>
7965 #: ../en/ch07-filenames.xml:272
7966 msgid "Ignoring unwanted files and directories"
7967 msgstr "忽略不需要的文件和目录"
7969 #. type: Content of: <book><chapter><sect1><para>
7970 #: ../en/ch07-filenames.xml:274
7971 msgid "XXX."
7972 msgstr ""
7974 #. type: Content of: <book><chapter><sect1><title>
7975 #: ../en/ch07-filenames.xml:278
7976 msgid "Case sensitivity"
7977 msgstr "大小写敏感性"
7979 #. type: Content of: <book><chapter><sect1><para>
7980 #: ../en/ch07-filenames.xml:280
7981 msgid ""
7982 "If you're working in a mixed development environment that contains both Linux "
7983 "(or other Unix) systems and Macs or Windows systems, you should keep in the "
7984 "back of your mind the knowledge that they treat the case (<quote>N</quote> "
7985 "versus <quote>n</quote>) of file names in incompatible ways. This is not "
7986 "very likely to affect you, and it's easy to deal with if it does, but it "
7987 "could surprise you if you don't know about it."
7988 msgstr ""
7990 #. type: Content of: <book><chapter><sect1><para>
7991 #: ../en/ch07-filenames.xml:289
7992 msgid ""
7993 "Operating systems and filesystems differ in the way they handle the "
7994 "<emphasis>case</emphasis> of characters in file and directory names. There "
7995 "are three common ways to handle case in names."
7996 msgstr ""
7998 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
7999 #: ../en/ch07-filenames.xml:294
8000 msgid ""
8001 "Completely case insensitive. Uppercase and lowercase versions of a letter "
8002 "are treated as identical, both when creating a file and during subsequent "
8003 "accesses. This is common on older DOS-based systems."
8004 msgstr ""
8006 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8007 #: ../en/ch07-filenames.xml:299
8008 msgid ""
8009 "Case preserving, but insensitive. When a file or directory is created, the "
8010 "case of its name is stored, and can be retrieved and displayed by the "
8011 "operating system. When an existing file is being looked up, its case is "
8012 "ignored. This is the standard arrangement on Windows and MacOS. The names "
8013 "<filename>foo</filename> and <filename>FoO</filename> identify the same "
8014 "file. This treatment of uppercase and lowercase letters as interchangeable "
8015 "is also referred to as <emphasis>case folding</emphasis>."
8016 msgstr ""
8018 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8019 #: ../en/ch07-filenames.xml:310
8020 msgid ""
8021 "Case sensitive. The case of a name is significant at all times. The names "
8022 "<filename>foo</filename> and {FoO} identify different files. This is the way "
8023 "Linux and Unix systems normally work."
8024 msgstr ""
8026 #. type: Content of: <book><chapter><sect1><para>
8027 #: ../en/ch07-filenames.xml:316
8028 msgid ""
8029 "On Unix-like systems, it is possible to have any or all of the above ways of "
8030 "handling case in action at once. For example, if you use a USB thumb drive "
8031 "formatted with a FAT32 filesystem on a Linux system, Linux will handle names "
8032 "on that filesystem in a case preserving, but insensitive, way."
8033 msgstr ""
8035 #. type: Content of: <book><chapter><sect1><sect2><title>
8036 #: ../en/ch07-filenames.xml:323
8037 msgid "Safe, portable repository storage"
8038 msgstr "安全，可移植的版本库存储"
8040 #. type: Content of: <book><chapter><sect1><sect2><para>
8041 #: ../en/ch07-filenames.xml:325
8042 msgid ""
8043 "Mercurial's repository storage mechanism is <emphasis>case safe</emphasis>. "
8044 "It translates file names so that they can be safely stored on both case "
8045 "sensitive and case insensitive filesystems. This means that you can use "
8046 "normal file copying tools to transfer a Mercurial repository onto, for "
8047 "example, a USB thumb drive, and safely move that drive and repository back "
8048 "and forth between a Mac, a PC running Windows, and a Linux box."
8049 msgstr ""
8051 #. type: Content of: <book><chapter><sect1><sect2><title>
8052 #: ../en/ch07-filenames.xml:336
8053 msgid "Detecting case conflicts"
8054 msgstr "检测大小写冲突"
8056 #. type: Content of: <book><chapter><sect1><sect2><para>
8057 #: ../en/ch07-filenames.xml:338
8058 msgid ""
8059 "When operating in the working directory, Mercurial honours the naming policy "
8060 "of the filesystem where the working directory is located. If the filesystem "
8061 "is case preserving, but insensitive, Mercurial will treat names that differ "
8062 "only in case as the same."
8063 msgstr ""
8065 #. type: Content of: <book><chapter><sect1><sect2><para>
8066 #: ../en/ch07-filenames.xml:344
8067 msgid ""
8068 "An important aspect of this approach is that it is possible to commit a "
8069 "changeset on a case sensitive (typically Linux or Unix) filesystem that will "
8070 "cause trouble for users on case insensitive (usually Windows and MacOS) "
8071 "users. If a Linux user commits changes to two files, one named "
8072 "<filename>myfile.c</filename> and the other named <filename>MyFile.C</"
8073 "filename>, they will be stored correctly in the repository. And in the "
8074 "working directories of other Linux users, they will be correctly represented "
8075 "as separate files."
8076 msgstr ""
8078 #. type: Content of: <book><chapter><sect1><sect2><para>
8079 #: ../en/ch07-filenames.xml:355
8080 msgid ""
8081 "If a Windows or Mac user pulls this change, they will not initially have a "
8082 "problem, because Mercurial's repository storage mechanism is case safe. "
8083 "However, once they try to <command role=\"hg-cmd\">hg update</command> the "
8084 "working directory to that changeset, or <command role=\"hg-cmd\">hg merge</"
8085 "command> with that changeset, Mercurial will spot the conflict between the "
8086 "two file names that the filesystem would treat as the same, and forbid the "
8087 "update or merge from occurring."
8088 msgstr ""
8090 #. type: Content of: <book><chapter><sect1><sect2><title>
8091 #: ../en/ch07-filenames.xml:367
8092 msgid "Fixing a case conflict"
8093 msgstr "修正大小写冲突"
8095 #. type: Content of: <book><chapter><sect1><sect2><para>
8096 #: ../en/ch07-filenames.xml:369
8097 msgid ""
8098 "If you are using Windows or a Mac in a mixed environment where some of your "
8099 "collaborators are using Linux or Unix, and Mercurial reports a case folding "
8100 "conflict when you try to <command role=\"hg-cmd\">hg update</command> or "
8101 "<command role=\"hg-cmd\">hg merge</command>, the procedure to fix the problem "
8102 "is simple."
8103 msgstr ""
8105 #. type: Content of: <book><chapter><sect1><sect2><para>
8106 #: ../en/ch07-filenames.xml:376
8107 msgid ""
8108 "Just find a nearby Linux or Unix box, clone the problem repository onto it, "
8109 "and use Mercurial's <command role=\"hg-cmd\">hg rename</command> command to "
8110 "change the names of any offending files or directories so that they will no "
8111 "longer cause case folding conflicts. Commit this change, <command role=\"hg-"
8112 "cmd\">hg pull</command> or <command role=\"hg-cmd\">hg push</command> it "
8113 "across to your Windows or MacOS system, and <command role=\"hg-cmd\">hg "
8114 "update</command> to the revision with the non-conflicting names."
8115 msgstr ""
8117 #. type: Content of: <book><chapter><sect1><sect2><para>
8118 #: ../en/ch07-filenames.xml:386
8119 msgid ""
8120 "The changeset with case-conflicting names will remain in your project's "
8121 "history, and you still won't be able to <command role=\"hg-cmd\">hg update</"
8122 "command> your working directory to that changeset on a Windows or MacOS "
8123 "system, but you can continue development unimpeded."
8124 msgstr ""
8126 #. type: Content of: <book><chapter><sect1><sect2><note><para>
8127 #: ../en/ch07-filenames.xml:393
8128 msgid ""
8129 "Prior to version 0.9.3, Mercurial did not use a case safe repository storage "
8130 "mechanism, and did not detect case folding conflicts. If you are using an "
8131 "older version of Mercurial on Windows or MacOS, I strongly recommend that you "
8132 "upgrade."
8133 msgstr ""
8135 #. type: Content of: <book><chapter><title>
8136 #: ../en/ch08-branch.xml:5
8137 msgid "Managing releases and branchy development"
8138 msgstr "发布管理与分支开发"
8140 #. type: Content of: <book><chapter><para>
8141 #: ../en/ch08-branch.xml:7
8142 msgid ""
8143 "Mercurial provides several mechanisms for you to manage a project that is "
8144 "making progress on multiple fronts at once. To understand these mechanisms, "
8145 "let's first take a brief look at a fairly normal software project structure."
8146 msgstr ""
8148 #. type: Content of: <book><chapter><para>
8149 #: ../en/ch08-branch.xml:12
8150 msgid ""
8151 "Many software projects issue periodic <quote>major</quote> releases that "
8152 "contain substantial new features. In parallel, they may issue <quote>minor</"
8153 "quote> releases. These are usually identical to the major releases off which "
8154 "they're based, but with a few bugs fixed."
8155 msgstr ""
8157 #. type: Content of: <book><chapter><para>
8158 #: ../en/ch08-branch.xml:18
8159 msgid ""
8160 "In this chapter, we'll start by talking about how to keep records of project "
8161 "milestones such as releases. We'll then continue on to talk about the flow "
8162 "of work between different phases of a project, and how Mercurial can help you "
8163 "to isolate and manage this work."
8164 msgstr ""
8166 #. type: Content of: <book><chapter><sect1><title>
8167 #: ../en/ch08-branch.xml:25
8168 msgid "Giving a persistent name to a revision"
8169 msgstr "给版本指定一个永久的名称"
8171 #. type: Content of: <book><chapter><sect1><para>
8172 #: ../en/ch08-branch.xml:27
8173 msgid ""
8174 "Once you decide that you'd like to call a particular revision a "
8175 "<quote>release</quote>, it's a good idea to record the identity of that "
8176 "revision. This will let you reproduce that release at a later date, for "
8177 "whatever purpose you might need at the time (reproducing a bug, porting to a "
8178 "new platform, etc). &interaction.tag.init;"
8179 msgstr ""
8181 #
8182 #. type: Content of: <book><chapter><sect1><para>
8183 #: ../en/ch08-branch.xml:34
8184 msgid ""
8185 "Mercurial lets you give a permanent name to any revision using the <command "
8186 "role=\"hg-cmd\">hg tag</command> command. Not surprisingly, these names are "
8187 "called <quote>tags</quote>."
8188 msgstr ""
8190 #. type: Content of: <book><chapter><sect1><para>
8191 #: ../en/ch08-branch.xml:40
8192 msgid ""
8193 "A tag is nothing more than a <quote>symbolic name</quote> for a revision. "
8194 "Tags exist purely for your convenience, so that you have a handy permanent "
8195 "way to refer to a revision; Mercurial doesn't interpret the tag names you use "
8196 "in any way. Neither does Mercurial place any restrictions on the name of a "
8197 "tag, beyond a few that are necessary to ensure that a tag can be parsed "
8198 "unambiguously. A tag name cannot contain any of the following characters:"
8199 msgstr ""
8201 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8202 #: ../en/ch08-branch.xml:49
8203 msgid "Colon (ASCII 58, <quote><literal>:</literal></quote>)"
8204 msgstr ""
8206 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8207 #: ../en/ch08-branch.xml:52
8208 msgid "Carriage return (ASCII 13, <quote><literal>\\r</literal></quote>)"
8209 msgstr ""
8211 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8212 #: ../en/ch08-branch.xml:55
8213 msgid "Newline (ASCII 10, <quote><literal>\\n</literal></quote>)"
8214 msgstr ""
8216 #. type: Content of: <book><chapter><sect1><para>
8217 #: ../en/ch08-branch.xml:59
8218 msgid ""
8219 "You can use the <command role=\"hg-cmd\">hg tags</command> command to display "
8220 "the tags present in your repository. In the output, each tagged revision is "
8221 "identified first by its name, then by revision number, and finally by the "
8222 "unique hash of the revision."
8223 msgstr ""
8225 #. type: Content of: <book><chapter><sect1><para>
8226 #: ../en/ch08-branch.xml:67
8227 msgid ""
8228 "Notice that <literal>tip</literal> is listed in the output of <command role="
8229 "\"hg-cmd\">hg tags</command>. The <literal>tip</literal> tag is a special "
8230 "<quote>floating</quote> tag, which always identifies the newest revision in "
8231 "the repository."
8232 msgstr ""
8234 #. type: Content of: <book><chapter><sect1><para>
8235 #: ../en/ch08-branch.xml:73
8236 msgid ""
8237 "In the output of the <command role=\"hg-cmd\">hg tags</command> command, tags "
8238 "are listed in reverse order, by revision number. This usually means that "
8239 "recent tags are listed before older tags. It also means that <literal>tip</"
8240 "literal> is always going to be the first tag listed in the output of <command "
8241 "role=\"hg-cmd\">hg tags</command>."
8242 msgstr ""
8244 #. type: Content of: <book><chapter><sect1><para>
8245 #: ../en/ch08-branch.xml:80
8246 msgid ""
8247 "When you run <command role=\"hg-cmd\">hg log</command>, if it displays a "
8248 "revision that has tags associated with it, it will print those tags."
8249 msgstr ""
8251 #
8252 #. type: Content of: <book><chapter><sect1><para>
8253 #: ../en/ch08-branch.xml:86
8254 msgid ""
8255 "Any time you need to provide a revision ID to a Mercurial command, the "
8256 "command will accept a tag name in its place. Internally, Mercurial will "
8257 "translate your tag name into the corresponding revision ID, then use that."
8258 msgstr ""
8260 #. type: Content of: <book><chapter><sect1><para>
8261 #: ../en/ch08-branch.xml:93
8262 msgid ""
8263 "There's no limit on the number of tags you can have in a repository, or on "
8264 "the number of tags that a single revision can have. As a practical matter, "
8265 "it's not a great idea to have <quote>too many</quote> (a number which will "
8266 "vary from project to project), simply because tags are supposed to help you "
8267 "to find revisions. If you have lots of tags, the ease of using them to "
8268 "identify revisions diminishes rapidly."
8269 msgstr ""
8271 #. type: Content of: <book><chapter><sect1><para>
8272 #: ../en/ch08-branch.xml:101
8273 msgid ""
8274 "For example, if your project has milestones as frequent as every few days, "
8275 "it's perfectly reasonable to tag each one of those. But if you have a "
8276 "continuous build system that makes sure every revision can be built cleanly, "
8277 "you'd be introducing a lot of noise if you were to tag every clean build. "
8278 "Instead, you could tag failed builds (on the assumption that they're rare!), "
8279 "or simply not use tags to track buildability."
8280 msgstr ""
8282 #. type: Content of: <book><chapter><sect1><para>
8283 #: ../en/ch08-branch.xml:109
8284 msgid ""
8285 "If you want to remove a tag that you no longer want, use <command role=\"hg-"
8286 "cmd\">hg tag --remove</command>."
8287 msgstr ""
8289 #. type: Content of: <book><chapter><sect1><para>
8290 #: ../en/ch08-branch.xml:114
8291 msgid ""
8292 "You can also modify a tag at any time, so that it identifies a different "
8293 "revision, by simply issuing a new <command role=\"hg-cmd\">hg tag</command> "
8294 "command. You'll have to use the <option role=\"hg-opt-tag\">-f</option> "
8295 "option to tell Mercurial that you <emphasis>really</emphasis> want to update "
8296 "the tag."
8297 msgstr ""
8299 #. type: Content of: <book><chapter><sect1><para>
8300 #: ../en/ch08-branch.xml:123
8301 msgid ""
8302 "There will still be a permanent record of the previous identity of the tag, "
8303 "but Mercurial will no longer use it. There's thus no penalty to tagging the "
8304 "wrong revision; all you have to do is turn around and tag the correct "
8305 "revision once you discover your error."
8306 msgstr ""
8308 #
8309 #. type: Content of: <book><chapter><sect1><para>
8310 #: ../en/ch08-branch.xml:129
8311 msgid ""
8312 "Mercurial stores tags in a normal revision-controlled file in your "
8313 "repository. If you've created any tags, you'll find them in a file named "
8314 "<filename role=\"special\">.hgtags</filename>. When you run the <command "
8315 "role=\"hg-cmd\">hg tag</command> command, Mercurial modifies this file, then "
8316 "automatically commits the change to it. This means that every time you run "
8317 "<command role=\"hg-cmd\">hg tag</command>, you'll see a corresponding "
8318 "changeset in the output of <command role=\"hg-cmd\">hg log</command>."
8319 msgstr ""
8321 #. type: Content of: <book><chapter><sect1><sect2><title>
8322 #: ../en/ch08-branch.xml:142
8323 msgid "Handling tag conflicts during a merge"
8324 msgstr "在合并期间处理标签冲突"
8326 #. type: Content of: <book><chapter><sect1><sect2><para>
8327 #: ../en/ch08-branch.xml:144
8328 msgid ""
8329 "You won't often need to care about the <filename role=\"special\">.hgtags</"
8330 "filename> file, but it sometimes makes its presence known during a merge. "
8331 "The format of the file is simple: it consists of a series of lines. Each "
8332 "line starts with a changeset hash, followed by a space, followed by the name "
8333 "of a tag."
8334 msgstr ""
8336 #. type: Content of: <book><chapter><sect1><sect2><para>
8337 #: ../en/ch08-branch.xml:151
8338 msgid ""
8339 "If you're resolving a conflict in the <filename role=\"special\">.hgtags</"
8340 "filename> file during a merge, there's one twist to modifying the <filename "
8341 "role=\"special\">.hgtags</filename> file: when Mercurial is parsing the tags "
8342 "in a repository, it <emphasis>never</emphasis> reads the working copy of the "
8343 "<filename role=\"special\">.hgtags</filename> file. Instead, it reads the "
8344 "<emphasis>most recently committed</emphasis> revision of the file."
8345 msgstr ""
8347 #. type: Content of: <book><chapter><sect1><sect2><para>
8348 #: ../en/ch08-branch.xml:161
8349 msgid ""
8350 "An unfortunate consequence of this design is that you can't actually verify "
8351 "that your merged <filename role=\"special\">.hgtags</filename> file is "
8352 "correct until <emphasis>after</emphasis> you've committed a change. So if "
8353 "you find yourself resolving a conflict on <filename role=\"special\">.hgtags</"
8354 "filename> during a merge, be sure to run <command role=\"hg-cmd\">hg tags</"
8355 "command> after you commit. If it finds an error in the <filename role="
8356 "\"special\">.hgtags</filename> file, it will report the location of the "
8357 "error, which you can then fix and commit. You should then run <command role="
8358 "\"hg-cmd\">hg tags</command> again, just to be sure that your fix is correct."
8359 msgstr ""
8361 #. type: Content of: <book><chapter><sect1><sect2><title>
8362 #: ../en/ch08-branch.xml:176
8363 msgid "Tags and cloning"
8364 msgstr "标签与克隆"
8366 #. type: Content of: <book><chapter><sect1><sect2><para>
8367 #: ../en/ch08-branch.xml:178
8368 msgid ""
8369 "You may have noticed that the <command role=\"hg-cmd\">hg clone</command> "
8370 "command has a <option role=\"hg-opt-clone\">-r</option> option that lets you "
8371 "clone an exact copy of the repository as of a particular changeset. The new "
8372 "clone will not contain any project history that comes after the revision you "
8373 "specified. This has an interaction with tags that can surprise the unwary."
8374 msgstr ""
8376 #. type: Content of: <book><chapter><sect1><sect2><para>
8377 #: ../en/ch08-branch.xml:186
8378 msgid ""
8379 "Recall that a tag is stored as a revision to the <filename role=\"special\">."
8380 "hgtags</filename> file, so that when you create a tag, the changeset in which "
8381 "it's recorded necessarily refers to an older changeset. When you run "
8382 "<command role=\"hg-cmd\">hg clone -r foo</command> to clone a repository as "
8383 "of tag <literal>foo</literal>, the new clone <emphasis>will not contain the "
8384 "history that created the tag</emphasis> that you used to clone the "
8385 "repository. The result is that you'll get exactly the right subset of the "
8386 "project's history in the new repository, but <emphasis>not</emphasis> the tag "
8387 "you might have expected."
8388 msgstr ""
8390 #. type: Content of: <book><chapter><sect1><sect2><title>
8391 #: ../en/ch08-branch.xml:201
8392 msgid "When permanent tags are too much"
8393 msgstr "当永久标签太多的时候"
8395 #. type: Content of: <book><chapter><sect1><sect2><para>
8396 #: ../en/ch08-branch.xml:203
8397 msgid ""
8398 "Since Mercurial's tags are revision controlled and carried around with a "
8399 "project's history, everyone you work with will see the tags you create. But "
8400 "giving names to revisions has uses beyond simply noting that revision "
8401 "<literal>4237e45506ee</literal> is really <literal>v2.0.2</literal>. If "
8402 "you're trying to track down a subtle bug, you might want a tag to remind you "
8403 "of something like <quote>Anne saw the symptoms with this revision</quote>."
8404 msgstr ""
8406 #. type: Content of: <book><chapter><sect1><sect2><para>
8407 #: ../en/ch08-branch.xml:213
8408 msgid ""
8409 "For cases like this, what you might want to use are <emphasis>local</"
8410 "emphasis> tags. You can create a local tag with the <option role=\"hg-opt-tag"
8411 "\">-l</option> option to the <command role=\"hg-cmd\">hg tag</command> "
8412 "command. This will store the tag in a file called <filename role=\"special"
8413 "\">.hg/localtags</filename>. Unlike <filename role=\"special\">.hgtags</"
8414 "filename>, <filename role=\"special\">.hg/localtags</filename> is not "
8415 "revision controlled. Any tags you create using <option role=\"hg-opt-tag\">-"
8416 "l</option> remain strictly local to the repository you're currently working "
8417 "in."
8418 msgstr ""
8420 #. type: Content of: <book><chapter><sect1><title>
8421 #: ../en/ch08-branch.xml:228
8422 msgid "The flow of changes&emdash;big picture vs. little"
8423 msgstr "修改流程&emdash;宏观与微观"
8425 #. type: Content of: <book><chapter><sect1><para>
8426 #: ../en/ch08-branch.xml:230
8427 msgid ""
8428 "To return to the outline I sketched at the beginning of a chapter, let's "
8429 "think about a project that has multiple concurrent pieces of work under "
8430 "development at once."
8431 msgstr ""
8433 #. type: Content of: <book><chapter><sect1><para>
8434 #: ../en/ch08-branch.xml:234
8435 msgid ""
8436 "There might be a push for a new <quote>main</quote> release; a new minor "
8437 "bugfix release to the last main release; and an unexpected <quote>hot fix</"
8438 "quote> to an old release that is now in maintenance mode."
8439 msgstr ""
8441 #. type: Content of: <book><chapter><sect1><para>
8442 #: ../en/ch08-branch.xml:239
8443 msgid ""
8444 "The usual way people refer to these different concurrent directions of "
8445 "development is as <quote>branches</quote>. However, we've already seen "
8446 "numerous times that Mercurial treats <emphasis>all of history</emphasis> as a "
8447 "series of branches and merges. Really, what we have here is two ideas that "
8448 "are peripherally related, but which happen to share a name."
8449 msgstr ""
8451 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8452 #: ../en/ch08-branch.xml:246
8453 msgid ""
8454 "<quote>Big picture</quote> branches represent the sweep of a project's "
8455 "evolution; people give them names, and talk about them in conversation."
8456 msgstr ""
8458 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
8459 #: ../en/ch08-branch.xml:250
8460 msgid ""
8461 "<quote>Little picture</quote> branches are artefacts of the day-to-day "
8462 "activity of developing and merging changes. They expose the narrative of how "
8463 "the code was developed."
8464 msgstr ""
8466 #. type: Content of: <book><chapter><sect1><title>
8467 #: ../en/ch08-branch.xml:258
8468 msgid "Managing big-picture branches in repositories"
8469 msgstr "在版本库中管理分支"
8471 #. type: Content of: <book><chapter><sect1><para>
8472 #: ../en/ch08-branch.xml:260
8473 msgid ""
8474 "The easiest way to isolate a <quote>big picture</quote> branch in Mercurial "
8475 "is in a dedicated repository. If you have an existing shared "
8476 "repository&emdash;let's call it <literal>myproject</literal>&emdash;that "
8477 "reaches a <quote>1.0</quote> milestone, you can start to prepare for future "
8478 "maintenance releases on top of version 1.0 by tagging the revision from which "
8479 "you prepared the 1.0 release."
8480 msgstr ""
8482 #. type: Content of: <book><chapter><sect1><para>
8483 #: ../en/ch08-branch.xml:270
8484 msgid ""
8485 "You can then clone a new shared <literal>myproject-1.0.1</literal> repository "
8486 "as of that tag."
8487 msgstr ""
8489 #. type: Content of: <book><chapter><sect1><para>
8490 #: ../en/ch08-branch.xml:276
8491 msgid ""
8492 "Afterwards, if someone needs to work on a bug fix that ought to go into an "
8493 "upcoming 1.0.1 minor release, they clone the <literal>myproject-1.0.1</"
8494 "literal> repository, make their changes, and push them back."
8495 msgstr ""
8497 #. type: Content of: <book><chapter><sect1><para>
8498 #: ../en/ch08-branch.xml:283
8499 msgid ""
8500 "Meanwhile, development for the next major release can continue, isolated and "
8501 "unabated, in the <literal>myproject</literal> repository."
8502 msgstr ""
8504 #. type: Content of: <book><chapter><sect1><title>
8505 #: ../en/ch08-branch.xml:291
8506 msgid "Don't repeat yourself: merging across branches"
8507 msgstr "不要重复劳动：在分支间合并"
8509 #. type: Content of: <book><chapter><sect1><para>
8510 #: ../en/ch08-branch.xml:293
8511 msgid ""
8512 "In many cases, if you have a bug to fix on a maintenance branch, the chances "
8513 "are good that the bug exists on your project's main branch (and possibly "
8514 "other maintenance branches, too). It's a rare developer who wants to fix the "
8515 "same bug multiple times, so let's look at a few ways that Mercurial can help "
8516 "you to manage these bugfixes without duplicating your work."
8517 msgstr ""
8519 #. type: Content of: <book><chapter><sect1><para>
8520 #: ../en/ch08-branch.xml:301
8521 msgid ""
8522 "In the simplest instance, all you need to do is pull changes from your "
8523 "maintenance branch into your local clone of the target branch."
8524 msgstr ""
8526 #. type: Content of: <book><chapter><sect1><para>
8527 #: ../en/ch08-branch.xml:307
8528 msgid ""
8529 "You'll then need to merge the heads of the two branches, and push back to the "
8530 "main branch."
8531 msgstr ""
8533 #. type: Content of: <book><chapter><sect1><title>
8534 #: ../en/ch08-branch.xml:314
8535 msgid "Naming branches within one repository"
8536 msgstr "版本库中的命名分支"
8538 #. type: Content of: <book><chapter><sect1><para>
8539 #: ../en/ch08-branch.xml:316
8540 msgid ""
8541 "In most instances, isolating branches in repositories is the right approach. "
8542 "Its simplicity makes it easy to understand; and so it's hard to make "
8543 "mistakes. There's a one-to-one relationship between branches you're working "
8544 "in and directories on your system. This lets you use normal (non-Mercurial-"
8545 "aware) tools to work on files within a branch/repository."
8546 msgstr ""
8548 #. type: Content of: <book><chapter><sect1><para>
8549 #: ../en/ch08-branch.xml:323
8550 msgid ""
8551 "If you're more in the <quote>power user</quote> category (<emphasis>and</"
8552 "emphasis> your collaborators are too), there is an alternative way of "
8553 "handling branches that you can consider. I've already mentioned the human-"
8554 "level distinction between <quote>small picture</quote> and <quote>big "
8555 "picture</quote> branches. While Mercurial works with multiple <quote>small "
8556 "picture</quote> branches in a repository all the time (for example after you "
8557 "pull changes in, but before you merge them), it can <emphasis>also</emphasis> "
8558 "work with multiple <quote>big picture</quote> branches."
8559 msgstr ""
8561 #. type: Content of: <book><chapter><sect1><para>
8562 #: ../en/ch08-branch.xml:334
8563 msgid ""
8564 "The key to working this way is that Mercurial lets you assign a persistent "
8565 "<emphasis>name</emphasis> to a branch. There always exists a branch named "
8566 "<literal>default</literal>. Even before you start naming branches yourself, "
8567 "you can find traces of the <literal>default</literal> branch if you look for "
8568 "them."
8569 msgstr ""
8571 #. type: Content of: <book><chapter><sect1><para>
8572 #: ../en/ch08-branch.xml:341
8573 msgid ""
8574 "As an example, when you run the <command role=\"hg-cmd\">hg commit</command> "
8575 "command, and it pops up your editor so that you can enter a commit message, "
8576 "look for a line that contains the text <quote><literal>HG: branch default</"
8577 "literal></quote> at the bottom. This is telling you that your commit will "
8578 "occur on the branch named <literal>default</literal>."
8579 msgstr ""
8581 #. type: Content of: <book><chapter><sect1><para>
8582 #: ../en/ch08-branch.xml:348
8583 msgid ""
8584 "To start working with named branches, use the <command role=\"hg-cmd\">hg "
8585 "branches</command> command. This command lists the named branches already "
8586 "present in your repository, telling you which changeset is the tip of each."
8587 msgstr ""
8589 #. type: Content of: <book><chapter><sect1><para>
8590 #: ../en/ch08-branch.xml:355
8591 msgid ""
8592 "Since you haven't created any named branches yet, the only one that exists is "
8593 "<literal>default</literal>."
8594 msgstr ""
8596 #. type: Content of: <book><chapter><sect1><para>
8597 #: ../en/ch08-branch.xml:358
8598 msgid ""
8599 "To find out what the <quote>current</quote> branch is, run the <command role="
8600 "\"hg-cmd\">hg branch</command> command, giving it no arguments. This tells "
8601 "you what branch the parent of the current changeset is on."
8602 msgstr ""
8604 #
8605 #. type: Content of: <book><chapter><sect1><para>
8606 #: ../en/ch08-branch.xml:365
8607 msgid ""
8608 "To create a new branch, run the <command role=\"hg-cmd\">hg branch</command> "
8609 "command again. This time, give it one argument: the name of the branch you "
8610 "want to create."
8611 msgstr ""
8613 #. type: Content of: <book><chapter><sect1><para>
8614 #: ../en/ch08-branch.xml:371
8615 msgid ""
8616 "After you've created a branch, you might wonder what effect the <command role="
8617 "\"hg-cmd\">hg branch</command> command has had. What do the <command role="
8618 "\"hg-cmd\">hg status</command> and <command role=\"hg-cmd\">hg tip</command> "
8619 "commands report?"
8620 msgstr ""
8622 #. type: Content of: <book><chapter><sect1><para>
8623 #: ../en/ch08-branch.xml:378
8624 msgid ""
8625 "Nothing has changed in the working directory, and there's been no new history "
8626 "created. As this suggests, running the <command role=\"hg-cmd\">hg branch</"
8627 "command> command has no permanent effect; it only tells Mercurial what branch "
8628 "name to use the <emphasis>next</emphasis> time you commit a changeset."
8629 msgstr ""
8631 #. type: Content of: <book><chapter><sect1><para>
8632 #: ../en/ch08-branch.xml:385
8633 msgid ""
8634 "When you commit a change, Mercurial records the name of the branch on which "
8635 "you committed. Once you've switched from the <literal>default</literal> "
8636 "branch to another and committed, you'll see the name of the new branch show "
8637 "up in the output of <command role=\"hg-cmd\">hg log</command>, <command role="
8638 "\"hg-cmd\">hg tip</command>, and other commands that display the same kind of "
8639 "output."
8640 msgstr ""
8642 #. type: Content of: <book><chapter><sect1><para>
8643 #: ../en/ch08-branch.xml:395
8644 msgid ""
8645 "The <command role=\"hg-cmd\">hg log</command>-like commands will print the "
8646 "branch name of every changeset that's not on the <literal>default</literal> "
8647 "branch. As a result, if you never use named branches, you'll never see this "
8648 "information."
8649 msgstr ""
8651 #. type: Content of: <book><chapter><sect1><para>
8652 #: ../en/ch08-branch.xml:400
8653 msgid ""
8654 "Once you've named a branch and committed a change with that name, every "
8655 "subsequent commit that descends from that change will inherit the same branch "
8656 "name. You can change the name of a branch at any time, using the <command "
8657 "role=\"hg-cmd\">hg branch</command> command."
8658 msgstr ""
8660 #. type: Content of: <book><chapter><sect1><para>
8661 #: ../en/ch08-branch.xml:408
8662 msgid ""
8663 "In practice, this is something you won't do very often, as branch names tend "
8664 "to have fairly long lifetimes. (This isn't a rule, just an observation.)"
8665 msgstr ""
8667 #. type: Content of: <book><chapter><sect1><title>
8668 #: ../en/ch08-branch.xml:414
8669 msgid "Dealing with multiple named branches in a repository"
8670 msgstr "在版本库中处理多个命名分支"
8672 #. type: Content of: <book><chapter><sect1><para>
8673 #: ../en/ch08-branch.xml:417
8674 msgid ""
8675 "If you have more than one named branch in a repository, Mercurial will "
8676 "remember the branch that your working directory on when you start a command "
8677 "like <command role=\"hg-cmd\">hg update</command> or <command role=\"hg-cmd"
8678 "\">hg pull -u</command>. It will update the working directory to the tip of "
8679 "this branch, no matter what the <quote>repo-wide</quote> tip is. To update "
8680 "to a revision that's on a different named branch, you may need to use the "
8681 "<option role=\"hg-opt-update\">-C</option> option to <command role=\"hg-cmd"
8682 "\">hg update</command>."
8683 msgstr ""
8685 #. type: Content of: <book><chapter><sect1><para>
8686 #: ../en/ch08-branch.xml:427
8687 msgid ""
8688 "This behaviour is a little subtle, so let's see it in action. First, let's "
8689 "remind ourselves what branch we're currently on, and what branches are in our "
8690 "repository."
8691 msgstr ""
8693 #. type: Content of: <book><chapter><sect1><para>
8694 #: ../en/ch08-branch.xml:433
8695 msgid ""
8696 "We're on the <literal>bar</literal> branch, but there also exists an older "
8697 "<command role=\"hg-cmd\">hg foo</command> branch."
8698 msgstr ""
8700 #. type: Content of: <book><chapter><sect1><para>
8701 #: ../en/ch08-branch.xml:437
8702 msgid ""
8703 "We can <command role=\"hg-cmd\">hg update</command> back and forth between "
8704 "the tips of the <literal>foo</literal> and <literal>bar</literal> branches "
8705 "without needing to use the <option role=\"hg-opt-update\">-C</option> option, "
8706 "because this only involves going backwards and forwards linearly through our "
8707 "change history."
8708 msgstr ""
8710 #
8711 #. type: Content of: <book><chapter><sect1><para>
8712 #: ../en/ch08-branch.xml:446
8713 msgid ""
8714 "If we go back to the <literal>foo</literal> branch and then run <command role="
8715 "\"hg-cmd\">hg update</command>, it will keep us on <literal>foo</literal>, "
8716 "not move us to the tip of <literal>bar</literal>."
8717 msgstr ""
8719 #
8720 #. type: Content of: <book><chapter><sect1><para>
8721 #: ../en/ch08-branch.xml:453
8722 msgid ""
8723 "Committing a new change on the <literal>foo</literal> branch introduces a new "
8724 "head."
8725 msgstr ""
8727 #. type: Content of: <book><chapter><sect1><title>
8728 #: ../en/ch08-branch.xml:460
8729 msgid "Branch names and merging"
8730 msgstr "分支名称与合并"
8732 #. type: Content of: <book><chapter><sect1><para>
8733 #: ../en/ch08-branch.xml:462
8734 msgid ""
8735 "As you've probably noticed, merges in Mercurial are not symmetrical. Let's "
8736 "say our repository has two heads, 17 and 23. If I <command role=\"hg-cmd"
8737 "\">hg update</command> to 17 and then <command role=\"hg-cmd\">hg merge</"
8738 "command> with 23, Mercurial records 17 as the first parent of the merge, and "
8739 "23 as the second. Whereas if I <command role=\"hg-cmd\">hg update</command> "
8740 "to 23 and then <command role=\"hg-cmd\">hg merge</command> with 17, it "
8741 "records 23 as the first parent, and 17 as the second."
8742 msgstr ""
8744 #. type: Content of: <book><chapter><sect1><para>
8745 #: ../en/ch08-branch.xml:472
8746 msgid ""
8747 "This affects Mercurial's choice of branch name when you merge. After a "
8748 "merge, Mercurial will retain the branch name of the first parent when you "
8749 "commit the result of the merge. If your first parent's branch name is "
8750 "<literal>foo</literal>, and you merge with <literal>bar</literal>, the branch "
8751 "name will still be <literal>foo</literal> after you merge."
8752 msgstr ""
8754 #. type: Content of: <book><chapter><sect1><para>
8755 #: ../en/ch08-branch.xml:479
8756 msgid ""
8757 "It's not unusual for a repository to contain multiple heads, each with the "
8758 "same branch name. Let's say I'm working on the <literal>foo</literal> "
8759 "branch, and so are you. We commit different changes; I pull your changes; I "
8760 "now have two heads, each claiming to be on the <literal>foo</literal> "
8761 "branch. The result of a merge will be a single head on the <literal>foo</"
8762 "literal> branch, as you might hope."
8763 msgstr ""
8765 #
8766 #. type: Content of: <book><chapter><sect1><para>
8767 #: ../en/ch08-branch.xml:487
8768 msgid ""
8769 "But if I'm working on the <literal>bar</literal> branch, and I merge work "
8770 "from the <literal>foo</literal> branch, the result will remain on the "
8771 "<literal>bar</literal> branch."
8772 msgstr ""
8774 #. type: Content of: <book><chapter><sect1><para>
8775 #: ../en/ch08-branch.xml:493
8776 msgid ""
8777 "To give a more concrete example, if I'm working on the <literal>bleeding-"
8778 "edge</literal> branch, and I want to bring in the latest fixes from the "
8779 "<literal>stable</literal> branch, Mercurial will choose the <quote>right</"
8780 "quote> (<literal>bleeding-edge</literal>) branch name when I pull and merge "
8781 "from <literal>stable</literal>."
8782 msgstr ""
8784 #. type: Content of: <book><chapter><sect1><title>
8785 #: ../en/ch08-branch.xml:502
8786 msgid "Branch naming is generally useful"
8787 msgstr "分支名称通常都很有用"
8789 #. type: Content of: <book><chapter><sect1><para>
8790 #: ../en/ch08-branch.xml:504
8791 msgid ""
8792 "You shouldn't think of named branches as applicable only to situations where "
8793 "you have multiple long-lived branches cohabiting in a single repository. "
8794 "They're very useful even in the one-branch-per-repository case."
8795 msgstr ""
8797 #. type: Content of: <book><chapter><sect1><para>
8798 #: ../en/ch08-branch.xml:509
8799 msgid ""
8800 "In the simplest case, giving a name to each branch gives you a permanent "
8801 "record of which branch a changeset originated on. This gives you more "
8802 "context when you're trying to follow the history of a long-lived branchy "
8803 "project."
8804 msgstr ""
8806 #. type: Content of: <book><chapter><sect1><para>
8807 #: ../en/ch08-branch.xml:514
8808 msgid ""
8809 "If you're working with shared repositories, you can set up a <literal role="
8810 "\"hook\">pretxnchangegroup</literal> hook on each that will block incoming "
8811 "changes that have the <quote>wrong</quote> branch name. This provides a "
8812 "simple, but effective, defence against people accidentally pushing changes "
8813 "from a <quote>bleeding edge</quote> branch to a <quote>stable</quote> "
8814 "branch. Such a hook might look like this inside the shared repo's <filename "
8815 "role=\"special\"> /.hgrc</filename>."
8816 msgstr ""
8818 #. type: Content of: <book><chapter><title>
8819 #: ../en/ch09-undo.xml:5
8820 msgid "Finding and fixing mistakes"
8821 msgstr "查找和修改错误"
8823 #. type: Content of: <book><chapter><para>
8824 #: ../en/ch09-undo.xml:7
8825 msgid ""
8826 "To err might be human, but to really handle the consequences well takes a top-"
8827 "notch revision control system. In this chapter, we'll discuss some of the "
8828 "techniques you can use when you find that a problem has crept into your "
8829 "project. Mercurial has some highly capable features that will help you to "
8830 "isolate the sources of problems, and to handle them appropriately."
8831 msgstr ""
8833 #. type: Content of: <book><chapter><sect1><title>
8834 #: ../en/ch09-undo.xml:15
8835 msgid "Erasing local history"
8836 msgstr "销毁本地历史"
8838 #. type: Content of: <book><chapter><sect1><sect2><title>
8839 #: ../en/ch09-undo.xml:18
8840 msgid "The accidental commit"
8841 msgstr "意外的提交"
8843 #. type: Content of: <book><chapter><sect1><sect2><para>
8844 #: ../en/ch09-undo.xml:20
8845 msgid ""
8846 "I have the occasional but persistent problem of typing rather more quickly "
8847 "than I can think, which sometimes results in me committing a changeset that "
8848 "is either incomplete or plain wrong. In my case, the usual kind of "
8849 "incomplete changeset is one in which I've created a new source file, but "
8850 "forgotten to <command role=\"hg-cmd\">hg add</command> it. A <quote>plain "
8851 "wrong</quote> changeset is not as common, but no less annoying."
8852 msgstr ""
8854 #. type: Content of: <book><chapter><sect1><sect2><title>
8855 #: ../en/ch09-undo.xml:31
8856 msgid "Rolling back a transaction"
8857 msgstr "回滚一个事务"
8859 #. type: Content of: <book><chapter><sect1><sect2><para>
8860 #: ../en/ch09-undo.xml:33
8861 msgid ""
8862 "In section <xref linkend=\"sec.concepts.txn\"/>, I mentioned that Mercurial "
8863 "treats each modification of a repository as a <emphasis>transaction</"
8864 "emphasis>. Every time you commit a changeset or pull changes from another "
8865 "repository, Mercurial remembers what you did. You can undo, or "
8866 "<emphasis>roll back</emphasis>, exactly one of these actions using the "
8867 "<command role=\"hg-cmd\">hg rollback</command> command. (See section <xref "
8868 "linkend=\"sec.undo.rollback-after-push\"/> for an important caveat about the "
8869 "use of this command.)"
8870 msgstr ""
8872 #. type: Content of: <book><chapter><sect1><sect2><para>
8873 #: ../en/ch09-undo.xml:43
8874 msgid ""
8875 "Here's a mistake that I often find myself making: committing a change in "
8876 "which I've created a new file, but forgotten to <command role=\"hg-cmd\">hg "
8877 "add</command> it."
8878 msgstr ""
8880 #. type: Content of: <book><chapter><sect1><sect2><para>
8881 #: ../en/ch09-undo.xml:50
8882 msgid ""
8883 "Looking at the output of <command role=\"hg-cmd\">hg status</command> after "
8884 "the commit immediately confirms the error."
8885 msgstr ""
8887 #. type: Content of: <book><chapter><sect1><sect2><para>
8888 #: ../en/ch09-undo.xml:56
8889 msgid ""
8890 "The commit captured the changes to the file <filename>a</filename>, but not "
8891 "the new file <filename>b</filename>. If I were to push this changeset to a "
8892 "repository that I shared with a colleague, the chances are high that "
8893 "something in <filename>a</filename> would refer to <filename>b</filename>, "
8894 "which would not be present in their repository when they pulled my changes. "
8895 "I would thus become the object of some indignation."
8896 msgstr ""
8898 #. type: Content of: <book><chapter><sect1><sect2><para>
8899 #: ../en/ch09-undo.xml:65
8900 msgid ""
8901 "However, luck is with me&emdash;I've caught my error before I pushed the "
8902 "changeset. I use the <command role=\"hg-cmd\">hg rollback</command> command, "
8903 "and Mercurial makes that last changeset vanish."
8904 msgstr ""
8906 #. type: Content of: <book><chapter><sect1><sect2><para>
8907 #: ../en/ch09-undo.xml:72
8908 msgid ""
8909 "Notice that the changeset is no longer present in the repository's history, "
8910 "and the working directory once again thinks that the file <filename>a</"
8911 "filename> is modified. The commit and rollback have left the working "
8912 "directory exactly as it was prior to the commit; the changeset has been "
8913 "completely erased. I can now safely <command role=\"hg-cmd\">hg add</"
8914 "command> the file <filename>b</filename>, and rerun my commit."
8915 msgstr ""
8917 #. type: Content of: <book><chapter><sect1><sect2><title>
8918 #: ../en/ch09-undo.xml:85
8919 msgid "The erroneous pull"
8920 msgstr "错误的抓取"
8922 #. type: Content of: <book><chapter><sect1><sect2><para>
8923 #: ../en/ch09-undo.xml:87
8924 msgid ""
8925 "It's common practice with Mercurial to maintain separate development branches "
8926 "of a project in different repositories. Your development team might have one "
8927 "shared repository for your project's <quote>0.9</quote> release, and another, "
8928 "containing different changes, for the <quote>1.0</quote> release."
8929 msgstr ""
8931 #. type: Content of: <book><chapter><sect1><sect2><para>
8932 #: ../en/ch09-undo.xml:94
8933 msgid ""
8934 "Given this, you can imagine that the consequences could be messy if you had a "
8935 "local <quote>0.9</quote> repository, and accidentally pulled changes from the "
8936 "shared <quote>1.0</quote> repository into it. At worst, you could be paying "
8937 "insufficient attention, and push those changes into the shared <quote>0.9</"
8938 "quote> tree, confusing your entire team (but don't worry, we'll return to "
8939 "this horror scenario later). However, it's more likely that you'll notice "
8940 "immediately, because Mercurial will display the URL it's pulling from, or you "
8941 "will see it pull a suspiciously large number of changes into the repository."
8942 msgstr ""
8944 #. type: Content of: <book><chapter><sect1><sect2><para>
8945 #: ../en/ch09-undo.xml:106
8946 msgid ""
8947 "The <command role=\"hg-cmd\">hg rollback</command> command will work nicely "
8948 "to expunge all of the changesets that you just pulled. Mercurial groups all "
8949 "changes from one <command role=\"hg-cmd\">hg pull</command> into a single "
8950 "transaction, so one <command role=\"hg-cmd\">hg rollback</command> is all you "
8951 "need to undo this mistake."
8952 msgstr ""
8954 #. type: Content of: <book><chapter><sect1><sect2><title>
8955 #: ../en/ch09-undo.xml:115
8956 msgid "Rolling back is useless once you've pushed"
8957 msgstr "当完成推送后，回滚是无效的"
8959 #. type: Content of: <book><chapter><sect1><sect2><para>
8960 #: ../en/ch09-undo.xml:117
8961 msgid ""
8962 "The value of the <command role=\"hg-cmd\">hg rollback</command> command drops "
8963 "to zero once you've pushed your changes to another repository. Rolling back "
8964 "a change makes it disappear entirely, but <emphasis>only</emphasis> in the "
8965 "repository in which you perform the <command role=\"hg-cmd\">hg rollback</"
8966 "command>. Because a rollback eliminates history, there's no way for the "
8967 "disappearance of a change to propagate between repositories."
8968 msgstr ""
8970 #. type: Content of: <book><chapter><sect1><sect2><para>
8971 #: ../en/ch09-undo.xml:126
8972 msgid ""
8973 "If you've pushed a change to another repository&emdash;particularly if it's a "
8974 "shared repository&emdash;it has essentially <quote>escaped into the wild,</"
8975 "quote> and you'll have to recover from your mistake in a different way. What "
8976 "will happen if you push a changeset somewhere, then roll it back, then pull "
8977 "from the repository you pushed to, is that the changeset will reappear in "
8978 "your repository."
8979 msgstr ""
8981 #. type: Content of: <book><chapter><sect1><sect2><para>
8982 #: ../en/ch09-undo.xml:135
8983 msgid ""
8984 "(If you absolutely know for sure that the change you want to roll back is the "
8985 "most recent change in the repository that you pushed to, <emphasis>and</"
8986 "emphasis> you know that nobody else could have pulled it from that "
8987 "repository, you can roll back the changeset there, too, but you really should "
8988 "really not rely on this working reliably. If you do this, sooner or later a "
8989 "change really will make it into a repository that you don't directly control "
8990 "(or have forgotten about), and come back to bite you.)"
8991 msgstr ""
8993 #. type: Content of: <book><chapter><sect1><sect2><title>
8994 #: ../en/ch09-undo.xml:147
8995 msgid "You can only roll back once"
8996 msgstr "你只能回滚一次"
8998 #. type: Content of: <book><chapter><sect1><sect2><para>
8999 #: ../en/ch09-undo.xml:149
9000 msgid ""
9001 "Mercurial stores exactly one transaction in its transaction log; that "
9002 "transaction is the most recent one that occurred in the repository. This "
9003 "means that you can only roll back one transaction. If you expect to be able "
9004 "to roll back one transaction, then its predecessor, this is not the behaviour "
9005 "you will get."
9006 msgstr ""
9008 #. type: Content of: <book><chapter><sect1><sect2><para>
9009 #: ../en/ch09-undo.xml:158
9010 msgid ""
9011 "Once you've rolled back one transaction in a repository, you can't roll back "
9012 "again in that repository until you perform another commit or pull."
9013 msgstr ""
9015 #. type: Content of: <book><chapter><sect1><title>
9016 #: ../en/ch09-undo.xml:165
9017 msgid "Reverting the mistaken change"
9018 msgstr "撤销错误的修改"
9020 #. type: Content of: <book><chapter><sect1><para>
9021 #: ../en/ch09-undo.xml:167
9022 msgid ""
9023 "If you make a modification to a file, and decide that you really didn't want "
9024 "to change the file at all, and you haven't yet committed your changes, the "
9025 "<command role=\"hg-cmd\">hg revert</command> command is the one you'll need. "
9026 "It looks at the changeset that's the parent of the working directory, and "
9027 "restores the contents of the file to their state as of that changeset. "
9028 "(That's a long-winded way of saying that, in the normal case, it undoes your "
9029 "modifications.)"
9030 msgstr ""
9032 #. type: Content of: <book><chapter><sect1><para>
9033 #: ../en/ch09-undo.xml:176
9034 msgid ""
9035 "Let's illustrate how the <command role=\"hg-cmd\">hg revert</command> command "
9036 "works with yet another small example. We'll begin by modifying a file that "
9037 "Mercurial is already tracking."
9038 msgstr ""
9040 #. type: Content of: <book><chapter><sect1><para>
9041 #: ../en/ch09-undo.xml:183
9042 msgid ""
9043 "If we don't want that change, we can simply <command role=\"hg-cmd\">hg "
9044 "revert</command> the file."
9045 msgstr ""
9047 #. type: Content of: <book><chapter><sect1><para>
9048 #: ../en/ch09-undo.xml:189
9049 msgid ""
9050 "The <command role=\"hg-cmd\">hg revert</command> command provides us with an "
9051 "extra degree of safety by saving our modified file with a <filename>.orig</"
9052 "filename> extension."
9053 msgstr ""
9055 #. type: Content of: <book><chapter><sect1><para>
9056 #: ../en/ch09-undo.xml:196
9057 msgid ""
9058 "Here is a summary of the cases that the <command role=\"hg-cmd\">hg revert</"
9059 "command> command can deal with. We will describe each of these in more "
9060 "detail in the section that follows."
9061 msgstr ""
9063 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9064 #: ../en/ch09-undo.xml:201
9065 msgid "If you modify a file, it will restore the file to its unmodified state."
9066 msgstr ""
9068 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9069 #: ../en/ch09-undo.xml:204
9070 msgid ""
9071 "If you <command role=\"hg-cmd\">hg add</command> a file, it will undo the "
9072 "<quote>added</quote> state of the file, but leave the file itself untouched."
9073 msgstr ""
9075 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9076 #: ../en/ch09-undo.xml:208
9077 msgid ""
9078 "If you delete a file without telling Mercurial, it will restore the file to "
9079 "its unmodified contents."
9080 msgstr ""
9082 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9083 #: ../en/ch09-undo.xml:211
9084 msgid ""
9085 "If you use the <command role=\"hg-cmd\">hg remove</command> command to remove "
9086 "a file, it will undo the <quote>removed</quote> state of the file, and "
9087 "restore the file to its unmodified contents."
9088 msgstr ""
9090 #. type: Content of: <book><chapter><sect1><sect2><title>
9091 #: ../en/ch09-undo.xml:218
9092 msgid "File management errors"
9093 msgstr "文件管理错误"
9095 #. type: Content of: <book><chapter><sect1><sect2><para>
9096 #: ../en/ch09-undo.xml:220
9097 msgid ""
9098 "The <command role=\"hg-cmd\">hg revert</command> command is useful for more "
9099 "than just modified files. It lets you reverse the results of all of "
9100 "Mercurial's file management commands&emdash;<command role=\"hg-cmd\">hg add</"
9101 "command>, <command role=\"hg-cmd\">hg remove</command>, and so on."
9102 msgstr ""
9104 #
9105 #. type: Content of: <book><chapter><sect1><sect2><para>
9106 #: ../en/ch09-undo.xml:226
9107 msgid ""
9108 "If you <command role=\"hg-cmd\">hg add</command> a file, then decide that in "
9109 "fact you don't want Mercurial to track it, use <command role=\"hg-cmd\">hg "
9110 "revert</command> to undo the add. Don't worry; Mercurial will not modify the "
9111 "file in any way. It will just <quote>unmark</quote> the file."
9112 msgstr ""
9114 #. type: Content of: <book><chapter><sect1><sect2><para>
9115 #: ../en/ch09-undo.xml:234
9116 msgid ""
9117 "Similarly, if you ask Mercurial to <command role=\"hg-cmd\">hg remove</"
9118 "command> a file, you can use <command role=\"hg-cmd\">hg revert</command> to "
9119 "restore it to the contents it had as of the parent of the working directory. "
9120 "&interaction.daily.revert.remove; This works just as well for a file that you "
9121 "deleted by hand, without telling Mercurial (recall that in Mercurial "
9122 "terminology, this kind of file is called <quote>missing</quote>)."
9123 msgstr ""
9125 #
9126 #. type: Content of: <book><chapter><sect1><sect2><para>
9127 #: ../en/ch09-undo.xml:245
9128 msgid ""
9129 "If you revert a <command role=\"hg-cmd\">hg copy</command>, the copied-to "
9130 "file remains in your working directory afterwards, untracked. Since a copy "
9131 "doesn't affect the copied-from file in any way, Mercurial doesn't do anything "
9132 "with the copied-from file."
9133 msgstr ""
9135 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
9136 #: ../en/ch09-undo.xml:254
9137 msgid "A slightly special case: reverting a rename"
9138 msgstr "一个稍微特别的案例：撤销改名"
9140 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9141 #: ../en/ch09-undo.xml:256
9142 msgid ""
9143 "If you <command role=\"hg-cmd\">hg rename</command> a file, there is one "
9144 "small detail that you should remember. When you <command role=\"hg-cmd\">hg "
9145 "revert</command> a rename, it's not enough to provide the name of the renamed-"
9146 "to file, as you can see here."
9147 msgstr ""
9149 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9150 #: ../en/ch09-undo.xml:264
9151 msgid ""
9152 "As you can see from the output of <command role=\"hg-cmd\">hg status</"
9153 "command>, the renamed-to file is no longer identified as added, but the "
9154 "renamed-<emphasis>from</emphasis> file is still removed! This is counter-"
9155 "intuitive (at least to me), but at least it's easy to deal with."
9156 msgstr ""
9158 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9159 #: ../en/ch09-undo.xml:273
9160 msgid ""
9161 "So remember, to revert a <command role=\"hg-cmd\">hg rename</command>, you "
9162 "must provide <emphasis>both</emphasis> the source and destination names."
9163 msgstr ""
9165 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9166 #: ../en/ch09-undo.xml:278
9167 msgid "% TODO: the output doesn't look like it will be removed!"
9168 msgstr ""
9170 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9171 #: ../en/ch09-undo.xml:281
9172 msgid ""
9173 "(By the way, if you rename a file, then modify the renamed-to file, then "
9174 "revert both components of the rename, when Mercurial restores the file that "
9175 "was removed as part of the rename, it will be unmodified. If you need the "
9176 "modifications in the renamed-to file to show up in the renamed-from file, "
9177 "don't forget to copy them over.)"
9178 msgstr ""
9180 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9181 #: ../en/ch09-undo.xml:288
9182 msgid ""
9183 "These fiddly aspects of reverting a rename arguably constitute a small bug in "
9184 "Mercurial."
9185 msgstr ""
9187 #. type: Content of: <book><chapter><sect1><title>
9188 #: ../en/ch09-undo.xml:295
9189 msgid "Dealing with committed changes"
9190 msgstr "处理已经提交的修改"
9192 #. type: Content of: <book><chapter><sect1><para>
9193 #: ../en/ch09-undo.xml:297
9194 msgid ""
9195 "Consider a case where you have committed a change $a$, and another change $b$ "
9196 "on top of it; you then realise that change $a$ was incorrect. Mercurial lets "
9197 "you <quote>back out</quote> an entire changeset automatically, and building "
9198 "blocks that let you reverse part of a changeset by hand."
9199 msgstr ""
9201 #. type: Content of: <book><chapter><sect1><para>
9202 #: ../en/ch09-undo.xml:303
9203 msgid ""
9204 "Before you read this section, here's something to keep in mind: the <command "
9205 "role=\"hg-cmd\">hg backout</command> command undoes changes by "
9206 "<emphasis>adding</emphasis> history, not by modifying or erasing it. It's "
9207 "the right tool to use if you're fixing bugs, but not if you're trying to undo "
9208 "some change that has catastrophic consequences. To deal with those, see "
9209 "section <xref linkend=\"sec.undo.aaaiiieee\"/>."
9210 msgstr ""
9212 #. type: Content of: <book><chapter><sect1><sect2><title>
9213 #: ../en/ch09-undo.xml:312
9214 msgid "Backing out a changeset"
9215 msgstr "恢复一个修改集"
9217 #. type: Content of: <book><chapter><sect1><sect2><para>
9218 #: ../en/ch09-undo.xml:314
9219 msgid ""
9220 "The <command role=\"hg-cmd\">hg backout</command> command lets you "
9221 "<quote>undo</quote> the effects of an entire changeset in an automated "
9222 "fashion. Because Mercurial's history is immutable, this command "
9223 "<emphasis>does not</emphasis> get rid of the changeset you want to undo. "
9224 "Instead, it creates a new changeset that <emphasis>reverses</emphasis> the "
9225 "effect of the to-be-undone changeset."
9226 msgstr ""
9228 #
9229 #. type: Content of: <book><chapter><sect1><sect2><para>
9230 #: ../en/ch09-undo.xml:323
9231 msgid ""
9232 "The operation of the <command role=\"hg-cmd\">hg backout</command> command is "
9233 "a little intricate, so let's illustrate it with some examples. First, we'll "
9234 "create a repository with some simple changes."
9235 msgstr ""
9237 #. type: Content of: <book><chapter><sect1><sect2><para>
9238 #: ../en/ch09-undo.xml:330
9239 msgid ""
9240 "The <command role=\"hg-cmd\">hg backout</command> command takes a single "
9241 "changeset ID as its argument; this is the changeset to back out. Normally, "
9242 "<command role=\"hg-cmd\">hg backout</command> will drop you into a text "
9243 "editor to write a commit message, so you can record why you're backing the "
9244 "change out. In this example, we provide a commit message on the command line "
9245 "using the <option role=\"hg-opt-backout\">-m</option> option."
9246 msgstr ""
9248 #. type: Content of: <book><chapter><sect1><sect2><title>
9249 #: ../en/ch09-undo.xml:341
9250 msgid "Backing out the tip changeset"
9251 msgstr "恢复顶点修改集"
9253 #. type: Content of: <book><chapter><sect1><sect2><para>
9254 #: ../en/ch09-undo.xml:343
9255 msgid "We're going to start by backing out the last changeset we committed."
9256 msgstr ""
9258 #. type: Content of: <book><chapter><sect1><sect2><para>
9259 #: ../en/ch09-undo.xml:348
9260 msgid ""
9261 "You can see that the second line from <filename>myfile</filename> is no "
9262 "longer present. Taking a look at the output of <command role=\"hg-cmd\">hg "
9263 "log</command> gives us an idea of what the <command role=\"hg-cmd\">hg "
9264 "backout</command> command has done. &interaction.backout.simple.log; Notice "
9265 "that the new changeset that <command role=\"hg-cmd\">hg backout</command> has "
9266 "created is a child of the changeset we backed out. It's easier to see this "
9267 "in figure <xref endterm=\"fig.undo.backout.caption\" linkend=\"fig.undo."
9268 "backout\"/>, which presents a graphical view of the change history. As you "
9269 "can see, the history is nice and linear."
9270 msgstr ""
9272 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9273 #: ../en/ch09-undo.xml:364
9274 msgid ""
9275 "<imageobject><imagedata fileref=\"images/undo-simple.png\"/> </imageobject>"
9276 msgstr ""
9278 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
9279 #: ../en/ch09-undo.xml:367 ../en/ch09-undo.xml:486
9280 msgid ""
9281 "Backing out a change using the <command role=\"hg-cmd\">hg backout</command> "
9282 "command"
9283 msgstr ""
9285 #. type: Content of: <book><chapter><sect1><sect2><title>
9286 #: ../en/ch09-undo.xml:376
9287 msgid "Backing out a non-tip change"
9288 msgstr "恢复非顶点的修改"
9290 #. type: Content of: <book><chapter><sect1><sect2><para>
9291 #: ../en/ch09-undo.xml:378
9292 msgid ""
9293 "If you want to back out a change other than the last one you committed, pass "
9294 "the <option role=\"hg-opt-backout\">--merge</option> option to the <command "
9295 "role=\"hg-cmd\">hg backout</command> command."
9296 msgstr ""
9298 #. type: Content of: <book><chapter><sect1><sect2><para>
9299 #: ../en/ch09-undo.xml:385
9300 msgid ""
9301 "This makes backing out any changeset a <quote>one-shot</quote> operation "
9302 "that's usually simple and fast."
9303 msgstr ""
9305 #. type: Content of: <book><chapter><sect1><sect2><para>
9306 #: ../en/ch09-undo.xml:391
9307 msgid ""
9308 "If you take a look at the contents of <filename>myfile</filename> after the "
9309 "backout finishes, you'll see that the first and third changes are present, "
9310 "but not the second."
9311 msgstr ""
9313 #. type: Content of: <book><chapter><sect1><sect2><para>
9314 #: ../en/ch09-undo.xml:398
9315 msgid ""
9316 "As the graphical history in figure <xref endterm=\"fig.undo.backout-non-tip."
9317 "caption\" linkend=\"fig.undo.backout-non-tip\"/> illustrates, Mercurial "
9318 "actually commits <emphasis>two</emphasis> changes in this kind of situation "
9319 "(the box-shaped nodes are the ones that Mercurial commits automatically). "
9320 "Before Mercurial begins the backout process, it first remembers what the "
9321 "current parent of the working directory is. It then backs out the target "
9322 "changeset, and commits that as a changeset. Finally, it merges back to the "
9323 "previous parent of the working directory, and commits the result of the merge."
9324 msgstr ""
9326 #. type: Content of: <book><chapter><sect1><sect2><para>
9327 #: ../en/ch09-undo.xml:410
9328 msgid ""
9329 "% TODO: to me it looks like mercurial doesn't commit the second merge "
9330 "automatically!"
9331 msgstr ""
9333 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9334 #: ../en/ch09-undo.xml:415
9335 msgid ""
9336 "<imageobject><imagedata fileref=\"images/undo-non-tip.png\"/> </imageobject>"
9337 msgstr ""
9339 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
9340 #: ../en/ch09-undo.xml:418
9341 msgid ""
9342 "Automated backout of a non-tip change using the <command role=\"hg-cmd\">hg "
9343 "backout</command> command"
9344 msgstr ""
9346 #. type: Content of: <book><chapter><sect1><sect2><para>
9347 #: ../en/ch09-undo.xml:424
9348 msgid ""
9349 "The result is that you end up <quote>back where you were</quote>, only with "
9350 "some extra history that undoes the effect of the changeset you wanted to back "
9351 "out."
9352 msgstr ""
9354 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
9355 #: ../en/ch09-undo.xml:429
9356 msgid "Always use the <option role=\"hg-opt-backout\">--merge</option> option"
9357 msgstr "始终使用选项 <option role=\"hg-opt-backout\">--merge</option>"
9359 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
9360 #: ../en/ch09-undo.xml:432
9361 msgid ""
9362 "In fact, since the <option role=\"hg-opt-backout\">--merge</option> option "
9363 "will do the <quote>right thing</quote> whether or not the changeset you're "
9364 "backing out is the tip (i.e. it won't try to merge if it's backing out the "
9365 "tip, since there's no need), you should <emphasis>always</emphasis> use this "
9366 "option when you run the <command role=\"hg-cmd\">hg backout</command> command."
9367 msgstr ""
9369 #. type: Content of: <book><chapter><sect1><sect2><title>
9370 #: ../en/ch09-undo.xml:443
9371 msgid "Gaining more control of the backout process"
9372 msgstr "在恢复处理中获得更多控制"
9374 #. type: Content of: <book><chapter><sect1><sect2><para>
9375 #: ../en/ch09-undo.xml:445
9376 msgid ""
9377 "While I've recommended that you always use the <option role=\"hg-opt-backout"
9378 "\">--merge</option> option when backing out a change, the <command role=\"hg-"
9379 "cmd\">hg backout</command> command lets you decide how to merge a backout "
9380 "changeset. Taking control of the backout process by hand is something you "
9381 "will rarely need to do, but it can be useful to understand what the <command "
9382 "role=\"hg-cmd\">hg backout</command> command is doing for you automatically. "
9383 "To illustrate this, let's clone our first repository, but omit the backout "
9384 "change that it contains."
9385 msgstr ""
9387 #. type: Content of: <book><chapter><sect1><sect2><para>
9388 #: ../en/ch09-undo.xml:458
9389 msgid ""
9390 "As with our earlier example, We'll commit a third changeset, then back out "
9391 "its parent, and see what happens."
9392 msgstr ""
9394 #. type: Content of: <book><chapter><sect1><sect2><para>
9395 #: ../en/ch09-undo.xml:464
9396 msgid ""
9397 "Our new changeset is again a descendant of the changeset we backout out; it's "
9398 "thus a new head, <emphasis>not</emphasis> a descendant of the changeset that "
9399 "was the tip. The <command role=\"hg-cmd\">hg backout</command> command was "
9400 "quite explicit in telling us this."
9401 msgstr ""
9403 #. type: Content of: <book><chapter><sect1><sect2><para>
9404 #: ../en/ch09-undo.xml:472
9405 msgid ""
9406 "Again, it's easier to see what has happened by looking at a graph of the "
9407 "revision history, in figure <xref endterm=\"fig.undo.backout-manual.caption\" "
9408 "linkend=\"fig.undo.backout-manual\"/>. This makes it clear that when we use "
9409 "<command role=\"hg-cmd\">hg backout</command> to back out a change other than "
9410 "the tip, Mercurial adds a new head to the repository (the change it committed "
9411 "is box-shaped)."
9412 msgstr ""
9414 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9415 #: ../en/ch09-undo.xml:483
9416 msgid ""
9417 "<imageobject><imagedata fileref=\"images/undo-manual.png\"/> </imageobject>"
9418 msgstr ""
9420 #. type: Content of: <book><chapter><sect1><sect2><para>
9421 #: ../en/ch09-undo.xml:492
9422 msgid ""
9423 "After the <command role=\"hg-cmd\">hg backout</command> command has "
9424 "completed, it leaves the new <quote>backout</quote> changeset as the parent "
9425 "of the working directory."
9426 msgstr ""
9428 #. type: Content of: <book><chapter><sect1><sect2><para>
9429 #: ../en/ch09-undo.xml:499
9430 msgid "Now we have two isolated sets of changes."
9431 msgstr ""
9433 #. type: Content of: <book><chapter><sect1><sect2><para>
9434 #: ../en/ch09-undo.xml:503
9435 msgid ""
9436 "Let's think about what we expect to see as the contents of <filename>myfile</"
9437 "filename> now. The first change should be present, because we've never "
9438 "backed it out. The second change should be missing, as that's the change we "
9439 "backed out. Since the history graph shows the third change as a separate "
9440 "head, we <emphasis>don't</emphasis> expect to see the third change present in "
9441 "<filename>myfile</filename>."
9442 msgstr ""
9444 #. type: Content of: <book><chapter><sect1><sect2><para>
9445 #: ../en/ch09-undo.xml:513
9446 msgid ""
9447 "To get the third change back into the file, we just do a normal merge of our "
9448 "two heads."
9449 msgstr ""
9451 #. type: Content of: <book><chapter><sect1><sect2><para>
9452 #: ../en/ch09-undo.xml:518
9453 msgid ""
9454 "Afterwards, the graphical history of our repository looks like figure <xref "
9455 "endterm=\"fig.undo.backout-manual-merge.caption\" linkend=\"fig.undo.backout-"
9456 "manual-merge\"/>."
9457 msgstr ""
9459 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
9460 #: ../en/ch09-undo.xml:525
9461 msgid ""
9462 "<imageobject><imagedata fileref=\"images/undo-manual-merge.png\"/> </"
9463 "imageobject>"
9464 msgstr ""
9466 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
9467 #: ../en/ch09-undo.xml:528
9468 msgid "Manually merging a backout change"
9469 msgstr ""
9471 #. type: Content of: <book><chapter><sect1><sect2><title>
9472 #: ../en/ch09-undo.xml:535
9473 msgid "Why <command role=\"hg-cmd\">hg backout</command> works as it does"
9474 msgstr "<command role=\"hg-cmd\">hg backout</command> 的内幕"
9476 #. type: Content of: <book><chapter><sect1><sect2><para>
9477 #: ../en/ch09-undo.xml:538
9478 msgid ""
9479 "Here's a brief description of how the <command role=\"hg-cmd\">hg backout</"
9480 "command> command works."
9481 msgstr ""
9483 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9484 #: ../en/ch09-undo.xml:541
9485 msgid ""
9486 "It ensures that the working directory is <quote>clean</quote>, i.e. that the "
9487 "output of <command role=\"hg-cmd\">hg status</command> would be empty."
9488 msgstr ""
9490 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9491 #: ../en/ch09-undo.xml:545
9492 msgid ""
9493 "It remembers the current parent of the working directory. Let's call this "
9494 "changeset <literal>orig</literal>"
9495 msgstr ""
9497 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9498 #: ../en/ch09-undo.xml:549
9499 msgid ""
9500 "It does the equivalent of a <command role=\"hg-cmd\">hg update</command> to "
9501 "sync the working directory to the changeset you want to back out. Let's call "
9502 "this changeset <literal>backout</literal>"
9503 msgstr ""
9505 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9506 #: ../en/ch09-undo.xml:554
9507 msgid ""
9508 "It finds the parent of that changeset. Let's call that changeset "
9509 "<literal>parent</literal>."
9510 msgstr ""
9512 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9513 #: ../en/ch09-undo.xml:557
9514 msgid ""
9515 "For each file that the <literal>backout</literal> changeset affected, it does "
9516 "the equivalent of a <command role=\"hg-cmd\">hg revert -r parent</command> on "
9517 "that file, to restore it to the contents it had before that changeset was "
9518 "committed."
9519 msgstr ""
9521 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9522 #: ../en/ch09-undo.xml:564
9523 msgid ""
9524 "It commits the result as a new changeset. This changeset has "
9525 "<literal>backout</literal> as its parent."
9526 msgstr ""
9528 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9529 #: ../en/ch09-undo.xml:568
9530 msgid ""
9531 "If you specify <option role=\"hg-opt-backout\">--merge</option> on the "
9532 "command line, it merges with <literal>orig</literal>, and commits the result "
9533 "of the merge."
9534 msgstr ""
9536 #. type: Content of: <book><chapter><sect1><sect2><para>
9537 #: ../en/ch09-undo.xml:574
9538 msgid ""
9539 "An alternative way to implement the <command role=\"hg-cmd\">hg backout</"
9540 "command> command would be to <command role=\"hg-cmd\">hg export</command> the "
9541 "to-be-backed-out changeset as a diff, then use the <option role=\"cmd-opt-"
9542 "patch\">--reverse</option> option to the <command>patch</command> command to "
9543 "reverse the effect of the change without fiddling with the working "
9544 "directory. This sounds much simpler, but it would not work nearly as well."
9545 msgstr ""
9547 #. type: Content of: <book><chapter><sect1><sect2><para>
9548 #: ../en/ch09-undo.xml:584
9549 msgid ""
9550 "The reason that <command role=\"hg-cmd\">hg backout</command> does an update, "
9551 "a commit, a merge, and another commit is to give the merge machinery the best "
9552 "chance to do a good job when dealing with all the changes <emphasis>between</"
9553 "emphasis> the change you're backing out and the current tip."
9554 msgstr ""
9556 #. type: Content of: <book><chapter><sect1><sect2><para>
9557 #: ../en/ch09-undo.xml:591
9558 msgid ""
9559 "If you're backing out a changeset that's 100 revisions back in your project's "
9560 "history, the chances that the <command>patch</command> command will be able "
9561 "to apply a reverse diff cleanly are not good, because intervening changes are "
9562 "likely to have <quote>broken the context</quote> that <command>patch</"
9563 "command> uses to determine whether it can apply a patch (if this sounds like "
9564 "gibberish, see <xref linkend=\"sec.mq.patch\"/> for a discussion of the "
9565 "<command>patch</command> command). Also, Mercurial's merge machinery will "
9566 "handle files and directories being renamed, permission changes, and "
9567 "modifications to binary files, none of which <command>patch</command> can "
9568 "deal with."
9569 msgstr ""
9571 #. type: Content of: <book><chapter><sect1><title>
9572 #: ../en/ch09-undo.xml:608
9573 msgid "Changes that should never have been"
9574 msgstr "不该发生的修改"
9576 #. type: Content of: <book><chapter><sect1><para>
9577 #: ../en/ch09-undo.xml:610
9578 msgid ""
9579 "Most of the time, the <command role=\"hg-cmd\">hg backout</command> command "
9580 "is exactly what you need if you want to undo the effects of a change. It "
9581 "leaves a permanent record of exactly what you did, both when committing the "
9582 "original changeset and when you cleaned up after it."
9583 msgstr ""
9585 #. type: Content of: <book><chapter><sect1><para>
9586 #: ../en/ch09-undo.xml:616
9587 msgid ""
9588 "On rare occasions, though, you may find that you've committed a change that "
9589 "really should not be present in the repository at all. For example, it would "
9590 "be very unusual, and usually considered a mistake, to commit a software "
9591 "project's object files as well as its source files. Object files have almost "
9592 "no intrinsic value, and they're <emphasis>big</emphasis>, so they increase "
9593 "the size of the repository and the amount of time it takes to clone or pull "
9594 "changes."
9595 msgstr ""
9597 #. type: Content of: <book><chapter><sect1><para>
9598 #: ../en/ch09-undo.xml:625
9599 msgid ""
9600 "Before I discuss the options that you have if you commit a <quote>brown paper "
9601 "bag</quote> change (the kind that's so bad that you want to pull a brown "
9602 "paper bag over your head), let me first discuss some approaches that probably "
9603 "won't work."
9604 msgstr ""
9606 #. type: Content of: <book><chapter><sect1><para>
9607 #: ../en/ch09-undo.xml:630
9608 msgid ""
9609 "Since Mercurial treats history as accumulative&emdash;every change builds on "
9610 "top of all changes that preceded it&emdash;you generally can't just make "
9611 "disastrous changes disappear. The one exception is when you've just "
9612 "committed a change, and it hasn't been pushed or pulled into another "
9613 "repository. That's when you can safely use the <command role=\"hg-cmd\">hg "
9614 "rollback</command> command, as I detailed in section <xref linkend=\"sec.undo."
9615 "rollback\"/>."
9616 msgstr ""
9618 #. type: Content of: <book><chapter><sect1><para>
9619 #: ../en/ch09-undo.xml:639
9620 msgid ""
9621 "After you've pushed a bad change to another repository, you <emphasis>could</"
9622 "emphasis> still use <command role=\"hg-cmd\">hg rollback</command> to make "
9623 "your local copy of the change disappear, but it won't have the consequences "
9624 "you want. The change will still be present in the remote repository, so it "
9625 "will reappear in your local repository the next time you pull."
9626 msgstr ""
9628 #. type: Content of: <book><chapter><sect1><para>
9629 #: ../en/ch09-undo.xml:647
9630 msgid ""
9631 "If a situation like this arises, and you know which repositories your bad "
9632 "change has propagated into, you can <emphasis>try</emphasis> to get rid of "
9633 "the changeefrom <emphasis>every</emphasis> one of those repositories. This "
9634 "is, of course, not a satisfactory solution: if you miss even a single "
9635 "repository while you're expunging, the change is still <quote>in the wild</"
9636 "quote>, and could propagate further."
9637 msgstr ""
9639 #. type: Content of: <book><chapter><sect1><para>
9640 #: ../en/ch09-undo.xml:655
9641 msgid ""
9642 "If you've committed one or more changes <emphasis>after</emphasis> the change "
9643 "that you'd like to see disappear, your options are further reduced. Mercurial "
9644 "doesn't provide a way to <quote>punch a hole</quote> in history, leaving "
9645 "changesets intact."
9646 msgstr ""
9648 #. type: Content of: <book><chapter><sect1><para>
9649 #: ../en/ch09-undo.xml:661
9650 msgid ""
9651 "XXX This needs filling out. The <literal>hg-replay</literal> script in the "
9652 "<literal>examples</literal> directory works, but doesn't handle merge "
9653 "changesets. Kind of an important omission."
9654 msgstr ""
9656 #. type: Content of: <book><chapter><sect1><sect2><title>
9657 #: ../en/ch09-undo.xml:667
9658 msgid "Protect yourself from <quote>escaped</quote> changes"
9659 msgstr "使用<quote>校验</quote>修改来保护你自己"
9661 #. type: Content of: <book><chapter><sect1><sect2><para>
9662 #: ../en/ch09-undo.xml:670
9663 msgid ""
9664 "If you've committed some changes to your local repository and they've been "
9665 "pushed or pulled somewhere else, this isn't necessarily a disaster. You can "
9666 "protect yourself ahead of time against some classes of bad changeset. This "
9667 "is particularly easy if your team usually pulls changes from a central "
9668 "repository."
9669 msgstr ""
9671 #. type: Content of: <book><chapter><sect1><sect2><para>
9672 #: ../en/ch09-undo.xml:677
9673 msgid ""
9674 "By configuring some hooks on that repository to validate incoming changesets "
9675 "(see chapter <xref linkend=\"chap.hook\"/>), you can automatically prevent "
9676 "some kinds of bad changeset from being pushed to the central repository at "
9677 "all. With such a configuration in place, some kinds of bad changeset will "
9678 "naturally tend to <quote>die out</quote> because they can't propagate into "
9679 "the central repository. Better yet, this happens without any need for "
9680 "explicit intervention."
9681 msgstr ""
9683 #. type: Content of: <book><chapter><sect1><sect2><para>
9684 #: ../en/ch09-undo.xml:687
9685 msgid ""
9686 "For instance, an incoming change hook that verifies that a changeset will "
9687 "actually compile can prevent people from inadvertantly <quote>breaking the "
9688 "build</quote>."
9689 msgstr ""
9691 #. type: Content of: <book><chapter><sect1><title>
9692 #: ../en/ch09-undo.xml:694
9693 msgid "Finding the source of a bug"
9694 msgstr "查找问题的根源"
9696 #. type: Content of: <book><chapter><sect1><para>
9697 #: ../en/ch09-undo.xml:696
9698 msgid ""
9699 "While it's all very well to be able to back out a changeset that introduced a "
9700 "bug, this requires that you know which changeset to back out. Mercurial "
9701 "provides an invaluable command, called <command role=\"hg-cmd\">hg bisect</"
9702 "command>, that helps you to automate this process and accomplish it very "
9703 "efficiently."
9704 msgstr ""
9706 #. type: Content of: <book><chapter><sect1><para>
9707 #: ../en/ch09-undo.xml:703
9708 msgid ""
9709 "The idea behind the <command role=\"hg-cmd\">hg bisect</command> command is "
9710 "that a changeset has introduced some change of behaviour that you can "
9711 "identify with a simple binary test. You don't know which piece of code "
9712 "introduced the change, but you know how to test for the presence of the bug. "
9713 "The <command role=\"hg-cmd\">hg bisect</command> command uses your test to "
9714 "direct its search for the changeset that introduced the code that caused the "
9715 "bug."
9716 msgstr ""
9718 #. type: Content of: <book><chapter><sect1><para>
9719 #: ../en/ch09-undo.xml:712
9720 msgid ""
9721 "Here are a few scenarios to help you understand how you might apply this "
9722 "command."
9723 msgstr ""
9725 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9726 #: ../en/ch09-undo.xml:715
9727 msgid ""
9728 "The most recent version of your software has a bug that you remember wasn't "
9729 "present a few weeks ago, but you don't know when it was introduced. Here, "
9730 "your binary test checks for the presence of that bug."
9731 msgstr ""
9733 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9734 #: ../en/ch09-undo.xml:720
9735 msgid ""
9736 "You fixed a bug in a rush, and now it's time to close the entry in your "
9737 "team's bug database. The bug database requires a changeset ID when you close "
9738 "an entry, but you don't remember which changeset you fixed the bug in. Once "
9739 "again, your binary test checks for the presence of the bug."
9740 msgstr ""
9742 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9743 #: ../en/ch09-undo.xml:727
9744 msgid ""
9745 "Your software works correctly, but runs 15% slower than the last time you "
9746 "measured it. You want to know which changeset introduced the performance "
9747 "regression. In this case, your binary test measures the performance of your "
9748 "software, to see whether it's <quote>fast</quote> or <quote>slow</quote>."
9749 msgstr ""
9751 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
9752 #: ../en/ch09-undo.xml:734
9753 msgid ""
9754 "The sizes of the components of your project that you ship exploded recently, "
9755 "and you suspect that something changed in the way you build your project."
9756 msgstr ""
9758 #. type: Content of: <book><chapter><sect1><para>
9759 #: ../en/ch09-undo.xml:739
9760 msgid ""
9761 "From these examples, it should be clear that the <command role=\"hg-cmd\">hg "
9762 "bisect</command> command is not useful only for finding the sources of bugs. "
9763 "You can use it to find any <quote>emergent property</quote> of a repository "
9764 "(anything that you can't find from a simple text search of the files in the "
9765 "tree) for which you can write a binary test."
9766 msgstr ""
9768 #. type: Content of: <book><chapter><sect1><para>
9769 #: ../en/ch09-undo.xml:746
9770 msgid ""
9771 "We'll introduce a little bit of terminology here, just to make it clear which "
9772 "parts of the search process are your responsibility, and which are "
9773 "Mercurial's. A <emphasis>test</emphasis> is something that <emphasis>you</"
9774 "emphasis> run when <command role=\"hg-cmd\">hg bisect</command> chooses a "
9775 "changeset. A <emphasis>probe</emphasis> is what <command role=\"hg-cmd\">hg "
9776 "bisect</command> runs to tell whether a revision is good. Finally, we'll use "
9777 "the word <quote>bisect</quote>, as both a noun and a verb, to stand in for "
9778 "the phrase <quote>search using the <command role=\"hg-cmd\">hg bisect</"
9779 "command> command</quote>."
9780 msgstr ""
9782 #. type: Content of: <book><chapter><sect1><para>
9783 #: ../en/ch09-undo.xml:759
9784 msgid ""
9785 "One simple way to automate the searching process would be simply to probe "
9786 "every changeset. However, this scales poorly. If it took ten minutes to "
9787 "test a single changeset, and you had 10,000 changesets in your repository, "
9788 "the exhaustive approach would take on average 35 <emphasis>days</emphasis> to "
9789 "find the changeset that introduced a bug. Even if you knew that the bug was "
9790 "introduced by one of the last 500 changesets, and limited your search to "
9791 "those, you'd still be looking at over 40 hours to find the changeset that "
9792 "introduced your bug."
9793 msgstr ""
9795 #. type: Content of: <book><chapter><sect1><para>
9796 #: ../en/ch09-undo.xml:769
9797 msgid ""
9798 "What the <command role=\"hg-cmd\">hg bisect</command> command does is use its "
9799 "knowledge of the <quote>shape</quote> of your project's revision history to "
9800 "perform a search in time proportional to the <emphasis>logarithm</emphasis> "
9801 "of the number of changesets to check (the kind of search it performs is "
9802 "called a dichotomic search). With this approach, searching through 10,000 "
9803 "changesets will take less than three hours, even at ten minutes per test (the "
9804 "search will require about 14 tests). Limit your search to the last hundred "
9805 "changesets, and it will take only about an hour (roughly seven tests)."
9806 msgstr ""
9808 #. type: Content of: <book><chapter><sect1><para>
9809 #: ../en/ch09-undo.xml:780
9810 msgid ""
9811 "The <command role=\"hg-cmd\">hg bisect</command> command is aware of the "
9812 "<quote>branchy</quote> nature of a Mercurial project's revision history, so "
9813 "it has no problems dealing with branches, merges, or multiple heads in a "
9814 "repository. It can prune entire branches of history with a single probe, "
9815 "which is how it operates so efficiently."
9816 msgstr ""
9818 #. type: Content of: <book><chapter><sect1><sect2><title>
9819 #: ../en/ch09-undo.xml:788
9820 msgid "Using the <command role=\"hg-cmd\">hg bisect</command> command"
9821 msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>"
9823 #. type: Content of: <book><chapter><sect1><sect2><para>
9824 #: ../en/ch09-undo.xml:791
9825 msgid ""
9826 "Here's an example of <command role=\"hg-cmd\">hg bisect</command> in action."
9827 msgstr ""
9829 #. type: Content of: <book><chapter><sect1><sect2><note><para>
9830 #: ../en/ch09-undo.xml:795
9831 msgid ""
9832 "In versions 0.9.5 and earlier of Mercurial, <command role=\"hg-cmd\">hg "
9833 "bisect</command> was not a core command: it was distributed with Mercurial as "
9834 "an extension. This section describes the built-in command, not the old "
9835 "extension."
9836 msgstr ""
9838 #. type: Content of: <book><chapter><sect1><sect2><para>
9839 #: ../en/ch09-undo.xml:802
9840 msgid ""
9841 "Now let's create a repository, so that we can try out the <command role=\"hg-"
9842 "cmd\">hg bisect</command> command in isolation."
9843 msgstr ""
9845 #. type: Content of: <book><chapter><sect1><sect2><para>
9846 #: ../en/ch09-undo.xml:808
9847 msgid ""
9848 "We'll simulate a project that has a bug in it in a simple-minded way: create "
9849 "trivial changes in a loop, and nominate one specific change that will have "
9850 "the <quote>bug</quote>. This loop creates 35 changesets, each adding a "
9851 "single file to the repository. We'll represent our <quote>bug</quote> with a "
9852 "file that contains the text <quote>i have a gub</quote>."
9853 msgstr ""
9855 #. type: Content of: <book><chapter><sect1><sect2><para>
9856 #: ../en/ch09-undo.xml:818
9857 msgid ""
9858 "The next thing that we'd like to do is figure out how to use the <command "
9859 "role=\"hg-cmd\">hg bisect</command> command. We can use Mercurial's normal "
9860 "built-in help mechanism for this."
9861 msgstr ""
9863 #. type: Content of: <book><chapter><sect1><sect2><para>
9864 #: ../en/ch09-undo.xml:825
9865 msgid ""
9866 "The <command role=\"hg-cmd\">hg bisect</command> command works in steps. "
9867 "Each step proceeds as follows."
9868 msgstr ""
9870 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9871 #: ../en/ch09-undo.xml:828
9872 msgid "You run your binary test."
9873 msgstr ""
9875 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
9876 #: ../en/ch09-undo.xml:830
9877 msgid ""
9878 "If the test succeeded, you tell <command role=\"hg-cmd\">hg bisect</command> "
9879 "by running the <command role=\"hg-cmd\">hg bisect good</command> command."
9880 msgstr ""
9882 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
9883 #: ../en/ch09-undo.xml:835
9884 msgid ""
9885 "If it failed, run the <command role=\"hg-cmd\">hg bisect bad</command> "
9886 "command."
9887 msgstr ""
9889 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9890 #: ../en/ch09-undo.xml:839
9891 msgid ""
9892 "The command uses your information to decide which changeset to test next."
9893 msgstr ""
9895 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
9896 #: ../en/ch09-undo.xml:842
9897 msgid ""
9898 "It updates the working directory to that changeset, and the process begins "
9899 "again."
9900 msgstr ""
9902 #. type: Content of: <book><chapter><sect1><sect2><para>
9903 #: ../en/ch09-undo.xml:845
9904 msgid ""
9905 "The process ends when <command role=\"hg-cmd\">hg bisect</command> identifies "
9906 "a unique changeset that marks the point where your test transitioned from "
9907 "<quote>succeeding</quote> to <quote>failing</quote>."
9908 msgstr ""
9910 #
9911 #. type: Content of: <book><chapter><sect1><sect2><para>
9912 #: ../en/ch09-undo.xml:850
9913 msgid ""
9914 "To start the search, we must run the <command role=\"hg-cmd\">hg bisect --"
9915 "reset</command> command."
9916 msgstr ""
9918 #. type: Content of: <book><chapter><sect1><sect2><para>
9919 #: ../en/ch09-undo.xml:855
9920 msgid ""
9921 "In our case, the binary test we use is simple: we check to see if any file in "
9922 "the repository contains the string <quote>i have a gub</quote>. If it does, "
9923 "this changeset contains the change that <quote>caused the bug</quote>. By "
9924 "convention, a changeset that has the property we're searching for is "
9925 "<quote>bad</quote>, while one that doesn't is <quote>good</quote>."
9926 msgstr ""
9928 #. type: Content of: <book><chapter><sect1><sect2><para>
9929 #: ../en/ch09-undo.xml:863
9930 msgid ""
9931 "Most of the time, the revision to which the working directory is synced "
9932 "(usually the tip) already exhibits the problem introduced by the buggy "
9933 "change, so we'll mark it as <quote>bad</quote>."
9934 msgstr ""
9936 #
9937 #. type: Content of: <book><chapter><sect1><sect2><para>
9938 #: ../en/ch09-undo.xml:870
9939 msgid ""
9940 "Our next task is to nominate a changeset that we know <emphasis>doesn't</"
9941 "emphasis> have the bug; the <command role=\"hg-cmd\">hg bisect</command> "
9942 "command will <quote>bracket</quote> its search between the first pair of good "
9943 "and bad changesets. In our case, we know that revision 10 didn't have the "
9944 "bug. (I'll have more words about choosing the first <quote>good</quote> "
9945 "changeset later.)"
9946 msgstr ""
9948 #. type: Content of: <book><chapter><sect1><sect2><para>
9949 #: ../en/ch09-undo.xml:880
9950 msgid "Notice that this command printed some output."
9951 msgstr ""
9953 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
9954 #: ../en/ch09-undo.xml:882
9955 msgid ""
9956 "It told us how many changesets it must consider before it can identify the "
9957 "one that introduced the bug, and how many tests that will require."
9958 msgstr ""
9960 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
9961 #: ../en/ch09-undo.xml:886
9962 msgid ""
9963 "It updated the working directory to the next changeset to test, and told us "
9964 "which changeset it's testing."
9965 msgstr ""
9967 #. type: Content of: <book><chapter><sect1><sect2><para>
9968 #: ../en/ch09-undo.xml:891
9969 msgid ""
9970 "We now run our test in the working directory. We use the <command>grep</"
9971 "command> command to see if our <quote>bad</quote> file is present in the "
9972 "working directory. If it is, this revision is bad; if not, this revision is "
9973 "good. &interaction.bisect.search.step1;"
9974 msgstr ""
9976 #. type: Content of: <book><chapter><sect1><sect2><para>
9977 #: ../en/ch09-undo.xml:897
9978 msgid ""
9979 "This test looks like a perfect candidate for automation, so let's turn it "
9980 "into a shell function."
9981 msgstr ""
9983 #. type: Content of: <book><chapter><sect1><sect2><para>
9984 #: ../en/ch09-undo.xml:901
9985 msgid ""
9986 "We can now run an entire test step with a single command, <literal>mytest</"
9987 "literal>."
9988 msgstr ""
9990 #. type: Content of: <book><chapter><sect1><sect2><para>
9991 #: ../en/ch09-undo.xml:906
9992 msgid "A few more invocations of our canned test step command, and we're done."
9993 msgstr ""
9995 #. type: Content of: <book><chapter><sect1><sect2><para>
9996 #: ../en/ch09-undo.xml:911
9997 msgid ""
9998 "Even though we had 40 changesets to search through, the <command role=\"hg-cmd"
9999 "\">hg bisect</command> command let us find the changeset that introduced our "
10000 "<quote>bug</quote> with only five tests. Because the number of tests that "
10001 "the <command role=\"hg-cmd\">hg bisect</command> command performs grows "
10002 "logarithmically with the number of changesets to search, the advantage that "
10003 "it has over the <quote>brute force</quote> search approach increases with "
10004 "every changeset you add."
10005 msgstr ""
10007 #. type: Content of: <book><chapter><sect1><sect2><title>
10008 #: ../en/ch09-undo.xml:922
10009 msgid "Cleaning up after your search"
10010 msgstr "搜索后的清理"
10012 #
10013 #. type: Content of: <book><chapter><sect1><sect2><para>
10014 #: ../en/ch09-undo.xml:924
10015 msgid ""
10016 "When you're finished using the <command role=\"hg-cmd\">hg bisect</command> "
10017 "command in a repository, you can use the <command role=\"hg-cmd\">hg bisect "
10018 "reset</command> command to drop the information it was using to drive your "
10019 "search. The command doesn't use much space, so it doesn't matter if you "
10020 "forget to run this command. However, <command role=\"hg-cmd\">hg bisect</"
10021 "command> won't let you start a new search in that repository until you do a "
10022 "<command role=\"hg-cmd\">hg bisect reset</command>."
10023 msgstr ""
10025 #. type: Content of: <book><chapter><sect1><title>
10026 #: ../en/ch09-undo.xml:939
10027 msgid "Tips for finding bugs effectively"
10028 msgstr "有效查找问题的技巧"
10030 #. type: Content of: <book><chapter><sect1><sect2><title>
10031 #: ../en/ch09-undo.xml:942
10032 msgid "Give consistent input"
10033 msgstr "给出一致的输入"
10035 #. type: Content of: <book><chapter><sect1><sect2><para>
10036 #: ../en/ch09-undo.xml:944
10037 msgid ""
10038 "The <command role=\"hg-cmd\">hg bisect</command> command requires that you "
10039 "correctly report the result of every test you perform. If you tell it that a "
10040 "test failed when it really succeeded, it <emphasis>might</emphasis> be able "
10041 "to detect the inconsistency. If it can identify an inconsistency in your "
10042 "reports, it will tell you that a particular changeset is both good and bad. "
10043 "However, it can't do this perfectly; it's about as likely to report the wrong "
10044 "changeset as the source of the bug."
10045 msgstr ""
10047 #. type: Content of: <book><chapter><sect1><sect2><title>
10048 #: ../en/ch09-undo.xml:956
10049 msgid "Automate as much as possible"
10050 msgstr "尽量自动"
10052 #. type: Content of: <book><chapter><sect1><sect2><para>
10053 #: ../en/ch09-undo.xml:958
10054 msgid ""
10055 "When I started using the <command role=\"hg-cmd\">hg bisect</command> "
10056 "command, I tried a few times to run my tests by hand, on the command line. "
10057 "This is an approach that I, at least, am not suited to. After a few tries, I "
10058 "found that I was making enough mistakes that I was having to restart my "
10059 "searches several times before finally getting correct results."
10060 msgstr ""
10062 #. type: Content of: <book><chapter><sect1><sect2><para>
10063 #: ../en/ch09-undo.xml:966
10064 msgid ""
10065 "My initial problems with driving the <command role=\"hg-cmd\">hg bisect</"
10066 "command> command by hand occurred even with simple searches on small "
10067 "repositories; if the problem you're looking for is more subtle, or the number "
10068 "of tests that <command role=\"hg-cmd\">hg bisect</command> must perform "
10069 "increases, the likelihood of operator error ruining the search is much "
10070 "higher. Once I started automating my tests, I had much better results."
10071 msgstr ""
10073 #. type: Content of: <book><chapter><sect1><sect2><para>
10074 #: ../en/ch09-undo.xml:975
10075 msgid "The key to automated testing is twofold:"
10076 msgstr ""
10078 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10079 #: ../en/ch09-undo.xml:977
10080 msgid "always test for the same symptom, and"
10081 msgstr ""
10083 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10084 #: ../en/ch09-undo.xml:979
10085 msgid ""
10086 "always feed consistent input to the <command role=\"hg-cmd\">hg bisect</"
10087 "command> command."
10088 msgstr ""
10090 #. type: Content of: <book><chapter><sect1><sect2><para>
10091 #: ../en/ch09-undo.xml:982
10092 msgid ""
10093 "In my tutorial example above, the <command>grep</command> command tests for "
10094 "the symptom, and the <literal>if</literal> statement takes the result of this "
10095 "check and ensures that we always feed the same input to the <command role="
10096 "\"hg-cmd\">hg bisect</command> command. The <literal>mytest</literal> "
10097 "function marries these together in a reproducible way, so that every test is "
10098 "uniform and consistent."
10099 msgstr ""
10101 #. type: Content of: <book><chapter><sect1><sect2><title>
10102 #: ../en/ch09-undo.xml:992
10103 msgid "Check your results"
10104 msgstr "检查你的结果"
10106 #. type: Content of: <book><chapter><sect1><sect2><para>
10107 #: ../en/ch09-undo.xml:994
10108 msgid ""
10109 "Because the output of a <command role=\"hg-cmd\">hg bisect</command> search "
10110 "is only as good as the input you give it, don't take the changeset it reports "
10111 "as the absolute truth. A simple way to cross-check its report is to manually "
10112 "run your test at each of the following changesets:"
10113 msgstr ""
10115 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10116 #: ../en/ch09-undo.xml:1000
10117 msgid ""
10118 "The changeset that it reports as the first bad revision. Your test should "
10119 "still report this as bad."
10120 msgstr ""
10122 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10123 #: ../en/ch09-undo.xml:1004
10124 msgid ""
10125 "The parent of that changeset (either parent, if it's a merge). Your test "
10126 "should report this changeset as good."
10127 msgstr ""
10129 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
10130 #: ../en/ch09-undo.xml:1008
10131 msgid ""
10132 "A child of that changeset. Your test should report this changeset as bad."
10133 msgstr ""
10135 #. type: Content of: <book><chapter><sect1><sect2><title>
10136 #: ../en/ch09-undo.xml:1014
10137 msgid "Beware interference between bugs"
10138 msgstr "谨防问题之间的冲突"
10140 #. type: Content of: <book><chapter><sect1><sect2><para>
10141 #: ../en/ch09-undo.xml:1016
10142 msgid ""
10143 "It's possible that your search for one bug could be disrupted by the presence "
10144 "of another. For example, let's say your software crashes at revision 100, "
10145 "and worked correctly at revision 50. Unknown to you, someone else introduced "
10146 "a different crashing bug at revision 60, and fixed it at revision 80. This "
10147 "could distort your results in one of several ways."
10148 msgstr ""
10150 #. type: Content of: <book><chapter><sect1><sect2><para>
10151 #: ../en/ch09-undo.xml:1024
10152 msgid ""
10153 "It is possible that this other bug completely <quote>masks</quote> yours, "
10154 "which is to say that it occurs before your bug has a chance to manifest "
10155 "itself. If you can't avoid that other bug (for example, it prevents your "
10156 "project from building), and so can't tell whether your bug is present in a "
10157 "particular changeset, the <command role=\"hg-cmd\">hg bisect</command> "
10158 "command cannot help you directly. Instead, you can mark a changeset as "
10159 "untested by running <command role=\"hg-cmd\">hg bisect --skip</command>."
10160 msgstr ""
10162 #. type: Content of: <book><chapter><sect1><sect2><para>
10163 #: ../en/ch09-undo.xml:1034
10164 msgid ""
10165 "A different problem could arise if your test for a bug's presence is not "
10166 "specific enough. If you check for <quote>my program crashes</quote>, then "
10167 "both your crashing bug and an unrelated crashing bug that masks it will look "
10168 "like the same thing, and mislead <command role=\"hg-cmd\">hg bisect</command>."
10169 msgstr ""
10171 #. type: Content of: <book><chapter><sect1><sect2><para>
10172 #: ../en/ch09-undo.xml:1041
10173 msgid ""
10174 "Another useful situation in which to use <command role=\"hg-cmd\">hg bisect --"
10175 "skip</command> is if you can't test a revision because your project was in a "
10176 "broken and hence untestable state at that revision, perhaps because someone "
10177 "checked in a change that prevented the project from building."
10178 msgstr ""
10180 #. type: Content of: <book><chapter><sect1><sect2><title>
10181 #: ../en/ch09-undo.xml:1050
10182 msgid "Bracket your search lazily"
10183 msgstr "减少你的查找工作"
10185 #. type: Content of: <book><chapter><sect1><sect2><para>
10186 #: ../en/ch09-undo.xml:1052
10187 msgid ""
10188 "Choosing the first <quote>good</quote> and <quote>bad</quote> changesets that "
10189 "will mark the end points of your search is often easy, but it bears a little "
10190 "discussion nevertheless. From the perspective of <command role=\"hg-cmd\">hg "
10191 "bisect</command>, the <quote>newest</quote> changeset is conventionally "
10192 "<quote>bad</quote>, and the older changeset is <quote>good</quote>."
10193 msgstr ""
10195 #. type: Content of: <book><chapter><sect1><sect2><para>
10196 #: ../en/ch09-undo.xml:1060
10197 msgid ""
10198 "If you're having trouble remembering when a suitable <quote>good</quote> "
10199 "change was, so that you can tell <command role=\"hg-cmd\">hg bisect</"
10200 "command>, you could do worse than testing changesets at random. Just "
10201 "remember to eliminate contenders that can't possibly exhibit the bug (perhaps "
10202 "because the feature with the bug isn't present yet) and those where another "
10203 "problem masks the bug (as I discussed above)."
10204 msgstr ""
10206 #. type: Content of: <book><chapter><sect1><sect2><para>
10207 #: ../en/ch09-undo.xml:1069
10208 msgid ""
10209 "Even if you end up <quote>early</quote> by thousands of changesets or months "
10210 "of history, you will only add a handful of tests to the total number that "
10211 "<command role=\"hg-cmd\">hg bisect</command> must perform, thanks to its "
10212 "logarithmic behaviour."
10213 msgstr ""
10215 #. type: Content of: <book><chapter><title>
10216 #: ../en/ch10-hook.xml:5
10217 msgid "Handling repository events with hooks"
10218 msgstr "使用钩子处理版本库事件"
10220 #. type: Content of: <book><chapter><para>
10221 #: ../en/ch10-hook.xml:7
10222 msgid ""
10223 "Mercurial offers a powerful mechanism to let you perform automated actions in "
10224 "response to events that occur in a repository. In some cases, you can even "
10225 "control Mercurial's response to those events."
10226 msgstr ""
10228 #. type: Content of: <book><chapter><para>
10229 #: ../en/ch10-hook.xml:12
10230 msgid ""
10231 "The name Mercurial uses for one of these actions is a <emphasis>hook</"
10232 "emphasis>. Hooks are called <quote>triggers</quote> in some revision control "
10233 "systems, but the two names refer to the same idea."
10234 msgstr ""
10236 #. type: Content of: <book><chapter><sect1><title>
10237 #: ../en/ch10-hook.xml:18
10238 msgid "An overview of hooks in Mercurial"
10239 msgstr "Mercurial 钩子概述"
10241 #. type: Content of: <book><chapter><sect1><para>
10242 #: ../en/ch10-hook.xml:20
10243 msgid ""
10244 "Here is a brief list of the hooks that Mercurial supports. We will revisit "
10245 "each of these hooks in more detail later, in section <xref linkend=\"sec.hook."
10246 "ref\"/>."
10247 msgstr ""
10249 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10250 #: ../en/ch10-hook.xml:25
10251 msgid ""
10252 "<literal role=\"hook\">changegroup</literal>: This is run after a group of "
10253 "changesets has been brought into the repository from elsewhere."
10254 msgstr ""
10256 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10257 #: ../en/ch10-hook.xml:29
10258 msgid ""
10259 "<literal role=\"hook\">commit</literal>: This is run after a new changeset "
10260 "has been created in the local repository."
10261 msgstr ""
10263 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10264 #: ../en/ch10-hook.xml:33
10265 msgid ""
10266 "<literal role=\"hook\">incoming</literal>: This is run once for each new "
10267 "changeset that is brought into the repository from elsewhere. Notice the "
10268 "difference from <literal role=\"hook\">changegroup</literal>, which is run "
10269 "once per <emphasis>group</emphasis> of changesets brought in."
10270 msgstr ""
10272 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10273 #: ../en/ch10-hook.xml:40
10274 msgid ""
10275 "<literal role=\"hook\">outgoing</literal>: This is run after a group of "
10276 "changesets has been transmitted from this repository."
10277 msgstr ""
10279 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10280 #: ../en/ch10-hook.xml:44
10281 msgid ""
10282 "<literal role=\"hook\">prechangegroup</literal>: This is run before starting "
10283 "to bring a group of changesets into the repository."
10284 msgstr ""
10286 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10287 #: ../en/ch10-hook.xml:49
10288 msgid ""
10289 "<literal role=\"hook\">precommit</literal>: Controlling. This is run before "
10290 "starting a commit."
10291 msgstr ""
10293 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10294 #: ../en/ch10-hook.xml:53
10295 msgid ""
10296 "<literal role=\"hook\">preoutgoing</literal>: Controlling. This is run before "
10297 "starting to transmit a group of changesets from this repository."
10298 msgstr ""
10300 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10301 #: ../en/ch10-hook.xml:58
10302 msgid ""
10303 "<literal role=\"hook\">pretag</literal>: Controlling. This is run before "
10304 "creating a tag."
10305 msgstr ""
10307 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10308 #: ../en/ch10-hook.xml:62
10309 msgid ""
10310 "<literal role=\"hook\">pretxnchangegroup</literal>: Controlling. This is run "
10311 "after a group of changesets has been brought into the local repository from "
10312 "another, but before the transaction completes that will make the changes "
10313 "permanent in the repository."
10314 msgstr ""
10316 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10317 #: ../en/ch10-hook.xml:70
10318 msgid ""
10319 "<literal role=\"hook\">pretxncommit</literal>: Controlling. This is run after "
10320 "a new changeset has been created in the local repository, but before the "
10321 "transaction completes that will make it permanent."
10322 msgstr ""
10324 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10325 #: ../en/ch10-hook.xml:76
10326 msgid ""
10327 "<literal role=\"hook\">preupdate</literal>: Controlling. This is run before "
10328 "starting an update or merge of the working directory."
10329 msgstr ""
10331 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10332 #: ../en/ch10-hook.xml:81
10333 msgid ""
10334 "<literal role=\"hook\">tag</literal>: This is run after a tag is created."
10335 msgstr ""
10337 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
10338 #: ../en/ch10-hook.xml:85
10339 msgid ""
10340 "<literal role=\"hook\">update</literal>: This is run after an update or merge "
10341 "of the working directory has finished."
10342 msgstr ""
10344 #. type: Content of: <book><chapter><sect1><para>
10345 #: ../en/ch10-hook.xml:90
10346 msgid ""
10347 "Each of the hooks whose description begins with the word <quote>Controlling</"
10348 "quote> has the ability to determine whether an activity can proceed. If the "
10349 "hook succeeds, the activity may proceed; if it fails, the activity is either "
10350 "not permitted or undone, depending on the hook."
10351 msgstr ""
10353 #. type: Content of: <book><chapter><sect1><title>
10354 #: ../en/ch10-hook.xml:99
10355 msgid "Hooks and security"
10356 msgstr "钩子与安全性"
10358 #. type: Content of: <book><chapter><sect1><sect2><title>
10359 #: ../en/ch10-hook.xml:102
10360 msgid "Hooks are run with your privileges"
10361 msgstr "钩子以你的特权执行"
10363 #. type: Content of: <book><chapter><sect1><sect2><para>
10364 #: ../en/ch10-hook.xml:104
10365 msgid ""
10366 "When you run a Mercurial command in a repository, and the command causes a "
10367 "hook to run, that hook runs on <emphasis>your</emphasis> system, under "
10368 "<emphasis>your</emphasis> user account, with <emphasis>your</emphasis> "
10369 "privilege level. Since hooks are arbitrary pieces of executable code, you "
10370 "should treat them with an appropriate level of suspicion. Do not install a "
10371 "hook unless you are confident that you know who created it and what it does."
10372 msgstr ""
10374 #. type: Content of: <book><chapter><sect1><sect2><para>
10375 #: ../en/ch10-hook.xml:115
10376 msgid ""
10377 "In some cases, you may be exposed to hooks that you did not install "
10378 "yourself. If you work with Mercurial on an unfamiliar system, Mercurial will "
10379 "run hooks defined in that system's global <filename role=\"special\"> /.hgrc</"
10380 "filename>\\ file."
10381 msgstr ""
10383 #. type: Content of: <book><chapter><sect1><sect2><para>
10384 #: ../en/ch10-hook.xml:122
10385 msgid ""
10386 "If you are working with a repository owned by another user, Mercurial can run "
10387 "hooks defined in that user's repository, but it will still run them as "
10388 "<quote>you</quote>. For example, if you <command role=\"hg-cmd\">hg pull</"
10389 "command> from that repository, and its <filename role=\"special\">.hg/hgrc</"
10390 "filename> defines a local <literal role=\"hook\">outgoing</literal> hook, "
10391 "that hook will run under your user account, even though you don't own that "
10392 "repository."
10393 msgstr ""
10395 #. type: Content of: <book><chapter><sect1><sect2><note><para>
10396 #: ../en/ch10-hook.xml:134
10397 msgid ""
10398 "This only applies if you are pulling from a repository on a local or network "
10399 "filesystem. If you're pulling over http or ssh, any <literal role=\"hook"
10400 "\">outgoing</literal> hook will run under whatever account is executing the "
10401 "server process, on the server."
10402 msgstr ""
10404 #. type: Content of: <book><chapter><sect1><sect2><para>
10405 #: ../en/ch10-hook.xml:142
10406 msgid ""
10407 "XXX To see what hooks are defined in a repository, use the <command role=\"hg-"
10408 "cmd\">hg config hooks</command> command. If you are working in one "
10409 "repository, but talking to another that you do not own (e.g. using <command "
10410 "role=\"hg-cmd\">hg pull</command> or <command role=\"hg-cmd\">hg incoming</"
10411 "command>), remember that it is the other repository's hooks you should be "
10412 "checking, not your own."
10413 msgstr ""
10415 #. type: Content of: <book><chapter><sect1><sect2><title>
10416 #: ../en/ch10-hook.xml:153
10417 msgid "Hooks do not propagate"
10418 msgstr "钩子不会传播"
10420 #. type: Content of: <book><chapter><sect1><sect2><para>
10421 #: ../en/ch10-hook.xml:155
10422 msgid ""
10423 "In Mercurial, hooks are not revision controlled, and do not propagate when "
10424 "you clone, or pull from, a repository. The reason for this is simple: a hook "
10425 "is a completely arbitrary piece of executable code. It runs under your user "
10426 "identity, with your privilege level, on your machine."
10427 msgstr ""
10429 #. type: Content of: <book><chapter><sect1><sect2><para>
10430 #: ../en/ch10-hook.xml:162
10431 msgid ""
10432 "It would be extremely reckless for any distributed revision control system to "
10433 "implement revision-controlled hooks, as this would offer an easily "
10434 "exploitable way to subvert the accounts of users of the revision control "
10435 "system."
10436 msgstr ""
10438 #. type: Content of: <book><chapter><sect1><sect2><para>
10439 #: ../en/ch10-hook.xml:168
10440 msgid ""
10441 "Since Mercurial does not propagate hooks, if you are collaborating with other "
10442 "people on a common project, you should not assume that they are using the "
10443 "same Mercurial hooks as you are, or that theirs are correctly configured. "
10444 "You should document the hooks you expect people to use."
10445 msgstr ""
10447 #. type: Content of: <book><chapter><sect1><sect2><para>
10448 #: ../en/ch10-hook.xml:175
10449 msgid ""
10450 "In a corporate intranet, this is somewhat easier to control, as you can for "
10451 "example provide a <quote>standard</quote> installation of Mercurial on an NFS "
10452 "filesystem, and use a site-wide <filename role=\"special\"> /.hgrc</filename>"
10453 "\\ file to define hooks that all users will see. However, this too has its "
10454 "limits; see below."
10455 msgstr ""
10457 #. type: Content of: <book><chapter><sect1><sect2><title>
10458 #: ../en/ch10-hook.xml:185
10459 msgid "Hooks can be overridden"
10460 msgstr "钩子可以被覆盖"
10462 #. type: Content of: <book><chapter><sect1><sect2><para>
10463 #: ../en/ch10-hook.xml:187
10464 msgid ""
10465 "Mercurial allows you to override a hook definition by redefining the hook. "
10466 "You can disable it by setting its value to the empty string, or change its "
10467 "behaviour as you wish."
10468 msgstr ""
10470 #. type: Content of: <book><chapter><sect1><sect2><para>
10471 #: ../en/ch10-hook.xml:192
10472 msgid ""
10473 "If you deploy a system- or site-wide <filename role=\"special\"> /.hgrc</"
10474 "filename>\\ file that defines some hooks, you should thus understand that "
10475 "your users can disable or override those hooks."
10476 msgstr ""
10478 #. type: Content of: <book><chapter><sect1><sect2><title>
10479 #: ../en/ch10-hook.xml:200
10480 msgid "Ensuring that critical hooks are run"
10481 msgstr "确保关键钩子的执行"
10483 #. type: Content of: <book><chapter><sect1><sect2><para>
10484 #: ../en/ch10-hook.xml:202
10485 msgid ""
10486 "Sometimes you may want to enforce a policy that you do not want others to be "
10487 "able to work around. For example, you may have a requirement that every "
10488 "changeset must pass a rigorous set of tests. Defining this requirement via a "
10489 "hook in a site-wide <filename role=\"special\"> /.hgrc</filename>\\ won't "
10490 "work for remote users on laptops, and of course local users can subvert it at "
10491 "will by overriding the hook."
10492 msgstr ""
10494 #. type: Content of: <book><chapter><sect1><sect2><para>
10495 #: ../en/ch10-hook.xml:211
10496 msgid ""
10497 "Instead, you can set up your policies for use of Mercurial so that people are "
10498 "expected to propagate changes through a well-known <quote>canonical</quote> "
10499 "server that you have locked down and configured appropriately."
10500 msgstr ""
10502 #. type: Content of: <book><chapter><sect1><sect2><para>
10503 #: ../en/ch10-hook.xml:217
10504 msgid ""
10505 "One way to do this is via a combination of social engineering and "
10506 "technology. Set up a restricted-access account; users can push changes over "
10507 "the network to repositories managed by this account, but they cannot log into "
10508 "the account and run normal shell commands. In this scenario, a user can "
10509 "commit a changeset that contains any old garbage they want."
10510 msgstr ""
10512 #. type: Content of: <book><chapter><sect1><sect2><para>
10513 #: ../en/ch10-hook.xml:226
10514 msgid ""
10515 "When someone pushes a changeset to the server that everyone pulls from, the "
10516 "server will test the changeset before it accepts it as permanent, and reject "
10517 "it if it fails to pass the test suite. If people only pull changes from this "
10518 "filtering server, it will serve to ensure that all changes that people pull "
10519 "have been automatically vetted."
10520 msgstr ""
10522 #. type: Content of: <book><chapter><sect1><title>
10523 #: ../en/ch10-hook.xml:237
10524 msgid "Care with <literal>pretxn</literal> hooks in a shared-access repository"
10525 msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子"
10527 #. type: Content of: <book><chapter><sect1><para>
10528 #: ../en/ch10-hook.xml:240
10529 msgid ""
10530 "If you want to use hooks to do some automated work in a repository that a "
10531 "number of people have shared access to, you need to be careful in how you do "
10532 "this."
10533 msgstr ""
10535 #. type: Content of: <book><chapter><sect1><para>
10536 #: ../en/ch10-hook.xml:245
10537 msgid ""
10538 "Mercurial only locks a repository when it is writing to the repository, and "
10539 "only the parts of Mercurial that write to the repository pay attention to "
10540 "locks. Write locks are necessary to prevent multiple simultaneous writers "
10541 "from scribbling on each other's work, corrupting the repository."
10542 msgstr ""
10544 #. type: Content of: <book><chapter><sect1><para>
10545 #: ../en/ch10-hook.xml:252
10546 msgid ""
10547 "Because Mercurial is careful with the order in which it reads and writes "
10548 "data, it does not need to acquire a lock when it wants to read data from the "
10549 "repository. The parts of Mercurial that read from the repository never pay "
10550 "attention to locks. This lockless reading scheme greatly increases "
10551 "performance and concurrency."
10552 msgstr ""
10554 #. type: Content of: <book><chapter><sect1><para>
10555 #: ../en/ch10-hook.xml:260
10556 msgid ""
10557 "With great performance comes a trade-off, though, one which has the potential "
10558 "to cause you trouble unless you're aware of it. To describe this requires a "
10559 "little detail about how Mercurial adds changesets to a repository and reads "
10560 "those changes."
10561 msgstr ""
10563 #. type: Content of: <book><chapter><sect1><para>
10564 #: ../en/ch10-hook.xml:267
10565 msgid ""
10566 "When Mercurial <emphasis>writes</emphasis> metadata, it writes it straight "
10567 "into the destination file. It writes file data first, then manifest data "
10568 "(which contains pointers to the new file data), then changelog data (which "
10569 "contains pointers to the new manifest data). Before the first write to each "
10570 "file, it stores a record of where the end of the file was in its transaction "
10571 "log. If the transaction must be rolled back, Mercurial simply truncates each "
10572 "file back to the size it was before the transaction began."
10573 msgstr ""
10575 #. type: Content of: <book><chapter><sect1><para>
10576 #: ../en/ch10-hook.xml:278
10577 msgid ""
10578 "When Mercurial <emphasis>reads</emphasis> metadata, it reads the changelog "
10579 "first, then everything else. Since a reader will only access parts of the "
10580 "manifest or file metadata that it can see in the changelog, it can never see "
10581 "partially written data."
10582 msgstr ""
10584 #. type: Content of: <book><chapter><sect1><para>
10585 #: ../en/ch10-hook.xml:284
10586 msgid ""
10587 "Some controlling hooks (<literal role=\"hook\">pretxncommit</literal> and "
10588 "<literal role=\"hook\">pretxnchangegroup</literal>) run when a transaction is "
10589 "almost complete. All of the metadata has been written, but Mercurial can "
10590 "still roll the transaction back and cause the newly-written data to disappear."
10591 msgstr ""
10593 #. type: Content of: <book><chapter><sect1><para>
10594 #: ../en/ch10-hook.xml:292
10595 msgid ""
10596 "If one of these hooks runs for long, it opens a window of time during which a "
10597 "reader can see the metadata for changesets that are not yet permanent, and "
10598 "should not be thought of as <quote>really there</quote>. The longer the hook "
10599 "runs, the longer that window is open."
10600 msgstr ""
10602 #. type: Content of: <book><chapter><sect1><sect2><title>
10603 #: ../en/ch10-hook.xml:300
10604 msgid "The problem illustrated"
10605 msgstr "问题的演示"
10607 #. type: Content of: <book><chapter><sect1><sect2><para>
10608 #: ../en/ch10-hook.xml:302
10609 msgid ""
10610 "In principle, a good use for the <literal role=\"hook\">pretxnchangegroup</"
10611 "literal> hook would be to automatically build and test incoming changes "
10612 "before they are accepted into a central repository. This could let you "
10613 "guarantee that nobody can push changes to this repository that <quote>break "
10614 "the build</quote>. But if a client can pull changes while they're being "
10615 "tested, the usefulness of the test is zero; an unsuspecting someone can pull "
10616 "untested changes, potentially breaking their build."
10617 msgstr ""
10619 #. type: Content of: <book><chapter><sect1><sect2><para>
10620 #: ../en/ch10-hook.xml:313
10621 msgid ""
10622 "The safest technological answer to this challenge is to set up such a "
10623 "<quote>gatekeeper</quote> repository as <emphasis>unidirectional</emphasis>. "
10624 "Let it take changes pushed in from the outside, but do not allow anyone to "
10625 "pull changes from it (use the <literal role=\"hook\">preoutgoing</literal> "
10626 "hook to lock it down). Configure a <literal role=\"hook\">changegroup</"
10627 "literal> hook so that if a build or test succeeds, the hook will push the new "
10628 "changes out to another repository that people <emphasis>can</emphasis> pull "
10629 "from."
10630 msgstr ""
10632 #. type: Content of: <book><chapter><sect1><sect2><para>
10633 #: ../en/ch10-hook.xml:325
10634 msgid ""
10635 "In practice, putting a centralised bottleneck like this in place is not often "
10636 "a good idea, and transaction visibility has nothing to do with the problem. "
10637 "As the size of a project&emdash;and the time it takes to build and "
10638 "test&emdash;grows, you rapidly run into a wall with this <quote>try before "
10639 "you buy</quote> approach, where you have more changesets to test than time in "
10640 "which to deal with them. The inevitable result is frustration on the part of "
10641 "all involved."
10642 msgstr ""
10644 #. type: Content of: <book><chapter><sect1><sect2><para>
10645 #: ../en/ch10-hook.xml:336
10646 msgid ""
10647 "An approach that scales better is to get people to build and test before they "
10648 "push, then run automated builds and tests centrally <emphasis>after</"
10649 "emphasis> a push, to be sure all is well. The advantage of this approach is "
10650 "that it does not impose a limit on the rate at which the repository can "
10651 "accept changes."
10652 msgstr ""
10654 #. type: Content of: <book><chapter><sect1><title>
10655 #: ../en/ch10-hook.xml:347
10656 msgid "A short tutorial on using hooks"
10657 msgstr "使用钩子的简短指南"
10659 #. type: Content of: <book><chapter><sect1><para>
10660 #: ../en/ch10-hook.xml:349
10661 msgid ""
10662 "It is easy to write a Mercurial hook. Let's start with a hook that runs when "
10663 "you finish a <command role=\"hg-cmd\">hg commit</command>, and simply prints "
10664 "the hash of the changeset you just created. The hook is called <literal role="
10665 "\"hook\">commit</literal>."
10666 msgstr ""
10668 #. type: Content of: <book><chapter><sect1><para>
10669 #: ../en/ch10-hook.xml:356
10670 msgid "All hooks follow the pattern in this example."
10671 msgstr ""
10673 #. type: Content of: <book><chapter><sect1><para>
10674 #: ../en/ch10-hook.xml:360
10675 msgid ""
10676 "You add an entry to the <literal role=\"rc-hooks\">hooks</literal> section of "
10677 "your <filename role=\"special\"> /.hgrc</filename>. On the left is the name "
10678 "of the event to trigger on; on the right is the action to take. As you can "
10679 "see, you can run an arbitrary shell command in a hook. Mercurial passes "
10680 "extra information to the hook using environment variables (look for "
10681 "<envar>HG_NODE</envar> in the example)."
10682 msgstr ""
10684 #. type: Content of: <book><chapter><sect1><sect2><title>
10685 #: ../en/ch10-hook.xml:370
10686 msgid "Performing multiple actions per event"
10687 msgstr "每个事件执行多个操作"
10689 #. type: Content of: <book><chapter><sect1><sect2><para>
10690 #: ../en/ch10-hook.xml:372
10691 msgid ""
10692 "Quite often, you will want to define more than one hook for a particular kind "
10693 "of event, as shown below."
10694 msgstr ""
10696 #. type: Content of: <book><chapter><sect1><sect2><para>
10697 #: ../en/ch10-hook.xml:377
10698 msgid ""
10699 "Mercurial lets you do this by adding an <emphasis>extension</emphasis> to the "
10700 "end of a hook's name. You extend a hook's name by giving the name of the "
10701 "hook, followed by a full stop (the <quote><literal>.</literal></quote> "
10702 "character), followed by some more text of your choosing. For example, "
10703 "Mercurial will run both <literal>commit.foo</literal> and <literal>commit."
10704 "bar</literal> when the <literal>commit</literal> event occurs."
10705 msgstr ""
10707 #. type: Content of: <book><chapter><sect1><sect2><para>
10708 #: ../en/ch10-hook.xml:388
10709 msgid ""
10710 "To give a well-defined order of execution when there are multiple hooks "
10711 "defined for an event, Mercurial sorts hooks by extension, and executes the "
10712 "hook commands in this sorted order. In the above example, it will execute "
10713 "<literal>commit.bar</literal> before <literal>commit.foo</literal>, and "
10714 "<literal>commit</literal> before both."
10715 msgstr ""
10717 #. type: Content of: <book><chapter><sect1><sect2><para>
10718 #: ../en/ch10-hook.xml:397
10719 msgid ""
10720 "It is a good idea to use a somewhat descriptive extension when you define a "
10721 "new hook. This will help you to remember what the hook was for. If the hook "
10722 "fails, you'll get an error message that contains the hook name and extension, "
10723 "so using a descriptive extension could give you an immediate hint as to why "
10724 "the hook failed (see section <xref linkend=\"sec.hook.perm\"/> for an "
10725 "example)."
10726 msgstr ""
10728 #. type: Content of: <book><chapter><sect1><sect2><title>
10729 #: ../en/ch10-hook.xml:408
10730 msgid "Controlling whether an activity can proceed"
10731 msgstr "控制处理的活动"
10733 #. type: Content of: <book><chapter><sect1><sect2><para>
10734 #: ../en/ch10-hook.xml:410
10735 msgid ""
10736 "In our earlier examples, we used the <literal role=\"hook\">commit</literal> "
10737 "hook, which is run after a commit has completed. This is one of several "
10738 "Mercurial hooks that run after an activity finishes. Such hooks have no way "
10739 "of influencing the activity itself."
10740 msgstr ""
10742 #. type: Content of: <book><chapter><sect1><sect2><para>
10743 #: ../en/ch10-hook.xml:417
10744 msgid ""
10745 "Mercurial defines a number of events that occur before an activity starts; or "
10746 "after it starts, but before it finishes. Hooks that trigger on these events "
10747 "have the added ability to choose whether the activity can continue, or will "
10748 "abort."
10749 msgstr ""
10751 #. type: Content of: <book><chapter><sect1><sect2><para>
10752 #: ../en/ch10-hook.xml:423
10753 msgid ""
10754 "The <literal role=\"hook\">pretxncommit</literal> hook runs after a commit "
10755 "has all but completed. In other words, the metadata representing the "
10756 "changeset has been written out to disk, but the transaction has not yet been "
10757 "allowed to complete. The <literal role=\"hook\">pretxncommit</literal> hook "
10758 "has the ability to decide whether the transaction can complete, or must be "
10759 "rolled back."
10760 msgstr ""
10762 #. type: Content of: <book><chapter><sect1><sect2><para>
10763 #: ../en/ch10-hook.xml:432
10764 msgid ""
10765 "If the <literal role=\"hook\">pretxncommit</literal> hook exits with a status "
10766 "code of zero, the transaction is allowed to complete; the commit finishes; "
10767 "and the <literal role=\"hook\">commit</literal> hook is run. If the <literal "
10768 "role=\"hook\">pretxncommit</literal> hook exits with a non-zero status code, "
10769 "the transaction is rolled back; the metadata representing the changeset is "
10770 "erased; and the <literal role=\"hook\">commit</literal> hook is not run."
10771 msgstr ""
10773 #. type: Content of: <book><chapter><sect1><sect2><para>
10774 #: ../en/ch10-hook.xml:444
10775 msgid ""
10776 "The hook in the example above checks that a commit comment contains a bug "
10777 "ID. If it does, the commit can complete. If not, the commit is rolled back."
10778 msgstr ""
10780 #. type: Content of: <book><chapter><sect1><title>
10781 #: ../en/ch10-hook.xml:452
10782 msgid "Writing your own hooks"
10783 msgstr "编写钩子"
10785 #. type: Content of: <book><chapter><sect1><para>
10786 #: ../en/ch10-hook.xml:454
10787 msgid ""
10788 "When you are writing a hook, you might find it useful to run Mercurial either "
10789 "with the <option role=\"hg-opt-global\">-v</option> option, or the <envar "
10790 "role=\"rc-item-ui\">verbose</envar> config item set to <quote>true</quote>. "
10791 "When you do so, Mercurial will print a message before it calls each hook."
10792 msgstr ""
10794 #. type: Content of: <book><chapter><sect1><sect2><title>
10795 #: ../en/ch10-hook.xml:463
10796 msgid "Choosing how your hook should run"
10797 msgstr "选择钩子的执行方式"
10799 #. type: Content of: <book><chapter><sect1><sect2><para>
10800 #: ../en/ch10-hook.xml:465
10801 msgid ""
10802 "You can write a hook either as a normal program&emdash;typically a shell "
10803 "script&emdash;or as a Python function that is executed within the Mercurial "
10804 "process."
10805 msgstr ""
10807 #. type: Content of: <book><chapter><sect1><sect2><para>
10808 #: ../en/ch10-hook.xml:470
10809 msgid ""
10810 "Writing a hook as an external program has the advantage that it requires no "
10811 "knowledge of Mercurial's internals. You can call normal Mercurial commands "
10812 "to get any added information you need. The trade-off is that external hooks "
10813 "are slower than in-process hooks."
10814 msgstr ""
10816 #. type: Content of: <book><chapter><sect1><sect2><para>
10817 #: ../en/ch10-hook.xml:477
10818 msgid ""
10819 "An in-process Python hook has complete access to the Mercurial API, and does "
10820 "not <quote>shell out</quote> to another process, so it is inherently faster "
10821 "than an external hook. It is also easier to obtain much of the information "
10822 "that a hook requires by using the Mercurial API than by running Mercurial "
10823 "commands."
10824 msgstr ""
10826 #. type: Content of: <book><chapter><sect1><sect2><para>
10827 #: ../en/ch10-hook.xml:485
10828 msgid ""
10829 "If you are comfortable with Python, or require high performance, writing your "
10830 "hooks in Python may be a good choice. However, when you have a "
10831 "straightforward hook to write and you don't need to care about performance "
10832 "(probably the majority of hooks), a shell script is perfectly fine."
10833 msgstr ""
10835 #. type: Content of: <book><chapter><sect1><sect2><title>
10836 #: ../en/ch10-hook.xml:494
10837 msgid "Hook parameters"
10838 msgstr "钩子的参数"
10840 #. type: Content of: <book><chapter><sect1><sect2><para>
10841 #: ../en/ch10-hook.xml:496
10842 msgid ""
10843 "Mercurial calls each hook with a set of well-defined parameters. In Python, "
10844 "a parameter is passed as a keyword argument to your hook function. For an "
10845 "external program, a parameter is passed as an environment variable."
10846 msgstr ""
10848 #. type: Content of: <book><chapter><sect1><sect2><para>
10849 #: ../en/ch10-hook.xml:502
10850 msgid ""
10851 "Whether your hook is written in Python or as a shell script, the hook-"
10852 "specific parameter names and values will be the same. A boolean parameter "
10853 "will be represented as a boolean value in Python, but as the number 1 (for "
10854 "<quote>true</quote>) or 0 (for <quote>false</quote>) as an environment "
10855 "variable for an external hook. If a hook parameter is named <literal>foo</"
10856 "literal>, the keyword argument for a Python hook will also be named "
10857 "<literal>foo</literal>, while the environment variable for an external hook "
10858 "will be named <literal>HG_FOO</literal>."
10859 msgstr ""
10861 #. type: Content of: <book><chapter><sect1><sect2><title>
10862 #: ../en/ch10-hook.xml:516
10863 msgid "Hook return values and activity control"
10864 msgstr "钩子的返回值与活动控制"
10866 #. type: Content of: <book><chapter><sect1><sect2><para>
10867 #: ../en/ch10-hook.xml:518
10868 msgid ""
10869 "A hook that executes successfully must exit with a status of zero if "
10870 "external, or return boolean <quote>false</quote> if in-process. Failure is "
10871 "indicated with a non-zero exit status from an external hook, or an in-process "
10872 "hook returning boolean <quote>true</quote>. If an in-process hook raises an "
10873 "exception, the hook is considered to have failed."
10874 msgstr ""
10876 #. type: Content of: <book><chapter><sect1><sect2><para>
10877 #: ../en/ch10-hook.xml:526
10878 msgid ""
10879 "For a hook that controls whether an activity can proceed, zero/false means "
10880 "<quote>allow</quote>, while non-zero/true/exception means <quote>deny</quote>."
10881 msgstr ""
10883 #. type: Content of: <book><chapter><sect1><sect2><title>
10884 #: ../en/ch10-hook.xml:533
10885 msgid "Writing an external hook"
10886 msgstr "编写外部钩子"
10888 #. type: Content of: <book><chapter><sect1><sect2><para>
10889 #: ../en/ch10-hook.xml:535
10890 msgid ""
10891 "When you define an external hook in your <filename role=\"special\"> /.hgrc</"
10892 "filename>\\ and the hook is run, its value is passed to your shell, which "
10893 "interprets it. This means that you can use normal shell constructs in the "
10894 "body of the hook."
10895 msgstr ""
10897 #. type: Content of: <book><chapter><sect1><sect2><para>
10898 #: ../en/ch10-hook.xml:542
10899 msgid ""
10900 "An executable hook is always run with its current directory set to a "
10901 "repository's root directory."
10902 msgstr ""
10904 #. type: Content of: <book><chapter><sect1><sect2><para>
10905 #: ../en/ch10-hook.xml:546
10906 msgid ""
10907 "Each hook parameter is passed in as an environment variable; the name is "
10908 "upper-cased, and prefixed with the string <quote><literal>HG_</literal></"
10909 "quote>."
10910 msgstr ""
10912 #. type: Content of: <book><chapter><sect1><sect2><para>
10913 #: ../en/ch10-hook.xml:551
10914 msgid ""
10915 "With the exception of hook parameters, Mercurial does not set or modify any "
10916 "environment variables when running a hook. This is useful to remember if you "
10917 "are writing a site-wide hook that may be run by a number of different users "
10918 "with differing environment variables set. In multi-user situations, you "
10919 "should not rely on environment variables being set to the values you have in "
10920 "your environment when testing the hook."
10921 msgstr ""
10923 #. type: Content of: <book><chapter><sect1><sect2><title>
10924 #: ../en/ch10-hook.xml:562
10925 msgid "Telling Mercurial to use an in-process hook"
10926 msgstr "让 Mercurial 使用进程内钩子"
10928 #. type: Content of: <book><chapter><sect1><sect2><para>
10929 #: ../en/ch10-hook.xml:564
10930 msgid ""
10931 "The <filename role=\"special\"> /.hgrc</filename>\\ syntax for defining an in-"
10932 "process hook is slightly different than for an executable hook. The value of "
10933 "the hook must start with the text <quote><literal>python:</literal></quote>, "
10934 "and continue with the fully-qualified name of a callable object to use as the "
10935 "hook's value."
10936 msgstr ""
10938 #. type: Content of: <book><chapter><sect1><sect2><para>
10939 #: ../en/ch10-hook.xml:572
10940 msgid ""
10941 "The module in which a hook lives is automatically imported when a hook is "
10942 "run. So long as you have the module name and <envar>PYTHONPATH</envar> "
10943 "right, it should <quote>just work</quote>."
10944 msgstr ""
10946 #. type: Content of: <book><chapter><sect1><sect2><para>
10947 #: ../en/ch10-hook.xml:578
10948 msgid ""
10949 "The following <filename role=\"special\"> /.hgrc</filename>\\ example snippet "
10950 "illustrates the syntax and meaning of the notions we just described."
10951 msgstr ""
10953 #. type: Content of: <book><chapter><sect1><sect2><para>
10954 #: ../en/ch10-hook.xml:584
10955 msgid ""
10956 "When Mercurial runs the <literal>commit.example</literal> hook, it imports "
10957 "<literal>mymodule.submodule</literal>, looks for the callable object named "
10958 "<literal>myhook</literal>, and calls it."
10959 msgstr ""
10961 #. type: Content of: <book><chapter><sect1><sect2><title>
10962 #: ../en/ch10-hook.xml:592
10963 msgid "Writing an in-process hook"
10964 msgstr "编写进程内钩子"
10966 #. type: Content of: <book><chapter><sect1><sect2><para>
10967 #: ../en/ch10-hook.xml:594
10968 msgid ""
10969 "The simplest in-process hook does nothing, but illustrates the basic shape of "
10970 "the hook API:"
10971 msgstr ""
10973 #. type: Content of: <book><chapter><sect1><sect2><para>
10974 #: ../en/ch10-hook.xml:599
10975 msgid ""
10976 "The first argument to a Python hook is always a <literal role=\"py-mod-"
10977 "mercurial.ui\">ui</literal> object. The second is a repository object; at "
10978 "the moment, it is always an instance of <literal role=\"py-mod-mercurial."
10979 "localrepo\">localrepository</literal>. Following these two arguments are "
10980 "other keyword arguments. Which ones are passed in depends on the hook being "
10981 "called, but a hook can ignore arguments it doesn't care about by dropping "
10982 "them into a keyword argument dict, as with <literal>**kwargs</literal> above."
10983 msgstr ""
10985 #. type: Content of: <book><chapter><sect1><title>
10986 #: ../en/ch10-hook.xml:614
10987 msgid "Some hook examples"
10988 msgstr "钩子样例"
10990 #. type: Content of: <book><chapter><sect1><sect2><title>
10991 #: ../en/ch10-hook.xml:617
10992 msgid "Writing meaningful commit messages"
10993 msgstr "编写有意义的提交日志"
10995 #. type: Content of: <book><chapter><sect1><sect2><para>
10996 #: ../en/ch10-hook.xml:619
10997 msgid ""
10998 "It's hard to imagine a useful commit message being very short. The simple "
10999 "<literal role=\"hook\">pretxncommit</literal> hook of the example below will "
11000 "prevent you from committing a changeset with a message that is less than ten "
11001 "bytes long."
11002 msgstr ""
11004 #. type: Content of: <book><chapter><sect1><sect2><title>
11005 #: ../en/ch10-hook.xml:629
11006 msgid "Checking for trailing whitespace"
11007 msgstr "检查行尾空格"
11009 #. type: Content of: <book><chapter><sect1><sect2><para>
11010 #: ../en/ch10-hook.xml:631
11011 msgid ""
11012 "An interesting use of a commit-related hook is to help you to write cleaner "
11013 "code. A simple example of <quote>cleaner code</quote> is the dictum that a "
11014 "change should not add any new lines of text that contain <quote>trailing "
11015 "whitespace</quote>. Trailing whitespace is a series of space and tab "
11016 "characters at the end of a line of text. In most cases, trailing whitespace "
11017 "is unnecessary, invisible noise, but it is occasionally problematic, and "
11018 "people often prefer to get rid of it."
11019 msgstr ""
11021 #. type: Content of: <book><chapter><sect1><sect2><para>
11022 #: ../en/ch10-hook.xml:642
11023 msgid ""
11024 "You can use either the <literal role=\"hook\">precommit</literal> or <literal "
11025 "role=\"hook\">pretxncommit</literal> hook to tell whether you have a trailing "
11026 "whitespace problem. If you use the <literal role=\"hook\">precommit</"
11027 "literal> hook, the hook will not know which files you are committing, so it "
11028 "will have to check every modified file in the repository for trailing white "
11029 "space. If you want to commit a change to just the file <filename>foo</"
11030 "filename>, but the file <filename>bar</filename> contains trailing "
11031 "whitespace, doing a check in the <literal role=\"hook\">precommit</literal> "
11032 "hook will prevent you from committing <filename>foo</filename> due to the "
11033 "problem with <filename>bar</filename>. This doesn't seem right."
11034 msgstr ""
11036 #. type: Content of: <book><chapter><sect1><sect2><para>
11037 #: ../en/ch10-hook.xml:658
11038 msgid ""
11039 "Should you choose the <literal role=\"hook\">pretxncommit</literal> hook, the "
11040 "check won't occur until just before the transaction for the commit "
11041 "completes. This will allow you to check for problems only the exact files "
11042 "that are being committed. However, if you entered the commit message "
11043 "interactively and the hook fails, the transaction will roll back; you'll have "
11044 "to re-enter the commit message after you fix the trailing whitespace and run "
11045 "<command role=\"hg-cmd\">hg commit</command> again."
11046 msgstr ""
11048 #. type: Content of: <book><chapter><sect1><sect2><para>
11049 #: ../en/ch10-hook.xml:671
11050 msgid ""
11051 "In this example, we introduce a simple <literal role=\"hook\">pretxncommit</"
11052 "literal> hook that checks for trailing whitespace. This hook is short, but "
11053 "not very helpful. It exits with an error status if a change adds a line with "
11054 "trailing whitespace to any file, but does not print any information that "
11055 "might help us to identify the offending file or line. It also has the nice "
11056 "property of not paying attention to unmodified lines; only lines that "
11057 "introduce new trailing whitespace cause problems."
11058 msgstr ""
11060 #. type: Content of: <book><chapter><sect1><sect2><para>
11061 #: ../en/ch10-hook.xml:682
11062 msgid ""
11063 "The above version is much more complex, but also more useful. It parses a "
11064 "unified diff to see if any lines add trailing whitespace, and prints the name "
11065 "of the file and the line number of each such occurrence. Even better, if the "
11066 "change adds trailing whitespace, this hook saves the commit comment and "
11067 "prints the name of the save file before exiting and telling Mercurial to roll "
11068 "the transaction back, so you can use the <option role=\"hg-opt-commit\">-l "
11069 "filename</option> option to <command role=\"hg-cmd\">hg commit</command> to "
11070 "reuse the saved commit message once you've corrected the problem."
11071 msgstr ""
11073 #. type: Content of: <book><chapter><sect1><sect2><para>
11074 #: ../en/ch10-hook.xml:696
11075 msgid ""
11076 "As a final aside, note in the example above the use of <command>perl</"
11077 "command>'s in-place editing feature to get rid of trailing whitespace from a "
11078 "file. This is concise and useful enough that I will reproduce it here."
11079 msgstr ""
11081 #. type: Content of: <book><chapter><sect1><title>
11082 #: ../en/ch10-hook.xml:706
11083 msgid "Bundled hooks"
11084 msgstr "内置的钩子"
11086 #. type: Content of: <book><chapter><sect1><para>
11087 #: ../en/ch10-hook.xml:708
11088 msgid ""
11089 "Mercurial ships with several bundled hooks. You can find them in the "
11090 "<filename class=\"directory\">hgext</filename> directory of a Mercurial "
11091 "source tree. If you are using a Mercurial binary package, the hooks will be "
11092 "located in the <filename class=\"directory\">hgext</filename> directory of "
11093 "wherever your package installer put Mercurial."
11094 msgstr ""
11096 #. type: Content of: <book><chapter><sect1><sect2><title>
11097 #: ../en/ch10-hook.xml:717
11098 msgid ""
11099 "<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a "
11100 "repository"
11101 msgstr "<literal role=\"hg-ext\">acl</literal>&emdash;版本库的访问控制"
11103 #. type: Content of: <book><chapter><sect1><sect2><para>
11104 #: ../en/ch10-hook.xml:720
11105 msgid ""
11106 "The <literal role=\"hg-ext\">acl</literal> extension lets you control which "
11107 "remote users are allowed to push changesets to a networked server. You can "
11108 "protect any portion of a repository (including the entire repo), so that a "
11109 "specific remote user can push changes that do not affect the protected "
11110 "portion."
11111 msgstr ""
11113 #. type: Content of: <book><chapter><sect1><sect2><para>
11114 #: ../en/ch10-hook.xml:728
11115 msgid ""
11116 "This extension implements access control based on the identity of the user "
11117 "performing a push, <emphasis>not</emphasis> on who committed the changesets "
11118 "they're pushing. It makes sense to use this hook only if you have a locked-"
11119 "down server environment that authenticates remote users, and you want to be "
11120 "sure that only specific users are allowed to push changes to that server."
11121 msgstr ""
11123 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11124 #: ../en/ch10-hook.xml:738
11125 msgid "Configuring the <literal role=\"hook\">acl</literal> hook"
11126 msgstr "配置 <literal role=\"hook\">acl</literal> 钩子"
11128 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11129 #: ../en/ch10-hook.xml:741
11130 msgid ""
11131 "In order to manage incoming changesets, the <literal role=\"hg-ext\">acl</"
11132 "literal> hook must be used as a <literal role=\"hook\">pretxnchangegroup</"
11133 "literal> hook. This lets it see which files are modified by each incoming "
11134 "changeset, and roll back a group of changesets if they modify "
11135 "<quote>forbidden</quote> files. Example:"
11136 msgstr ""
11138 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11139 #: ../en/ch10-hook.xml:751
11140 msgid ""
11141 "The <literal role=\"hg-ext\">acl</literal> extension is configured using "
11142 "three sections."
11143 msgstr ""
11145 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11146 #: ../en/ch10-hook.xml:755
11147 msgid ""
11148 "The <literal role=\"rc-acl\">acl</literal> section has only one entry, <envar "
11149 "role=\"rc-item-acl\">sources</envar>, which lists the sources of incoming "
11150 "changesets that the hook should pay attention to. You don't normally need to "
11151 "configure this section."
11152 msgstr ""
11154 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11155 #: ../en/ch10-hook.xml:762
11156 msgid ""
11157 "<envar role=\"rc-item-acl\">serve</envar>: Control incoming changesets that "
11158 "are arriving from a remote repository over http or ssh. This is the default "
11159 "value of <envar role=\"rc-item-acl\">sources</envar>, and usually the only "
11160 "setting you'll need for this configuration item."
11161 msgstr ""
11163 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11164 #: ../en/ch10-hook.xml:770
11165 msgid ""
11166 "<envar role=\"rc-item-acl\">pull</envar>: Control incoming changesets that "
11167 "are arriving via a pull from a local repository."
11168 msgstr ""
11170 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11171 #: ../en/ch10-hook.xml:775
11172 msgid ""
11173 "<envar role=\"rc-item-acl\">push</envar>: Control incoming changesets that "
11174 "are arriving via a push from a local repository."
11175 msgstr ""
11177 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11178 #: ../en/ch10-hook.xml:780
11179 msgid ""
11180 "<envar role=\"rc-item-acl\">bundle</envar>: Control incoming changesets that "
11181 "are arriving from another repository via a bundle."
11182 msgstr ""
11184 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11185 #: ../en/ch10-hook.xml:786
11186 msgid ""
11187 "The <literal role=\"rc-acl.allow\">acl.allow</literal> section controls the "
11188 "users that are allowed to add changesets to the repository. If this section "
11189 "is not present, all users that are not explicitly denied are allowed. If "
11190 "this section is present, all users that are not explicitly allowed are denied "
11191 "(so an empty section means that all users are denied)."
11192 msgstr ""
11194 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11195 #: ../en/ch10-hook.xml:795
11196 msgid ""
11197 "The <literal role=\"rc-acl.deny\">acl.deny</literal> section determines which "
11198 "users are denied from adding changesets to the repository. If this section "
11199 "is not present or is empty, no users are denied."
11200 msgstr ""
11202 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11203 #: ../en/ch10-hook.xml:801
11204 msgid ""
11205 "The syntaxes for the <literal role=\"rc-acl.allow\">acl.allow</literal> and "
11206 "<literal role=\"rc-acl.deny\">acl.deny</literal> sections are identical. On "
11207 "the left of each entry is a glob pattern that matches files or directories, "
11208 "relative to the root of the repository; on the right, a user name."
11209 msgstr ""
11211 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11212 #: ../en/ch10-hook.xml:809
11213 msgid ""
11214 "In the following example, the user <literal>docwriter</literal> can only push "
11215 "changes to the <filename class=\"directory\">docs</filename> subtree of the "
11216 "repository, while <literal>intern</literal> can push changes to any file or "
11217 "directory except <filename class=\"directory\">source/sensitive</filename>."
11218 msgstr ""
11220 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11221 #: ../en/ch10-hook.xml:821 ../en/ch10-hook.xml:1095 ../en/ch10-hook.xml:1308
11222 msgid "Testing and troubleshooting"
11223 msgstr "测试与问题处理"
11225 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11226 #: ../en/ch10-hook.xml:823
11227 msgid ""
11228 "If you want to test the <literal role=\"hg-ext\">acl</literal> hook, run it "
11229 "with Mercurial's debugging output enabled. Since you'll probably be running "
11230 "it on a server where it's not convenient (or sometimes possible) to pass in "
11231 "the <option role=\"hg-opt-global\">--debug</option> option, don't forget that "
11232 "you can enable debugging output in your <filename role=\"special\"> /.hgrc</"
11233 "filename>:"
11234 msgstr ""
11236 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11237 #: ../en/ch10-hook.xml:833
11238 msgid ""
11239 "With this enabled, the <literal role=\"hg-ext\">acl</literal> hook will print "
11240 "enough information to let you figure out why it is allowing or forbidding "
11241 "pushes from specific users."
11242 msgstr ""
11244 #. type: Content of: <book><chapter><sect1><sect2><title>
11245 #: ../en/ch10-hook.xml:842
11246 msgid ""
11247 "<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla"
11248 msgstr "<literal role=\"hg-ext\">bugzilla</literal>&emdash;与 Bugzilla 的集成"
11250 #. type: Content of: <book><chapter><sect1><sect2><para>
11251 #: ../en/ch10-hook.xml:846
11252 msgid ""
11253 "The <literal role=\"hg-ext\">bugzilla</literal> extension adds a comment to a "
11254 "Bugzilla bug whenever it finds a reference to that bug ID in a commit "
11255 "comment. You can install this hook on a shared server, so that any time a "
11256 "remote user pushes changes to this server, the hook gets run."
11257 msgstr ""
11259 #. type: Content of: <book><chapter><sect1><sect2><para>
11260 #: ../en/ch10-hook.xml:853
11261 msgid ""
11262 "It adds a comment to the bug that looks like this (you can configure the "
11263 "contents of the comment&emdash;see below):"
11264 msgstr ""
11266 #. type: Content of: <book><chapter><sect1><sect2><para>
11267 #: ../en/ch10-hook.xml:862
11268 msgid ""
11269 "The value of this hook is that it automates the process of updating a bug any "
11270 "time a changeset refers to it. If you configure the hook properly, it makes "
11271 "it easy for people to browse straight from a Bugzilla bug to a changeset that "
11272 "refers to that bug."
11273 msgstr ""
11275 #. type: Content of: <book><chapter><sect1><sect2><para>
11276 #: ../en/ch10-hook.xml:869
11277 msgid ""
11278 "You can use the code in this hook as a starting point for some more exotic "
11279 "Bugzilla integration recipes. Here are a few possibilities:"
11280 msgstr ""
11282 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11283 #: ../en/ch10-hook.xml:874
11284 msgid ""
11285 "Require that every changeset pushed to the server have a valid bug ID in its "
11286 "commit comment. In this case, you'd want to configure the hook as a <literal "
11287 "role=\"hook\">pretxncommit</literal> hook. This would allow the hook to "
11288 "reject changes that didn't contain bug IDs."
11289 msgstr ""
11291 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11292 #: ../en/ch10-hook.xml:882
11293 msgid ""
11294 "Allow incoming changesets to automatically modify the <emphasis>state</"
11295 "emphasis> of a bug, as well as simply adding a comment. For example, the "
11296 "hook could recognise the string <quote>fixed bug 31337</quote> as indicating "
11297 "that it should update the state of bug 31337 to <quote>requires testing</"
11298 "quote>."
11299 msgstr ""
11301 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11302 #: ../en/ch10-hook.xml:892
11303 msgid "Configuring the <literal role=\"hook\">bugzilla</literal> hook"
11304 msgstr "配置 <literal role=\"hook\">bugzilla</literal> 钩子"
11306 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11307 #: ../en/ch10-hook.xml:895
11308 msgid ""
11309 "You should configure this hook in your server's <filename role=\"special\"> /."
11310 "hgrc</filename>\\ as an <literal role=\"hook\">incoming</literal> hook, for "
11311 "example as follows:"
11312 msgstr ""
11314 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11315 #: ../en/ch10-hook.xml:903
11316 msgid ""
11317 "Because of the specialised nature of this hook, and because Bugzilla was not "
11318 "written with this kind of integration in mind, configuring this hook is a "
11319 "somewhat involved process."
11320 msgstr ""
11322 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11323 #: ../en/ch10-hook.xml:909
11324 msgid ""
11325 "Before you begin, you must install the MySQL bindings for Python on the host"
11326 "(s) where you'll be running the hook. If this is not available as a binary "
11327 "package for your system, you can download it from <citation>web:mysql-python</"
11328 "citation>."
11329 msgstr ""
11331 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11332 #: ../en/ch10-hook.xml:916
11333 msgid ""
11334 "Configuration information for this hook lives in the <literal role=\"rc-"
11335 "bugzilla\">bugzilla</literal> section of your <filename role=\"special\"> /."
11336 "hgrc</filename>."
11337 msgstr ""
11339 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11340 #: ../en/ch10-hook.xml:921
11341 msgid ""
11342 "<envar role=\"rc-item-bugzilla\">version</envar>: The version of Bugzilla "
11343 "installed on the server. The database schema that Bugzilla uses changes "
11344 "occasionally, so this hook has to know exactly which schema to use. At the "
11345 "moment, the only version supported is <literal>2.16</literal>."
11346 msgstr ""
11348 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11349 #: ../en/ch10-hook.xml:930
11350 msgid ""
11351 "<envar role=\"rc-item-bugzilla\">host</envar>: The hostname of the MySQL "
11352 "server that stores your Bugzilla data. The database must be configured to "
11353 "allow connections from whatever host you are running the <literal role=\"hook"
11354 "\">bugzilla</literal> hook on."
11355 msgstr ""
11357 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11358 #: ../en/ch10-hook.xml:937
11359 msgid ""
11360 "<envar role=\"rc-item-bugzilla\">user</envar>: The username with which to "
11361 "connect to the MySQL server. The database must be configured to allow this "
11362 "user to connect from whatever host you are running the <literal role=\"hook"
11363 "\">bugzilla</literal> hook on. This user must be able to access and modify "
11364 "Bugzilla tables. The default value of this item is <literal>bugs</literal>, "
11365 "which is the standard name of the Bugzilla user in a MySQL database."
11366 msgstr ""
11368 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11369 #: ../en/ch10-hook.xml:948
11370 msgid ""
11371 "<envar role=\"rc-item-bugzilla\">password</envar>: The MySQL password for the "
11372 "user you configured above. This is stored as plain text, so you should make "
11373 "sure that unauthorised users cannot read the <filename role=\"special\"> /."
11374 "hgrc</filename>\\ file where you store this information."
11375 msgstr ""
11377 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11378 #: ../en/ch10-hook.xml:957
11379 msgid ""
11380 "<envar role=\"rc-item-bugzilla\">db</envar>: The name of the Bugzilla "
11381 "database on the MySQL server. The default value of this item is "
11382 "<literal>bugs</literal>, which is the standard name of the MySQL database "
11383 "where Bugzilla stores its data."
11384 msgstr ""
11386 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11387 #: ../en/ch10-hook.xml:964
11388 msgid ""
11389 "<envar role=\"rc-item-bugzilla\">notify</envar>: If you want Bugzilla to send "
11390 "out a notification email to subscribers after this hook has added a comment "
11391 "to a bug, you will need this hook to run a command whenever it updates the "
11392 "database. The command to run depends on where you have installed Bugzilla, "
11393 "but it will typically look something like this, if you have Bugzilla "
11394 "installed in <filename class=\"directory\">/var/www/html/bugzilla</filename>:"
11395 msgstr ""
11397 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11398 #: ../en/ch10-hook.xml:977
11399 msgid ""
11400 "The Bugzilla <literal>processmail</literal> program expects to be given a bug "
11401 "ID (the hook replaces <quote><literal>%s</literal></quote> with the bug ID) "
11402 "and an email address. It also expects to be able to write to some files in "
11403 "the directory that it runs in. If Bugzilla and this hook are not installed "
11404 "on the same machine, you will need to find a way to run <literal>processmail</"
11405 "literal> on the server where Bugzilla is installed."
11406 msgstr ""
11408 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11409 #: ../en/ch10-hook.xml:992
11410 msgid "Mapping committer names to Bugzilla user names"
11411 msgstr "提交者的名称与 Bugzilla 用户名称的映射"
11413 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11414 #: ../en/ch10-hook.xml:994
11415 msgid ""
11416 "By default, the <literal role=\"hg-ext\">bugzilla</literal> hook tries to use "
11417 "the email address of a changeset's committer as the Bugzilla user name with "
11418 "which to update a bug. If this does not suit your needs, you can map "
11419 "committer email addresses to Bugzilla user names using a <literal role=\"rc-"
11420 "usermap\">usermap</literal> section."
11421 msgstr ""
11423 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11424 #: ../en/ch10-hook.xml:1003
11425 msgid ""
11426 "Each item in the <literal role=\"rc-usermap\">usermap</literal> section "
11427 "contains an email address on the left, and a Bugzilla user name on the right."
11428 msgstr ""
11430 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11431 #: ../en/ch10-hook.xml:1010
11432 msgid ""
11433 "You can either keep the <literal role=\"rc-usermap\">usermap</literal> data "
11434 "in a normal <filename role=\"special\">~/.hgrc</filename>, or tell the "
11435 "<literal role=\"hg-ext\">bugzilla</literal> hook to read the information from "
11436 "an external <filename>usermap</filename> file. In the latter case, you can "
11437 "store <filename>usermap</filename> data by itself in (for example) a user-"
11438 "modifiable repository. This makes it possible to let your users maintain "
11439 "their own <envar role=\"rc-item-bugzilla\">usermap</envar> entries. The main "
11440 "<filename role=\"special\"> /.hgrc</filename>\\ file might look like this:"
11441 msgstr ""
11443 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11444 #: ../en/ch10-hook.xml:1026
11445 msgid ""
11446 "While the <filename>usermap</filename> file that it refers to might look like "
11447 "this:"
11448 msgstr ""
11450 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11451 #: ../en/ch10-hook.xml:1035
11452 msgid "Configuring the text that gets added to a bug"
11453 msgstr "配置增加到问题中的正文"
11455 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11456 #: ../en/ch10-hook.xml:1037
11457 msgid ""
11458 "You can configure the text that this hook adds as a comment; you specify it "
11459 "in the form of a Mercurial template. Several <filename role=\"special\"> /."
11460 "hgrc</filename>\\ entries (still in the <literal role=\"rc-bugzilla"
11461 "\">bugzilla</literal> section) control this behaviour."
11462 msgstr ""
11464 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11465 #: ../en/ch10-hook.xml:1044
11466 msgid ""
11467 "<literal>strip</literal>: The number of leading path elements to strip from a "
11468 "repository's path name to construct a partial path for a URL. For example, if "
11469 "the repositories on your server live under <filename class=\"directory\">/"
11470 "home/hg/repos</filename>, and you have a repository whose path is <filename "
11471 "class=\"directory\">/home/hg/repos/app/tests</filename>, then setting "
11472 "<literal>strip</literal> to <literal>4</literal> will give a partial path of "
11473 "<filename class=\"directory\">app/tests</filename>. The hook will make this "
11474 "partial path available when expanding a template, as <literal>webroot</"
11475 "literal>."
11476 msgstr ""
11478 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11479 #: ../en/ch10-hook.xml:1058
11480 msgid ""
11481 "<literal>template</literal>: The text of the template to use. In addition to "
11482 "the usual changeset-related variables, this template can use <literal>hgweb</"
11483 "literal> (the value of the <literal>hgweb</literal> configuration item above) "
11484 "and <literal>webroot</literal> (the path constructed using <literal>strip</"
11485 "literal> above)."
11486 msgstr ""
11488 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11489 #: ../en/ch10-hook.xml:1068
11490 msgid ""
11491 "In addition, you can add a <envar role=\"rc-item-web\">baseurl</envar> item "
11492 "to the <literal role=\"rc-web\">web</literal> section of your <filename role="
11493 "\"special\"> /.hgrc</filename>. The <literal role=\"hg-ext\">bugzilla</"
11494 "literal> hook will make this available when expanding a template, as the base "
11495 "string to use when constructing a URL that will let users browse from a "
11496 "Bugzilla comment to view a changeset. Example:"
11497 msgstr ""
11499 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11500 #: ../en/ch10-hook.xml:1080
11501 msgid ""
11502 "Here is an example set of <literal role=\"hg-ext\">bugzilla</literal> hook "
11503 "config information."
11504 msgstr ""
11506 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11507 #: ../en/ch10-hook.xml:1097
11508 msgid ""
11509 "The most common problems with configuring the <literal role=\"hg-ext"
11510 "\">bugzilla</literal> hook relate to running Bugzilla's "
11511 "<filename>processmail</filename> script and mapping committer names to user "
11512 "names."
11513 msgstr ""
11515 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11516 #: ../en/ch10-hook.xml:1103
11517 msgid ""
11518 "Recall from section <xref linkend=\"sec.hook.bugzilla.config\"/> above that "
11519 "the user that runs the Mercurial process on the server is also the one that "
11520 "will run the <filename>processmail</filename> script. The "
11521 "<filename>processmail</filename> script sometimes causes Bugzilla to write to "
11522 "files in its configuration directory, and Bugzilla's configuration files are "
11523 "usually owned by the user that your web server runs under."
11524 msgstr ""
11526 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11527 #: ../en/ch10-hook.xml:1114
11528 msgid ""
11529 "You can cause <filename>processmail</filename> to be run with the suitable "
11530 "user's identity using the <command>sudo</command> command. Here is an "
11531 "example entry for a <filename>sudoers</filename> file."
11532 msgstr ""
11534 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11535 #: ../en/ch10-hook.xml:1122
11536 msgid ""
11537 "This allows the <literal>hg_user</literal> user to run a "
11538 "<filename>processmail-wrapper</filename> program under the identity of "
11539 "<literal>httpd_user</literal>."
11540 msgstr ""
11542 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11543 #: ../en/ch10-hook.xml:1127
11544 msgid ""
11545 "This indirection through a wrapper script is necessary, because "
11546 "<filename>processmail</filename> expects to be run with its current directory "
11547 "set to wherever you installed Bugzilla; you can't specify that kind of "
11548 "constraint in a <filename>sudoers</filename> file. The contents of the "
11549 "wrapper script are simple:"
11550 msgstr ""
11552 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11553 #: ../en/ch10-hook.xml:1136
11554 msgid ""
11555 "It doesn't seem to matter what email address you pass to "
11556 "<filename>processmail</filename>."
11557 msgstr ""
11559 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11560 #: ../en/ch10-hook.xml:1140
11561 msgid ""
11562 "If your <literal role=\"rc-usermap\">usermap</literal> is not set up "
11563 "correctly, users will see an error message from the <literal role=\"hg-ext"
11564 "\">bugzilla</literal> hook when they push changes to the server. The error "
11565 "message will look like this:"
11566 msgstr ""
11568 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11569 #: ../en/ch10-hook.xml:1148
11570 msgid ""
11571 "What this means is that the committer's address, <literal>john.q."
11572 "public@example.com</literal>, is not a valid Bugzilla user name, nor does it "
11573 "have an entry in your <literal role=\"rc-usermap\">usermap</literal> that "
11574 "maps it to a valid Bugzilla user name."
11575 msgstr ""
11577 #. type: Content of: <book><chapter><sect1><sect2><title>
11578 #: ../en/ch10-hook.xml:1158
11579 msgid ""
11580 "<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications"
11581 msgstr "<literal role=\"hg-ext\">notify</literal>&emdash;邮件通知"
11583 #. type: Content of: <book><chapter><sect1><sect2><para>
11584 #: ../en/ch10-hook.xml:1161
11585 msgid ""
11586 "Although Mercurial's built-in web server provides RSS feeds of changes in "
11587 "every repository, many people prefer to receive change notifications via "
11588 "email. The <literal role=\"hg-ext\">notify</literal> hook lets you send out "
11589 "notifications to a set of email addresses whenever changesets arrive that "
11590 "those subscribers are interested in."
11591 msgstr ""
11593 #. type: Content of: <book><chapter><sect1><sect2><para>
11594 #: ../en/ch10-hook.xml:1169
11595 msgid ""
11596 "As with the <literal role=\"hg-ext\">bugzilla</literal> hook, the <literal "
11597 "role=\"hg-ext\">notify</literal> hook is template-driven, so you can "
11598 "customise the contents of the notification messages that it sends."
11599 msgstr ""
11601 #. type: Content of: <book><chapter><sect1><sect2><para>
11602 #: ../en/ch10-hook.xml:1175
11603 msgid ""
11604 "By default, the <literal role=\"hg-ext\">notify</literal> hook includes a "
11605 "diff of every changeset that it sends out; you can limit the size of the "
11606 "diff, or turn this feature off entirely. It is useful for letting "
11607 "subscribers review changes immediately, rather than clicking to follow a URL."
11608 msgstr ""
11610 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11611 #: ../en/ch10-hook.xml:1183
11612 msgid "Configuring the <literal role=\"hg-ext\">notify</literal> hook"
11613 msgstr "配置 <literal role=\"hg-ext\">notify</literal> 钩子"
11615 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11616 #: ../en/ch10-hook.xml:1186
11617 msgid ""
11618 "You can set up the <literal role=\"hg-ext\">notify</literal> hook to send one "
11619 "email message per incoming changeset, or one per incoming group of changesets "
11620 "(all those that arrived in a single pull or push)."
11621 msgstr ""
11623 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11624 #: ../en/ch10-hook.xml:1197
11625 msgid ""
11626 "Configuration information for this hook lives in the <literal role=\"rc-notify"
11627 "\">notify</literal> section of a <filename role=\"special\"> /.hgrc</filename>"
11628 "\\ file."
11629 msgstr ""
11631 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11632 #: ../en/ch10-hook.xml:1202
11633 msgid ""
11634 "<envar role=\"rc-item-notify\">test</envar>: By default, this hook does not "
11635 "send out email at all; instead, it prints the message that it "
11636 "<emphasis>would</emphasis> send. Set this item to <literal>false</literal> "
11637 "to allow email to be sent. The reason that sending of email is turned off by "
11638 "default is that it takes several tries to configure this extension exactly as "
11639 "you would like, and it would be bad form to spam subscribers with a number of "
11640 "<quote>broken</quote> notifications while you debug your configuration."
11641 msgstr ""
11643 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11644 #: ../en/ch10-hook.xml:1214
11645 msgid ""
11646 "<envar role=\"rc-item-notify\">config</envar>: The path to a configuration "
11647 "file that contains subscription information. This is kept separate from the "
11648 "main <filename role=\"special\"> /.hgrc</filename>\\ so that you can maintain "
11649 "it in a repository of its own. People can then clone that repository, update "
11650 "their subscriptions, and push the changes back to your server."
11651 msgstr ""
11653 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11654 #: ../en/ch10-hook.xml:1223
11655 msgid ""
11656 "<envar role=\"rc-item-notify\">strip</envar>: The number of leading path "
11657 "separator characters to strip from a repository's path, when deciding whether "
11658 "a repository has subscribers. For example, if the repositories on your "
11659 "server live in <filename class=\"directory\">/home/hg/repos</filename>, and "
11660 "<literal role=\"hg-ext\">notify</literal> is considering a repository named "
11661 "<filename class=\"directory\">/home/hg/repos/shared/test</filename>, setting "
11662 "<envar role=\"rc-item-notify\">strip</envar> to <literal>4</literal> will "
11663 "cause <literal role=\"hg-ext\">notify</literal> to trim the path it considers "
11664 "down to <filename class=\"directory\">shared/test</filename>, and it will "
11665 "match subscribers against that."
11666 msgstr ""
11668 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11669 #: ../en/ch10-hook.xml:1240
11670 msgid ""
11671 "<envar role=\"rc-item-notify\">template</envar>: The template text to use "
11672 "when sending messages. This specifies both the contents of the message "
11673 "header and its body."
11674 msgstr ""
11676 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11677 #: ../en/ch10-hook.xml:1246
11678 msgid ""
11679 "<envar role=\"rc-item-notify\">maxdiff</envar>: The maximum number of lines "
11680 "of diff data to append to the end of a message. If a diff is longer than "
11681 "this, it is truncated. By default, this is set to 300. Set this to "
11682 "<literal>0</literal> to omit diffs from notification emails."
11683 msgstr ""
11685 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11686 #: ../en/ch10-hook.xml:1255
11687 msgid ""
11688 "<envar role=\"rc-item-notify\">sources</envar>: A list of sources of "
11689 "changesets to consider. This lets you limit <literal role=\"hg-ext\">notify</"
11690 "literal> to only sending out email about changes that remote users pushed "
11691 "into this repository via a server, for example. See section <xref linkend="
11692 "\"sec.hook.sources\"/> for the sources you can specify here."
11693 msgstr ""
11695 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11696 #: ../en/ch10-hook.xml:1267
11697 msgid ""
11698 "If you set the <envar role=\"rc-item-web\">baseurl</envar> item in the "
11699 "<literal role=\"rc-web\">web</literal> section, you can use it in a template; "
11700 "it will be available as <literal>webroot</literal>."
11701 msgstr ""
11703 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11704 #: ../en/ch10-hook.xml:1273
11705 msgid ""
11706 "Here is an example set of <literal role=\"hg-ext\">notify</literal> "
11707 "configuration information."
11708 msgstr ""
11710 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11711 #: ../en/ch10-hook.xml:1289
11712 msgid "This will produce a message that looks like the following:"
11713 msgstr ""
11715 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11716 #: ../en/ch10-hook.xml:1310
11717 msgid ""
11718 "Do not forget that by default, the <literal role=\"hg-ext\">notify</literal> "
11719 "extension <emphasis>will not send any mail</emphasis> until you explicitly "
11720 "configure it to do so, by setting <envar role=\"rc-item-notify\">test</envar> "
11721 "to <literal>false</literal>. Until you do that, it simply prints the message "
11722 "it <emphasis>would</emphasis> send."
11723 msgstr ""
11725 #. type: Content of: <book><chapter><sect1><title>
11726 #: ../en/ch10-hook.xml:1322
11727 msgid "Information for writers of hooks"
11728 msgstr "编写钩子的信息"
11730 #. type: Content of: <book><chapter><sect1><sect2><title>
11731 #: ../en/ch10-hook.xml:1325
11732 msgid "In-process hook execution"
11733 msgstr "进程内钩子的执行"
11735 #. type: Content of: <book><chapter><sect1><sect2><para>
11736 #: ../en/ch10-hook.xml:1327
11737 msgid "An in-process hook is called with arguments of the following form:"
11738 msgstr ""
11740 #. type: Content of: <book><chapter><sect1><sect2><para>
11741 #: ../en/ch10-hook.xml:1333
11742 msgid ""
11743 "The <literal>ui</literal> parameter is a <literal role=\"py-mod-mercurial.ui"
11744 "\">ui</literal> object. The <literal>repo</literal> parameter is a <literal "
11745 "role=\"py-mod-mercurial.localrepo\">localrepository</literal> object. The "
11746 "names and values of the <literal>**kwargs</literal> parameters depend on the "
11747 "hook being invoked, with the following common features:"
11748 msgstr ""
11750 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11751 #: ../en/ch10-hook.xml:1342
11752 msgid ""
11753 "If a parameter is named <literal>node</literal> or <literal>parentN</"
11754 "literal>, it will contain a hexadecimal changeset ID. The empty string is "
11755 "used to represent <quote>null changeset ID</quote> instead of a string of "
11756 "zeroes."
11757 msgstr ""
11759 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11760 #: ../en/ch10-hook.xml:1349
11761 msgid ""
11762 "If a parameter is named <literal>url</literal>, it will contain the URL of a "
11763 "remote repository, if that can be determined."
11764 msgstr ""
11766 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11767 #: ../en/ch10-hook.xml:1354
11768 msgid ""
11769 "Boolean-valued parameters are represented as Python <literal>bool</literal> "
11770 "objects."
11771 msgstr ""
11773 #. type: Content of: <book><chapter><sect1><sect2><para>
11774 #: ../en/ch10-hook.xml:1359
11775 msgid ""
11776 "An in-process hook is called without a change to the process's working "
11777 "directory (unlike external hooks, which are run in the root of the "
11778 "repository). It must not change the process's working directory, or it will "
11779 "cause any calls it makes into the Mercurial API to fail."
11780 msgstr ""
11782 #. type: Content of: <book><chapter><sect1><sect2><para>
11783 #: ../en/ch10-hook.xml:1366
11784 msgid ""
11785 "If a hook returns a boolean <quote>false</quote> value, it is considered to "
11786 "have succeeded. If it returns a boolean <quote>true</quote> value or raises "
11787 "an exception, it is considered to have failed. A useful way to think of the "
11788 "calling convention is <quote>tell me if you fail</quote>."
11789 msgstr ""
11791 #. type: Content of: <book><chapter><sect1><sect2><para>
11792 #: ../en/ch10-hook.xml:1373
11793 msgid ""
11794 "Note that changeset IDs are passed into Python hooks as hexadecimal strings, "
11795 "not the binary hashes that Mercurial's APIs normally use. To convert a hash "
11796 "from hex to binary, use the \\pymodfunc{mercurial.node}{bin} function."
11797 msgstr ""
11799 #. type: Content of: <book><chapter><sect1><sect2><title>
11800 #: ../en/ch10-hook.xml:1381
11801 msgid "External hook execution"
11802 msgstr "外部钩子的执行"
11804 #. type: Content of: <book><chapter><sect1><sect2><para>
11805 #: ../en/ch10-hook.xml:1383
11806 msgid ""
11807 "An external hook is passed to the shell of the user running Mercurial. "
11808 "Features of that shell, such as variable substitution and command "
11809 "redirection, are available. The hook is run in the root directory of the "
11810 "repository (unlike in-process hooks, which are run in the same directory that "
11811 "Mercurial was run in)."
11812 msgstr ""
11814 #. type: Content of: <book><chapter><sect1><sect2><para>
11815 #: ../en/ch10-hook.xml:1391
11816 msgid ""
11817 "Hook parameters are passed to the hook as environment variables. Each "
11818 "environment variable's name is converted in upper case and prefixed with the "
11819 "string <quote><literal>HG_</literal></quote>. For example, if the name of a "
11820 "parameter is <quote><literal>node</literal></quote>, the name of the "
11821 "environment variable representing that parameter will be "
11822 "<quote><literal>HG_NODE</literal></quote>."
11823 msgstr ""
11825 #. type: Content of: <book><chapter><sect1><sect2><para>
11826 #: ../en/ch10-hook.xml:1400
11827 msgid ""
11828 "A boolean parameter is represented as the string <quote><literal>1</literal></"
11829 "quote> for <quote>true</quote>, <quote><literal>0</literal></quote> for "
11830 "<quote>false</quote>. If an environment variable is named <envar>HG_NODE</"
11831 "envar>, <envar>HG_PARENT1</envar> or <envar>HG_PARENT2</envar>, it contains a "
11832 "changeset ID represented as a hexadecimal string. The empty string is used "
11833 "to represent <quote>null changeset ID</quote> instead of a string of zeroes. "
11834 "If an environment variable is named <envar>HG_URL</envar>, it will contain "
11835 "the URL of a remote repository, if that can be determined."
11836 msgstr ""
11838 #. type: Content of: <book><chapter><sect1><sect2><para>
11839 #: ../en/ch10-hook.xml:1412
11840 msgid ""
11841 "If a hook exits with a status of zero, it is considered to have succeeded. "
11842 "If it exits with a non-zero status, it is considered to have failed."
11843 msgstr ""
11845 #. type: Content of: <book><chapter><sect1><sect2><title>
11846 #: ../en/ch10-hook.xml:1419
11847 msgid "Finding out where changesets come from"
11848 msgstr "检查修改集来自何处"
11850 #. type: Content of: <book><chapter><sect1><sect2><para>
11851 #: ../en/ch10-hook.xml:1421
11852 msgid ""
11853 "A hook that involves the transfer of changesets between a local repository "
11854 "and another may be able to find out information about the <quote>far side</"
11855 "quote>. Mercurial knows <emphasis>how</emphasis> changes are being "
11856 "transferred, and in many cases <emphasis>where</emphasis> they are being "
11857 "transferred to or from."
11858 msgstr ""
11860 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11861 #: ../en/ch10-hook.xml:1430
11862 msgid "Sources of changesets"
11863 msgstr "修改集的来源"
11865 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11866 #: ../en/ch10-hook.xml:1432
11867 msgid ""
11868 "Mercurial will tell a hook what means are, or were, used to transfer "
11869 "changesets between repositories. This is provided by Mercurial in a Python "
11870 "parameter named <literal>source</literal>, or an environment variable named "
11871 "<envar>HG_SOURCE</envar>."
11872 msgstr ""
11874 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11875 #: ../en/ch10-hook.xml:1440
11876 msgid ""
11877 "<literal>serve</literal>: Changesets are transferred to or from a remote "
11878 "repository over http or ssh."
11879 msgstr ""
11881 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11882 #: ../en/ch10-hook.xml:1445
11883 msgid ""
11884 "<literal>pull</literal>: Changesets are being transferred via a pull from one "
11885 "repository into another."
11886 msgstr ""
11888 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11889 #: ../en/ch10-hook.xml:1450
11890 msgid ""
11891 "<literal>push</literal>: Changesets are being transferred via a push from one "
11892 "repository into another."
11893 msgstr ""
11895 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11896 #: ../en/ch10-hook.xml:1455
11897 msgid ""
11898 "<literal>bundle</literal>: Changesets are being transferred to or from a "
11899 "bundle."
11900 msgstr ""
11902 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
11903 #: ../en/ch10-hook.xml:1462
11904 msgid "Where changes are going&emdash;remote repository URLs"
11905 msgstr "修改集要到哪里&emdash;远程版本库的地址"
11907 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11908 #: ../en/ch10-hook.xml:1465
11909 msgid ""
11910 "When possible, Mercurial will tell a hook the location of the <quote>far "
11911 "side</quote> of an activity that transfers changeset data between "
11912 "repositories. This is provided by Mercurial in a Python parameter named "
11913 "<literal>url</literal>, or an environment variable named <envar>HG_URL</"
11914 "envar>."
11915 msgstr ""
11917 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
11918 #: ../en/ch10-hook.xml:1473
11919 msgid ""
11920 "This information is not always known. If a hook is invoked in a repository "
11921 "that is being served via http or ssh, Mercurial cannot tell where the remote "
11922 "repository is, but it may know where the client is connecting from. In such "
11923 "cases, the URL will take one of the following forms:"
11924 msgstr ""
11926 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11927 #: ../en/ch10-hook.xml:1480
11928 msgid ""
11929 "<literal>remote:ssh:1.2.3.4</literal>&emdash;remote ssh client, at the IP "
11930 "address <literal>1.2.3.4</literal>."
11931 msgstr ""
11933 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11934 #: ../en/ch10-hook.xml:1485
11935 msgid ""
11936 "<literal>remote:http:1.2.3.4</literal>&emdash;remote http client, at the IP "
11937 "address <literal>1.2.3.4</literal>. If the client is using SSL, this will be "
11938 "of the form <literal>remote:https:1.2.3.4</literal>."
11939 msgstr ""
11941 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
11942 #: ../en/ch10-hook.xml:1492
11943 msgid "Empty&emdash;no information could be discovered about the remote client."
11944 msgstr ""
11946 #. type: Content of: <book><chapter><sect1><title>
11947 #: ../en/ch10-hook.xml:1501
11948 msgid "Hook reference"
11949 msgstr "钩子参考"
11951 #. type: Content of: <book><chapter><sect1><sect2><title>
11952 #: ../en/ch10-hook.xml:1504
11953 msgid ""
11954 "<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets "
11955 "added"
11956 msgstr "<literal role=\"hook\">changegroup</literal>&emdash;增加远程修改集之后"
11958 #. type: Content of: <book><chapter><sect1><sect2><para>
11959 #: ../en/ch10-hook.xml:1507
11960 msgid ""
11961 "This hook is run after a group of pre-existing changesets has been added to "
11962 "the repository, for example via a <command role=\"hg-cmd\">hg pull</command> "
11963 "or <command role=\"hg-cmd\">hg unbundle</command>. This hook is run once per "
11964 "operation that added one or more changesets. This is in contrast to the "
11965 "<literal role=\"hook\">incoming</literal> hook, which is run once per "
11966 "changeset, regardless of whether the changesets arrive in a group."
11967 msgstr ""
11969 #. type: Content of: <book><chapter><sect1><sect2><para>
11970 #: ../en/ch10-hook.xml:1517
11971 msgid ""
11972 "Some possible uses for this hook include kicking off an automated build or "
11973 "test of the added changesets, updating a bug database, or notifying "
11974 "subscribers that a repository contains new changes."
11975 msgstr ""
11977 #. type: Content of: <book><chapter><sect1><sect2><para>
11978 #: ../en/ch10-hook.xml:1523 ../en/ch10-hook.xml:1564 ../en/ch10-hook.xml:1607
11979 #: ../en/ch10-hook.xml:1649 ../en/ch10-hook.xml:1704 ../en/ch10-hook.xml:1744
11980 #: ../en/ch10-hook.xml:1780 ../en/ch10-hook.xml:1815 ../en/ch10-hook.xml:1877
11981 #: ../en/ch10-hook.xml:1935 ../en/ch10-hook.xml:1969 ../en/ch10-hook.xml:1997
11982 msgid "Parameters to this hook:"
11983 msgstr ""
11985 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11986 #: ../en/ch10-hook.xml:1526 ../en/ch10-hook.xml:1880
11987 msgid ""
11988 "<literal>node</literal>: A changeset ID. The changeset ID of the first "
11989 "changeset in the group that was added. All changesets between this and "
11990 "\\index{tags!<literal>tip</literal>}<literal>tip</literal>, inclusive, were "
11991 "added by a single <command role=\"hg-cmd\">hg pull</command>, <command role="
11992 "\"hg-cmd\">hg push</command> or <command role=\"hg-cmd\">hg unbundle</"
11993 "command>."
11994 msgstr ""
11996 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
11997 #: ../en/ch10-hook.xml:1536 ../en/ch10-hook.xml:1614 ../en/ch10-hook.xml:1707
11998 #: ../en/ch10-hook.xml:1890
11999 msgid ""
12000 "<literal>source</literal>: A string. The source of these changes. See "
12001 "section <xref linkend=\"sec.hook.sources\"/> for details."
12002 msgstr ""
12004 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12005 #: ../en/ch10-hook.xml:1541 ../en/ch10-hook.xml:1619 ../en/ch10-hook.xml:1670
12006 #: ../en/ch10-hook.xml:1712 ../en/ch10-hook.xml:1794 ../en/ch10-hook.xml:1895
12007 msgid ""
12008 "<literal>url</literal>: A URL. The location of the remote repository, if "
12009 "known. See section <xref linkend=\"sec.hook.url\"/> for more information."
12010 msgstr ""
12012 #. type: Content of: <book><chapter><sect1><sect2><para>
12013 #: ../en/ch10-hook.xml:1548
12014 msgid ""
12015 "See also: <literal role=\"hook\">incoming</literal> (section <xref linkend="
12016 "\"sec.hook.incoming\"/>), <literal role=\"hook\">prechangegroup</literal> "
12017 "(section <xref linkend=\"sec.hook.prechangegroup\"/>), <literal role=\"hook"
12018 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
12019 "pretxnchangegroup\"/>)"
12020 msgstr ""
12022 #. type: Content of: <book><chapter><sect1><sect2><title>
12023 #: ../en/ch10-hook.xml:1558
12024 msgid ""
12025 "<literal role=\"hook\">commit</literal>&emdash;after a new changeset is "
12026 "created"
12027 msgstr "<literal role=\"hook\">commit</literal>&emdash;创建新修改集之后"
12029 #. type: Content of: <book><chapter><sect1><sect2><para>
12030 #: ../en/ch10-hook.xml:1561
12031 msgid "This hook is run after a new changeset has been created."
12032 msgstr ""
12034 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12035 #: ../en/ch10-hook.xml:1567 ../en/ch10-hook.xml:1938
12036 msgid ""
12037 "<literal>node</literal>: A changeset ID. The changeset ID of the newly "
12038 "committed changeset."
12039 msgstr ""
12041 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12042 #: ../en/ch10-hook.xml:1571 ../en/ch10-hook.xml:1942
12043 msgid ""
12044 "<literal>parent1</literal>: A changeset ID. The changeset ID of the first "
12045 "parent of the newly committed changeset."
12046 msgstr ""
12048 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12049 #: ../en/ch10-hook.xml:1576 ../en/ch10-hook.xml:1947
12050 msgid ""
12051 "<literal>parent2</literal>: A changeset ID. The changeset ID of the second "
12052 "parent of the newly committed changeset."
12053 msgstr ""
12055 #. type: Content of: <book><chapter><sect1><sect2><para>
12056 #: ../en/ch10-hook.xml:1582
12057 msgid ""
12058 "See also: <literal role=\"hook\">precommit</literal> (section <xref linkend="
12059 "\"sec.hook.precommit\"/>), <literal role=\"hook\">pretxncommit</literal> "
12060 "(section <xref linkend=\"sec.hook.pretxncommit\"/>)"
12061 msgstr ""
12063 #. type: Content of: <book><chapter><sect1><sect2><title>
12064 #: ../en/ch10-hook.xml:1590
12065 msgid ""
12066 "<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset "
12067 "is added"
12068 msgstr "<literal role=\"hook\">incoming</literal>&emdash;增加远程修改集之后"
12070 #. type: Content of: <book><chapter><sect1><sect2><para>
12071 #: ../en/ch10-hook.xml:1593
12072 msgid ""
12073 "This hook is run after a pre-existing changeset has been added to the "
12074 "repository, for example via a <command role=\"hg-cmd\">hg push</command>. If "
12075 "a group of changesets was added in a single operation, this hook is called "
12076 "once for each added changeset."
12077 msgstr ""
12079 #. type: Content of: <book><chapter><sect1><sect2><para>
12080 #: ../en/ch10-hook.xml:1600
12081 msgid ""
12082 "You can use this hook for the same purposes as the <literal role=\"hook"
12083 "\">changegroup</literal> hook (section <xref linkend=\"sec.hook.changegroup\"/"
12084 ">); it's simply more convenient sometimes to run a hook once per group of "
12085 "changesets, while other times it's handier once per changeset."
12086 msgstr ""
12088 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12089 #: ../en/ch10-hook.xml:1610
12090 msgid ""
12091 "<literal>node</literal>: A changeset ID. The ID of the newly added changeset."
12092 msgstr ""
12094 #. type: Content of: <book><chapter><sect1><sect2><para>
12095 #: ../en/ch10-hook.xml:1626
12096 msgid ""
12097 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
12098 "\"sec.hook.changegroup\"/>) <literal role=\"hook\">prechangegroup</literal> "
12099 "(section <xref linkend=\"sec.hook.prechangegroup\"/>), <literal role=\"hook"
12100 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
12101 "pretxnchangegroup\"/>)"
12102 msgstr ""
12104 #. type: Content of: <book><chapter><sect1><sect2><title>
12105 #: ../en/ch10-hook.xml:1636
12106 msgid ""
12107 "<literal role=\"hook\">outgoing</literal>&emdash;after changesets are "
12108 "propagated"
12109 msgstr "<literal role=\"hook\">outgoing</literal>&emdash;传播修改集之后"
12111 #. type: Content of: <book><chapter><sect1><sect2><para>
12112 #: ../en/ch10-hook.xml:1639
12113 msgid ""
12114 "This hook is run after a group of changesets has been propagated out of this "
12115 "repository, for example by a <command role=\"hg-cmd\">hg push</command> or "
12116 "<command role=\"hg-cmd\">hg bundle</command> command."
12117 msgstr ""
12119 #. type: Content of: <book><chapter><sect1><sect2><para>
12120 #: ../en/ch10-hook.xml:1645
12121 msgid ""
12122 "One possible use for this hook is to notify administrators that changes have "
12123 "been pulled."
12124 msgstr ""
12126 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12127 #: ../en/ch10-hook.xml:1652
12128 msgid ""
12129 "<literal>node</literal>: A changeset ID. The changeset ID of the first "
12130 "changeset of the group that was sent."
12131 msgstr ""
12133 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12134 #: ../en/ch10-hook.xml:1657
12135 msgid ""
12136 "<literal>source</literal>: A string. The source of the of the operation (see "
12137 "section <xref linkend=\"sec.hook.sources\"/>). If a remote client pulled "
12138 "changes from this repository, <literal>source</literal> will be "
12139 "<literal>serve</literal>. If the client that obtained changes from this "
12140 "repository was local, <literal>source</literal> will be <literal>bundle</"
12141 "literal>, <literal>pull</literal>, or <literal>push</literal>, depending on "
12142 "the operation the client performed."
12143 msgstr ""
12145 #. type: Content of: <book><chapter><sect1><sect2><para>
12146 #: ../en/ch10-hook.xml:1677
12147 msgid ""
12148 "See also: <literal role=\"hook\">preoutgoing</literal> (section <xref linkend="
12149 "\"sec.hook.preoutgoing\"/>)"
12150 msgstr ""
12152 #. type: Content of: <book><chapter><sect1><sect2><title>
12153 #: ../en/ch10-hook.xml:1683
12154 msgid ""
12155 "<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add "
12156 "remote changesets"
12157 msgstr ""
12158 "<literal role=\"hook\">prechangegroup</literal>&emdash;增加远程修改集之前"
12160 #. type: Content of: <book><chapter><sect1><sect2><para>
12161 #: ../en/ch10-hook.xml:1687
12162 msgid ""
12163 "This controlling hook is run before Mercurial begins to add a group of "
12164 "changesets from another repository."
12165 msgstr ""
12167 #. type: Content of: <book><chapter><sect1><sect2><para>
12168 #: ../en/ch10-hook.xml:1691
12169 msgid ""
12170 "This hook does not have any information about the changesets to be added, "
12171 "because it is run before transmission of those changesets is allowed to "
12172 "begin. If this hook fails, the changesets will not be transmitted."
12173 msgstr ""
12175 #. type: Content of: <book><chapter><sect1><sect2><para>
12176 #: ../en/ch10-hook.xml:1697
12177 msgid ""
12178 "One use for this hook is to prevent external changes from being added to a "
12179 "repository. For example, you could use this to <quote>freeze</quote> a "
12180 "server-hosted branch temporarily or permanently so that users cannot push to "
12181 "it, while still allowing a local administrator to modify the repository."
12182 msgstr ""
12184 #. type: Content of: <book><chapter><sect1><sect2><para>
12185 #: ../en/ch10-hook.xml:1719
12186 msgid ""
12187 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
12188 "\"sec.hook.changegroup\"/>), <literal role=\"hook\">incoming</literal> "
12189 "(section <xref linkend=\"sec.hook.incoming\"/>), , <literal role=\"hook"
12190 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
12191 "pretxnchangegroup\"/>)"
12192 msgstr ""
12194 #. type: Content of: <book><chapter><sect1><sect2><title>
12195 #: ../en/ch10-hook.xml:1729
12196 msgid ""
12197 "<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a "
12198 "changeset"
12199 msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前"
12201 #. type: Content of: <book><chapter><sect1><sect2><para>
12202 #: ../en/ch10-hook.xml:1732
12203 msgid ""
12204 "This hook is run before Mercurial begins to commit a new changeset. It is run "
12205 "before Mercurial has any of the metadata for the commit, such as the files to "
12206 "be committed, the commit message, or the commit date."
12207 msgstr ""
12209 #. type: Content of: <book><chapter><sect1><sect2><para>
12210 #: ../en/ch10-hook.xml:1738
12211 msgid ""
12212 "One use for this hook is to disable the ability to commit new changesets, "
12213 "while still allowing incoming changesets. Another is to run a build or test, "
12214 "and only allow the commit to begin if the build or test succeeds."
12215 msgstr ""
12217 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12218 #: ../en/ch10-hook.xml:1747
12219 msgid ""
12220 "<literal>parent1</literal>: A changeset ID. The changeset ID of the first "
12221 "parent of the working directory."
12222 msgstr ""
12224 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12225 #: ../en/ch10-hook.xml:1752
12226 msgid ""
12227 "<literal>parent2</literal>: A changeset ID. The changeset ID of the second "
12228 "parent of the working directory."
12229 msgstr ""
12231 #. type: Content of: <book><chapter><sect1><sect2><para>
12232 #: ../en/ch10-hook.xml:1757
12233 msgid ""
12234 "If the commit proceeds, the parents of the working directory will become the "
12235 "parents of the new changeset."
12236 msgstr ""
12238 #. type: Content of: <book><chapter><sect1><sect2><para>
12239 #: ../en/ch10-hook.xml:1761
12240 msgid ""
12241 "See also: <literal role=\"hook\">commit</literal> (section <xref linkend="
12242 "\"sec.hook.commit\"/>), <literal role=\"hook\">pretxncommit</literal> "
12243 "(section <xref linkend=\"sec.hook.pretxncommit\"/>)"
12244 msgstr ""
12246 #. type: Content of: <book><chapter><sect1><sect2><title>
12247 #: ../en/ch10-hook.xml:1769
12248 msgid ""
12249 "<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to "
12250 "propagate changesets"
12251 msgstr "<literal role=\"hook\">preoutgoing</literal>&emdash;传播修改集之前"
12253 #. type: Content of: <book><chapter><sect1><sect2><para>
12254 #: ../en/ch10-hook.xml:1772
12255 msgid ""
12256 "This hook is invoked before Mercurial knows the identities of the changesets "
12257 "to be transmitted."
12258 msgstr ""
12260 #. type: Content of: <book><chapter><sect1><sect2><para>
12261 #: ../en/ch10-hook.xml:1776
12262 msgid ""
12263 "One use for this hook is to prevent changes from being transmitted to another "
12264 "repository."
12265 msgstr ""
12267 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12268 #: ../en/ch10-hook.xml:1783
12269 msgid ""
12270 "<literal>source</literal>: A string. The source of the operation that is "
12271 "attempting to obtain changes from this repository (see section <xref linkend="
12272 "\"sec.hook.sources\"/>). See the documentation for the <literal>source</"
12273 "literal> parameter to the <literal role=\"hook\">outgoing</literal> hook, in "
12274 "section <xref linkend=\"sec.hook.outgoing\"/>, for possible values of this "
12275 "parameter."
12276 msgstr ""
12278 #. type: Content of: <book><chapter><sect1><sect2><para>
12279 #: ../en/ch10-hook.xml:1801
12280 msgid ""
12281 "See also: <literal role=\"hook\">outgoing</literal> (section <xref linkend="
12282 "\"sec.hook.outgoing\"/>)"
12283 msgstr ""
12285 #. type: Content of: <book><chapter><sect1><sect2><title>
12286 #: ../en/ch10-hook.xml:1807
12287 msgid ""
12288 "<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset"
12289 msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前"
12291 #. type: Content of: <book><chapter><sect1><sect2><para>
12292 #: ../en/ch10-hook.xml:1810
12293 msgid ""
12294 "This controlling hook is run before a tag is created. If the hook succeeds, "
12295 "creation of the tag proceeds. If the hook fails, the tag is not created."
12296 msgstr ""
12298 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12299 #: ../en/ch10-hook.xml:1818
12300 msgid ""
12301 "<literal>local</literal>: A boolean. Whether the tag is local to this "
12302 "repository instance (i.e. stored in <filename role=\"special\">.hg/localtags</"
12303 "filename>) or managed by Mercurial (stored in <filename role=\"special\">."
12304 "hgtags</filename>)."
12305 msgstr ""
12307 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12308 #: ../en/ch10-hook.xml:1825
12309 msgid ""
12310 "<literal>node</literal>: A changeset ID. The ID of the changeset to be "
12311 "tagged."
12312 msgstr ""
12314 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12315 #: ../en/ch10-hook.xml:1829
12316 msgid "<literal>tag</literal>: A string. The name of the tag to be created."
12317 msgstr ""
12319 #. type: Content of: <book><chapter><sect1><sect2><para>
12320 #: ../en/ch10-hook.xml:1834
12321 msgid ""
12322 "If the tag to be created is revision-controlled, the <literal role=\"hook"
12323 "\">precommit</literal> and <literal role=\"hook\">pretxncommit</literal> "
12324 "hooks (sections <xref linkend=\"sec.hook.commit\"/> and <xref linkend=\"sec."
12325 "hook.pretxncommit\"/>) will also be run."
12326 msgstr ""
12328 #. type: Content of: <book><chapter><sect1><sect2><para>
12329 #: ../en/ch10-hook.xml:1841
12330 msgid ""
12331 "See also: <literal role=\"hook\">tag</literal> (section <xref linkend=\"sec."
12332 "hook.tag\"/>)"
12333 msgstr ""
12335 #. type: Content of: <book><chapter><sect1><sect2><title>
12336 #: ../en/ch10-hook.xml:1846
12337 msgid ""
12338 "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing "
12339 "addition of remote changesets"
12340 msgstr ""
12341 "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;完成增加远程修改集之"
12342 "前"
12344 #. type: Content of: <book><chapter><sect1><sect2><para>
12345 #: ../en/ch10-hook.xml:1850
12346 msgid ""
12347 "This controlling hook is run before a transaction&emdash;that manages the "
12348 "addition of a group of new changesets from outside the repository&emdash;"
12349 "completes. If the hook succeeds, the transaction completes, and all of the "
12350 "changesets become permanent within this repository. If the hook fails, the "
12351 "transaction is rolled back, and the data for the changesets is erased."
12352 msgstr ""
12354 #. type: Content of: <book><chapter><sect1><sect2><para>
12355 #: ../en/ch10-hook.xml:1859
12356 msgid ""
12357 "This hook can access the metadata associated with the almost-added "
12358 "changesets, but it should not do anything permanent with this data. It must "
12359 "also not modify the working directory."
12360 msgstr ""
12362 #. type: Content of: <book><chapter><sect1><sect2><para>
12363 #: ../en/ch10-hook.xml:1865
12364 msgid ""
12365 "While this hook is running, if other Mercurial processes access this "
12366 "repository, they will be able to see the almost-added changesets as if they "
12367 "are permanent. This may lead to race conditions if you do not take steps to "
12368 "avoid them."
12369 msgstr ""
12371 #. type: Content of: <book><chapter><sect1><sect2><para>
12372 #: ../en/ch10-hook.xml:1872
12373 msgid ""
12374 "This hook can be used to automatically vet a group of changesets. If the "
12375 "hook fails, all of the changesets are <quote>rejected</quote> when the "
12376 "transaction rolls back."
12377 msgstr ""
12379 #. type: Content of: <book><chapter><sect1><sect2><para>
12380 #: ../en/ch10-hook.xml:1902
12381 msgid ""
12382 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
12383 "\"sec.hook.changegroup\"/>), <literal role=\"hook\">incoming</literal> "
12384 "(section <xref linkend=\"sec.hook.incoming\"/>), <literal role=\"hook"
12385 "\">prechangegroup</literal> (section <xref linkend=\"sec.hook.prechangegroup"
12386 "\"/>)"
12387 msgstr ""
12389 #. type: Content of: <book><chapter><sect1><sect2><title>
12390 #: ../en/ch10-hook.xml:1912
12391 msgid ""
12392 "<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit "
12393 "of new changeset"
12394 msgstr "<literal role=\"hook\">pretxncommit</literal>&emdash;完成提交之前"
12396 #. type: Content of: <book><chapter><sect1><sect2><para>
12397 #: ../en/ch10-hook.xml:1915
12398 msgid ""
12399 "This controlling hook is run before a transaction&emdash;that manages a new "
12400 "commit&emdash;completes. If the hook succeeds, the transaction completes and "
12401 "the changeset becomes permanent within this repository. If the hook fails, "
12402 "the transaction is rolled back, and the commit data is erased."
12403 msgstr ""
12405 #. type: Content of: <book><chapter><sect1><sect2><para>
12406 #: ../en/ch10-hook.xml:1923
12407 msgid ""
12408 "This hook can access the metadata associated with the almost-new changeset, "
12409 "but it should not do anything permanent with this data. It must also not "
12410 "modify the working directory."
12411 msgstr ""
12413 #. type: Content of: <book><chapter><sect1><sect2><para>
12414 #: ../en/ch10-hook.xml:1929
12415 msgid ""
12416 "While this hook is running, if other Mercurial processes access this "
12417 "repository, they will be able to see the almost-new changeset as if it is "
12418 "permanent. This may lead to race conditions if you do not take steps to "
12419 "avoid them."
12420 msgstr ""
12422 #. type: Content of: <book><chapter><sect1><sect2><para>
12423 #: ../en/ch10-hook.xml:1953
12424 msgid ""
12425 "See also: <literal role=\"hook\">precommit</literal> (section <xref linkend="
12426 "\"sec.hook.precommit\"/>)"
12427 msgstr ""
12429 #. type: Content of: <book><chapter><sect1><sect2><title>
12430 #: ../en/ch10-hook.xml:1959
12431 msgid ""
12432 "<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging "
12433 "working directory"
12434 msgstr ""
12435 "<literal role=\"hook\">preupdate</literal>&emdash;更新或合并工作目录之前"
12437 #. type: Content of: <book><chapter><sect1><sect2><para>
12438 #: ../en/ch10-hook.xml:1962
12439 msgid ""
12440 "This controlling hook is run before an update or merge of the working "
12441 "directory begins. It is run only if Mercurial's normal pre-update checks "
12442 "determine that the update or merge can proceed. If the hook succeeds, the "
12443 "update or merge may proceed; if it fails, the update or merge does not start."
12444 msgstr ""
12446 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12447 #: ../en/ch10-hook.xml:1972
12448 msgid ""
12449 "<literal>parent1</literal>: A changeset ID. The ID of the parent that the "
12450 "working directory is to be updated to. If the working directory is being "
12451 "merged, it will not change this parent."
12452 msgstr ""
12454 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12455 #: ../en/ch10-hook.xml:1978
12456 msgid ""
12457 "<literal>parent2</literal>: A changeset ID. Only set if the working "
12458 "directory is being merged. The ID of the revision that the working directory "
12459 "is being merged with."
12460 msgstr ""
12462 #. type: Content of: <book><chapter><sect1><sect2><para>
12463 #: ../en/ch10-hook.xml:1985
12464 msgid ""
12465 "See also: <literal role=\"hook\">update</literal> (section <xref linkend="
12466 "\"sec.hook.update\"/>)"
12467 msgstr ""
12469 #. type: Content of: <book><chapter><sect1><sect2><title>
12470 #: ../en/ch10-hook.xml:1991
12471 msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset"
12472 msgstr "<literal role=\"hook\">tag</literal>&emdash;创建标签之后"
12474 #. type: Content of: <book><chapter><sect1><sect2><para>
12475 #: ../en/ch10-hook.xml:1994
12476 msgid "This hook is run after a tag has been created."
12477 msgstr ""
12479 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12480 #: ../en/ch10-hook.xml:2000
12481 msgid ""
12482 "<literal>local</literal>: A boolean. Whether the new tag is local to this "
12483 "repository instance (i.e. stored in <filename role=\"special\">.hg/"
12484 "localtags</filename>) or managed by Mercurial (stored in <filename role="
12485 "\"special\">.hgtags</filename>)."
12486 msgstr ""
12488 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12489 #: ../en/ch10-hook.xml:2008
12490 msgid ""
12491 "<literal>node</literal>: A changeset ID. The ID of the changeset that was "
12492 "tagged."
12493 msgstr ""
12495 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12496 #: ../en/ch10-hook.xml:2012
12497 msgid "<literal>tag</literal>: A string. The name of the tag that was created."
12498 msgstr ""
12500 #. type: Content of: <book><chapter><sect1><sect2><para>
12501 #: ../en/ch10-hook.xml:2017
12502 msgid ""
12503 "If the created tag is revision-controlled, the <literal role=\"hook\">commit</"
12504 "literal> hook (section <xref linkend=\"sec.hook.commit\"/>) is run before "
12505 "this hook."
12506 msgstr ""
12508 #. type: Content of: <book><chapter><sect1><sect2><para>
12509 #: ../en/ch10-hook.xml:2022
12510 msgid ""
12511 "See also: <literal role=\"hook\">pretag</literal> (section <xref linkend="
12512 "\"sec.hook.pretag\"/>)"
12513 msgstr ""
12515 #. type: Content of: <book><chapter><sect1><sect2><title>
12516 #: ../en/ch10-hook.xml:2028
12517 msgid ""
12518 "<literal role=\"hook\">update</literal>&emdash;after updating or merging "
12519 "working directory"
12520 msgstr "<literal role=\"hook\">update</literal>&emdash;更新或合并工作目录之后"
12522 #. type: Content of: <book><chapter><sect1><sect2><para>
12523 #: ../en/ch10-hook.xml:2031
12524 msgid ""
12525 "This hook is run after an update or merge of the working directory "
12526 "completes. Since a merge can fail (if the external <command>hgmerge</"
12527 "command> command fails to resolve conflicts in a file), this hook "
12528 "communicates whether the update or merge completed cleanly."
12529 msgstr ""
12531 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12532 #: ../en/ch10-hook.xml:2039
12533 msgid ""
12534 "<literal>error</literal>: A boolean. Indicates whether the update or merge "
12535 "completed successfully."
12536 msgstr ""
12538 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12539 #: ../en/ch10-hook.xml:2044
12540 msgid ""
12541 "<literal>parent1</literal>: A changeset ID. The ID of the parent that the "
12542 "working directory was updated to. If the working directory was merged, it "
12543 "will not have changed this parent."
12544 msgstr ""
12546 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
12547 #: ../en/ch10-hook.xml:2050
12548 msgid ""
12549 "<literal>parent2</literal>: A changeset ID. Only set if the working "
12550 "directory was merged. The ID of the revision that the working directory was "
12551 "merged with."
12552 msgstr ""
12554 #. type: Content of: <book><chapter><sect1><sect2><para>
12555 #: ../en/ch10-hook.xml:2056
12556 msgid ""
12557 "See also: <literal role=\"hook\">preupdate</literal> (section <xref linkend="
12558 "\"sec.hook.preupdate\"/>)"
12559 msgstr ""
12561 #. type: Content of: <book><chapter><title>
12562 #: ../en/ch11-template.xml:5
12563 msgid "Customising the output of Mercurial"
12564 msgstr "定制 Mercurial 的输出"
12566 #. type: Content of: <book><chapter><para>
12567 #: ../en/ch11-template.xml:7
12568 msgid ""
12569 "Mercurial provides a powerful mechanism to let you control how it displays "
12570 "information. The mechanism is based on templates. You can use templates to "
12571 "generate specific output for a single command, or to customise the entire "
12572 "appearance of the built-in web interface."
12573 msgstr ""
12575 #. type: Content of: <book><chapter><sect1><title>
12576 #: ../en/ch11-template.xml:14
12577 msgid "Using precanned output styles"
12578 msgstr "使用预定义的输出样式"
12580 #. type: Content of: <book><chapter><sect1><para>
12581 #: ../en/ch11-template.xml:16
12582 msgid ""
12583 "Packaged with Mercurial are some output styles that you can use immediately. "
12584 "A style is simply a precanned template that someone wrote and installed "
12585 "somewhere that Mercurial can find."
12586 msgstr ""
12588 #. type: Content of: <book><chapter><sect1><para>
12589 #: ../en/ch11-template.xml:21
12590 msgid ""
12591 "Before we take a look at Mercurial's bundled styles, let's review its normal "
12592 "output."
12593 msgstr ""
12595 #. type: Content of: <book><chapter><sect1><para>
12596 #: ../en/ch11-template.xml:26
12597 msgid ""
12598 "This is somewhat informative, but it takes up a lot of space&emdash;five "
12599 "lines of output per changeset. The <literal>compact</literal> style reduces "
12600 "this to three lines, presented in a sparse manner."
12601 msgstr ""
12603 #. type: Content of: <book><chapter><sect1><para>
12604 #: ../en/ch11-template.xml:33
12605 msgid ""
12606 "The <literal>changelog</literal> style hints at the expressive power of "
12607 "Mercurial's templating engine. This style attempts to follow the GNU "
12608 "Project's changelog guidelines<citation>web:changelog</citation>."
12609 msgstr ""
12611 #. type: Content of: <book><chapter><sect1><para>
12612 #: ../en/ch11-template.xml:40
12613 msgid ""
12614 "You will not be shocked to learn that Mercurial's default output style is "
12615 "named <literal>default</literal>."
12616 msgstr ""
12618 #. type: Content of: <book><chapter><sect1><sect2><title>
12619 #: ../en/ch11-template.xml:44
12620 msgid "Setting a default style"
12621 msgstr "设置默认样式"
12623 #. type: Content of: <book><chapter><sect1><sect2><para>
12624 #: ../en/ch11-template.xml:46
12625 msgid ""
12626 "You can modify the output style that Mercurial will use for every command by "
12627 "editing your <filename role=\"special\"> /.hgrc</filename>\\ file, naming the "
12628 "style you would prefer to use."
12629 msgstr ""
12631 #. type: Content of: <book><chapter><sect1><sect2><para>
12632 #: ../en/ch11-template.xml:53
12633 msgid ""
12634 "If you write a style of your own, you can use it by either providing the path "
12635 "to your style file, or copying your style file into a location where "
12636 "Mercurial can find it (typically the <literal>templates</literal> "
12637 "subdirectory of your Mercurial install directory)."
12638 msgstr ""
12640 #. type: Content of: <book><chapter><sect1><title>
12641 #: ../en/ch11-template.xml:62
12642 msgid "Commands that support styles and templates"
12643 msgstr "支持样式和模版的命令"
12645 #. type: Content of: <book><chapter><sect1><para>
12646 #: ../en/ch11-template.xml:64
12647 msgid ""
12648 "All of Mercurial's <quote><literal>log</literal>-like</quote> commands let "
12649 "you use styles and templates: <command role=\"hg-cmd\">hg incoming</command>, "
12650 "<command role=\"hg-cmd\">hg log</command>, <command role=\"hg-cmd\">hg "
12651 "outgoing</command>, and <command role=\"hg-cmd\">hg tip</command>."
12652 msgstr ""
12654 #. type: Content of: <book><chapter><sect1><para>
12655 #: ../en/ch11-template.xml:71
12656 msgid ""
12657 "As I write this manual, these are so far the only commands that support "
12658 "styles and templates. Since these are the most important commands that need "
12659 "customisable output, there has been little pressure from the Mercurial user "
12660 "community to add style and template support to other commands."
12661 msgstr ""
12663 #. type: Content of: <book><chapter><sect1><title>
12664 #: ../en/ch11-template.xml:79
12665 msgid "The basics of templating"
12666 msgstr "模版基础"
12668 #. type: Content of: <book><chapter><sect1><para>
12669 #: ../en/ch11-template.xml:81
12670 msgid ""
12671 "At its simplest, a Mercurial template is a piece of text. Some of the text "
12672 "never changes, while other parts are <emphasis>expanded</emphasis>, or "
12673 "replaced with new text, when necessary."
12674 msgstr ""
12676 #. type: Content of: <book><chapter><sect1><para>
12677 #: ../en/ch11-template.xml:86
12678 msgid ""
12679 "Before we continue, let's look again at a simple example of Mercurial's "
12680 "normal output."
12681 msgstr ""
12683 #. type: Content of: <book><chapter><sect1><para>
12684 #: ../en/ch11-template.xml:91
12685 msgid ""
12686 "Now, let's run the same command, but using a template to change its output."
12687 msgstr ""
12689 #. type: Content of: <book><chapter><sect1><para>
12690 #: ../en/ch11-template.xml:96
12691 msgid ""
12692 "The example above illustrates the simplest possible template; it's just a "
12693 "piece of static text, printed once for each changeset. The <option role=\"hg-"
12694 "opt-log\">--template</option> option to the <command role=\"hg-cmd\">hg log</"
12695 "command> command tells Mercurial to use the given text as the template when "
12696 "printing each changeset."
12697 msgstr ""
12699 #. type: Content of: <book><chapter><sect1><para>
12700 #: ../en/ch11-template.xml:104
12701 msgid ""
12702 "Notice that the template string above ends with the text <quote><literal>\\n</"
12703 "literal></quote>. This is an <emphasis>escape sequence</emphasis>, telling "
12704 "Mercurial to print a newline at the end of each template item. If you omit "
12705 "this newline, Mercurial will run each piece of output together. See section "
12706 "<xref linkend=\"sec.template.escape\"/> for more details of escape sequences."
12707 msgstr ""
12709 #. type: Content of: <book><chapter><sect1><para>
12710 #: ../en/ch11-template.xml:112
12711 msgid ""
12712 "A template that prints a fixed string of text all the time isn't very useful; "
12713 "let's try something a bit more complex."
12714 msgstr ""
12716 #. type: Content of: <book><chapter><sect1><para>
12717 #: ../en/ch11-template.xml:118
12718 msgid ""
12719 "As you can see, the string <quote><literal>{desc}</literal></quote> in the "
12720 "template has been replaced in the output with the description of each "
12721 "changeset. Every time Mercurial finds text enclosed in curly braces "
12722 "(<quote><literal>{</literal></quote> and <quote><literal>}</literal></"
12723 "quote>), it will try to replace the braces and text with the expansion of "
12724 "whatever is inside. To print a literal curly brace, you must escape it, as "
12725 "described in section <xref linkend=\"sec.template.escape\"/>."
12726 msgstr ""
12728 #. type: Content of: <book><chapter><sect1><title>
12729 #: ../en/ch11-template.xml:131
12730 msgid "Common template keywords"
12731 msgstr "模版关键字"
12733 #. type: Content of: <book><chapter><sect1><para>
12734 #: ../en/ch11-template.xml:133
12735 msgid ""
12736 "You can start writing simple templates immediately using the keywords below."
12737 msgstr ""
12739 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12740 #: ../en/ch11-template.xml:137
12741 msgid ""
12742 "<literal role=\"template-keyword\">author</literal>: String. The unmodified "
12743 "author of the changeset."
12744 msgstr ""
12746 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12747 #: ../en/ch11-template.xml:141
12748 msgid ""
12749 "<literal role=\"template-keyword\">branches</literal>: String. The name of "
12750 "the branch on which the changeset was committed. Will be empty if the branch "
12751 "name was <literal>default</literal>."
12752 msgstr ""
12754 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12755 #: ../en/ch11-template.xml:147
12756 msgid ""
12757 "<literal role=\"template-keyword\">date</literal>: Date information. The "
12758 "date when the changeset was committed. This is <emphasis>not</emphasis> "
12759 "human-readable; you must pass it through a filter that will render it "
12760 "appropriately. See section <xref linkend=\"sec.template.filter\"/> for more "
12761 "information on filters. The date is expressed as a pair of numbers. The "
12762 "first number is a Unix UTC timestamp (seconds since January 1, 1970); the "
12763 "second is the offset of the committer's timezone from UTC, in seconds."
12764 msgstr ""
12766 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12767 #: ../en/ch11-template.xml:158
12768 msgid ""
12769 "<literal role=\"template-keyword\">desc</literal>: String. The text of the "
12770 "changeset description."
12771 msgstr ""
12773 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12774 #: ../en/ch11-template.xml:161
12775 msgid ""
12776 "<literal role=\"template-keyword\">files</literal>: List of strings. All "
12777 "files modified, added, or removed by this changeset."
12778 msgstr ""
12780 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12781 #: ../en/ch11-template.xml:166
12782 msgid ""
12783 "<literal role=\"template-keyword\">file_adds</literal>: List of strings. "
12784 "Files added by this changeset."
12785 msgstr ""
12787 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12788 #: ../en/ch11-template.xml:170
12789 msgid ""
12790 "<literal role=\"template-keyword\">file_dels</literal>: List of strings. "
12791 "Files removed by this changeset."
12792 msgstr ""
12794 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12795 #: ../en/ch11-template.xml:174
12796 msgid ""
12797 "<literal role=\"template-keyword\">node</literal>: String. The changeset "
12798 "identification hash, as a 40-character hexadecimal string."
12799 msgstr ""
12801 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12802 #: ../en/ch11-template.xml:178
12803 msgid ""
12804 "<literal role=\"template-keyword\">parents</literal>: List of strings. The "
12805 "parents of the changeset."
12806 msgstr ""
12808 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12809 #: ../en/ch11-template.xml:182
12810 msgid ""
12811 "<literal role=\"template-keyword\">rev</literal>: Integer. The repository-"
12812 "local changeset revision number."
12813 msgstr ""
12815 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12816 #: ../en/ch11-template.xml:186
12817 msgid ""
12818 "<literal role=\"template-keyword\">tags</literal>: List of strings. Any tags "
12819 "associated with the changeset."
12820 msgstr ""
12822 #. type: Content of: <book><chapter><sect1><para>
12823 #: ../en/ch11-template.xml:191
12824 msgid ""
12825 "A few simple experiments will show us what to expect when we use these "
12826 "keywords; you can see the results below."
12827 msgstr ""
12829 #. type: Content of: <book><chapter><sect1><para>
12830 #: ../en/ch11-template.xml:196
12831 msgid ""
12832 "As we noted above, the date keyword does not produce human-readable output, "
12833 "so we must treat it specially. This involves using a <emphasis>filter</"
12834 "emphasis>, about which more in section <xref linkend=\"sec.template.filter\"/"
12835 ">."
12836 msgstr ""
12838 #. type: Content of: <book><chapter><sect1><title>
12839 #: ../en/ch11-template.xml:206
12840 msgid "Escape sequences"
12841 msgstr "转义序列"
12843 #. type: Content of: <book><chapter><sect1><para>
12844 #: ../en/ch11-template.xml:208
12845 msgid ""
12846 "Mercurial's templating engine recognises the most commonly used escape "
12847 "sequences in strings. When it sees a backslash (<quote><literal>\\</"
12848 "literal></quote>) character, it looks at the following character and "
12849 "substitutes the two characters with a single replacement, as described below."
12850 msgstr ""
12852 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12853 #: ../en/ch11-template.xml:215
12854 msgid ""
12855 "<literal>\\textbackslash\\textbackslash</literal>: Backslash, <quote><literal>"
12856 "\\</literal></quote>, ASCII 134."
12857 msgstr ""
12859 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12860 #: ../en/ch11-template.xml:219
12861 msgid "<literal>\\textbackslash n</literal>: Newline, ASCII 12."
12862 msgstr ""
12864 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12865 #: ../en/ch11-template.xml:222
12866 msgid "<literal>\\textbackslash r</literal>: Carriage return, ASCII 15."
12867 msgstr ""
12869 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12870 #: ../en/ch11-template.xml:225
12871 msgid "<literal>\\textbackslash t</literal>: Tab, ASCII 11."
12872 msgstr ""
12874 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12875 #: ../en/ch11-template.xml:228
12876 msgid "<literal>\\textbackslash v</literal>: Vertical tab, ASCII 13."
12877 msgstr ""
12879 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12880 #: ../en/ch11-template.xml:231
12881 msgid ""
12882 "<literal>\\textbackslash {</literal>: Open curly brace, <quote><literal>{</"
12883 "literal></quote>, ASCII 173."
12884 msgstr ""
12886 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12887 #: ../en/ch11-template.xml:235
12888 msgid ""
12889 "<literal>\\textbackslash }</literal>: Close curly brace, <quote><literal>}</"
12890 "literal></quote>, ASCII 175."
12891 msgstr ""
12893 #. type: Content of: <book><chapter><sect1><para>
12894 #: ../en/ch11-template.xml:240
12895 msgid ""
12896 "As indicated above, if you want the expansion of a template to contain a "
12897 "literal <quote><literal>\\</literal></quote>, <quote><literal>{</literal></"
12898 "quote>, or <quote><literal>{</literal></quote> character, you must escape it."
12899 msgstr ""
12901 #. type: Content of: <book><chapter><sect1><title>
12902 #: ../en/ch11-template.xml:248
12903 msgid "Filtering keywords to change their results"
12904 msgstr "通过过滤关键字来修改输出结果"
12906 #. type: Content of: <book><chapter><sect1><para>
12907 #: ../en/ch11-template.xml:250
12908 msgid ""
12909 "Some of the results of template expansion are not immediately easy to use. "
12910 "Mercurial lets you specify an optional chain of <emphasis>filters</emphasis> "
12911 "to modify the result of expanding a keyword. You have already seen a common "
12912 "filter, <literal role=\"template-kw-filt-date\">isodate</literal>, in action "
12913 "above, to make a date readable."
12914 msgstr ""
12916 #. type: Content of: <book><chapter><sect1><para>
12917 #: ../en/ch11-template.xml:257
12918 msgid ""
12919 "Below is a list of the most commonly used filters that Mercurial supports. "
12920 "While some filters can be applied to any text, others can only be used in "
12921 "specific circumstances. The name of each filter is followed first by an "
12922 "indication of where it can be used, then a description of its effect."
12923 msgstr ""
12925 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12926 #: ../en/ch11-template.xml:264
12927 msgid ""
12928 "<literal role=\"template-filter\">addbreaks</literal>: Any text. Add an XHTML "
12929 "<quote><literal><br/></literal></quote> tag before the end of every "
12930 "line except the last. For example, <quote><literal>foo\\nbar</literal></"
12931 "quote> becomes <quote><literal>foo<br/>\\nbar</literal></quote>."
12932 msgstr ""
12934 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12935 #: ../en/ch11-template.xml:271
12936 msgid ""
12937 "<literal role=\"template-kw-filt-date\">age</literal>: <literal role="
12938 "\"template-keyword\">date</literal> keyword. Render the age of the date, "
12939 "relative to the current time. Yields a string like <quote><literal>10 "
12940 "minutes</literal></quote>."
12941 msgstr ""
12943 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12944 #: ../en/ch11-template.xml:278
12945 msgid ""
12946 "<literal role=\"template-filter\">basename</literal>: Any text, but most "
12947 "useful for the <literal role=\"template-keyword\">files</literal> keyword and "
12948 "its relatives. Treat the text as a path, and return the basename. For "
12949 "example, <quote><literal>foo/bar/baz</literal></quote> becomes "
12950 "<quote><literal>baz</literal></quote>."
12951 msgstr ""
12953 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12954 #: ../en/ch11-template.xml:287
12955 msgid ""
12956 "<literal role=\"template-kw-filt-date\">date</literal>: <literal role="
12957 "\"template-keyword\">date</literal> keyword. Render a date in a similar "
12958 "format to the Unix <literal role=\"template-keyword\">date</literal> command, "
12959 "but with timezone included. Yields a string like <quote><literal>Mon Sep 04 "
12960 "15:13:13 2006 -0700</literal></quote>."
12961 msgstr ""
12963 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12964 #: ../en/ch11-template.xml:295
12965 msgid ""
12966 "<literal role=\"template-kw-filt-author\">domain</literal>: Any text, but "
12967 "most useful for the <literal role=\"template-keyword\">author</literal> "
12968 "keyword. Finds the first string that looks like an email address, and "
12969 "extract just the domain component. For example, <quote><literal>Bryan "
12970 "O'Sullivan <bos@serpentine.com></literal></quote> becomes "
12971 "<quote><literal>serpentine.com</literal></quote>."
12972 msgstr ""
12974 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12975 #: ../en/ch11-template.xml:305
12976 msgid ""
12977 "<literal role=\"template-kw-filt-author\">email</literal>: Any text, but most "
12978 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
12979 "Extract the first string that looks like an email address. For example, "
12980 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
12981 "becomes <quote><literal>bos@serpentine.com</literal></quote>."
12982 msgstr ""
12984 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12985 #: ../en/ch11-template.xml:314
12986 msgid ""
12987 "<literal role=\"template-filter\">escape</literal>: Any text. Replace the "
12988 "special XML/XHTML characters <quote><literal>&</literal></quote>, "
12989 "<quote><literal><</literal></quote> and <quote><literal>></literal></"
12990 "quote> with XML entities."
12991 msgstr ""
12993 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
12994 #: ../en/ch11-template.xml:322
12995 msgid ""
12996 "<literal role=\"template-filter\">fill68</literal>: Any text. Wrap the text "
12997 "to fit in 68 columns. This is useful before you pass text through the "
12998 "<literal role=\"template-filter\">tabindent</literal> filter, and still want "
12999 "it to fit in an 80-column fixed-font window."
13000 msgstr ""
13002 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13003 #: ../en/ch11-template.xml:330
13004 msgid ""
13005 "<literal role=\"template-filter\">fill76</literal>: Any text. Wrap the text "
13006 "to fit in 76 columns."
13007 msgstr ""
13009 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13010 #: ../en/ch11-template.xml:334
13011 msgid ""
13012 "<literal role=\"template-filter\">firstline</literal>: Any text. Yield the "
13013 "first line of text, without any trailing newlines."
13014 msgstr ""
13016 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13017 #: ../en/ch11-template.xml:339
13018 msgid ""
13019 "<literal role=\"template-kw-filt-date\">hgdate</literal>: <literal role="
13020 "\"template-keyword\">date</literal> keyword. Render the date as a pair of "
13021 "readable numbers. Yields a string like <quote><literal>1157407993 25200</"
13022 "literal></quote>."
13023 msgstr ""
13025 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13026 #: ../en/ch11-template.xml:346
13027 msgid ""
13028 "<literal role=\"template-kw-filt-date\">isodate</literal>: <literal role="
13029 "\"template-keyword\">date</literal> keyword. Render the date as a text "
13030 "string in ISO 8601 format. Yields a string like <quote><literal>2006-09-04 "
13031 "15:13:13 -0700</literal></quote>."
13032 msgstr ""
13034 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13035 #: ../en/ch11-template.xml:353
13036 msgid ""
13037 "<literal role=\"template-filter\">obfuscate</literal>: Any text, but most "
13038 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
13039 "Yield the input text rendered as a sequence of XML entities. This helps to "
13040 "defeat some particularly stupid screen-scraping email harvesting spambots."
13041 msgstr ""
13043 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13044 #: ../en/ch11-template.xml:361
13045 msgid ""
13046 "<literal role=\"template-kw-filt-author\">person</literal>: Any text, but "
13047 "most useful for the <literal role=\"template-keyword\">author</literal> "
13048 "keyword. Yield the text before an email address. For example, "
13049 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
13050 "becomes <quote><literal>Bryan O'Sullivan</literal></quote>."
13051 msgstr ""
13053 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13054 #: ../en/ch11-template.xml:370
13055 msgid ""
13056 "<literal role=\"template-kw-filt-date\">rfc822date</literal>: <literal role="
13057 "\"template-keyword\">date</literal> keyword. Render a date using the same "
13058 "format used in email headers. Yields a string like <quote><literal>Mon, 04 "
13059 "Sep 2006 15:13:13 -0700</literal></quote>."
13060 msgstr ""
13062 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13063 #: ../en/ch11-template.xml:377
13064 msgid ""
13065 "<literal role=\"template-kw-filt-node\">short</literal>: Changeset hash. "
13066 "Yield the short form of a changeset hash, i.e. a 12-character hexadecimal "
13067 "string."
13068 msgstr ""
13070 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13071 #: ../en/ch11-template.xml:382
13072 msgid ""
13073 "<literal role=\"template-kw-filt-date\">shortdate</literal>: <literal role="
13074 "\"template-keyword\">date</literal> keyword. Render the year, month, and day "
13075 "of the date. Yields a string like <quote><literal>2006-09-04</literal></"
13076 "quote>."
13077 msgstr ""
13079 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13080 #: ../en/ch11-template.xml:388
13081 msgid ""
13082 "<literal role=\"template-filter\">strip</literal>: Any text. Strip all "
13083 "leading and trailing whitespace from the string."
13084 msgstr ""
13086 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13087 #: ../en/ch11-template.xml:392
13088 msgid ""
13089 "<literal role=\"template-filter\">tabindent</literal>: Any text. Yield the "
13090 "text, with every line except the first starting with a tab character."
13091 msgstr ""
13093 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13094 #: ../en/ch11-template.xml:397
13095 msgid ""
13096 "<literal role=\"template-filter\">urlescape</literal>: Any text. Escape all "
13097 "characters that are considered <quote>special</quote> by URL parsers. For "
13098 "example, <literal>foo bar</literal> becomes <literal>foo%20bar</literal>."
13099 msgstr ""
13101 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
13102 #: ../en/ch11-template.xml:404
13103 msgid ""
13104 "<literal role=\"template-kw-filt-author\">user</literal>: Any text, but most "
13105 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
13106 "Return the <quote>user</quote> portion of an email address. For example, "
13107 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
13108 "becomes <quote><literal>bos</literal></quote>."
13109 msgstr ""
13111 #. type: Content of: <book><chapter><sect1><note><para>
13112 #: ../en/ch11-template.xml:417
13113 msgid ""
13114 "If you try to apply a filter to a piece of data that it cannot process, "
13115 "Mercurial will fail and print a Python exception. For example, trying to run "
13116 "the output of the <literal role=\"template-keyword\">desc</literal> keyword "
13117 "into the <literal role=\"template-kw-filt-date\">isodate</literal> filter is "
13118 "not a good idea."
13119 msgstr ""
13121 #. type: Content of: <book><chapter><sect1><sect2><title>
13122 #: ../en/ch11-template.xml:426
13123 msgid "Combining filters"
13124 msgstr "组合过滤器"
13126 #. type: Content of: <book><chapter><sect1><sect2><para>
13127 #: ../en/ch11-template.xml:428
13128 msgid ""
13129 "It is easy to combine filters to yield output in the form you would like. "
13130 "The following chain of filters tidies up a description, then makes sure that "
13131 "it fits cleanly into 68 columns, then indents it by a further 8 characters "
13132 "(at least on Unix-like systems, where a tab is conventionally 8 characters "
13133 "wide)."
13134 msgstr ""
13136 #. type: Content of: <book><chapter><sect1><sect2><para>
13137 #: ../en/ch11-template.xml:437
13138 msgid ""
13139 "Note the use of <quote><literal>\\t</literal></quote> (a tab character) in "
13140 "the template to force the first line to be indented; this is necessary since "
13141 "<literal role=\"template-keyword\">tabindent</literal> indents all lines "
13142 "<emphasis>except</emphasis> the first."
13143 msgstr ""
13145 #. type: Content of: <book><chapter><sect1><sect2><para>
13146 #: ../en/ch11-template.xml:443
13147 msgid ""
13148 "Keep in mind that the order of filters in a chain is significant. The first "
13149 "filter is applied to the result of the keyword; the second to the result of "
13150 "the first filter; and so on. For example, using <literal>fill68|tabindent</"
13151 "literal> gives very different results from <literal>tabindent|fill68</"
13152 "literal>."
13153 msgstr ""
13155 #. type: Content of: <book><chapter><sect1><title>
13156 #: ../en/ch11-template.xml:454
13157 msgid "From templates to styles"
13158 msgstr "从模版到样式"
13160 #. type: Content of: <book><chapter><sect1><para>
13161 #: ../en/ch11-template.xml:456
13162 msgid ""
13163 "A command line template provides a quick and simple way to format some "
13164 "output. Templates can become verbose, though, and it's useful to be able to "
13165 "give a template a name. A style file is a template with a name, stored in a "
13166 "file."
13167 msgstr ""
13169 #. type: Content of: <book><chapter><sect1><para>
13170 #: ../en/ch11-template.xml:461
13171 msgid ""
13172 "More than that, using a style file unlocks the power of Mercurial's "
13173 "templating engine in ways that are not possible using the command line "
13174 "<option role=\"hg-opt-log\">--template</option> option."
13175 msgstr ""
13177 #. type: Content of: <book><chapter><sect1><sect2><title>
13178 #: ../en/ch11-template.xml:467
13179 msgid "The simplest of style files"
13180 msgstr "最简单的样式文件"
13182 #. type: Content of: <book><chapter><sect1><sect2><para>
13183 #: ../en/ch11-template.xml:469
13184 msgid "Our simple style file contains just one line:"
13185 msgstr ""
13187 #. type: Content of: <book><chapter><sect1><sect2><para>
13188 #: ../en/ch11-template.xml:473
13189 msgid ""
13190 "This tells Mercurial, <quote>if you're printing a changeset, use the text on "
13191 "the right as the template</quote>."
13192 msgstr ""
13194 #. type: Content of: <book><chapter><sect1><sect2><title>
13195 #: ../en/ch11-template.xml:479
13196 msgid "Style file syntax"
13197 msgstr "样式文件语法"
13199 #. type: Content of: <book><chapter><sect1><sect2><para>
13200 #: ../en/ch11-template.xml:481
13201 msgid "The syntax rules for a style file are simple."
13202 msgstr ""
13204 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13205 #: ../en/ch11-template.xml:484
13206 msgid "The file is processed one line at a time."
13207 msgstr ""
13209 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13210 #: ../en/ch11-template.xml:487
13211 msgid "Leading and trailing white space are ignored."
13212 msgstr ""
13214 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13215 #: ../en/ch11-template.xml:490
13216 msgid "Empty lines are skipped."
13217 msgstr ""
13219 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13220 #: ../en/ch11-template.xml:492
13221 msgid ""
13222 "If a line starts with either of the characters <quote><literal>#</literal></"
13223 "quote> or <quote><literal>;</literal></quote>, the entire line is treated as "
13224 "a comment, and skipped as if empty."
13225 msgstr ""
13227 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13228 #: ../en/ch11-template.xml:497
13229 msgid ""
13230 "A line starts with a keyword. This must start with an alphabetic character "
13231 "or underscore, and can subsequently contain any alphanumeric character or "
13232 "underscore. (In regexp notation, a keyword must match <literal>[A-Za-z_][A-"
13233 "Za-z0-9_]*</literal>.)"
13234 msgstr ""
13236 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13237 #: ../en/ch11-template.xml:503
13238 msgid ""
13239 "The next element must be an <quote><literal>=</literal></quote> character, "
13240 "which can be preceded or followed by an arbitrary amount of white space."
13241 msgstr ""
13243 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13244 #: ../en/ch11-template.xml:508
13245 msgid ""
13246 "If the rest of the line starts and ends with matching quote characters "
13247 "(either single or double quote), it is treated as a template body."
13248 msgstr ""
13250 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13251 #: ../en/ch11-template.xml:512
13252 msgid ""
13253 "If the rest of the line <emphasis>does not</emphasis> start with a quote "
13254 "character, it is treated as the name of a file; the contents of this file "
13255 "will be read and used as a template body."
13256 msgstr ""
13258 #. type: Content of: <book><chapter><sect1><title>
13259 #: ../en/ch11-template.xml:521
13260 msgid "Style files by example"
13261 msgstr "样式文件例子"
13263 #. type: Content of: <book><chapter><sect1><para>
13264 #: ../en/ch11-template.xml:523
13265 msgid ""
13266 "To illustrate how to write a style file, we will construct a few by example. "
13267 "Rather than provide a complete style file and walk through it, we'll mirror "
13268 "the usual process of developing a style file by starting with something very "
13269 "simple, and walking through a series of successively more complete examples."
13270 msgstr ""
13272 #. type: Content of: <book><chapter><sect1><sect2><title>
13273 #: ../en/ch11-template.xml:530
13274 msgid "Identifying mistakes in style files"
13275 msgstr "在样式文件中定位错误"
13277 #. type: Content of: <book><chapter><sect1><sect2><para>
13278 #: ../en/ch11-template.xml:532
13279 msgid ""
13280 "If Mercurial encounters a problem in a style file you are working on, it "
13281 "prints a terse error message that, once you figure out what it means, is "
13282 "actually quite useful."
13283 msgstr ""
13285 #. type: Content of: <book><chapter><sect1><sect2><para>
13286 #: ../en/ch11-template.xml:538
13287 msgid ""
13288 "Notice that <filename>broken.style</filename> attempts to define a "
13289 "<literal>changeset</literal> keyword, but forgets to give any content for it. "
13290 "When instructed to use this style file, Mercurial promptly complains."
13291 msgstr ""
13293 #. type: Content of: <book><chapter><sect1><sect2><para>
13294 #: ../en/ch11-template.xml:545
13295 msgid "This error message looks intimidating, but it is not too hard to follow."
13296 msgstr ""
13298 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13299 #: ../en/ch11-template.xml:549
13300 msgid ""
13301 "The first component is simply Mercurial's way of saying <quote>I am giving "
13302 "up</quote>."
13303 msgstr ""
13305 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13306 #: ../en/ch11-template.xml:554
13307 msgid "Next comes the name of the style file that contains the error."
13308 msgstr ""
13310 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13311 #: ../en/ch11-template.xml:560
13312 msgid ""
13313 "Following the file name is the line number where the error was encountered."
13314 msgstr ""
13316 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13317 #: ../en/ch11-template.xml:565
13318 msgid "Finally, a description of what went wrong."
13319 msgstr ""
13321 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13322 #: ../en/ch11-template.xml:570
13323 msgid ""
13324 "The description of the problem is not always clear (as in this case), but "
13325 "even when it is cryptic, it is almost always trivial to visually inspect the "
13326 "offending line in the style file and see what is wrong."
13327 msgstr ""
13329 #. type: Content of: <book><chapter><sect1><sect2><title>
13330 #: ../en/ch11-template.xml:578
13331 msgid "Uniquely identifying a repository"
13332 msgstr "版本库的唯一标识"
13334 #. type: Content of: <book><chapter><sect1><sect2><para>
13335 #: ../en/ch11-template.xml:580
13336 msgid ""
13337 "If you would like to be able to identify a Mercurial repository <quote>fairly "
13338 "uniquely</quote> using a short string as an identifier, you can use the first "
13339 "revision in the repository."
13340 msgstr ""
13342 #. type: Content of: <book><chapter><sect1><sect2><para>
13343 #: ../en/ch11-template.xml:587
13344 msgid ""
13345 "This is not guaranteed to be unique, but it is nevertheless useful in many "
13346 "cases."
13347 msgstr ""
13349 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13350 #: ../en/ch11-template.xml:590
13351 msgid ""
13352 "It will not work in a completely empty repository, because such a repository "
13353 "does not have a revision zero."
13354 msgstr ""
13356 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13357 #: ../en/ch11-template.xml:594
13358 msgid ""
13359 "Neither will it work in the (extremely rare) case where a repository is a "
13360 "merge of two or more formerly independent repositories, and you still have "
13361 "those repositories around."
13362 msgstr ""
13364 #. type: Content of: <book><chapter><sect1><sect2><para>
13365 #: ../en/ch11-template.xml:599
13366 msgid "Here are some uses to which you could put this identifier:"
13367 msgstr ""
13369 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13370 #: ../en/ch11-template.xml:602
13371 msgid ""
13372 "As a key into a table for a database that manages repositories on a server."
13373 msgstr ""
13375 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13376 #: ../en/ch11-template.xml:605
13377 msgid ""
13378 "As half of a {<emphasis>repository ID</emphasis>, <emphasis>revision ID</"
13379 "emphasis>} tuple. Save this information away when you run an automated build "
13380 "or other activity, so that you can <quote>replay</quote> the build later if "
13381 "necessary."
13382 msgstr ""
13384 #. type: Content of: <book><chapter><sect1><sect2><title>
13385 #: ../en/ch11-template.xml:614
13386 msgid "Mimicking Subversion's output"
13387 msgstr "模仿 Subversion 的输出"
13389 #
13390 #. type: Content of: <book><chapter><sect1><sect2><para>
13391 #: ../en/ch11-template.xml:616
13392 msgid ""
13393 "Let's try to emulate the default output format used by another revision "
13394 "control tool, Subversion."
13395 msgstr ""
13397 #
13398 #. type: Content of: <book><chapter><sect1><sect2><para>
13399 #: ../en/ch11-template.xml:621
13400 msgid ""
13401 "Since Subversion's output style is fairly simple, it is easy to copy-and-"
13402 "paste a hunk of its output into a file, and replace the text produced above "
13403 "by Subversion with the template values we'd like to see expanded."
13404 msgstr ""
13406 #. type: Content of: <book><chapter><sect1><sect2><para>
13407 #: ../en/ch11-template.xml:628
13408 msgid ""
13409 "There are a few small ways in which this template deviates from the output "
13410 "produced by Subversion."
13411 msgstr ""
13413 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13414 #: ../en/ch11-template.xml:631
13415 msgid ""
13416 "Subversion prints a <quote>readable</quote> date (the <quote><literal>Wed, 27 "
13417 "Sep 2006</literal></quote> in the example output above) in parentheses. "
13418 "Mercurial's templating engine does not provide a way to display a date in "
13419 "this format without also printing the time and time zone."
13420 msgstr ""
13422 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13423 #: ../en/ch11-template.xml:638
13424 msgid ""
13425 "We emulate Subversion's printing of <quote>separator</quote> lines full of "
13426 "<quote><literal>-</literal></quote> characters by ending the template with "
13427 "such a line. We use the templating engine's <literal role=\"template-keyword"
13428 "\">header</literal> keyword to print a separator line as the first line of "
13429 "output (see below), thus achieving similar output to Subversion."
13430 msgstr ""
13432 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13433 #: ../en/ch11-template.xml:647
13434 msgid ""
13435 "Subversion's output includes a count in the header of the number of lines in "
13436 "the commit message. We cannot replicate this in Mercurial; the templating "
13437 "engine does not currently provide a filter that counts the number of lines "
13438 "the template generates."
13439 msgstr ""
13441 #
13442 #. type: Content of: <book><chapter><sect1><sect2><para>
13443 #: ../en/ch11-template.xml:653
13444 msgid ""
13445 "It took me no more than a minute or two of work to replace literal text from "
13446 "an example of Subversion's output with some keywords and filters to give the "
13447 "template above. The style file simply refers to the template."
13448 msgstr ""
13450 #. type: Content of: <book><chapter><sect1><sect2><para>
13451 #: ../en/ch11-template.xml:660
13452 msgid ""
13453 "We could have included the text of the template file directly in the style "
13454 "file by enclosing it in quotes and replacing the newlines with "
13455 "<quote><literal>\\n</literal></quote> sequences, but it would have made the "
13456 "style file too difficult to read. Readability is a good guide when you're "
13457 "trying to decide whether some text belongs in a style file, or in a template "
13458 "file that the style file points to. If the style file will look too big or "
13459 "cluttered if you insert a literal piece of text, drop it into a template "
13460 "instead."
13461 msgstr ""
13463 #. type: Content of: <book><chapter><title>
13464 #: ../en/ch12-mq.xml:5
13465 msgid "Managing change with Mercurial Queues"
13466 msgstr "使用 MQ 管理修改"
13468 #. type: Content of: <book><chapter><sect1><title>
13469 #: ../en/ch12-mq.xml:8
13470 msgid "The patch management problem"
13471 msgstr "补丁的管理问题"
13473 #. type: Content of: <book><chapter><sect1><para>
13474 #: ../en/ch12-mq.xml:10
13475 msgid ""
13476 "Here is a common scenario: you need to install a software package from "
13477 "source, but you find a bug that you must fix in the source before you can "
13478 "start using the package. You make your changes, forget about the package for "
13479 "a while, and a few months later you need to upgrade to a newer version of the "
13480 "package. If the newer version of the package still has the bug, you must "
13481 "extract your fix from the older source tree and apply it against the newer "
13482 "version. This is a tedious task, and it's easy to make mistakes."
13483 msgstr ""
13485 #. type: Content of: <book><chapter><sect1><para>
13486 #: ../en/ch12-mq.xml:20
13487 msgid ""
13488 "This is a simple case of the <quote>patch management</quote> problem. You "
13489 "have an <quote>upstream</quote> source tree that you can't change; you need "
13490 "to make some local changes on top of the upstream tree; and you'd like to be "
13491 "able to keep those changes separate, so that you can apply them to newer "
13492 "versions of the upstream source."
13493 msgstr ""
13495 #. type: Content of: <book><chapter><sect1><para>
13496 #: ../en/ch12-mq.xml:27
13497 msgid ""
13498 "The patch management problem arises in many situations. Probably the most "
13499 "visible is that a user of an open source software project will contribute a "
13500 "bug fix or new feature to the project's maintainers in the form of a patch."
13501 msgstr ""
13503 #. type: Content of: <book><chapter><sect1><para>
13504 #: ../en/ch12-mq.xml:32
13505 msgid ""
13506 "Distributors of operating systems that include open source software often "
13507 "need to make changes to the packages they distribute so that they will build "
13508 "properly in their environments."
13509 msgstr ""
13511 #. type: Content of: <book><chapter><sect1><para>
13512 #: ../en/ch12-mq.xml:37
13513 msgid ""
13514 "When you have few changes to maintain, it is easy to manage a single patch "
13515 "using the standard <command>diff</command> and <command>patch</command> "
13516 "programs (see section <xref linkend=\"sec.mq.patch\"/> for a discussion of "
13517 "these tools). Once the number of changes grows, it starts to make sense to "
13518 "maintain patches as discrete <quote>chunks of work,</quote> so that for "
13519 "example a single patch will contain only one bug fix (the patch might modify "
13520 "several files, but it's doing <quote>only one thing</quote>), and you may "
13521 "have a number of such patches for different bugs you need fixed and local "
13522 "changes you require. In this situation, if you submit a bug fix patch to the "
13523 "upstream maintainers of a package and they include your fix in a subsequent "
13524 "release, you can simply drop that single patch when you're updating to the "
13525 "newer release."
13526 msgstr ""
13528 #. type: Content of: <book><chapter><sect1><para>
13529 #: ../en/ch12-mq.xml:52
13530 msgid ""
13531 "Maintaining a single patch against an upstream tree is a little tedious and "
13532 "error-prone, but not difficult. However, the complexity of the problem grows "
13533 "rapidly as the number of patches you have to maintain increases. With more "
13534 "than a tiny number of patches in hand, understanding which ones you have "
13535 "applied and maintaining them moves from messy to overwhelming."
13536 msgstr ""
13538 #. type: Content of: <book><chapter><sect1><para>
13539 #: ../en/ch12-mq.xml:59
13540 msgid ""
13541 "Fortunately, Mercurial includes a powerful extension, Mercurial Queues (or "
13542 "simply <quote>MQ</quote>), that massively simplifies the patch management "
13543 "problem."
13544 msgstr ""
13546 #. type: Content of: <book><chapter><sect1><title>
13547 #: ../en/ch12-mq.xml:65
13548 msgid "The prehistory of Mercurial Queues"
13549 msgstr "MQ 的历史"
13551 #. type: Content of: <book><chapter><sect1><para>
13552 #: ../en/ch12-mq.xml:67
13553 msgid ""
13554 "During the late 1990s, several Linux kernel developers started to maintain "
13555 "<quote>patch series</quote> that modified the behaviour of the Linux kernel. "
13556 "Some of these series were focused on stability, some on feature coverage, and "
13557 "others were more speculative."
13558 msgstr ""
13560 #. type: Content of: <book><chapter><sect1><para>
13561 #: ../en/ch12-mq.xml:73
13562 msgid ""
13563 "The sizes of these patch series grew rapidly. In 2002, Andrew Morton "
13564 "published some shell scripts he had been using to automate the task of "
13565 "managing his patch queues. Andrew was successfully using these scripts to "
13566 "manage hundreds (sometimes thousands) of patches on top of the Linux kernel."
13567 msgstr ""
13569 #. type: Content of: <book><chapter><sect1><sect2><title>
13570 #: ../en/ch12-mq.xml:80
13571 msgid "A patchwork quilt"
13572 msgstr ""
13574 #. type: Content of: <book><chapter><sect1><sect2><para>
13575 #: ../en/ch12-mq.xml:82
13576 msgid ""
13577 "In early 2003, Andreas Gruenbacher and Martin Quinson borrowed the approach "
13578 "of Andrew's scripts and published a tool called <quote>patchwork quilt</"
13579 "quote> <citation>web:quilt</citation>, or simply <quote>quilt</quote> (see "
13580 "<citation>gruenbacher:2005</citation> for a paper describing it). Because "
13581 "quilt substantially automated patch management, it rapidly gained a large "
13582 "following among open source software developers."
13583 msgstr ""
13585 #. type: Content of: <book><chapter><sect1><sect2><para>
13586 #: ../en/ch12-mq.xml:91
13587 msgid ""
13588 "Quilt manages a <emphasis>stack of patches</emphasis> on top of a directory "
13589 "tree. To begin, you tell quilt to manage a directory tree, and tell it which "
13590 "files you want to manage; it stores away the names and contents of those "
13591 "files. To fix a bug, you create a new patch (using a single command), edit "
13592 "the files you need to fix, then <quote>refresh</quote> the patch."
13593 msgstr ""
13595 #. type: Content of: <book><chapter><sect1><sect2><para>
13596 #: ../en/ch12-mq.xml:99
13597 msgid ""
13598 "The refresh step causes quilt to scan the directory tree; it updates the "
13599 "patch with all of the changes you have made. You can create another patch on "
13600 "top of the first, which will track the changes required to modify the tree "
13601 "from <quote>tree with one patch applied</quote> to <quote>tree with two "
13602 "patches applied</quote>."
13603 msgstr ""
13605 #. type: Content of: <book><chapter><sect1><sect2><para>
13606 #: ../en/ch12-mq.xml:106
13607 msgid ""
13608 "You can <emphasis>change</emphasis> which patches are applied to the tree. "
13609 "If you <quote>pop</quote> a patch, the changes made by that patch will vanish "
13610 "from the directory tree. Quilt remembers which patches you have popped, "
13611 "though, so you can <quote>push</quote> a popped patch again, and the "
13612 "directory tree will be restored to contain the modifications in the patch. "
13613 "Most importantly, you can run the <quote>refresh</quote> command at any time, "
13614 "and the topmost applied patch will be updated. This means that you can, at "
13615 "any time, change both which patches are applied and what modifications those "
13616 "patches make."
13617 msgstr ""
13619 #. type: Content of: <book><chapter><sect1><sect2><para>
13620 #: ../en/ch12-mq.xml:118
13621 msgid ""
13622 "Quilt knows nothing about revision control tools, so it works equally well on "
13623 "top of an unpacked tarball or a Subversion working copy."
13624 msgstr ""
13626 #. type: Content of: <book><chapter><sect1><sect2><title>
13627 #: ../en/ch12-mq.xml:124
13628 msgid "From patchwork quilt to Mercurial Queues"
13629 msgstr "从 patchwork quilt 到 MQ"
13631 #. type: Content of: <book><chapter><sect1><sect2><para>
13632 #: ../en/ch12-mq.xml:126
13633 msgid ""
13634 "In mid-2005, Chris Mason took the features of quilt and wrote an extension "
13635 "that he called Mercurial Queues, which added quilt-like behaviour to "
13636 "Mercurial."
13637 msgstr ""
13639 #. type: Content of: <book><chapter><sect1><sect2><para>
13640 #: ../en/ch12-mq.xml:130
13641 msgid ""
13642 "The key difference between quilt and MQ is that quilt knows nothing about "
13643 "revision control systems, while MQ is <emphasis>integrated</emphasis> into "
13644 "Mercurial. Each patch that you push is represented as a Mercurial "
13645 "changeset. Pop a patch, and the changeset goes away."
13646 msgstr ""
13648 #. type: Content of: <book><chapter><sect1><sect2><para>
13649 #: ../en/ch12-mq.xml:136
13650 msgid ""
13651 "Because quilt does not care about revision control tools, it is still a "
13652 "tremendously useful piece of software to know about for situations where you "
13653 "cannot use Mercurial and MQ."
13654 msgstr ""
13656 #. type: Content of: <book><chapter><sect1><title>
13657 #: ../en/ch12-mq.xml:144
13658 msgid "The huge advantage of MQ"
13659 msgstr "MQ 的巨大优势"
13661 #. type: Content of: <book><chapter><sect1><para>
13662 #: ../en/ch12-mq.xml:146
13663 msgid ""
13664 "I cannot overstate the value that MQ offers through the unification of "
13665 "patches and revision control."
13666 msgstr ""
13668 #. type: Content of: <book><chapter><sect1><para>
13669 #: ../en/ch12-mq.xml:149
13670 msgid ""
13671 "A major reason that patches have persisted in the free software and open "
13672 "source world&emdash;in spite of the availability of increasingly capable "
13673 "revision control tools over the years&emdash;is the <emphasis>agility</"
13674 "emphasis> they offer."
13675 msgstr ""
13677 #. type: Content of: <book><chapter><sect1><para>
13678 #: ../en/ch12-mq.xml:155
13679 msgid ""
13680 "Traditional revision control tools make a permanent, irreversible record of "
13681 "everything that you do. While this has great value, it's also somewhat "
13682 "stifling. If you want to perform a wild-eyed experiment, you have to be "
13683 "careful in how you go about it, or you risk leaving unneeded&emdash;or worse, "
13684 "misleading or destabilising&emdash;traces of your missteps and errors in the "
13685 "permanent revision record."
13686 msgstr ""
13688 #. type: Content of: <book><chapter><sect1><para>
13689 #: ../en/ch12-mq.xml:163
13690 msgid ""
13691 "By contrast, MQ's marriage of distributed revision control with patches makes "
13692 "it much easier to isolate your work. Your patches live on top of normal "
13693 "revision history, and you can make them disappear or reappear at will. If "
13694 "you don't like a patch, you can drop it. If a patch isn't quite as you want "
13695 "it to be, simply fix it&emdash;as many times as you need to, until you have "
13696 "refined it into the form you desire."
13697 msgstr ""
13699 #. type: Content of: <book><chapter><sect1><para>
13700 #: ../en/ch12-mq.xml:171
13701 msgid ""
13702 "As an example, the integration of patches with revision control makes "
13703 "understanding patches and debugging their effects&emdash;and their interplay "
13704 "with the code they're based on&emdash;<emphasis>enormously</emphasis> easier. "
13705 "Since every applied patch has an associated changeset, you can give <command "
13706 "role=\"hg-cmd\">hg log</command> a file name to see which changesets and "
13707 "patches affected the file. You can use the <command role=\"hg-cmd\">hg "
13708 "bisect</command> command to binary-search through all changesets and applied "
13709 "patches to see where a bug got introduced or fixed. You can use the <command "
13710 "role=\"hg-cmd\">hg annotate</command> command to see which changeset or patch "
13711 "modified a particular line of a source file. And so on."
13712 msgstr ""
13714 #. type: Content of: <book><chapter><sect1><title>
13715 #: ../en/ch12-mq.xml:187
13716 msgid "Understanding patches"
13717 msgstr "理解补丁"
13719 #. type: Content of: <book><chapter><sect1><para>
13720 #: ../en/ch12-mq.xml:189
13721 msgid ""
13722 "Because MQ doesn't hide its patch-oriented nature, it is helpful to "
13723 "understand what patches are, and a little about the tools that work with them."
13724 msgstr ""
13726 #. type: Content of: <book><chapter><sect1><para>
13727 #: ../en/ch12-mq.xml:193
13728 msgid ""
13729 "The traditional Unix <command>diff</command> command compares two files, and "
13730 "prints a list of differences between them. The <command>patch</command> "
13731 "command understands these differences as <emphasis>modifications</emphasis> "
13732 "to make to a file. Take a look below for a simple example of these commands "
13733 "in action."
13734 msgstr ""
13736 #. type: Content of: <book><chapter><sect1><para>
13737 #: ../en/ch12-mq.xml:202
13738 msgid ""
13739 "The type of file that <command>diff</command> generates (and <command>patch</"
13740 "command> takes as input) is called a <quote>patch</quote> or a <quote>diff</"
13741 "quote>; there is no difference between a patch and a diff. (We'll use the "
13742 "term <quote>patch</quote>, since it's more commonly used.)"
13743 msgstr ""
13745 #. type: Content of: <book><chapter><sect1><para>
13746 #: ../en/ch12-mq.xml:208
13747 msgid ""
13748 "A patch file can start with arbitrary text; the <command>patch</command> "
13749 "command ignores this text, but MQ uses it as the commit message when creating "
13750 "changesets. To find the beginning of the patch content, <command>patch</"
13751 "command> searches for the first line that starts with the string "
13752 "<quote><literal>diff -</literal></quote>."
13753 msgstr ""
13755 #. type: Content of: <book><chapter><sect1><para>
13756 #: ../en/ch12-mq.xml:215
13757 msgid ""
13758 "MQ works with <emphasis>unified</emphasis> diffs (<command>patch</command> "
13759 "can accept several other diff formats, but MQ doesn't). A unified diff "
13760 "contains two kinds of header. The <emphasis>file header</emphasis> describes "
13761 "the file being modified; it contains the name of the file to modify. When "
13762 "<command>patch</command> sees a new file header, it looks for a file with "
13763 "that name to start modifying."
13764 msgstr ""
13766 #. type: Content of: <book><chapter><sect1><para>
13767 #: ../en/ch12-mq.xml:223
13768 msgid ""
13769 "After the file header comes a series of <emphasis>hunks</emphasis>. Each "
13770 "hunk starts with a header; this identifies the range of line numbers within "
13771 "the file that the hunk should modify. Following the header, a hunk starts "
13772 "and ends with a few (usually three) lines of text from the unmodified file; "
13773 "these are called the <emphasis>context</emphasis> for the hunk. If there's "
13774 "only a small amount of context between successive hunks, <command>diff</"
13775 "command> doesn't print a new hunk header; it just runs the hunks together, "
13776 "with a few lines of context between modifications."
13777 msgstr ""
13779 #. type: Content of: <book><chapter><sect1><para>
13780 #: ../en/ch12-mq.xml:235
13781 msgid ""
13782 "Each line of context begins with a space character. Within the hunk, a line "
13783 "that begins with <quote><literal>-</literal></quote> means <quote>remove this "
13784 "line,</quote> while a line that begins with <quote><literal>+</literal></"
13785 "quote> means <quote>insert this line.</quote> For example, a line that is "
13786 "modified is represented by one deletion and one insertion."
13787 msgstr ""
13789 #. type: Content of: <book><chapter><sect1><para>
13790 #: ../en/ch12-mq.xml:243
13791 msgid ""
13792 "We will return to some of the more subtle aspects of patches later (in "
13793 "section <xref linkend=\"sec.mq.adv-patch\"/>), but you should have enough "
13794 "information now to use MQ."
13795 msgstr ""
13797 #. type: Content of: <book><chapter><sect1><title>
13798 #: ../en/ch12-mq.xml:250
13799 msgid "Getting started with Mercurial Queues"
13800 msgstr "开始使用 MQ"
13802 #. type: Content of: <book><chapter><sect1><para>
13803 #: ../en/ch12-mq.xml:252
13804 msgid ""
13805 "Because MQ is implemented as an extension, you must explicitly enable before "
13806 "you can use it. (You don't need to download anything; MQ ships with the "
13807 "standard Mercurial distribution.) To enable MQ, edit your <filename role="
13808 "\"home\">~/.hgrc</filename> file, and add the lines below."
13809 msgstr ""
13811 #. type: Content of: <book><chapter><sect1><para>
13812 #: ../en/ch12-mq.xml:261
13813 msgid ""
13814 "Once the extension is enabled, it will make a number of new commands "
13815 "available. To verify that the extension is working, you can use <command "
13816 "role=\"hg-cmd\">hg help</command> to see if the <command role=\"hg-ext-mq"
13817 "\">qinit</command> command is now available."
13818 msgstr ""
13820 #. type: Content of: <book><chapter><sect1><para>
13821 #: ../en/ch12-mq.xml:269
13822 msgid ""
13823 "You can use MQ with <emphasis>any</emphasis> Mercurial repository, and its "
13824 "commands only operate within that repository. To get started, simply prepare "
13825 "the repository using the <command role=\"hg-ext-mq\">qinit</command> command."
13826 msgstr ""
13828 #. type: Content of: <book><chapter><sect1><para>
13829 #: ../en/ch12-mq.xml:276
13830 msgid ""
13831 "This command creates an empty directory called <filename role=\"special\" "
13832 "class=\"directory\">.hg/patches</filename>, where MQ will keep its metadata. "
13833 "As with many Mercurial commands, the <command role=\"hg-ext-mq\">qinit</"
13834 "command> command prints nothing if it succeeds."
13835 msgstr ""
13837 #. type: Content of: <book><chapter><sect1><sect2><title>
13838 #: ../en/ch12-mq.xml:283
13839 msgid "Creating a new patch"
13840 msgstr "创建新补丁"
13842 #. type: Content of: <book><chapter><sect1><sect2><para>
13843 #: ../en/ch12-mq.xml:285
13844 msgid ""
13845 "To begin work on a new patch, use the <command role=\"hg-ext-mq\">qnew</"
13846 "command> command. This command takes one argument, the name of the patch to "
13847 "create."
13848 msgstr ""
13850 #. type: Content of: <book><chapter><sect1><sect2><para>
13851 #: ../en/ch12-mq.xml:289
13852 msgid ""
13853 "MQ will use this as the name of an actual file in the <filename role=\"special"
13854 "\" class=\"directory\">.hg/patches</filename> directory, as you can see below."
13855 msgstr ""
13857 #. type: Content of: <book><chapter><sect1><sect2><para>
13858 #: ../en/ch12-mq.xml:296
13859 msgid ""
13860 "Also newly present in the <filename role=\"special\" class=\"directory\">.hg/"
13861 "patches</filename> directory are two other files, <filename role=\"special"
13862 "\">series</filename> and <filename role=\"special\">status</filename>. The "
13863 "<filename role=\"special\">series</filename> file lists all of the patches "
13864 "that MQ knows about for this repository, with one patch per line. Mercurial "
13865 "uses the <filename role=\"special\">status</filename> file for internal book-"
13866 "keeping; it tracks all of the patches that MQ has <emphasis>applied</"
13867 "emphasis> in this repository."
13868 msgstr ""
13870 #. type: Content of: <book><chapter><sect1><sect2><note><para>
13871 #: ../en/ch12-mq.xml:308
13872 msgid ""
13873 "You may sometimes want to edit the <filename role=\"special\">series</"
13874 "filename> file by hand; for example, to change the sequence in which some "
13875 "patches are applied. However, manually editing the <filename role=\"special"
13876 "\">status</filename> file is almost always a bad idea, as it's easy to "
13877 "corrupt MQ's idea of what is happening."
13878 msgstr ""
13880 #. type: Content of: <book><chapter><sect1><sect2><para>
13881 #: ../en/ch12-mq.xml:317
13882 msgid ""
13883 "Once you have created your new patch, you can edit files in the working "
13884 "directory as you usually would. All of the normal Mercurial commands, such "
13885 "as <command role=\"hg-cmd\">hg diff</command> and <command role=\"hg-cmd\">hg "
13886 "annotate</command>, work exactly as they did before."
13887 msgstr ""
13889 #. type: Content of: <book><chapter><sect1><sect2><title>
13890 #: ../en/ch12-mq.xml:325
13891 msgid "Refreshing a patch"
13892 msgstr "刷新补丁"
13894 #. type: Content of: <book><chapter><sect1><sect2><para>
13895 #: ../en/ch12-mq.xml:327
13896 msgid ""
13897 "When you reach a point where you want to save your work, use the <command "
13898 "role=\"hg-ext-mq\">qrefresh</command> command to update the patch you are "
13899 "working on."
13900 msgstr ""
13902 #. type: Content of: <book><chapter><sect1><sect2><para>
13903 #: ../en/ch12-mq.xml:333
13904 msgid ""
13905 "This command folds the changes you have made in the working directory into "
13906 "your patch, and updates its corresponding changeset to contain those changes."
13907 msgstr ""
13909 #. type: Content of: <book><chapter><sect1><sect2><para>
13910 #: ../en/ch12-mq.xml:337
13911 msgid ""
13912 "You can run <command role=\"hg-ext-mq\">qrefresh</command> as often as you "
13913 "like, so it's a good way to <quote>checkpoint</quote> your work. Refresh "
13914 "your patch at an opportune time; try an experiment; and if the experiment "
13915 "doesn't work out, <command role=\"hg-cmd\">hg revert</command> your "
13916 "modifications back to the last time you refreshed."
13917 msgstr ""
13919 #. type: Content of: <book><chapter><sect1><sect2><title>
13920 #: ../en/ch12-mq.xml:348
13921 msgid "Stacking and tracking patches"
13922 msgstr "堆叠和跟踪补丁"
13924 #. type: Content of: <book><chapter><sect1><sect2><para>
13925 #: ../en/ch12-mq.xml:350
13926 msgid ""
13927 "Once you have finished working on a patch, or need to work on another, you "
13928 "can use the <command role=\"hg-ext-mq\">qnew</command> command again to "
13929 "create a new patch. Mercurial will apply this patch on top of your existing "
13930 "patch."
13931 msgstr ""
13933 #. type: Content of: <book><chapter><sect1><sect2><para>
13934 #: ../en/ch12-mq.xml:357
13935 msgid ""
13936 "Notice that the patch contains the changes in our prior patch as part of its "
13937 "context (you can see this more clearly in the output of <command role=\"hg-cmd"
13938 "\">hg annotate</command>)."
13939 msgstr ""
13941 #. type: Content of: <book><chapter><sect1><sect2><para>
13942 #: ../en/ch12-mq.xml:362
13943 msgid ""
13944 "So far, with the exception of <command role=\"hg-ext-mq\">qnew</command> and "
13945 "<command role=\"hg-ext-mq\">qrefresh</command>, we've been careful to only "
13946 "use regular Mercurial commands. However, MQ provides many commands that are "
13947 "easier to use when you are thinking about patches, as illustrated below."
13948 msgstr ""
13950 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13951 #: ../en/ch12-mq.xml:372
13952 msgid ""
13953 "The <command role=\"hg-ext-mq\">qseries</command> command lists every patch "
13954 "that MQ knows about in this repository, from oldest to newest (most recently "
13955 "<emphasis>created</emphasis>)."
13956 msgstr ""
13958 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
13959 #: ../en/ch12-mq.xml:378
13960 msgid ""
13961 "The <command role=\"hg-ext-mq\">qapplied</command> command lists every patch "
13962 "that MQ has <emphasis>applied</emphasis> in this repository, again from "
13963 "oldest to newest (most recently applied)."
13964 msgstr ""
13966 #. type: Content of: <book><chapter><sect1><sect2><title>
13967 #: ../en/ch12-mq.xml:387
13968 msgid "Manipulating the patch stack"
13969 msgstr "操作补丁堆栈"
13971 #. type: Content of: <book><chapter><sect1><sect2><para>
13972 #: ../en/ch12-mq.xml:389
13973 msgid ""
13974 "The previous discussion implied that there must be a difference between "
13975 "<quote>known</quote> and <quote>applied</quote> patches, and there is. MQ "
13976 "can manage a patch without it being applied in the repository."
13977 msgstr ""
13979 #. type: Content of: <book><chapter><sect1><sect2><para>
13980 #: ../en/ch12-mq.xml:394
13981 msgid ""
13982 "An <emphasis>applied</emphasis> patch has a corresponding changeset in the "
13983 "repository, and the effects of the patch and changeset are visible in the "
13984 "working directory. You can undo the application of a patch using the "
13985 "<command role=\"hg-ext-mq\">qpop</command> command. MQ still <emphasis>knows "
13986 "about</emphasis>, or manages, a popped patch, but the patch no longer has a "
13987 "corresponding changeset in the repository, and the working directory does not "
13988 "contain the changes made by the patch. Figure <xref endterm=\"fig.mq.stack."
13989 "caption\" linkend=\"fig.mq.stack\"/> illustrates the difference between "
13990 "applied and tracked patches."
13991 msgstr ""
13993 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
13994 #: ../en/ch12-mq.xml:408
13995 msgid "<imageobject><imagedata fileref=\"images/mq-stack.png\"/></imageobject>"
13996 msgstr ""
13998 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
13999 #: ../en/ch12-mq.xml:410
14000 msgid "Applied and unapplied patches in the MQ patch stack"
14001 msgstr ""
14003 #. type: Content of: <book><chapter><sect1><sect2><para>
14004 #: ../en/ch12-mq.xml:415
14005 msgid ""
14006 "You can reapply an unapplied, or popped, patch using the <command role=\"hg-"
14007 "ext-mq\">qpush</command> command. This creates a new changeset to correspond "
14008 "to the patch, and the patch's changes once again become present in the "
14009 "working directory. See below for examples of <command role=\"hg-ext-mq"
14010 "\">qpop</command> and <command role=\"hg-ext-mq\">qpush</command> in action."
14011 msgstr ""
14013 #. type: Content of: <book><chapter><sect1><sect2><para>
14014 #: ../en/ch12-mq.xml:424
14015 msgid ""
14016 "Notice that once we have popped a patch or two patches, the output of "
14017 "<command role=\"hg-ext-mq\">qseries</command> remains the same, while that of "
14018 "<command role=\"hg-ext-mq\">qapplied</command> has changed."
14019 msgstr ""
14021 #. type: Content of: <book><chapter><sect1><sect2><title>
14022 #: ../en/ch12-mq.xml:432
14023 msgid "Pushing and popping many patches"
14024 msgstr "压入或弹出多个补丁"
14026 #. type: Content of: <book><chapter><sect1><sect2><para>
14027 #: ../en/ch12-mq.xml:434
14028 msgid ""
14029 "While <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-"
14030 "mq\">qpop</command> each operate on a single patch at a time by default, you "
14031 "can push and pop many patches in one go. The <option role=\"hg-ext-mq-cmd-"
14032 "qpush-opt\">hg -a</option> option to <command role=\"hg-ext-mq\">qpush</"
14033 "command> causes it to push all unapplied patches, while the <option role=\"hg-"
14034 "ext-mq-cmd-qpop-opt\">-a</option> option to <command role=\"hg-ext-mq\">qpop</"
14035 "command> causes it to pop all applied patches. (For some more ways to push "
14036 "and pop many patches, see section <xref linkend=\"sec.mq.perf\"/> below.)"
14037 msgstr ""
14039 #. type: Content of: <book><chapter><sect1><sect2><title>
14040 #: ../en/ch12-mq.xml:451
14041 msgid "Safety checks, and overriding them"
14042 msgstr "安全的检查，然后覆盖它们"
14044 #. type: Content of: <book><chapter><sect1><sect2><para>
14045 #: ../en/ch12-mq.xml:453
14046 msgid ""
14047 "Several MQ commands check the working directory before they do anything, and "
14048 "fail if they find any modifications. They do this to ensure that you won't "
14049 "lose any changes that you have made, but not yet incorporated into a patch. "
14050 "The example below illustrates this; the <command role=\"hg-ext-mq\">qnew</"
14051 "command> command will not create a new patch if there are outstanding "
14052 "changes, caused in this case by the <command role=\"hg-cmd\">hg add</command> "
14053 "of <filename>file3</filename>."
14054 msgstr ""
14056 #. type: Content of: <book><chapter><sect1><sect2><para>
14057 #: ../en/ch12-mq.xml:465
14058 msgid ""
14059 "Commands that check the working directory all take an <quote>I know what I'm "
14060 "doing</quote> option, which is always named <option>-f</option>. The exact "
14061 "meaning of <option>-f</option> depends on the command. For example, <command "
14062 "role=\"hg-cmd\">hg qnew <option role=\"hg-ext-mq-cmd-qnew-opt\">hg -f</"
14063 "option></command> will incorporate any outstanding changes into the new patch "
14064 "it creates, but <command role=\"hg-cmd\">hg qpop <option role=\"hg-ext-mq-cmd-"
14065 "qpop-opt\">hg -f</option></command> will revert modifications to any files "
14066 "affected by the patch that it is popping. Be sure to read the documentation "
14067 "for a command's <option>-f</option> option before you use it!"
14068 msgstr ""
14070 #. type: Content of: <book><chapter><sect1><sect2><title>
14071 #: ../en/ch12-mq.xml:480
14072 msgid "Working on several patches at once"
14073 msgstr "同时处理多个补丁"
14075 #. type: Content of: <book><chapter><sect1><sect2><para>
14076 #: ../en/ch12-mq.xml:482
14077 msgid ""
14078 "The <command role=\"hg-ext-mq\">qrefresh</command> command always refreshes "
14079 "the <emphasis>topmost</emphasis> applied patch. This means that you can "
14080 "suspend work on one patch (by refreshing it), pop or push to make a different "
14081 "patch the top, and work on <emphasis>that</emphasis> patch for a while."
14082 msgstr ""
14084 #. type: Content of: <book><chapter><sect1><sect2><para>
14085 #: ../en/ch12-mq.xml:489
14086 msgid ""
14087 "Here's an example that illustrates how you can use this ability. Let's say "
14088 "you're developing a new feature as two patches. The first is a change to the "
14089 "core of your software, and the second&emdash;layered on top of the "
14090 "first&emdash;changes the user interface to use the code you just added to the "
14091 "core. If you notice a bug in the core while you're working on the UI patch, "
14092 "it's easy to fix the core. Simply <command role=\"hg-ext-mq\">qrefresh</"
14093 "command> the UI patch to save your in-progress changes, and <command role="
14094 "\"hg-ext-mq\">qpop</command> down to the core patch. Fix the core bug, "
14095 "<command role=\"hg-ext-mq\">qrefresh</command> the core patch, and <command "
14096 "role=\"hg-ext-mq\">qpush</command> back to the UI patch to continue where you "
14097 "left off."
14098 msgstr ""
14100 #. type: Content of: <book><chapter><sect1><title>
14101 #: ../en/ch12-mq.xml:506
14102 msgid "More about patches"
14103 msgstr "关于补丁的更多信息"
14105 #. type: Content of: <book><chapter><sect1><para>
14106 #: ../en/ch12-mq.xml:508
14107 msgid ""
14108 "MQ uses the GNU <command>patch</command> command to apply patches, so it's "
14109 "helpful to know a few more detailed aspects of how <command>patch</command> "
14110 "works, and about patches themselves."
14111 msgstr ""
14113 #. type: Content of: <book><chapter><sect1><sect2><title>
14114 #: ../en/ch12-mq.xml:514
14115 msgid "The strip count"
14116 msgstr "修剪计数"
14118 #. type: Content of: <book><chapter><sect1><sect2><para>
14119 #: ../en/ch12-mq.xml:516
14120 msgid ""
14121 "If you look at the file headers in a patch, you will notice that the "
14122 "pathnames usually have an extra component on the front that isn't present in "
14123 "the actual path name. This is a holdover from the way that people used to "
14124 "generate patches (people still do this, but it's somewhat rare with modern "
14125 "revision control tools)."
14126 msgstr ""
14128 #. type: Content of: <book><chapter><sect1><sect2><para>
14129 #: ../en/ch12-mq.xml:523
14130 msgid ""
14131 "Alice would unpack a tarball, edit her files, then decide that she wanted to "
14132 "create a patch. So she'd rename her working directory, unpack the tarball "
14133 "again (hence the need for the rename), and use the <option role=\"cmd-opt-diff"
14134 "\">-r</option> and <option role=\"cmd-opt-diff\">-N</option> options to "
14135 "<command>diff</command> to recursively generate a patch between the "
14136 "unmodified directory and the modified one. The result would be that the name "
14137 "of the unmodified directory would be at the front of the left-hand path in "
14138 "every file header, and the name of the modified directory would be at the "
14139 "front of the right-hand path."
14140 msgstr ""
14142 #. type: Content of: <book><chapter><sect1><sect2><para>
14143 #: ../en/ch12-mq.xml:536
14144 msgid ""
14145 "Since someone receiving a patch from the Alices of the net would be unlikely "
14146 "to have unmodified and modified directories with exactly the same names, the "
14147 "<command>patch</command> command has a <option role=\"cmd-opt-patch\">-p</"
14148 "option> option that indicates the number of leading path name components to "
14149 "strip when trying to apply a patch. This number is called the "
14150 "<emphasis>strip count</emphasis>."
14151 msgstr ""
14153 #. type: Content of: <book><chapter><sect1><sect2><para>
14154 #: ../en/ch12-mq.xml:544
14155 msgid ""
14156 "An option of <quote><literal>-p1</literal></quote> means <quote>use a strip "
14157 "count of one</quote>. If <command>patch</command> sees a file name "
14158 "<filename>foo/bar/baz</filename> in a file header, it will strip "
14159 "<filename>foo</filename> and try to patch a file named <filename>bar/baz</"
14160 "filename>. (Strictly speaking, the strip count refers to the number of "
14161 "<emphasis>path separators</emphasis> (and the components that go with them ) "
14162 "to strip. A strip count of one will turn <filename>foo/bar</filename> into "
14163 "<filename>bar</filename>, but <filename>/foo/bar</filename> (notice the extra "
14164 "leading slash) into <filename>foo/bar</filename>.)"
14165 msgstr ""
14167 #. type: Content of: <book><chapter><sect1><sect2><para>
14168 #: ../en/ch12-mq.xml:557
14169 msgid ""
14170 "The <quote>standard</quote> strip count for patches is one; almost all "
14171 "patches contain one leading path name component that needs to be stripped. "
14172 "Mercurial's <command role=\"hg-cmd\">hg diff</command> command generates path "
14173 "names in this form, and the <command role=\"hg-cmd\">hg import</command> "
14174 "command and MQ expect patches to have a strip count of one."
14175 msgstr ""
14177 #. type: Content of: <book><chapter><sect1><sect2><para>
14178 #: ../en/ch12-mq.xml:565
14179 msgid ""
14180 "If you receive a patch from someone that you want to add to your patch queue, "
14181 "and the patch needs a strip count other than one, you cannot just <command "
14182 "role=\"hg-ext-mq\">qimport</command> the patch, because <command role=\"hg-"
14183 "ext-mq\">qimport</command> does not yet have a <literal>-p</literal> option "
14184 "(see <ulink role=\"hg-bug\" url=\"http://www.selenic.com/mercurial/bts/"
14185 "issue311\">issue 311</ulink>). Your best bet is to <command role=\"hg-ext-mq"
14186 "\">qnew</command> a patch of your own, then use <command>patch -pN</command> "
14187 "to apply their patch, followed by <command role=\"hg-cmd\">hg addremove</"
14188 "command> to pick up any files added or removed by the patch, followed by "
14189 "<command role=\"hg-ext-mq\">hg qrefresh</command>. This complexity may become "
14190 "unnecessary; see <ulink role=\"hg-bug\" url=\"http://www.selenic.com/"
14191 "mercurial/bts/issue311\">issue 311</ulink> for details."
14192 msgstr ""
14194 #. type: Content of: <book><chapter><sect1><sect2><title>
14195 #: ../en/ch12-mq.xml:584
14196 msgid "Strategies for applying a patch"
14197 msgstr "应用补丁的策略"
14199 #. type: Content of: <book><chapter><sect1><sect2><para>
14200 #: ../en/ch12-mq.xml:586
14201 msgid ""
14202 "When <command>patch</command> applies a hunk, it tries a handful of "
14203 "successively less accurate strategies to try to make the hunk apply. This "
14204 "falling-back technique often makes it possible to take a patch that was "
14205 "generated against an old version of a file, and apply it against a newer "
14206 "version of that file."
14207 msgstr ""
14209 #. type: Content of: <book><chapter><sect1><sect2><para>
14210 #: ../en/ch12-mq.xml:593
14211 msgid ""
14212 "First, <command>patch</command> tries an exact match, where the line numbers, "
14213 "the context, and the text to be modified must apply exactly. If it cannot "
14214 "make an exact match, it tries to find an exact match for the context, without "
14215 "honouring the line numbering information. If this succeeds, it prints a line "
14216 "of output saying that the hunk was applied, but at some <emphasis>offset</"
14217 "emphasis> from the original line number."
14218 msgstr ""
14220 #. type: Content of: <book><chapter><sect1><sect2><para>
14221 #: ../en/ch12-mq.xml:602
14222 msgid ""
14223 "If a context-only match fails, <command>patch</command> removes the first and "
14224 "last lines of the context, and tries a <emphasis>reduced</emphasis> context-"
14225 "only match. If the hunk with reduced context succeeds, it prints a message "
14226 "saying that it applied the hunk with a <emphasis>fuzz factor</emphasis> (the "
14227 "number after the fuzz factor indicates how many lines of context "
14228 "<command>patch</command> had to trim before the patch applied)."
14229 msgstr ""
14231 #. type: Content of: <book><chapter><sect1><sect2><para>
14232 #: ../en/ch12-mq.xml:611
14233 msgid ""
14234 "When neither of these techniques works, <command>patch</command> prints a "
14235 "message saying that the hunk in question was rejected. It saves rejected "
14236 "hunks (also simply called <quote>rejects</quote>) to a file with the same "
14237 "name, and an added <filename role=\"special\">.rej</filename> extension. It "
14238 "also saves an unmodified copy of the file with a <filename role=\"special\">."
14239 "orig</filename> extension; the copy of the file without any extensions will "
14240 "contain any changes made by hunks that <emphasis>did</emphasis> apply "
14241 "cleanly. If you have a patch that modifies <filename>foo</filename> with six "
14242 "hunks, and one of them fails to apply, you will have: an unmodified "
14243 "<filename>foo.orig</filename>, a <filename>foo.rej</filename> containing one "
14244 "hunk, and <filename>foo</filename>, containing the changes made by the five "
14245 "successful hunks."
14246 msgstr ""
14248 #. type: Content of: <book><chapter><sect1><sect2><title>
14249 #: ../en/ch12-mq.xml:629
14250 msgid "Some quirks of patch representation"
14251 msgstr "补丁的一些特性"
14253 #. type: Content of: <book><chapter><sect1><sect2><para>
14254 #: ../en/ch12-mq.xml:631
14255 msgid ""
14256 "There are a few useful things to know about how <command>patch</command> "
14257 "works with files."
14258 msgstr ""
14260 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14261 #: ../en/ch12-mq.xml:634
14262 msgid ""
14263 "This should already be obvious, but <command>patch</command> cannot handle "
14264 "binary files."
14265 msgstr ""
14267 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14268 #: ../en/ch12-mq.xml:638
14269 msgid ""
14270 "Neither does it care about the executable bit; it creates new files as "
14271 "readable, but not executable."
14272 msgstr ""
14274 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14275 #: ../en/ch12-mq.xml:642
14276 msgid ""
14277 "<command>patch</command> treats the removal of a file as a diff between the "
14278 "file to be removed and the empty file. So your idea of <quote>I deleted this "
14279 "file</quote> looks like <quote>every line of this file was deleted</quote> in "
14280 "a patch."
14281 msgstr ""
14283 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14284 #: ../en/ch12-mq.xml:648
14285 msgid ""
14286 "It treats the addition of a file as a diff between the empty file and the "
14287 "file to be added. So in a patch, your idea of <quote>I added this file</"
14288 "quote> looks like <quote>every line of this file was added</quote>."
14289 msgstr ""
14291 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14292 #: ../en/ch12-mq.xml:654
14293 msgid ""
14294 "It treats a renamed file as the removal of the old name, and the addition of "
14295 "the new name. This means that renamed files have a big footprint in "
14296 "patches. (Note also that Mercurial does not currently try to infer when "
14297 "files have been renamed or copied in a patch.)"
14298 msgstr ""
14300 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14301 #: ../en/ch12-mq.xml:660
14302 msgid ""
14303 "<command>patch</command> cannot represent empty files, so you cannot use a "
14304 "patch to represent the notion <quote>I added this empty file to the tree</"
14305 "quote>."
14306 msgstr ""
14308 #. type: Content of: <book><chapter><sect1><sect2><title>
14309 #: ../en/ch12-mq.xml:667
14310 msgid "Beware the fuzz"
14311 msgstr "当心毛刺"
14313 #. type: Content of: <book><chapter><sect1><sect2><para>
14314 #: ../en/ch12-mq.xml:669
14315 msgid ""
14316 "While applying a hunk at an offset, or with a fuzz factor, will often be "
14317 "completely successful, these inexact techniques naturally leave open the "
14318 "possibility of corrupting the patched file. The most common cases typically "
14319 "involve applying a patch twice, or at an incorrect location in the file. If "
14320 "<command>patch</command> or <command role=\"hg-ext-mq\">qpush</command> ever "
14321 "mentions an offset or fuzz factor, you should make sure that the modified "
14322 "files are correct afterwards."
14323 msgstr ""
14325 #. type: Content of: <book><chapter><sect1><sect2><para>
14326 #: ../en/ch12-mq.xml:679
14327 msgid ""
14328 "It's often a good idea to refresh a patch that has applied with an offset or "
14329 "fuzz factor; refreshing the patch generates new context information that will "
14330 "make it apply cleanly. I say <quote>often,</quote> not <quote>always,</"
14331 "quote> because sometimes refreshing a patch will make it fail to apply "
14332 "against a different revision of the underlying files. In some cases, such as "
14333 "when you're maintaining a patch that must sit on top of multiple versions of "
14334 "a source tree, it's acceptable to have a patch apply with some fuzz, provided "
14335 "you've verified the results of the patching process in such cases."
14336 msgstr ""
14338 #. type: Content of: <book><chapter><sect1><sect2><title>
14339 #: ../en/ch12-mq.xml:692
14340 msgid "Handling rejection"
14341 msgstr "处理拒绝"
14343 #. type: Content of: <book><chapter><sect1><sect2><para>
14344 #: ../en/ch12-mq.xml:694
14345 msgid ""
14346 "If <command role=\"hg-ext-mq\">qpush</command> fails to apply a patch, it "
14347 "will print an error message and exit. If it has left <filename role=\"special"
14348 "\">.rej</filename> files behind, it is usually best to fix up the rejected "
14349 "hunks before you push more patches or do any further work."
14350 msgstr ""
14352 #. type: Content of: <book><chapter><sect1><sect2><para>
14353 #: ../en/ch12-mq.xml:700
14354 msgid ""
14355 "If your patch <emphasis>used to</emphasis> apply cleanly, and no longer does "
14356 "because you've changed the underlying code that your patches are based on, "
14357 "Mercurial Queues can help; see section <xref linkend=\"sec.mq.merge\"/> for "
14358 "details."
14359 msgstr ""
14361 #. type: Content of: <book><chapter><sect1><sect2><para>
14362 #: ../en/ch12-mq.xml:706
14363 msgid ""
14364 "Unfortunately, there aren't any great techniques for dealing with rejected "
14365 "hunks. Most often, you'll need to view the <filename role=\"special\">.rej</"
14366 "filename> file and edit the target file, applying the rejected hunks by hand."
14367 msgstr ""
14369 #. type: Content of: <book><chapter><sect1><sect2><para>
14370 #: ../en/ch12-mq.xml:711
14371 msgid ""
14372 "If you're feeling adventurous, Neil Brown, a Linux kernel hacker, wrote a "
14373 "tool called <command>wiggle</command> <citation>web:wiggle</citation>, which "
14374 "is more vigorous than <command>patch</command> in its attempts to make a "
14375 "patch apply."
14376 msgstr ""
14378 #. type: Content of: <book><chapter><sect1><sect2><para>
14379 #: ../en/ch12-mq.xml:717
14380 msgid ""
14381 "Another Linux kernel hacker, Chris Mason (the author of Mercurial Queues), "
14382 "wrote a similar tool called <command>mpatch</command> <citation>web:mpatch</"
14383 "citation>, which takes a simple approach to automating the application of "
14384 "hunks rejected by <command>patch</command>. The <command>mpatch</command> "
14385 "command can help with four common reasons that a hunk may be rejected:"
14386 msgstr ""
14388 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14389 #: ../en/ch12-mq.xml:726
14390 msgid "The context in the middle of a hunk has changed."
14391 msgstr ""
14393 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14394 #: ../en/ch12-mq.xml:729
14395 msgid "A hunk is missing some context at the beginning or end."
14396 msgstr ""
14398 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14399 #: ../en/ch12-mq.xml:732
14400 msgid ""
14401 "A large hunk might apply better&emdash;either entirely or in part&emdash;if "
14402 "it was broken up into smaller hunks."
14403 msgstr ""
14405 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
14406 #: ../en/ch12-mq.xml:736
14407 msgid ""
14408 "A hunk removes lines with slightly different content than those currently "
14409 "present in the file."
14410 msgstr ""
14412 #. type: Content of: <book><chapter><sect1><sect2><para>
14413 #: ../en/ch12-mq.xml:740
14414 msgid ""
14415 "If you use <command>wiggle</command> or <command>mpatch</command>, you should "
14416 "be doubly careful to check your results when you're done. In fact, "
14417 "<command>mpatch</command> enforces this method of double-checking the tool's "
14418 "output, by automatically dropping you into a merge program when it has done "
14419 "its job, so that you can verify its work and finish off any remaining merges."
14420 msgstr ""
14422 #. type: Content of: <book><chapter><sect1><title>
14423 #: ../en/ch12-mq.xml:752
14424 msgid "Getting the best performance out of MQ"
14425 msgstr "MQ 的性能"
14427 #. type: Content of: <book><chapter><sect1><para>
14428 #: ../en/ch12-mq.xml:754
14429 msgid ""
14430 "MQ is very efficient at handling a large number of patches. I ran some "
14431 "performance experiments in mid-2006 for a talk that I gave at the 2006 "
14432 "EuroPython conference <citation>web:europython</citation>. I used as my data "
14433 "set the Linux 2.6.17-mm1 patch series, which consists of 1,738 patches. I "
14434 "applied these on top of a Linux kernel repository containing all 27,472 "
14435 "revisions between Linux 2.6.12-rc2 and Linux 2.6.17."
14436 msgstr ""
14438 #. type: Content of: <book><chapter><sect1><para>
14439 #: ../en/ch12-mq.xml:763
14440 msgid ""
14441 "On my old, slow laptop, I was able to <command role=\"hg-cmd\">hg qpush "
14442 "<option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</option></command> all 1,738 "
14443 "patches in 3.5 minutes, and <command role=\"hg-cmd\">hg qpop <option role="
14444 "\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> them all in 30 seconds. "
14445 "(On a newer laptop, the time to push all patches dropped to two minutes.) I "
14446 "could <command role=\"hg-ext-mq\">qrefresh</command> one of the biggest "
14447 "patches (which made 22,779 lines of changes to 287 files) in 6.6 seconds."
14448 msgstr ""
14450 #. type: Content of: <book><chapter><sect1><para>
14451 #: ../en/ch12-mq.xml:774
14452 msgid ""
14453 "Clearly, MQ is well suited to working in large trees, but there are a few "
14454 "tricks you can use to get the best performance of it."
14455 msgstr ""
14457 #. type: Content of: <book><chapter><sect1><para>
14458 #: ../en/ch12-mq.xml:778
14459 msgid ""
14460 "First of all, try to <quote>batch</quote> operations together. Every time "
14461 "you run <command role=\"hg-ext-mq\">qpush</command> or <command role=\"hg-ext-"
14462 "mq\">qpop</command>, these commands scan the working directory once to make "
14463 "sure you haven't made some changes and then forgotten to run <command role="
14464 "\"hg-ext-mq\">qrefresh</command>. On a small tree, the time that this scan "
14465 "takes is unnoticeable. However, on a medium-sized tree (containing tens of "
14466 "thousands of files), it can take a second or more."
14467 msgstr ""
14469 #. type: Content of: <book><chapter><sect1><para>
14470 #: ../en/ch12-mq.xml:789
14471 msgid ""
14472 "The <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-mq"
14473 "\">qpop</command> commands allow you to push and pop multiple patches at a "
14474 "time. You can identify the <quote>destination patch</quote> that you want to "
14475 "end up at. When you <command role=\"hg-ext-mq\">qpush</command> with a "
14476 "destination specified, it will push patches until that patch is at the top of "
14477 "the applied stack. When you <command role=\"hg-ext-mq\">qpop</command> to a "
14478 "destination, MQ will pop patches until the destination patch is at the top."
14479 msgstr ""
14481 #. type: Content of: <book><chapter><sect1><para>
14482 #: ../en/ch12-mq.xml:799
14483 msgid ""
14484 "You can identify a destination patch using either the name of the patch, or "
14485 "by number. If you use numeric addressing, patches are counted from zero; "
14486 "this means that the first patch is zero, the second is one, and so on."
14487 msgstr ""
14489 #. type: Content of: <book><chapter><sect1><title>
14490 #: ../en/ch12-mq.xml:806
14491 msgid "Updating your patches when the underlying code changes"
14492 msgstr "当基础代码改变时，更新补丁的方法"
14494 #. type: Content of: <book><chapter><sect1><para>
14495 #: ../en/ch12-mq.xml:809
14496 msgid ""
14497 "It's common to have a stack of patches on top of an underlying repository "
14498 "that you don't modify directly. If you're working on changes to third-party "
14499 "code, or on a feature that is taking longer to develop than the rate of "
14500 "change of the code beneath, you will often need to sync up with the "
14501 "underlying code, and fix up any hunks in your patches that no longer apply. "
14502 "This is called <emphasis>rebasing</emphasis> your patch series."
14503 msgstr ""
14505 #. type: Content of: <book><chapter><sect1><para>
14506 #: ../en/ch12-mq.xml:818
14507 msgid ""
14508 "The simplest way to do this is to <command role=\"hg-cmd\">hg qpop <option "
14509 "role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches, then "
14510 "<command role=\"hg-cmd\">hg pull</command> changes into the underlying "
14511 "repository, and finally <command role=\"hg-cmd\">hg qpush <option role=\"hg-"
14512 "ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches again. MQ will "
14513 "stop pushing any time it runs across a patch that fails to apply during "
14514 "conflicts, allowing you to fix your conflicts, <command role=\"hg-ext-mq"
14515 "\">qrefresh</command> the affected patch, and continue pushing until you have "
14516 "fixed your entire stack."
14517 msgstr ""
14519 #. type: Content of: <book><chapter><sect1><para>
14520 #: ../en/ch12-mq.xml:830
14521 msgid ""
14522 "This approach is easy to use and works well if you don't expect changes to "
14523 "the underlying code to affect how well your patches apply. If your patch "
14524 "stack touches code that is modified frequently or invasively in the "
14525 "underlying repository, however, fixing up rejected hunks by hand quickly "
14526 "becomes tiresome."
14527 msgstr ""
14529 #. type: Content of: <book><chapter><sect1><para>
14530 #: ../en/ch12-mq.xml:837
14531 msgid ""
14532 "It's possible to partially automate the rebasing process. If your patches "
14533 "apply cleanly against some revision of the underlying repo, MQ can use this "
14534 "information to help you to resolve conflicts between your patches and a "
14535 "different revision."
14536 msgstr ""
14538 #. type: Content of: <book><chapter><sect1><para>
14539 #: ../en/ch12-mq.xml:843
14540 msgid "The process is a little involved."
14541 msgstr ""
14543 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14544 #: ../en/ch12-mq.xml:845
14545 msgid ""
14546 "To begin, <command role=\"hg-cmd\">hg qpush -a</command> all of your patches "
14547 "on top of the revision where you know that they apply cleanly."
14548 msgstr ""
14550 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14551 #: ../en/ch12-mq.xml:849
14552 msgid ""
14553 "Save a backup copy of your patch directory using <command role=\"hg-cmd\">hg "
14554 "qsave <option role=\"hg-ext-mq-cmd-qsave-opt\">hg -e</option> <option role="
14555 "\"hg-ext-mq-cmd-qsave-opt\">hg -c</option></command>. This prints the name "
14556 "of the directory that it has saved the patches in. It will save the patches "
14557 "to a directory called <filename role=\"special\" class=\"directory\">.hg/"
14558 "patches.N</filename>, where <literal>N</literal> is a small integer. It also "
14559 "commits a <quote>save changeset</quote> on top of your applied patches; this "
14560 "is for internal book-keeping, and records the states of the <filename role="
14561 "\"special\">series</filename> and <filename role=\"special\">status</"
14562 "filename> files."
14563 msgstr ""
14565 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14566 #: ../en/ch12-mq.xml:863
14567 msgid ""
14568 "Use <command role=\"hg-cmd\">hg pull</command> to bring new changes into the "
14569 "underlying repository. (Don't run <command role=\"hg-cmd\">hg pull -u</"
14570 "command>; see below for why.)"
14571 msgstr ""
14573 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14574 #: ../en/ch12-mq.xml:868
14575 msgid ""
14576 "Update to the new tip revision, using <command role=\"hg-cmd\">hg update "
14577 "<option role=\"hg-opt-update\">-C</option></command> to override the patches "
14578 "you have pushed."
14579 msgstr ""
14581 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
14582 #: ../en/ch12-mq.xml:873
14583 msgid ""
14584 "Merge all patches using \\hgcmdargs{qpush}{<option role=\"hg-ext-mq-cmd-qpush-"
14585 "opt\">hg -m</option> <option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</"
14586 "option>}. The <option role=\"hg-ext-mq-cmd-qpush-opt\">hg -m</option> option "
14587 "to <command role=\"hg-ext-mq\">qpush</command> tells MQ to perform a three-"
14588 "way merge if the patch fails to apply."
14589 msgstr ""
14591 #. type: Content of: <book><chapter><sect1><para>
14592 #: ../en/ch12-mq.xml:883
14593 msgid ""
14594 "During the <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-"
14595 "qpush-opt\">hg -m</option></command>, each patch in the <filename role="
14596 "\"special\">series</filename> file is applied normally. If a patch applies "
14597 "with fuzz or rejects, MQ looks at the queue you <command role=\"hg-ext-mq"
14598 "\">qsave</command>d, and performs a three-way merge with the corresponding "
14599 "changeset. This merge uses Mercurial's normal merge machinery, so it may pop "
14600 "up a GUI merge tool to help you to resolve problems."
14601 msgstr ""
14603 #. type: Content of: <book><chapter><sect1><para>
14604 #: ../en/ch12-mq.xml:893
14605 msgid ""
14606 "When you finish resolving the effects of a patch, MQ refreshes your patch "
14607 "based on the result of the merge."
14608 msgstr ""
14610 #. type: Content of: <book><chapter><sect1><para>
14611 #: ../en/ch12-mq.xml:896
14612 msgid ""
14613 "At the end of this process, your repository will have one extra head from the "
14614 "old patch queue, and a copy of the old patch queue will be in <filename role="
14615 "\"special\" class=\"directory\">.hg/patches.N</filename>. You can remove the "
14616 "extra head using <command role=\"hg-cmd\">hg qpop -a -n patches.N</command> "
14617 "or <command role=\"hg-cmd\">hg strip</command>. You can delete <filename "
14618 "role=\"special\" class=\"directory\">.hg/patches.N</filename> once you are "
14619 "sure that you no longer need it as a backup."
14620 msgstr ""
14622 #. type: Content of: <book><chapter><sect1><title>
14623 #: ../en/ch12-mq.xml:908
14624 msgid "Identifying patches"
14625 msgstr "标识补丁"
14627 #. type: Content of: <book><chapter><sect1><para>
14628 #: ../en/ch12-mq.xml:910
14629 msgid ""
14630 "MQ commands that work with patches let you refer to a patch either by using "
14631 "its name or by a number. By name is obvious enough; pass the name "
14632 "<filename>foo.patch</filename> to <command role=\"hg-ext-mq\">qpush</"
14633 "command>, for example, and it will push patches until <filename>foo.patch</"
14634 "filename> is applied."
14635 msgstr ""
14637 #. type: Content of: <book><chapter><sect1><para>
14638 #: ../en/ch12-mq.xml:917
14639 msgid ""
14640 "As a shortcut, you can refer to a patch using both a name and a numeric "
14641 "offset; <literal>foo.patch-2</literal> means <quote>two patches before "
14642 "<literal>foo.patch</literal></quote>, while <literal>bar.patch+4</literal> "
14643 "means <quote>four patches after <literal>bar.patch</literal></quote>."
14644 msgstr ""
14646 #. type: Content of: <book><chapter><sect1><para>
14647 #: ../en/ch12-mq.xml:923
14648 msgid ""
14649 "Referring to a patch by index isn't much different. The first patch printed "
14650 "in the output of <command role=\"hg-ext-mq\">qseries</command> is patch zero "
14651 "(yes, it's one of those start-at-zero counting systems); the second is patch "
14652 "one; and so on."
14653 msgstr ""
14655 #. type: Content of: <book><chapter><sect1><para>
14656 #: ../en/ch12-mq.xml:929
14657 msgid ""
14658 "MQ also makes it easy to work with patches when you are using normal "
14659 "Mercurial commands. Every command that accepts a changeset ID will also "
14660 "accept the name of an applied patch. MQ augments the tags normally in the "
14661 "repository with an eponymous one for each applied patch. In addition, the "
14662 "special tags \\index{tags!special tag names!<literal>qbase</literal>}"
14663 "<literal>qbase</literal> and \\index{tags!special tag names!<literal>qtip</"
14664 "literal>}<literal>qtip</literal> identify the <quote>bottom-most</quote> and "
14665 "topmost applied patches, respectively."
14666 msgstr ""
14668 #. type: Content of: <book><chapter><sect1><para>
14669 #: ../en/ch12-mq.xml:941
14670 msgid ""
14671 "These additions to Mercurial's normal tagging capabilities make dealing with "
14672 "patches even more of a breeze."
14673 msgstr ""
14675 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14676 #: ../en/ch12-mq.xml:944
14677 msgid "Want to patchbomb a mailing list with your latest series of changes?"
14678 msgstr ""
14680 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14681 #: ../en/ch12-mq.xml:948
14682 msgid ""
14683 "(Don't know what <quote>patchbombing</quote> is? See section <xref linkend="
14684 "\"sec.hgext.patchbomb\"/>.)"
14685 msgstr ""
14687 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14688 #: ../en/ch12-mq.xml:951
14689 msgid ""
14690 "Need to see all of the patches since <literal>foo.patch</literal> that have "
14691 "touched files in a subdirectory of your tree?"
14692 msgstr ""
14694 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><programlisting><emphasis>
14695 #: ../en/ch12-mq.xml:955
14696 msgid "subdir"
14697 msgstr ""
14699 #. type: Content of: <book><chapter><sect1><para>
14700 #: ../en/ch12-mq.xml:960
14701 msgid ""
14702 "Because MQ makes the names of patches available to the rest of Mercurial "
14703 "through its normal internal tag machinery, you don't need to type in the "
14704 "entire name of a patch when you want to identify it by name."
14705 msgstr ""
14707 #. type: Content of: <book><chapter><sect1><para>
14708 #: ../en/ch12-mq.xml:965
14709 msgid ""
14710 "Another nice consequence of representing patch names as tags is that when you "
14711 "run the <command role=\"hg-cmd\">hg log</command> command, it will display a "
14712 "patch's name as a tag, simply as part of its normal output. This makes it "
14713 "easy to visually distinguish applied patches from underlying <quote>normal</"
14714 "quote> revisions. The following example shows a few normal Mercurial "
14715 "commands in use with applied patches."
14716 msgstr ""
14718 #. type: Content of: <book><chapter><sect1><title>
14719 #: ../en/ch12-mq.xml:978
14720 msgid "Useful things to know about"
14721 msgstr "其它需要了解的东西"
14723 #. type: Content of: <book><chapter><sect1><para>
14724 #: ../en/ch12-mq.xml:980
14725 msgid ""
14726 "There are a number of aspects of MQ usage that don't fit tidily into sections "
14727 "of their own, but that are good to know. Here they are, in one place."
14728 msgstr ""
14730 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14731 #: ../en/ch12-mq.xml:985
14732 msgid ""
14733 "Normally, when you <command role=\"hg-ext-mq\">qpop</command> a patch and "
14734 "<command role=\"hg-ext-mq\">qpush</command> it again, the changeset that "
14735 "represents the patch after the pop/push will have a <emphasis>different "
14736 "identity</emphasis> than the changeset that represented the hash beforehand. "
14737 "See section <xref linkend=\"sec.mqref.cmd.qpush\"/> for information as to why "
14738 "this is."
14739 msgstr ""
14741 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
14742 #: ../en/ch12-mq.xml:994
14743 msgid ""
14744 "It's not a good idea to <command role=\"hg-cmd\">hg merge</command> changes "
14745 "from another branch with a patch changeset, at least if you want to maintain "
14746 "the <quote>patchiness</quote> of that changeset and changesets below it on "
14747 "the patch stack. If you try to do this, it will appear to succeed, but MQ "
14748 "will become confused."
14749 msgstr ""
14751 #. type: Content of: <book><chapter><sect1><title>
14752 #: ../en/ch12-mq.xml:1005
14753 msgid "Managing patches in a repository"
14754 msgstr "在版本库管理补丁"
14756 #. type: Content of: <book><chapter><sect1><para>
14757 #: ../en/ch12-mq.xml:1007
14758 msgid ""
14759 "Because MQ's <filename role=\"special\" class=\"directory\">.hg/patches</"
14760 "filename> directory resides outside a Mercurial repository's working "
14761 "directory, the <quote>underlying</quote> Mercurial repository knows nothing "
14762 "about the management or presence of patches."
14763 msgstr ""
14765 #. type: Content of: <book><chapter><sect1><para>
14766 #: ../en/ch12-mq.xml:1013
14767 msgid ""
14768 "This presents the interesting possibility of managing the contents of the "
14769 "patch directory as a Mercurial repository in its own right. This can be a "
14770 "useful way to work. For example, you can work on a patch for a while, "
14771 "<command role=\"hg-ext-mq\">qrefresh</command> it, then <command role=\"hg-cmd"
14772 "\">hg commit</command> the current state of the patch. This lets you "
14773 "<quote>roll back</quote> to that version of the patch later on."
14774 msgstr ""
14776 #. type: Content of: <book><chapter><sect1><para>
14777 #: ../en/ch12-mq.xml:1022
14778 msgid ""
14779 "You can then share different versions of the same patch stack among multiple "
14780 "underlying repositories. I use this when I am developing a Linux kernel "
14781 "feature. I have a pristine copy of my kernel sources for each of several CPU "
14782 "architectures, and a cloned repository under each that contains the patches I "
14783 "am working on. When I want to test a change on a different architecture, I "
14784 "push my current patches to the patch repository associated with that kernel "
14785 "tree, pop and push all of my patches, and build and test that kernel."
14786 msgstr ""
14788 #. type: Content of: <book><chapter><sect1><para>
14789 #: ../en/ch12-mq.xml:1032
14790 msgid ""
14791 "Managing patches in a repository makes it possible for multiple developers to "
14792 "work on the same patch series without colliding with each other, all on top "
14793 "of an underlying source base that they may or may not control."
14794 msgstr ""
14796 #. type: Content of: <book><chapter><sect1><sect2><title>
14797 #: ../en/ch12-mq.xml:1038
14798 msgid "MQ support for patch repositories"
14799 msgstr "MQ 支持补丁版本库"
14801 #. type: Content of: <book><chapter><sect1><sect2><para>
14802 #: ../en/ch12-mq.xml:1040
14803 msgid ""
14804 "MQ helps you to work with the <filename role=\"special\" class=\"directory\">."
14805 "hg/patches</filename> directory as a repository; when you prepare a "
14806 "repository for working with patches using <command role=\"hg-ext-mq\">qinit</"
14807 "command>, you can pass the <option role=\"hg-ext-mq-cmd-qinit-opt\">hg -c</"
14808 "option> option to create the <filename role=\"special\" class=\"directory\">."
14809 "hg/patches</filename> directory as a Mercurial repository."
14810 msgstr ""
14812 #. type: Content of: <book><chapter><sect1><sect2><note><para>
14813 #: ../en/ch12-mq.xml:1050
14814 msgid ""
14815 "If you forget to use the <option role=\"hg-ext-mq-cmd-qinit-opt\">hg -c</"
14816 "option> option, you can simply go into the <filename role=\"special\" class="
14817 "\"directory\">.hg/patches</filename> directory at any time and run <command "
14818 "role=\"hg-cmd\">hg init</command>. Don't forget to add an entry for the "
14819 "<filename role=\"special\">status</filename> file to the <filename role="
14820 "\"special\">.hgignore</filename> file, though"
14821 msgstr ""
14823 #. type: Content of: <book><chapter><sect1><sect2><note><para>
14824 #: ../en/ch12-mq.xml:1059
14825 msgid ""
14826 "(<command role=\"hg-cmd\">hg qinit <option role=\"hg-ext-mq-cmd-qinit-opt"
14827 "\">hg -c</option></command> does this for you automatically); you "
14828 "<emphasis>really</emphasis> don't want to manage the <filename role=\"special"
14829 "\">status</filename> file."
14830 msgstr ""
14832 #. type: Content of: <book><chapter><sect1><sect2><para>
14833 #: ../en/ch12-mq.xml:1066
14834 msgid ""
14835 "As a convenience, if MQ notices that the <filename class=\"directory\">.hg/"
14836 "patches</filename> directory is a repository, it will automatically <command "
14837 "role=\"hg-cmd\">hg add</command> every patch that you create and import."
14838 msgstr ""
14840 #. type: Content of: <book><chapter><sect1><sect2><para>
14841 #: ../en/ch12-mq.xml:1071
14842 msgid ""
14843 "MQ provides a shortcut command, <command role=\"hg-ext-mq\">qcommit</"
14844 "command>, that runs <command role=\"hg-cmd\">hg commit</command> in the "
14845 "<filename role=\"special\" class=\"directory\">.hg/patches</filename> "
14846 "directory. This saves some bothersome typing."
14847 msgstr ""
14849 #. type: Content of: <book><chapter><sect1><sect2><para>
14850 #: ../en/ch12-mq.xml:1077
14851 msgid ""
14852 "Finally, as a convenience to manage the patch directory, you can define the "
14853 "alias <command>mq</command> on Unix systems. For example, on Linux systems "
14854 "using the <command>bash</command> shell, you can include the following "
14855 "snippet in your <filename role=\"home\">~/.bashrc</filename>."
14856 msgstr ""
14858 #. type: Content of: <book><chapter><sect1><sect2><para>
14859 #: ../en/ch12-mq.xml:1087
14860 msgid ""
14861 "You can then issue commands of the form <command>mq pull</command> from the "
14862 "main repository."
14863 msgstr ""
14865 #. type: Content of: <book><chapter><sect1><sect2><title>
14866 #: ../en/ch12-mq.xml:1092
14867 msgid "A few things to watch out for"
14868 msgstr "需要注意的事情"
14870 #. type: Content of: <book><chapter><sect1><sect2><para>
14871 #: ../en/ch12-mq.xml:1094
14872 msgid ""
14873 "MQ's support for working with a repository full of patches is limited in a "
14874 "few small respects."
14875 msgstr ""
14877 #. type: Content of: <book><chapter><sect1><sect2><para>
14878 #: ../en/ch12-mq.xml:1097
14879 msgid ""
14880 "MQ cannot automatically detect changes that you make to the patch directory. "
14881 "If you <command role=\"hg-cmd\">hg pull</command>, manually edit, or <command "
14882 "role=\"hg-cmd\">hg update</command> changes to patches or the <filename role="
14883 "\"special\">series</filename> file, you will have to <command role=\"hg-cmd"
14884 "\">hg qpop <option role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> "
14885 "and then <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-qpush-"
14886 "opt\">hg -a</option></command> in the underlying repository to see those "
14887 "changes show up there. If you forget to do this, you can confuse MQ's idea "
14888 "of which patches are applied."
14889 msgstr ""
14891 #. type: Content of: <book><chapter><sect1><title>
14892 #: ../en/ch12-mq.xml:1113
14893 msgid "Third party tools for working with patches"
14894 msgstr "操作补丁的第三方工具"
14896 #. type: Content of: <book><chapter><sect1><para>
14897 #: ../en/ch12-mq.xml:1115
14898 msgid ""
14899 "Once you've been working with patches for a while, you'll find yourself "
14900 "hungry for tools that will help you to understand and manipulate the patches "
14901 "you're dealing with."
14902 msgstr ""
14904 #. type: Content of: <book><chapter><sect1><para>
14905 #: ../en/ch12-mq.xml:1119
14906 msgid ""
14907 "The <command>diffstat</command> command <citation>web:diffstat</citation> "
14908 "generates a histogram of the modifications made to each file in a patch. It "
14909 "provides a good way to <quote>get a sense of</quote> a patch&emdash;which "
14910 "files it affects, and how much change it introduces to each file and as a "
14911 "whole. (I find that it's a good idea to use <command>diffstat</command>'s "
14912 "<option role=\"cmd-opt-diffstat\">-p</option> option as a matter of course, "
14913 "as otherwise it will try to do clever things with prefixes of file names that "
14914 "inevitably confuse at least me.)"
14915 msgstr ""
14917 #. type: Content of: <book><chapter><sect1><para>
14918 #: ../en/ch12-mq.xml:1133
14919 msgid ""
14920 "The <literal role=\"package\">patchutils</literal> package <citation>web:"
14921 "patchutils</citation> is invaluable. It provides a set of small utilities "
14922 "that follow the <quote>Unix philosophy;</quote> each does one useful thing "
14923 "with a patch. The <literal role=\"package\">patchutils</literal> command I "
14924 "use most is <command>filterdiff</command>, which extracts subsets from a "
14925 "patch file. For example, given a patch that modifies hundreds of files "
14926 "across dozens of directories, a single invocation of <command>filterdiff</"
14927 "command> can generate a smaller patch that only touches files whose names "
14928 "match a particular glob pattern. See section <xref linkend=\"mq-collab.tips."
14929 "interdiff\"/> for another example."
14930 msgstr ""
14932 #. type: Content of: <book><chapter><sect1><title>
14933 #: ../en/ch12-mq.xml:1149
14934 msgid "Good ways to work with patches"
14935 msgstr "操作补丁的好习惯"
14937 #. type: Content of: <book><chapter><sect1><para>
14938 #: ../en/ch12-mq.xml:1151
14939 msgid ""
14940 "Whether you are working on a patch series to submit to a free software or "
14941 "open source project, or a series that you intend to treat as a sequence of "
14942 "regular changesets when you're done, you can use some simple techniques to "
14943 "keep your work well organised."
14944 msgstr ""
14946 #. type: Content of: <book><chapter><sect1><para>
14947 #: ../en/ch12-mq.xml:1157
14948 msgid ""
14949 "Give your patches descriptive names. A good name for a patch might be "
14950 "<filename>rework-device-alloc.patch</filename>, because it will immediately "
14951 "give you a hint what the purpose of the patch is. Long names shouldn't be a "
14952 "problem; you won't be typing the names often, but you <emphasis>will</"
14953 "emphasis> be running commands like <command role=\"hg-ext-mq\">qapplied</"
14954 "command> and <command role=\"hg-ext-mq\">qtop</command> over and over. Good "
14955 "naming becomes especially important when you have a number of patches to work "
14956 "with, or if you are juggling a number of different tasks and your patches "
14957 "only get a fraction of your attention."
14958 msgstr ""
14960 #. type: Content of: <book><chapter><sect1><para>
14961 #: ../en/ch12-mq.xml:1169
14962 msgid ""
14963 "Be aware of what patch you're working on. Use the <command role=\"hg-ext-mq"
14964 "\">qtop</command> command and skim over the text of your patches "
14965 "frequently&emdash;for example, using <command role=\"hg-cmd\">hg tip <option "
14966 "role=\"hg-opt-tip\">-p</option></command>)&emdash;to be sure of where you "
14967 "stand. I have several times worked on and <command role=\"hg-ext-mq"
14968 "\">qrefresh</command>ed a patch other than the one I intended, and it's often "
14969 "tricky to migrate changes into the right patch after making them in the wrong "
14970 "one."
14971 msgstr ""
14973 #. type: Content of: <book><chapter><sect1><para>
14974 #: ../en/ch12-mq.xml:1179
14975 msgid ""
14976 "For this reason, it is very much worth investing a little time to learn how "
14977 "to use some of the third-party tools I described in section <xref linkend="
14978 "\"sec.mq.tools\"/>, particularly <command>diffstat</command> and "
14979 "<command>filterdiff</command>. The former will give you a quick idea of what "
14980 "changes your patch is making, while the latter makes it easy to splice hunks "
14981 "selectively out of one patch and into another."
14982 msgstr ""
14984 #. type: Content of: <book><chapter><sect1><title>
14985 #: ../en/ch12-mq.xml:1190
14986 msgid "MQ cookbook"
14987 msgstr "MQ 手册"
14989 #. type: Content of: <book><chapter><sect1><sect2><title>
14990 #: ../en/ch12-mq.xml:1193
14991 msgid "Manage <quote>trivial</quote> patches"
14992 msgstr "管理<quote>琐碎的</quote>补丁"
14994 #. type: Content of: <book><chapter><sect1><sect2><para>
14995 #: ../en/ch12-mq.xml:1195
14996 msgid ""
14997 "Because the overhead of dropping files into a new Mercurial repository is so "
14998 "low, it makes a lot of sense to manage patches this way even if you simply "
14999 "want to make a few changes to a source tarball that you downloaded."
15000 msgstr ""
15002 #
15003 #. type: Content of: <book><chapter><sect1><sect2><para>
15004 #: ../en/ch12-mq.xml:1200
15005 msgid ""
15006 "Begin by downloading and unpacking the source tarball, and turning it into a "
15007 "Mercurial repository."
15008 msgstr ""
15010 #. type: Content of: <book><chapter><sect1><sect2><para>
15011 #: ../en/ch12-mq.xml:1205
15012 msgid "Continue by creating a patch stack and making your changes."
15013 msgstr ""
15015 #. type: Content of: <book><chapter><sect1><sect2><para>
15016 #: ../en/ch12-mq.xml:1210
15017 msgid ""
15018 "Let's say a few weeks or months pass, and your package author releases a new "
15019 "version. First, bring their changes into the repository."
15020 msgstr ""
15022 #. type: Content of: <book><chapter><sect1><sect2><para>
15023 #: ../en/ch12-mq.xml:1216
15024 msgid ""
15025 "The pipeline starting with <command role=\"hg-cmd\">hg locate</command> above "
15026 "deletes all files in the working directory, so that <command role=\"hg-cmd"
15027 "\">hg commit</command>'s <option role=\"hg-opt-commit\">--addremove</option> "
15028 "option can actually tell which files have really been removed in the newer "
15029 "version of the source."
15030 msgstr ""
15032 #. type: Content of: <book><chapter><sect1><sect2><para>
15033 #: ../en/ch12-mq.xml:1224
15034 msgid "Finally, you can apply your patches on top of the new tree."
15035 msgstr ""
15037 #. type: Content of: <book><chapter><sect1><sect2><title>
15038 #: ../en/ch12-mq.xml:1231
15039 msgid "Combining entire patches"
15040 msgstr "组合全部的补丁"
15042 #. type: Content of: <book><chapter><sect1><sect2><para>
15043 #: ../en/ch12-mq.xml:1233
15044 msgid ""
15045 "MQ provides a command, <command role=\"hg-ext-mq\">qfold</command> that lets "
15046 "you combine entire patches. This <quote>folds</quote> the patches you name, "
15047 "in the order you name them, into the topmost applied patch, and concatenates "
15048 "their descriptions onto the end of its description. The patches that you "
15049 "fold must be unapplied before you fold them."
15050 msgstr ""
15052 #. type: Content of: <book><chapter><sect1><sect2><para>
15053 #: ../en/ch12-mq.xml:1241
15054 msgid ""
15055 "The order in which you fold patches matters. If your topmost applied patch "
15056 "is <literal>foo</literal>, and you <command role=\"hg-ext-mq\">qfold</"
15057 "command> <literal>bar</literal> and <literal>quux</literal> into it, you will "
15058 "end up with a patch that has the same effect as if you applied first "
15059 "<literal>foo</literal>, then <literal>bar</literal>, followed by "
15060 "<literal>quux</literal>."
15061 msgstr ""
15063 #. type: Content of: <book><chapter><sect1><sect2><title>
15064 #: ../en/ch12-mq.xml:1252
15065 msgid "Merging part of one patch into another"
15066 msgstr "合并补丁的部分内容到其它补丁"
15068 #. type: Content of: <book><chapter><sect1><sect2><para>
15069 #: ../en/ch12-mq.xml:1254
15070 msgid ""
15071 "Merging <emphasis>part</emphasis> of one patch into another is more difficult "
15072 "than combining entire patches."
15073 msgstr ""
15075 #. type: Content of: <book><chapter><sect1><sect2><para>
15076 #: ../en/ch12-mq.xml:1258
15077 msgid ""
15078 "If you want to move changes to entire files, you can use <command>filterdiff</"
15079 "command>'s <option role=\"cmd-opt-filterdiff\">-i</option> and <option role="
15080 "\"cmd-opt-filterdiff\">-x</option> options to choose the modifications to "
15081 "snip out of one patch, concatenating its output onto the end of the patch you "
15082 "want to merge into. You usually won't need to modify the patch you've merged "
15083 "the changes from. Instead, MQ will report some rejected hunks when you "
15084 "<command role=\"hg-ext-mq\">qpush</command> it (from the hunks you moved into "
15085 "the other patch), and you can simply <command role=\"hg-ext-mq\">qrefresh</"
15086 "command> the patch to drop the duplicate hunks."
15087 msgstr ""
15089 #. type: Content of: <book><chapter><sect1><sect2><para>
15090 #: ../en/ch12-mq.xml:1271
15091 msgid ""
15092 "If you have a patch that has multiple hunks modifying a file, and you only "
15093 "want to move a few of those hunks, the job becomes more messy, but you can "
15094 "still partly automate it. Use <command>lsdiff -nvv</command> to print some "
15095 "metadata about the patch."
15096 msgstr ""
15098 #. type: Content of: <book><chapter><sect1><sect2><para>
15099 #: ../en/ch12-mq.xml:1279
15100 msgid "This command prints three different kinds of number:"
15101 msgstr ""
15103 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
15104 #: ../en/ch12-mq.xml:1282
15105 msgid ""
15106 "(in the first column) a <emphasis>file number</emphasis> to identify each "
15107 "file modified in the patch;"
15108 msgstr ""
15110 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
15111 #: ../en/ch12-mq.xml:1286
15112 msgid ""
15113 "(on the next line, indented) the line number within a modified file where a "
15114 "hunk starts; and"
15115 msgstr ""
15117 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
15118 #: ../en/ch12-mq.xml:1289
15119 msgid ""
15120 "(on the same line) a <emphasis>hunk number</emphasis> to identify that hunk."
15121 msgstr ""
15123 #. type: Content of: <book><chapter><sect1><sect2><para>
15124 #: ../en/ch12-mq.xml:1293
15125 msgid ""
15126 "You'll have to use some visual inspection, and reading of the patch, to "
15127 "identify the file and hunk numbers you'll want, but you can then pass them to "
15128 "to <command>filterdiff</command>'s <option role=\"cmd-opt-filterdiff\">--"
15129 "files</option> and <option role=\"cmd-opt-filterdiff\">--hunks</option> "
15130 "options, to select exactly the file and hunk you want to extract."
15131 msgstr ""
15133 #. type: Content of: <book><chapter><sect1><sect2><para>
15134 #: ../en/ch12-mq.xml:1301
15135 msgid ""
15136 "Once you have this hunk, you can concatenate it onto the end of your "
15137 "destination patch and continue with the remainder of section <xref linkend="
15138 "\"sec.mq.combine\"/>."
15139 msgstr ""
15141 #. type: Content of: <book><chapter><sect1><title>
15142 #: ../en/ch12-mq.xml:1308
15143 msgid "Differences between quilt and MQ"
15144 msgstr "MQ 与 quilt 的区别"
15146 #. type: Content of: <book><chapter><sect1><para>
15147 #: ../en/ch12-mq.xml:1310
15148 msgid ""
15149 "If you are already familiar with quilt, MQ provides a similar command set. "
15150 "There are a few differences in the way that it works."
15151 msgstr ""
15153 #. type: Content of: <book><chapter><sect1><para>
15154 #: ../en/ch12-mq.xml:1314
15155 msgid ""
15156 "You will already have noticed that most quilt commands have MQ counterparts "
15157 "that simply begin with a <quote><literal>q</literal></quote>. The exceptions "
15158 "are quilt's <literal>add</literal> and <literal>remove</literal> commands, "
15159 "the counterparts for which are the normal Mercurial <command role=\"hg-cmd"
15160 "\">hg add</command> and <command role=\"hg-cmd\">hg remove</command> "
15161 "commands. There is no MQ equivalent of the quilt <literal>edit</literal> "
15162 "command."
15163 msgstr ""
15165 #. type: Content of: <book><chapter><title>
15166 #: ../en/ch13-mq-collab.xml:5
15167 msgid "Advanced uses of Mercurial Queues"
15168 msgstr "MQ 的高级用法"
15170 #. type: Content of: <book><chapter><para>
15171 #: ../en/ch13-mq-collab.xml:7
15172 msgid ""
15173 "While it's easy to pick up straightforward uses of Mercurial Queues, use of a "
15174 "little discipline and some of MQ's less frequently used capabilities makes it "
15175 "possible to work in complicated development environments."
15176 msgstr ""
15178 #. type: Content of: <book><chapter><para>
15179 #: ../en/ch13-mq-collab.xml:12
15180 msgid ""
15181 "In this chapter, I will use as an example a technique I have used to manage "
15182 "the development of an Infiniband device driver for the Linux kernel. The "
15183 "driver in question is large (at least as drivers go), with 25,000 lines of "
15184 "code spread across 35 source files. It is maintained by a small team of "
15185 "developers."
15186 msgstr ""
15188 #. type: Content of: <book><chapter><para>
15189 #: ../en/ch13-mq-collab.xml:18
15190 msgid ""
15191 "While much of the material in this chapter is specific to Linux, the same "
15192 "principles apply to any code base for which you're not the primary owner, and "
15193 "upon which you need to do a lot of development."
15194 msgstr ""
15196 #. type: Content of: <book><chapter><sect1><title>
15197 #: ../en/ch13-mq-collab.xml:24
15198 msgid "The problem of many targets"
15199 msgstr "多个目标的问题"
15201 #. type: Content of: <book><chapter><sect1><para>
15202 #: ../en/ch13-mq-collab.xml:26
15203 msgid ""
15204 "The Linux kernel changes rapidly, and has never been internally stable; "
15205 "developers frequently make drastic changes between releases. This means that "
15206 "a version of the driver that works well with a particular released version of "
15207 "the kernel will not even <emphasis>compile</emphasis> correctly against, "
15208 "typically, any other version."
15209 msgstr ""
15211 #. type: Content of: <book><chapter><sect1><para>
15212 #: ../en/ch13-mq-collab.xml:33
15213 msgid ""
15214 "To maintain a driver, we have to keep a number of distinct versions of Linux "
15215 "in mind."
15216 msgstr ""
15218 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15219 #: ../en/ch13-mq-collab.xml:36
15220 msgid ""
15221 "One target is the main Linux kernel development tree. Maintenance of the code "
15222 "is in this case partly shared by other developers in the kernel community, "
15223 "who make <quote>drive-by</quote> modifications to the driver as they develop "
15224 "and refine kernel subsystems."
15225 msgstr ""
15227 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15228 #: ../en/ch13-mq-collab.xml:42
15229 msgid ""
15230 "We also maintain a number of <quote>backports</quote> to older versions of "
15231 "the Linux kernel, to support the needs of customers who are running older "
15232 "Linux distributions that do not incorporate our drivers. (To "
15233 "<emphasis>backport</emphasis> a piece of code is to modify it to work in an "
15234 "older version of its target environment than the version it was developed "
15235 "for.)"
15236 msgstr ""
15238 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15239 #: ../en/ch13-mq-collab.xml:50
15240 msgid ""
15241 "Finally, we make software releases on a schedule that is necessarily not "
15242 "aligned with those used by Linux distributors and kernel developers, so that "
15243 "we can deliver new features to customers without forcing them to upgrade "
15244 "their entire kernels or distributions."
15245 msgstr ""
15247 #. type: Content of: <book><chapter><sect1><sect2><title>
15248 #: ../en/ch13-mq-collab.xml:58
15249 msgid "Tempting approaches that don't work well"
15250 msgstr "工作不好的诱人方法"
15252 #. type: Content of: <book><chapter><sect1><sect2><para>
15253 #: ../en/ch13-mq-collab.xml:60
15254 msgid ""
15255 "There are two <quote>standard</quote> ways to maintain a piece of software "
15256 "that has to target many different environments."
15257 msgstr ""
15259 #. type: Content of: <book><chapter><sect1><sect2><para>
15260 #: ../en/ch13-mq-collab.xml:64
15261 msgid ""
15262 "The first is to maintain a number of branches, each intended for a single "
15263 "target. The trouble with this approach is that you must maintain iron "
15264 "discipline in the flow of changes between repositories. A new feature or bug "
15265 "fix must start life in a <quote>pristine</quote> repository, then percolate "
15266 "out to every backport repository. Backport changes are more limited in the "
15267 "branches they should propagate to; a backport change that is applied to a "
15268 "branch where it doesn't belong will probably stop the driver from compiling."
15269 msgstr ""
15271 #. type: Content of: <book><chapter><sect1><sect2><para>
15272 #: ../en/ch13-mq-collab.xml:74
15273 msgid ""
15274 "The second is to maintain a single source tree filled with conditional "
15275 "statements that turn chunks of code on or off depending on the intended "
15276 "target. Because these <quote>ifdefs</quote> are not allowed in the Linux "
15277 "kernel tree, a manual or automatic process must be followed to strip them out "
15278 "and yield a clean tree. A code base maintained in this fashion rapidly "
15279 "becomes a rat's nest of conditional blocks that are difficult to understand "
15280 "and maintain."
15281 msgstr ""
15283 #. type: Content of: <book><chapter><sect1><sect2><para>
15284 #: ../en/ch13-mq-collab.xml:83
15285 msgid ""
15286 "Neither of these approaches is well suited to a situation where you don't "
15287 "<quote>own</quote> the canonical copy of a source tree. In the case of a "
15288 "Linux driver that is distributed with the standard kernel, Linus's tree "
15289 "contains the copy of the code that will be treated by the world as "
15290 "canonical. The upstream version of <quote>my</quote> driver can be modified "
15291 "by people I don't know, without me even finding out about it until after the "
15292 "changes show up in Linus's tree."
15293 msgstr ""
15295 #. type: Content of: <book><chapter><sect1><sect2><para>
15296 #: ../en/ch13-mq-collab.xml:93
15297 msgid ""
15298 "These approaches have the added weakness of making it difficult to generate "
15299 "well-formed patches to submit upstream."
15300 msgstr ""
15302 #. type: Content of: <book><chapter><sect1><sect2><para>
15303 #: ../en/ch13-mq-collab.xml:97
15304 msgid ""
15305 "In principle, Mercurial Queues seems like a good candidate to manage a "
15306 "development scenario such as the above. While this is indeed the case, MQ "
15307 "contains a few added features that make the job more pleasant."
15308 msgstr ""
15310 #. type: Content of: <book><chapter><sect1><title>
15311 #: ../en/ch13-mq-collab.xml:105
15312 msgid "Conditionally applying patches with guards"
15313 msgstr "有条件的应用补丁"
15315 #. type: Content of: <book><chapter><sect1><para>
15316 #: ../en/ch13-mq-collab.xml:107
15317 msgid ""
15318 "Perhaps the best way to maintain sanity with so many targets is to be able to "
15319 "choose specific patches to apply for a given situation. MQ provides a "
15320 "feature called <quote>guards</quote> (which originates with quilt's "
15321 "<literal>guards</literal> command) that does just this. To start off, let's "
15322 "create a simple repository for experimenting in."
15323 msgstr ""
15325 #. type: Content of: <book><chapter><sect1><para>
15326 #: ../en/ch13-mq-collab.xml:116
15327 msgid ""
15328 "This gives us a tiny repository that contains two patches that don't have any "
15329 "dependencies on each other, because they touch different files."
15330 msgstr ""
15332 #. type: Content of: <book><chapter><sect1><para>
15333 #: ../en/ch13-mq-collab.xml:120
15334 msgid ""
15335 "The idea behind conditional application is that you can <quote>tag</quote> a "
15336 "patch with a <emphasis>guard</emphasis>, which is simply a text string of "
15337 "your choosing, then tell MQ to select specific guards to use when applying "
15338 "patches. MQ will then either apply, or skip over, a guarded patch, depending "
15339 "on the guards that you have selected."
15340 msgstr ""
15342 #. type: Content of: <book><chapter><sect1><para>
15343 #: ../en/ch13-mq-collab.xml:127
15344 msgid ""
15345 "A patch can have an arbitrary number of guards; each one is "
15346 "<emphasis>positive</emphasis> (<quote>apply this patch if this guard is "
15347 "selected</quote>) or <emphasis>negative</emphasis> (<quote>skip this patch if "
15348 "this guard is selected</quote>). A patch with no guards is always applied."
15349 msgstr ""
15351 #. type: Content of: <book><chapter><sect1><title>
15352 #: ../en/ch13-mq-collab.xml:135
15353 msgid "Controlling the guards on a patch"
15354 msgstr "控制补丁的应用条件"
15356 #. type: Content of: <book><chapter><sect1><para>
15357 #: ../en/ch13-mq-collab.xml:137
15358 msgid ""
15359 "The <command role=\"hg-ext-mq\">qguard</command> command lets you determine "
15360 "which guards should apply to a patch, or display the guards that are already "
15361 "in effect. Without any arguments, it displays the guards on the current "
15362 "topmost patch."
15363 msgstr ""
15365 #. type: Content of: <book><chapter><sect1><para>
15366 #: ../en/ch13-mq-collab.xml:144
15367 msgid ""
15368 "To set a positive guard on a patch, prefix the name of the guard with a "
15369 "<quote><literal>+</literal></quote>."
15370 msgstr ""
15372 #. type: Content of: <book><chapter><sect1><para>
15373 #: ../en/ch13-mq-collab.xml:149
15374 msgid ""
15375 "To set a negative guard on a patch, prefix the name of the guard with a "
15376 "<quote><literal>-</literal></quote>."
15377 msgstr ""
15379 #. type: Content of: <book><chapter><sect1><note><para>
15380 #: ../en/ch13-mq-collab.xml:156
15381 msgid ""
15382 "The <command role=\"hg-ext-mq\">qguard</command> command <emphasis>sets</"
15383 "emphasis> the guards on a patch; it doesn't <emphasis>modify</emphasis> "
15384 "them. What this means is that if you run <command role=\"hg-cmd\">hg qguard "
15385 "+a +b</command> on a patch, then <command role=\"hg-cmd\">hg qguard +c</"
15386 "command> on the same patch, the <emphasis>only</emphasis> guard that will be "
15387 "set on it afterwards is <literal>+c</literal>."
15388 msgstr ""
15390 #
15391 #. type: Content of: <book><chapter><sect1><para>
15392 #: ../en/ch13-mq-collab.xml:165
15393 msgid ""
15394 "Mercurial stores guards in the <filename role=\"special\">series</filename> "
15395 "file; the form in which they are stored is easy both to understand and to "
15396 "edit by hand. (In other words, you don't have to use the <command role=\"hg-"
15397 "ext-mq\">qguard</command> command if you don't want to; it's okay to simply "
15398 "edit the <filename role=\"special\">series</filename> file.)"
15399 msgstr ""
15401 #. type: Content of: <book><chapter><sect1><title>
15402 #: ../en/ch13-mq-collab.xml:177
15403 msgid "Selecting the guards to use"
15404 msgstr "选择使用的条件"
15406 #. type: Content of: <book><chapter><sect1><para>
15407 #: ../en/ch13-mq-collab.xml:179
15408 msgid ""
15409 "The <command role=\"hg-ext-mq\">qselect</command> command determines which "
15410 "guards are active at a given time. The effect of this is to determine which "
15411 "patches MQ will apply the next time you run <command role=\"hg-ext-mq"
15412 "\">qpush</command>. It has no other effect; in particular, it doesn't do "
15413 "anything to patches that are already applied."
15414 msgstr ""
15416 #. type: Content of: <book><chapter><sect1><para>
15417 #: ../en/ch13-mq-collab.xml:186
15418 msgid ""
15419 "With no arguments, the <command role=\"hg-ext-mq\">qselect</command> command "
15420 "lists the guards currently in effect, one per line of output. Each argument "
15421 "is treated as the name of a guard to apply."
15422 msgstr ""
15424 #. type: Content of: <book><chapter><sect1><para>
15425 #: ../en/ch13-mq-collab.xml:193
15426 msgid ""
15427 "In case you're interested, the currently selected guards are stored in the "
15428 "<filename role=\"special\">guards</filename> file."
15429 msgstr ""
15431 #. type: Content of: <book><chapter><sect1><para>
15432 #: ../en/ch13-mq-collab.xml:198
15433 msgid ""
15434 "We can see the effect the selected guards have when we run <command role=\"hg-"
15435 "ext-mq\">qpush</command>."
15436 msgstr ""
15438 #. type: Content of: <book><chapter><sect1><para>
15439 #: ../en/ch13-mq-collab.xml:203
15440 msgid ""
15441 "A guard cannot start with a <quote><literal>+</literal></quote> or "
15442 "<quote><literal>-</literal></quote> character. The name of a guard must not "
15443 "contain white space, but most other characters are acceptable. If you try to "
15444 "use a guard with an invalid name, MQ will complain:"
15445 msgstr ""
15447 #. type: Content of: <book><chapter><sect1><para>
15448 #: ../en/ch13-mq-collab.xml:212
15449 msgid "Changing the selected guards changes the patches that are applied."
15450 msgstr ""
15452 #. type: Content of: <book><chapter><sect1><para>
15453 #: ../en/ch13-mq-collab.xml:217
15454 msgid ""
15455 "You can see in the example below that negative guards take precedence over "
15456 "positive guards."
15457 msgstr ""
15459 #. type: Content of: <book><chapter><sect1><title>
15460 #: ../en/ch13-mq-collab.xml:224
15461 msgid "MQ's rules for applying patches"
15462 msgstr "MQ 应用补丁的规则"
15464 #. type: Content of: <book><chapter><sect1><para>
15465 #: ../en/ch13-mq-collab.xml:226
15466 msgid ""
15467 "The rules that MQ uses when deciding whether to apply a patch are as follows."
15468 msgstr ""
15470 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15471 #: ../en/ch13-mq-collab.xml:229
15472 msgid "A patch that has no guards is always applied."
15473 msgstr ""
15475 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15476 #: ../en/ch13-mq-collab.xml:232
15477 msgid ""
15478 "If the patch has any negative guard that matches any currently selected "
15479 "guard, the patch is skipped."
15480 msgstr ""
15482 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15483 #: ../en/ch13-mq-collab.xml:235
15484 msgid ""
15485 "If the patch has any positive guard that matches any currently selected "
15486 "guard, the patch is applied."
15487 msgstr ""
15489 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15490 #: ../en/ch13-mq-collab.xml:238
15491 msgid ""
15492 "If the patch has positive or negative guards, but none matches any currently "
15493 "selected guard, the patch is skipped."
15494 msgstr ""
15496 #. type: Content of: <book><chapter><sect1><title>
15497 #: ../en/ch13-mq-collab.xml:245
15498 msgid "Trimming the work environment"
15499 msgstr "修剪工作环境"
15501 #. type: Content of: <book><chapter><sect1><para>
15502 #: ../en/ch13-mq-collab.xml:247
15503 msgid ""
15504 "In working on the device driver I mentioned earlier, I don't apply the "
15505 "patches to a normal Linux kernel tree. Instead, I use a repository that "
15506 "contains only a snapshot of the source files and headers that are relevant to "
15507 "Infiniband development. This repository is 1% the size of a kernel "
15508 "repository, so it's easier to work with."
15509 msgstr ""
15511 #. type: Content of: <book><chapter><sect1><para>
15512 #: ../en/ch13-mq-collab.xml:254
15513 msgid ""
15514 "I then choose a <quote>base</quote> version on top of which the patches are "
15515 "applied. This is a snapshot of the Linux kernel tree as of a revision of my "
15516 "choosing. When I take the snapshot, I record the changeset ID from the "
15517 "kernel repository in the commit message. Since the snapshot preserves the "
15518 "<quote>shape</quote> and content of the relevant parts of the kernel tree, I "
15519 "can apply my patches on top of either my tiny repository or a normal kernel "
15520 "tree."
15521 msgstr ""
15523 #. type: Content of: <book><chapter><sect1><para>
15524 #: ../en/ch13-mq-collab.xml:263
15525 msgid ""
15526 "Normally, the base tree atop which the patches apply should be a snapshot of "
15527 "a very recent upstream tree. This best facilitates the development of "
15528 "patches that can easily be submitted upstream with few or no modifications."
15529 msgstr ""
15531 #. type: Content of: <book><chapter><sect1><title>
15532 #: ../en/ch13-mq-collab.xml:270
15533 msgid "Dividing up the <filename role=\"special\">series</filename> file"
15534 msgstr "分类补丁<filename role=\"special\">系列</filename>"
15536 #. type: Content of: <book><chapter><sect1><para>
15537 #: ../en/ch13-mq-collab.xml:273
15538 msgid ""
15539 "I categorise the patches in the <filename role=\"special\">series</filename> "
15540 "file into a number of logical groups. Each section of like patches begins "
15541 "with a block of comments that describes the purpose of the patches that "
15542 "follow."
15543 msgstr ""
15545 #. type: Content of: <book><chapter><sect1><para>
15546 #: ../en/ch13-mq-collab.xml:279
15547 msgid ""
15548 "The sequence of patch groups that I maintain follows. The ordering of these "
15549 "groups is important; I'll describe why after I introduce the groups."
15550 msgstr ""
15552 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15553 #: ../en/ch13-mq-collab.xml:283
15554 msgid ""
15555 "The <quote>accepted</quote> group. Patches that the development team has "
15556 "submitted to the maintainer of the Infiniband subsystem, and which he has "
15557 "accepted, but which are not present in the snapshot that the tiny repository "
15558 "is based on. These are <quote>read only</quote> patches, present only to "
15559 "transform the tree into a similar state as it is in the upstream maintainer's "
15560 "repository."
15561 msgstr ""
15563 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15564 #: ../en/ch13-mq-collab.xml:291
15565 msgid ""
15566 "The <quote>rework</quote> group. Patches that I have submitted, but that the "
15567 "upstream maintainer has requested modifications to before he will accept them."
15568 msgstr ""
15570 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15571 #: ../en/ch13-mq-collab.xml:296
15572 msgid ""
15573 "The <quote>pending</quote> group. Patches that I have not yet submitted to "
15574 "the upstream maintainer, but which we have finished working on. These will be "
15575 "<quote>read only</quote> for a while. If the upstream maintainer accepts "
15576 "them upon submission, I'll move them to the end of the <quote>accepted</"
15577 "quote> group. If he requests that I modify any, I'll move them to the "
15578 "beginning of the <quote>rework</quote> group."
15579 msgstr ""
15581 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15582 #: ../en/ch13-mq-collab.xml:305
15583 msgid ""
15584 "The <quote>in progress</quote> group. Patches that are actively being "
15585 "developed, and should not be submitted anywhere yet."
15586 msgstr ""
15588 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15589 #: ../en/ch13-mq-collab.xml:309
15590 msgid ""
15591 "The <quote>backport</quote> group. Patches that adapt the source tree to "
15592 "older versions of the kernel tree."
15593 msgstr ""
15595 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15596 #: ../en/ch13-mq-collab.xml:313
15597 msgid ""
15598 "The <quote>do not ship</quote> group. Patches that for some reason should "
15599 "never be submitted upstream. For example, one such patch might change "
15600 "embedded driver identification strings to make it easier to distinguish, in "
15601 "the field, between an out-of-tree version of the driver and a version shipped "
15602 "by a distribution vendor."
15603 msgstr ""
15605 #. type: Content of: <book><chapter><sect1><para>
15606 #: ../en/ch13-mq-collab.xml:321
15607 msgid ""
15608 "Now to return to the reasons for ordering groups of patches in this way. We "
15609 "would like the lowest patches in the stack to be as stable as possible, so "
15610 "that we will not need to rework higher patches due to changes in context. "
15611 "Putting patches that will never be changed first in the <filename role="
15612 "\"special\">series</filename> file serves this purpose."
15613 msgstr ""
15615 #. type: Content of: <book><chapter><sect1><para>
15616 #: ../en/ch13-mq-collab.xml:329
15617 msgid ""
15618 "We would also like the patches that we know we'll need to modify to be "
15619 "applied on top of a source tree that resembles the upstream tree as closely "
15620 "as possible. This is why we keep accepted patches around for a while."
15621 msgstr ""
15623 #. type: Content of: <book><chapter><sect1><para>
15624 #: ../en/ch13-mq-collab.xml:334
15625 msgid ""
15626 "The <quote>backport</quote> and <quote>do not ship</quote> patches float at "
15627 "the end of the <filename role=\"special\">series</filename> file. The "
15628 "backport patches must be applied on top of all other patches, and the "
15629 "<quote>do not ship</quote> patches might as well stay out of harm's way."
15630 msgstr ""
15632 #. type: Content of: <book><chapter><sect1><title>
15633 #: ../en/ch13-mq-collab.xml:343
15634 msgid "Maintaining the patch series"
15635 msgstr "维护补丁系列"
15637 #. type: Content of: <book><chapter><sect1><para>
15638 #: ../en/ch13-mq-collab.xml:345
15639 msgid ""
15640 "In my work, I use a number of guards to control which patches are to be "
15641 "applied."
15642 msgstr ""
15644 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15645 #: ../en/ch13-mq-collab.xml:349
15646 msgid ""
15647 "<quote>Accepted</quote> patches are guarded with <literal>accepted</"
15648 "literal>. I enable this guard most of the time. When I'm applying the "
15649 "patches on top of a tree where the patches are already present, I can turn "
15650 "this patch off, and the patches that follow it will apply cleanly."
15651 msgstr ""
15653 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15654 #: ../en/ch13-mq-collab.xml:356
15655 msgid ""
15656 "Patches that are <quote>finished</quote>, but not yet submitted, have no "
15657 "guards. If I'm applying the patch stack to a copy of the upstream tree, I "
15658 "don't need to enable any guards in order to get a reasonably safe source tree."
15659 msgstr ""
15661 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15662 #: ../en/ch13-mq-collab.xml:362
15663 msgid ""
15664 "Those patches that need reworking before being resubmitted are guarded with "
15665 "<literal>rework</literal>."
15666 msgstr ""
15668 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15669 #: ../en/ch13-mq-collab.xml:366
15670 msgid ""
15671 "For those patches that are still under development, I use <literal>devel</"
15672 "literal>."
15673 msgstr ""
15675 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
15676 #: ../en/ch13-mq-collab.xml:369
15677 msgid ""
15678 "A backport patch may have several guards, one for each version of the kernel "
15679 "to which it applies. For example, a patch that backports a piece of code to "
15680 "2.6.9 will have a <literal>2.6.9</literal> guard."
15681 msgstr ""
15683 #. type: Content of: <book><chapter><sect1><para>
15684 #: ../en/ch13-mq-collab.xml:374
15685 msgid ""
15686 "This variety of guards gives me considerable flexibility in determining what "
15687 "kind of source tree I want to end up with. For most situations, the "
15688 "selection of appropriate guards is automated during the build process, but I "
15689 "can manually tune the guards to use for less common circumstances."
15690 msgstr ""
15692 #. type: Content of: <book><chapter><sect1><sect2><title>
15693 #: ../en/ch13-mq-collab.xml:381
15694 msgid "The art of writing backport patches"
15695 msgstr "编写向后移植补丁的艺术"
15697 #. type: Content of: <book><chapter><sect1><sect2><para>
15698 #: ../en/ch13-mq-collab.xml:383
15699 msgid ""
15700 "Using MQ, writing a backport patch is a simple process. All such a patch has "
15701 "to do is modify a piece of code that uses a kernel feature not present in the "
15702 "older version of the kernel, so that the driver continues to work correctly "
15703 "under that older version."
15704 msgstr ""
15706 #. type: Content of: <book><chapter><sect1><sect2><para>
15707 #: ../en/ch13-mq-collab.xml:389
15708 msgid ""
15709 "A useful goal when writing a good backport patch is to make your code look as "
15710 "if it was written for the older version of the kernel you're targeting. The "
15711 "less obtrusive the patch, the easier it will be to understand and maintain. "
15712 "If you're writing a collection of backport patches to avoid the <quote>rat's "
15713 "nest</quote> effect of lots of <literal>#ifdef</literal>s (hunks of source "
15714 "code that are only used conditionally) in your code, don't introduce version-"
15715 "dependent <literal>#ifdef</literal>s into the patches. Instead, write "
15716 "several patches, each of which makes unconditional changes, and control their "
15717 "application using guards."
15718 msgstr ""
15720 #. type: Content of: <book><chapter><sect1><sect2><para>
15721 #: ../en/ch13-mq-collab.xml:402
15722 msgid ""
15723 "There are two reasons to divide backport patches into a distinct group, away "
15724 "from the <quote>regular</quote> patches whose effects they modify. The first "
15725 "is that intermingling the two makes it more difficult to use a tool like the "
15726 "<literal role=\"hg-ext\">patchbomb</literal> extension to automate the "
15727 "process of submitting the patches to an upstream maintainer. The second is "
15728 "that a backport patch could perturb the context in which a subsequent regular "
15729 "patch is applied, making it impossible to apply the regular patch cleanly "
15730 "<emphasis>without</emphasis> the earlier backport patch already being applied."
15731 msgstr ""
15733 #. type: Content of: <book><chapter><sect1><title>
15734 #: ../en/ch13-mq-collab.xml:417
15735 msgid "Useful tips for developing with MQ"
15736 msgstr "使用 MQ 开发的技巧"
15738 #. type: Content of: <book><chapter><sect1><sect2><title>
15739 #: ../en/ch13-mq-collab.xml:420
15740 msgid "Organising patches in directories"
15741 msgstr "将补丁放到几个目录中"
15743 #. type: Content of: <book><chapter><sect1><sect2><para>
15744 #: ../en/ch13-mq-collab.xml:422
15745 msgid ""
15746 "If you're working on a substantial project with MQ, it's not difficult to "
15747 "accumulate a large number of patches. For example, I have one patch "
15748 "repository that contains over 250 patches."
15749 msgstr ""
15751 #. type: Content of: <book><chapter><sect1><sect2><para>
15752 #: ../en/ch13-mq-collab.xml:427
15753 msgid ""
15754 "If you can group these patches into separate logical categories, you can if "
15755 "you like store them in different directories; MQ has no problems with patch "
15756 "names that contain path separators."
15757 msgstr ""
15759 #. type: Content of: <book><chapter><sect1><sect2><title>
15760 #: ../en/ch13-mq-collab.xml:434
15761 msgid "Viewing the history of a patch"
15762 msgstr "察看补丁的历史"
15764 #. type: Content of: <book><chapter><sect1><sect2><para>
15765 #: ../en/ch13-mq-collab.xml:436
15766 msgid ""
15767 "If you're developing a set of patches over a long time, it's a good idea to "
15768 "maintain them in a repository, as discussed in section <xref linkend=\"sec.mq."
15769 "repo\"/>. If you do so, you'll quickly discover that using the <command role="
15770 "\"hg-cmd\">hg diff</command> command to look at the history of changes to a "
15771 "patch is unworkable. This is in part because you're looking at the second "
15772 "derivative of the real code (a diff of a diff), but also because MQ adds "
15773 "noise to the process by modifying time stamps and directory names when it "
15774 "updates a patch."
15775 msgstr ""
15777 #. type: Content of: <book><chapter><sect1><sect2><para>
15778 #: ../en/ch13-mq-collab.xml:448
15779 msgid ""
15780 "However, you can use the <literal role=\"hg-ext\">extdiff</literal> "
15781 "extension, which is bundled with Mercurial, to turn a diff of two versions of "
15782 "a patch into something readable. To do this, you will need a third-party "
15783 "package called <literal role=\"package\">patchutils</literal> <citation>web:"
15784 "patchutils</citation>. This provides a command named <command>interdiff</"
15785 "command>, which shows the differences between two diffs as a diff. Used on "
15786 "two versions of the same diff, it generates a diff that represents the diff "
15787 "from the first to the second version."
15788 msgstr ""
15790 #. type: Content of: <book><chapter><sect1><sect2><para>
15791 #: ../en/ch13-mq-collab.xml:459
15792 msgid ""
15793 "You can enable the <literal role=\"hg-ext\">extdiff</literal> extension in "
15794 "the usual way, by adding a line to the <literal role=\"rc-extensions"
15795 "\">extensions</literal> section of your <filename role=\"special\"> /.hgrc</"
15796 "filename>."
15797 msgstr ""
15799 #
15800 #. &example.hg-interdiff;
15801 #. type: Content of: <book><chapter><sect1><sect2><para>
15802 #: ../en/ch13-mq-collab.xml:465
15803 msgid ""
15804 "The <command>interdiff</command> command expects to be passed the names of "
15805 "two files, but the <literal role=\"hg-ext\">extdiff</literal> extension "
15806 "passes the program it runs a pair of directories, each of which can contain "
15807 "an arbitrary number of files. We thus need a small program that will run "
15808 "<command>interdiff</command> on each pair of files in these two directories. "
15809 "This program is available as <filename role=\"special\">hg-interdiff</"
15810 "filename> in the <filename class=\"directory\">examples</filename> directory "
15811 "of the source code repository that accompanies this book."
15812 msgstr ""
15814 #. type: Content of: <book><chapter><sect1><sect2><para>
15815 #: ../en/ch13-mq-collab.xml:477
15816 msgid ""
15817 "With the <filename role=\"special\">hg-interdiff</filename> program in your "
15818 "shell's search path, you can run it as follows, from inside an MQ patch "
15819 "directory:"
15820 msgstr ""
15822 #. type: Content of: <book><chapter><sect1><sect2><para>
15823 #: ../en/ch13-mq-collab.xml:482
15824 msgid ""
15825 "Since you'll probably want to use this long-winded command a lot, you can get "
15826 "<literal role=\"hg-ext\">hgext</literal> to make it available as a normal "
15827 "Mercurial command, again by editing your <filename role=\"special\"> /.hgrc</"
15828 "filename>."
15829 msgstr ""
15831 #. type: Content of: <book><chapter><sect1><sect2><para>
15832 #: ../en/ch13-mq-collab.xml:489
15833 msgid ""
15834 "This directs <literal role=\"hg-ext\">hgext</literal> to make an "
15835 "<literal>interdiff</literal> command available, so you can now shorten the "
15836 "previous invocation of <command role=\"hg-ext-extdiff\">extdiff</command> to "
15837 "something a little more wieldy."
15838 msgstr ""
15840 #. type: Content of: <book><chapter><sect1><sect2><note><para>
15841 #: ../en/ch13-mq-collab.xml:498
15842 msgid ""
15843 "The <command>interdiff</command> command works well only if the underlying "
15844 "files against which versions of a patch are generated remain the same. If "
15845 "you create a patch, modify the underlying files, and then regenerate the "
15846 "patch, <command>interdiff</command> may not produce useful output."
15847 msgstr ""
15849 #. type: Content of: <book><chapter><sect1><sect2><para>
15850 #: ../en/ch13-mq-collab.xml:506
15851 msgid ""
15852 "The <literal role=\"hg-ext\">extdiff</literal> extension is useful for more "
15853 "than merely improving the presentation of MQ patches. To read more about it, "
15854 "go to section <xref linkend=\"sec.hgext.extdiff\"/>."
15855 msgstr ""
15857 #. type: Content of: <book><chapter><title>
15858 #: ../en/ch14-hgext.xml:5
15859 msgid "Adding functionality with extensions"
15860 msgstr "使用扩展增加功能"
15862 #. type: Content of: <book><chapter><para>
15863 #: ../en/ch14-hgext.xml:7
15864 msgid ""
15865 "While the core of Mercurial is quite complete from a functionality "
15866 "standpoint, it's deliberately shorn of fancy features. This approach of "
15867 "preserving simplicity keeps the software easy to deal with for both "
15868 "maintainers and users."
15869 msgstr ""
15871 #. type: Content of: <book><chapter><para>
15872 #: ../en/ch14-hgext.xml:12
15873 msgid ""
15874 "However, Mercurial doesn't box you in with an inflexible command set: you can "
15875 "add features to it as <emphasis>extensions</emphasis> (sometimes known as "
15876 "<emphasis>plugins</emphasis>). We've already discussed a few of these "
15877 "extensions in earlier chapters."
15878 msgstr ""
15880 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15881 #: ../en/ch14-hgext.xml:18
15882 msgid ""
15883 "Section <xref linkend=\"sec.tour-merge.fetch\"/> covers the <literal role="
15884 "\"hg-ext\">fetch</literal> extension; this combines pulling new changes and "
15885 "merging them with local changes into a single command, <command role=\"hg-ext-"
15886 "fetch\">fetch</command>."
15887 msgstr ""
15889 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15890 #: ../en/ch14-hgext.xml:24
15891 msgid ""
15892 "In chapter <xref linkend=\"chap.hook\"/>, we covered several extensions that "
15893 "are useful for hook-related functionality: <literal role=\"hg-ext\">acl</"
15894 "literal> adds access control lists; <literal role=\"hg-ext\">bugzilla</"
15895 "literal> adds integration with the Bugzilla bug tracking system; and <literal "
15896 "role=\"hg-ext\">notify</literal> sends notification emails on new changes."
15897 msgstr ""
15899 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15900 #: ../en/ch14-hgext.xml:33
15901 msgid ""
15902 "The Mercurial Queues patch management extension is so invaluable that it "
15903 "merits two chapters and an appendix all to itself. Chapter <xref linkend="
15904 "\"chap.mq\"/> covers the basics; chapter <xref linkend=\"chap.mq-collab\"/> "
15905 "discusses advanced topics; and appendix <xref linkend=\"chap.mqref\"/> goes "
15906 "into detail on each command."
15907 msgstr ""
15909 #. type: Content of: <book><chapter><para>
15910 #: ../en/ch14-hgext.xml:43
15911 msgid ""
15912 "In this chapter, we'll cover some of the other extensions that are available "
15913 "for Mercurial, and briefly touch on some of the machinery you'll need to know "
15914 "about if you want to write an extension of your own."
15915 msgstr ""
15917 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
15918 #: ../en/ch14-hgext.xml:48
15919 msgid ""
15920 "In section <xref linkend=\"sec.hgext.inotify\"/>, we'll discuss the "
15921 "possibility of <emphasis>huge</emphasis> performance improvements using the "
15922 "<literal role=\"hg-ext\">inotify</literal> extension."
15923 msgstr ""
15925 #. type: Content of: <book><chapter><sect1><title>
15926 #: ../en/ch14-hgext.xml:55
15927 msgid ""
15928 "Improve performance with the <literal role=\"hg-ext\">inotify</literal> "
15929 "extension"
15930 msgstr "使用扩展 <literal role=\"hg-ext\">inotify</literal> 以提高性能"
15932 #. type: Content of: <book><chapter><sect1><para>
15933 #: ../en/ch14-hgext.xml:58
15934 msgid ""
15935 "Are you interested in having some of the most common Mercurial operations run "
15936 "as much as a hundred times faster? Read on!"
15937 msgstr ""
15939 #. type: Content of: <book><chapter><sect1><para>
15940 #: ../en/ch14-hgext.xml:62
15941 msgid ""
15942 "Mercurial has great performance under normal circumstances. For example, "
15943 "when you run the <command role=\"hg-cmd\">hg status</command> command, "
15944 "Mercurial has to scan almost every directory and file in your repository so "
15945 "that it can display file status. Many other Mercurial commands need to do "
15946 "the same work behind the scenes; for example, the <command role=\"hg-cmd\">hg "
15947 "diff</command> command uses the status machinery to avoid doing an expensive "
15948 "comparison operation on files that obviously haven't changed."
15949 msgstr ""
15951 #. type: Content of: <book><chapter><sect1><para>
15952 #: ../en/ch14-hgext.xml:72
15953 msgid ""
15954 "Because obtaining file status is crucial to good performance, the authors of "
15955 "Mercurial have optimised this code to within an inch of its life. However, "
15956 "there's no avoiding the fact that when you run <command role=\"hg-cmd\">hg "
15957 "status</command>, Mercurial is going to have to perform at least one "
15958 "expensive system call for each managed file to determine whether it's changed "
15959 "since the last time Mercurial checked. For a sufficiently large repository, "
15960 "this can take a long time."
15961 msgstr ""
15963 #. type: Content of: <book><chapter><sect1><para>
15964 #: ../en/ch14-hgext.xml:82
15965 msgid ""
15966 "To put a number on the magnitude of this effect, I created a repository "
15967 "containing 150,000 managed files. I timed <command role=\"hg-cmd\">hg "
15968 "status</command> as taking ten seconds to run, even when <emphasis>none</"
15969 "emphasis> of those files had been modified."
15970 msgstr ""
15972 #. type: Content of: <book><chapter><sect1><para>
15973 #: ../en/ch14-hgext.xml:88
15974 msgid ""
15975 "Many modern operating systems contain a file notification facility. If a "
15976 "program signs up to an appropriate service, the operating system will notify "
15977 "it every time a file of interest is created, modified, or deleted. On Linux "
15978 "systems, the kernel component that does this is called <literal>inotify</"
15979 "literal>."
15980 msgstr ""
15982 #. type: Content of: <book><chapter><sect1><para>
15983 #: ../en/ch14-hgext.xml:95
15984 msgid ""
15985 "Mercurial's <literal role=\"hg-ext\">inotify</literal> extension talks to the "
15986 "kernel's <literal>inotify</literal> component to optimise <command role=\"hg-"
15987 "cmd\">hg status</command> commands. The extension has two components. A "
15988 "daemon sits in the background and receives notifications from the "
15989 "<literal>inotify</literal> subsystem. It also listens for connections from a "
15990 "regular Mercurial command. The extension modifies Mercurial's behaviour so "
15991 "that instead of scanning the filesystem, it queries the daemon. Since the "
15992 "daemon has perfect information about the state of the repository, it can "
15993 "respond with a result instantaneously, avoiding the need to scan every "
15994 "directory and file in the repository."
15995 msgstr ""
15997 #. type: Content of: <book><chapter><sect1><para>
15998 #: ../en/ch14-hgext.xml:108
15999 msgid ""
16000 "Recall the ten seconds that I measured plain Mercurial as taking to run "
16001 "<command role=\"hg-cmd\">hg status</command> on a 150,000 file repository. "
16002 "With the <literal role=\"hg-ext\">inotify</literal> extension enabled, the "
16003 "time dropped to 0.1 seconds, a factor of <emphasis>one hundred</emphasis> "
16004 "faster."
16005 msgstr ""
16007 #. type: Content of: <book><chapter><sect1><para>
16008 #: ../en/ch14-hgext.xml:115
16009 msgid "Before we continue, please pay attention to some caveats."
16010 msgstr ""
16012 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
16013 #: ../en/ch14-hgext.xml:118
16014 msgid ""
16015 "The <literal role=\"hg-ext\">inotify</literal> extension is Linux-specific. "
16016 "Because it interfaces directly to the Linux kernel's <literal>inotify</"
16017 "literal> subsystem, it does not work on other operating systems."
16018 msgstr ""
16020 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
16021 #: ../en/ch14-hgext.xml:123
16022 msgid ""
16023 "It should work on any Linux distribution that was released after early 2005. "
16024 "Older distributions are likely to have a kernel that lacks <literal>inotify</"
16025 "literal>, or a version of <literal>glibc</literal> that does not have the "
16026 "necessary interfacing support."
16027 msgstr ""
16029 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
16030 #: ../en/ch14-hgext.xml:130
16031 msgid ""
16032 "Not all filesystems are suitable for use with the <literal role=\"hg-ext"
16033 "\">inotify</literal> extension. Network filesystems such as NFS are a non-"
16034 "starter, for example, particularly if you're running Mercurial on several "
16035 "systems, all mounting the same network filesystem. The kernel's "
16036 "<literal>inotify</literal> system has no way of knowing about changes made on "
16037 "another system. Most local filesystems (e.g. ext3, XFS, ReiserFS) should "
16038 "work fine."
16039 msgstr ""
16041 #. type: Content of: <book><chapter><sect1><para>
16042 #: ../en/ch14-hgext.xml:141
16043 msgid ""
16044 "The <literal role=\"hg-ext\">inotify</literal> extension is not yet shipped "
16045 "with Mercurial as of May 2007, so it's a little more involved to set up than "
16046 "other extensions. But the performance improvement is worth it!"
16047 msgstr ""
16049 #. type: Content of: <book><chapter><sect1><para>
16050 #: ../en/ch14-hgext.xml:146
16051 msgid ""
16052 "The extension currently comes in two parts: a set of patches to the Mercurial "
16053 "source code, and a library of Python bindings to the <literal>inotify</"
16054 "literal> subsystem."
16055 msgstr ""
16057 #. type: Content of: <book><chapter><sect1><note><para>
16058 #: ../en/ch14-hgext.xml:150
16059 msgid ""
16060 "There are <emphasis>two</emphasis> Python <literal>inotify</literal> binding "
16061 "libraries. One of them is called <literal>pyinotify</literal>, and is "
16062 "packaged by some Linux distributions as <literal>python-inotify</literal>. "
16063 "This is <emphasis>not</emphasis> the one you'll need, as it is too buggy and "
16064 "inefficient to be practical."
16065 msgstr ""
16067 #. type: Content of: <book><chapter><sect1><para>
16068 #: ../en/ch14-hgext.xml:157
16069 msgid ""
16070 "To get going, it's best to already have a functioning copy of Mercurial "
16071 "installed."
16072 msgstr ""
16074 #. type: Content of: <book><chapter><sect1><note><para>
16075 #: ../en/ch14-hgext.xml:160
16076 msgid ""
16077 "If you follow the instructions below, you'll be <emphasis>replacing</"
16078 "emphasis> and overwriting any existing installation of Mercurial that you "
16079 "might already have, using the latest <quote>bleeding edge</quote> Mercurial "
16080 "code. Don't say you weren't warned!"
16081 msgstr ""
16083 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16084 #: ../en/ch14-hgext.xml:167
16085 msgid ""
16086 "Clone the Python <literal>inotify</literal> binding repository. Build and "
16087 "install it."
16088 msgstr ""
16090 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16091 #: ../en/ch14-hgext.xml:175
16092 msgid ""
16093 "Clone the <filename class=\"directory\">crew</filename> Mercurial "
16094 "repository. Clone the <literal role=\"hg-ext\">inotify</literal> patch "
16095 "repository so that Mercurial Queues will be able to apply patches to your "
16096 "cope of the <filename class=\"directory\">crew</filename> repository."
16097 msgstr ""
16099 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16100 #: ../en/ch14-hgext.xml:188
16101 msgid ""
16102 "Make sure that you have the Mercurial Queues extension, <literal role=\"hg-ext"
16103 "\">mq</literal>, enabled. If you've never used MQ, read section <xref "
16104 "linkend=\"sec.mq.start\"/> to get started quickly."
16105 msgstr ""
16107 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16108 #: ../en/ch14-hgext.xml:194
16109 msgid ""
16110 "Go into the <filename class=\"directory\">inotify</filename> repo, and apply "
16111 "all of the <literal role=\"hg-ext\">inotify</literal> patches using the "
16112 "<option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</option> option to the "
16113 "<command role=\"hg-ext-mq\">qpush</command> command."
16114 msgstr ""
16116 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16117 #: ../en/ch14-hgext.xml:204
16118 msgid ""
16119 "If you get an error message from <command role=\"hg-ext-mq\">qpush</command>, "
16120 "you should not continue. Instead, ask for help."
16121 msgstr ""
16123 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
16124 #: ../en/ch14-hgext.xml:208
16125 msgid "Build and install the patched version of Mercurial."
16126 msgstr ""
16128 #. type: Content of: <book><chapter><sect1><para>
16129 #: ../en/ch14-hgext.xml:216
16130 msgid ""
16131 "Once you've build a suitably patched version of Mercurial, all you need to do "
16132 "to enable the <literal role=\"hg-ext\">inotify</literal> extension is add an "
16133 "entry to your <filename role=\"special\"> /.hgrc</filename>."
16134 msgstr ""
16136 #. type: Content of: <book><chapter><sect1><para>
16137 #: ../en/ch14-hgext.xml:221
16138 msgid ""
16139 "When the <literal role=\"hg-ext\">inotify</literal> extension is enabled, "
16140 "Mercurial will automatically and transparently start the status daemon the "
16141 "first time you run a command that needs status in a repository. It runs one "
16142 "status daemon per repository."
16143 msgstr ""
16145 #. type: Content of: <book><chapter><sect1><para>
16146 #: ../en/ch14-hgext.xml:227
16147 msgid ""
16148 "The status daemon is started silently, and runs in the background. If you "
16149 "look at a list of running processes after you've enabled the <literal role="
16150 "\"hg-ext\">inotify</literal> extension and run a few commands in different "
16151 "repositories, you'll thus see a few <literal>hg</literal> processes sitting "
16152 "around, waiting for updates from the kernel and queries from Mercurial."
16153 msgstr ""
16155 #. type: Content of: <book><chapter><sect1><para>
16156 #: ../en/ch14-hgext.xml:235
16157 msgid ""
16158 "The first time you run a Mercurial command in a repository when you have the "
16159 "<literal role=\"hg-ext\">inotify</literal> extension enabled, it will run "
16160 "with about the same performance as a normal Mercurial command. This is "
16161 "because the status daemon needs to perform a normal status scan so that it "
16162 "has a baseline against which to apply later updates from the kernel. "
16163 "However, <emphasis>every</emphasis> subsequent command that does any kind of "
16164 "status check should be noticeably faster on repositories of even fairly "
16165 "modest size. Better yet, the bigger your repository is, the greater a "
16166 "performance advantage you'll see. The <literal role=\"hg-ext\">inotify</"
16167 "literal> daemon makes status operations almost instantaneous on repositories "
16168 "of all sizes!"
16169 msgstr ""
16171 #. type: Content of: <book><chapter><sect1><para>
16172 #: ../en/ch14-hgext.xml:249
16173 msgid ""
16174 "If you like, you can manually start a status daemon using the <command role="
16175 "\"hg-ext-inotify\">inserve</command> command. This gives you slightly finer "
16176 "control over how the daemon ought to run. This command will of course only "
16177 "be available when the <literal role=\"hg-ext\">inotify</literal> extension is "
16178 "enabled."
16179 msgstr ""
16181 #. type: Content of: <book><chapter><sect1><para>
16182 #: ../en/ch14-hgext.xml:256
16183 msgid ""
16184 "When you're using the <literal role=\"hg-ext\">inotify</literal> extension, "
16185 "you should notice <emphasis>no difference at all</emphasis> in Mercurial's "
16186 "behaviour, with the sole exception of status-related commands running a whole "
16187 "lot faster than they used to. You should specifically expect that commands "
16188 "will not print different output; neither should they give different results. "
16189 "If either of these situations occurs, please report a bug."
16190 msgstr ""
16192 #. type: Content of: <book><chapter><sect1><title>
16193 #: ../en/ch14-hgext.xml:267
16194 msgid ""
16195 "Flexible diff support with the <literal role=\"hg-ext\">extdiff</literal> "
16196 "extension"
16197 msgstr "使用扩展 <literal role=\"hg-ext\">extdiff</literal> 以扩展差异支持"
16199 #. type: Content of: <book><chapter><sect1><para>
16200 #: ../en/ch14-hgext.xml:270
16201 msgid ""
16202 "Mercurial's built-in <command role=\"hg-cmd\">hg diff</command> command "
16203 "outputs plaintext unified diffs."
16204 msgstr ""
16205 "Mercurial 内置命令 <command role=\"hg-cmd\">hg diff</command> 的输出与统一差异"
16206 "不同。"
16208 #. type: Content of: <book><chapter><sect1><para>
16209 #: ../en/ch14-hgext.xml:275
16210 msgid ""
16211 "If you would like to use an external tool to display modifications, you'll "
16212 "want to use the <literal role=\"hg-ext\">extdiff</literal> extension. This "
16213 "will let you use, for example, a graphical diff tool."
16214 msgstr ""
16216 #. type: Content of: <book><chapter><sect1><para>
16217 #: ../en/ch14-hgext.xml:280
16218 msgid ""
16219 "The <literal role=\"hg-ext\">extdiff</literal> extension is bundled with "
16220 "Mercurial, so it's easy to set up. In the <literal role=\"rc-extensions"
16221 "\">extensions</literal> section of your <filename role=\"special\"> /.hgrc</"
16222 "filename>, simply add a one-line entry to enable the extension."
16223 msgstr ""
16225 #. type: Content of: <book><chapter><sect1><para>
16226 #: ../en/ch14-hgext.xml:286
16227 msgid ""
16228 "This introduces a command named <command role=\"hg-ext-extdiff\">extdiff</"
16229 "command>, which by default uses your system's <command>diff</command> command "
16230 "to generate a unified diff in the same form as the built-in <command role="
16231 "\"hg-cmd\">hg diff</command> command."
16232 msgstr ""
16234 #. type: Content of: <book><chapter><sect1><para>
16235 #: ../en/ch14-hgext.xml:294
16236 msgid ""
16237 "The result won't be exactly the same as with the built-in <command role=\"hg-"
16238 "cmd\">hg diff</command> variations, because the output of <command>diff</"
16239 "command> varies from one system to another, even when passed the same options."
16240 msgstr ""
16242 #. type: Content of: <book><chapter><sect1><para>
16243 #: ../en/ch14-hgext.xml:299
16244 msgid ""
16245 "As the <quote><literal>making snapshot</literal></quote> lines of output "
16246 "above imply, the <command role=\"hg-ext-extdiff\">extdiff</command> command "
16247 "works by creating two snapshots of your source tree. The first snapshot is "
16248 "of the source revision; the second, of the target revision or working "
16249 "directory. The <command role=\"hg-ext-extdiff\">extdiff</command> command "
16250 "generates these snapshots in a temporary directory, passes the name of each "
16251 "directory to an external diff viewer, then deletes the temporary directory. "
16252 "For efficiency, it only snapshots the directories and files that have changed "
16253 "between the two revisions."
16254 msgstr ""
16256 #. type: Content of: <book><chapter><sect1><para>
16257 #: ../en/ch14-hgext.xml:312
16258 msgid ""
16259 "Snapshot directory names have the same base name as your repository. If your "
16260 "repository path is <filename class=\"directory\">/quux/bar/foo</filename>, "
16261 "then <filename class=\"directory\">foo</filename> will be the name of each "
16262 "snapshot directory. Each snapshot directory name has its changeset ID "
16263 "appended, if appropriate. If a snapshot is of revision "
16264 "<literal>a631aca1083f</literal>, the directory will be named <filename class="
16265 "\"directory\">foo.a631aca1083f</filename>. A snapshot of the working "
16266 "directory won't have a changeset ID appended, so it would just be <filename "
16267 "class=\"directory\">foo</filename> in this example. To see what this looks "
16268 "like in practice, look again at the <command role=\"hg-ext-extdiff\">extdiff</"
16269 "command> example above. Notice that the diff has the snapshot directory "
16270 "names embedded in its header."
16271 msgstr ""
16273 #. type: Content of: <book><chapter><sect1><para>
16274 #: ../en/ch14-hgext.xml:328
16275 msgid ""
16276 "The <command role=\"hg-ext-extdiff\">extdiff</command> command accepts two "
16277 "important options. The <option role=\"hg-ext-extdiff-cmd-extdiff-opt\">hg -p</"
16278 "option> option lets you choose a program to view differences with, instead of "
16279 "<command>diff</command>. With the <option role=\"hg-ext-extdiff-cmd-extdiff-"
16280 "opt\">hg -o</option> option, you can change the options that <command role="
16281 "\"hg-ext-extdiff\">extdiff</command> passes to the program (by default, these "
16282 "options are <quote><literal>-Npru</literal></quote>, which only make sense if "
16283 "you're running <command>diff</command>). In other respects, the <command "
16284 "role=\"hg-ext-extdiff\">extdiff</command> command acts similarly to the built-"
16285 "in <command role=\"hg-cmd\">hg diff</command> command: you use the same "
16286 "option names, syntax, and arguments to specify the revisions you want, the "
16287 "files you want, and so on."
16288 msgstr ""
16290 #
16291 #. type: Content of: <book><chapter><sect1><para>
16292 #: ../en/ch14-hgext.xml:345
16293 msgid ""
16294 "As an example, here's how to run the normal system <command>diff</command> "
16295 "command, getting it to generate context diffs (using the <option role=\"cmd-"
16296 "opt-diff\">-c</option> option) instead of unified diffs, and five lines of "
16297 "context instead of the default three (passing <literal>5</literal> as the "
16298 "argument to the <option role=\"cmd-opt-diff\">-C</option> option)."
16299 msgstr ""
16301 #. type: Content of: <book><chapter><sect1><para>
16302 #: ../en/ch14-hgext.xml:354
16303 msgid ""
16304 "Launching a visual diff tool is just as easy. Here's how to launch the "
16305 "<command>kdiff3</command> viewer."
16306 msgstr ""
16308 #. type: Content of: <book><chapter><sect1><para>
16309 #: ../en/ch14-hgext.xml:358
16310 msgid ""
16311 "If your diff viewing command can't deal with directories, you can easily work "
16312 "around this with a little scripting. For an example of such scripting in "
16313 "action with the <literal role=\"hg-ext\">mq</literal> extension and the "
16314 "<command>interdiff</command> command, see section <xref linkend=\"mq-collab."
16315 "tips.interdiff\"/>."
16316 msgstr ""
16318 #. type: Content of: <book><chapter><sect1><sect2><title>
16319 #: ../en/ch14-hgext.xml:366
16320 msgid "Defining command aliases"
16321 msgstr "定义命令的别名"
16323 #. type: Content of: <book><chapter><sect1><sect2><para>
16324 #: ../en/ch14-hgext.xml:368
16325 msgid ""
16326 "It can be cumbersome to remember the options to both the <command role=\"hg-"
16327 "ext-extdiff\">extdiff</command> command and the diff viewer you want to use, "
16328 "so the <literal role=\"hg-ext\">extdiff</literal> extension lets you define "
16329 "<emphasis>new</emphasis> commands that will invoke your diff viewer with "
16330 "exactly the right options."
16331 msgstr ""
16333 #. type: Content of: <book><chapter><sect1><sect2><para>
16334 #: ../en/ch14-hgext.xml:375
16335 msgid ""
16336 "All you need to do is edit your <filename role=\"special\"> /.hgrc</"
16337 "filename>, and add a section named <literal role=\"rc-extdiff\">extdiff</"
16338 "literal>. Inside this section, you can define multiple commands. Here's how "
16339 "to add a <literal>kdiff3</literal> command. Once you've defined this, you "
16340 "can type <quote><literal>hg kdiff3</literal></quote> and the <literal role="
16341 "\"hg-ext\">extdiff</literal> extension will run <command>kdiff3</command> for "
16342 "you."
16343 msgstr ""
16345 #. type: Content of: <book><chapter><sect1><sect2><para>
16346 #: ../en/ch14-hgext.xml:384
16347 msgid ""
16348 "If you leave the right hand side of the definition empty, as above, the "
16349 "<literal role=\"hg-ext\">extdiff</literal> extension uses the name of the "
16350 "command you defined as the name of the external program to run. But these "
16351 "names don't have to be the same. Here, we define a command named "
16352 "<quote><literal>hg wibble</literal></quote>, which runs <command>kdiff3</"
16353 "command>."
16354 msgstr ""
16356 #. type: Content of: <book><chapter><sect1><sect2><para>
16357 #: ../en/ch14-hgext.xml:393
16358 msgid ""
16359 "You can also specify the default options that you want to invoke your diff "
16360 "viewing program with. The prefix to use is <quote><literal>opts.</literal></"
16361 "quote>, followed by the name of the command to which the options apply. This "
16362 "example defines a <quote><literal>hg vimdiff</literal></quote> command that "
16363 "runs the <command>vim</command> editor's <literal>DirDiff</literal> extension."
16364 msgstr ""
16366 #. type: Content of: <book><chapter><sect1><title>
16367 #: ../en/ch14-hgext.xml:406
16368 msgid ""
16369 "Cherrypicking changes with the <literal role=\"hg-ext\">transplant</literal> "
16370 "extension"
16371 msgstr "使用扩展 <literal role=\"hg-ext\">transplant</literal> 以挑选修改"
16373 #. type: Content of: <book><chapter><sect1><para>
16374 #: ../en/ch14-hgext.xml:409
16375 msgid "Need to have a long chat with Brendan about this."
16376 msgstr ""
16378 #. type: Content of: <book><chapter><sect1><title>
16379 #: ../en/ch14-hgext.xml:413
16380 msgid ""
16381 "Send changes via email with the <literal role=\"hg-ext\">patchbomb</literal> "
16382 "extension"
16383 msgstr ""
16384 "使用扩展 <literal role=\"hg-ext\">patchbomb</literal> 通过 email 发送修改"
16386 #. type: Content of: <book><chapter><sect1><para>
16387 #: ../en/ch14-hgext.xml:416
16388 msgid ""
16389 "Many projects have a culture of <quote>change review</quote>, in which people "
16390 "send their modifications to a mailing list for others to read and comment on "
16391 "before they commit the final version to a shared repository. Some projects "
16392 "have people who act as gatekeepers; they apply changes from other people to a "
16393 "repository to which those others don't have access."
16394 msgstr ""
16396 #. type: Content of: <book><chapter><sect1><para>
16397 #: ../en/ch14-hgext.xml:424
16398 msgid ""
16399 "Mercurial makes it easy to send changes over email for review or application, "
16400 "via its <literal role=\"hg-ext\">patchbomb</literal> extension. The "
16401 "extension is so named because changes are formatted as patches, and it's "
16402 "usual to send one changeset per email message. Sending a long series of "
16403 "changes by email is thus much like <quote>bombing</quote> the recipient's "
16404 "inbox, hence <quote>patchbomb</quote>."
16405 msgstr ""
16407 #. type: Content of: <book><chapter><sect1><para>
16408 #: ../en/ch14-hgext.xml:432
16409 msgid ""
16410 "As usual, the basic configuration of the <literal role=\"hg-ext\">patchbomb</"
16411 "literal> extension takes just one or two lines in your <filename role="
16412 "\"special\"> /.hgrc</filename>."
16413 msgstr ""
16415 #. type: Content of: <book><chapter><sect1><para>
16416 #: ../en/ch14-hgext.xml:437
16417 msgid ""
16418 "Once you've enabled the extension, you will have a new command available, "
16419 "named <command role=\"hg-ext-patchbomb\">email</command>."
16420 msgstr ""
16422 #. type: Content of: <book><chapter><sect1><para>
16423 #: ../en/ch14-hgext.xml:441
16424 msgid ""
16425 "The safest and best way to invoke the <command role=\"hg-ext-patchbomb"
16426 "\">email</command> command is to <emphasis>always</emphasis> run it first "
16427 "with the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -n</option> "
16428 "option. This will show you what the command <emphasis>would</emphasis> send, "
16429 "without actually sending anything. Once you've had a quick glance over the "
16430 "changes and verified that you are sending the right ones, you can rerun the "
16431 "same command, with the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -n</"
16432 "option> option removed."
16433 msgstr ""
16435 #. type: Content of: <book><chapter><sect1><para>
16436 #: ../en/ch14-hgext.xml:452
16437 msgid ""
16438 "The <command role=\"hg-ext-patchbomb\">email</command> command accepts the "
16439 "same kind of revision syntax as every other Mercurial command. For example, "
16440 "this command will send every revision between 7 and <literal>tip</literal>, "
16441 "inclusive."
16442 msgstr ""
16444 #. type: Content of: <book><chapter><sect1><para>
16445 #: ../en/ch14-hgext.xml:457
16446 msgid ""
16447 "You can also specify a <emphasis>repository</emphasis> to compare with. If "
16448 "you provide a repository but no revisions, the <command role=\"hg-ext-"
16449 "patchbomb\">email</command> command will send all revisions in the local "
16450 "repository that are not present in the remote repository. If you "
16451 "additionally specify revisions or a branch name (the latter using the <option "
16452 "role=\"hg-ext-patchbomb-cmd-email-opt\">hg -b</option> option), this will "
16453 "constrain the revisions sent."
16454 msgstr ""
16456 #. type: Content of: <book><chapter><sect1><para>
16457 #: ../en/ch14-hgext.xml:466
16458 msgid ""
16459 "It's perfectly safe to run the <command role=\"hg-ext-patchbomb\">email</"
16460 "command> command without the names of the people you want to send to: if you "
16461 "do this, it will just prompt you for those values interactively. (If you're "
16462 "using a Linux or Unix-like system, you should have enhanced "
16463 "<literal>readline</literal>-style editing capabilities when entering those "
16464 "headers, too, which is useful.)"
16465 msgstr ""
16467 #. type: Content of: <book><chapter><sect1><para>
16468 #: ../en/ch14-hgext.xml:474
16469 msgid ""
16470 "When you are sending just one revision, the <command role=\"hg-ext-patchbomb"
16471 "\">email</command> command will by default use the first line of the "
16472 "changeset description as the subject of the single email message it sends."
16473 msgstr ""
16475 #. type: Content of: <book><chapter><sect1><para>
16476 #: ../en/ch14-hgext.xml:479
16477 msgid ""
16478 "If you send multiple revisions, the <command role=\"hg-ext-patchbomb\">email</"
16479 "command> command will usually send one message per changeset. It will "
16480 "preface the series with an introductory message, in which you should describe "
16481 "the purpose of the series of changes you're sending."
16482 msgstr ""
16484 #. type: Content of: <book><chapter><sect1><sect2><title>
16485 #: ../en/ch14-hgext.xml:486
16486 msgid "Changing the behaviour of patchbombs"
16487 msgstr "修改 patchbomb 的行为"
16489 #. type: Content of: <book><chapter><sect1><sect2><para>
16490 #: ../en/ch14-hgext.xml:488
16491 msgid ""
16492 "Not every project has exactly the same conventions for sending changes in "
16493 "email; the <literal role=\"hg-ext\">patchbomb</literal> extension tries to "
16494 "accommodate a number of variations through command line options."
16495 msgstr ""
16497 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16498 #: ../en/ch14-hgext.xml:494
16499 msgid ""
16500 "You can write a subject for the introductory message on the command line "
16501 "using the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -s</option> "
16502 "option. This takes one argument, the text of the subject to use."
16503 msgstr ""
16505 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16506 #: ../en/ch14-hgext.xml:500
16507 msgid ""
16508 "To change the email address from which the messages originate, use the "
16509 "<option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -f</option> option. This "
16510 "takes one argument, the email address to use."
16511 msgstr ""
16513 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16514 #: ../en/ch14-hgext.xml:506
16515 msgid ""
16516 "The default behaviour is to send unified diffs (see section <xref linkend="
16517 "\"sec.mq.patch\"/> for a description of the format), one per message. You "
16518 "can send a binary bundle instead with the <option role=\"hg-ext-patchbomb-cmd-"
16519 "email-opt\">hg -b</option> option."
16520 msgstr ""
16522 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16523 #: ../en/ch14-hgext.xml:514
16524 msgid ""
16525 "Unified diffs are normally prefaced with a metadata header. You can omit "
16526 "this, and send unadorned diffs, with the <option role=\"hg-ext-patchbomb-cmd-"
16527 "email-opt\">hg --plain</option> option."
16528 msgstr ""
16530 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16531 #: ../en/ch14-hgext.xml:520
16532 msgid ""
16533 "Diffs are normally sent <quote>inline</quote>, in the same body part as the "
16534 "description of a patch. This makes it easiest for the largest number of "
16535 "readers to quote and respond to parts of a diff, as some mail clients will "
16536 "only quote the first MIME body part in a message. If you'd prefer to send the "
16537 "description and the diff in separate body parts, use the <option role=\"hg-"
16538 "ext-patchbomb-cmd-email-opt\">hg -a</option> option."
16539 msgstr ""
16541 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16542 #: ../en/ch14-hgext.xml:530
16543 msgid ""
16544 "Instead of sending mail messages, you can write them to an <literal>mbox</"
16545 "literal>-format mail folder using the <option role=\"hg-ext-patchbomb-cmd-"
16546 "email-opt\">hg -m</option> option. That option takes one argument, the name "
16547 "of the file to write to."
16548 msgstr ""
16550 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
16551 #: ../en/ch14-hgext.xml:537
16552 msgid ""
16553 "If you would like to add a <command>diffstat</command>-format summary to each "
16554 "patch, and one to the introductory message, use the <option role=\"hg-ext-"
16555 "patchbomb-cmd-email-opt\">hg -d</option> option. The <command>diffstat</"
16556 "command> command displays a table containing the name of each file patched, "
16557 "the number of lines affected, and a histogram showing how much each file is "
16558 "modified. This gives readers a qualitative glance at how complex a patch is."
16559 msgstr ""