| rev |
line source |
|
dongsheng@627
|
1 #
|
|
dongsheng@627
|
2 # Simplified Chinese translation for hgbook
|
|
dongsheng@627
|
3 # This file is distributed under the same license as the hgbook.
|
|
dongsheng@627
|
4 #
|
|
dongsheng@627
|
5 # Authors:
|
|
dongsheng@627
|
6 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
|
|
dongsheng@627
|
7 #
|
|
dongsheng@627
|
8 # Update to new pot:
|
|
dongsheng@636
|
9 # msgmerge --update zh.po hgbook.pot
|
|
dongsheng@627
|
10 #
|
|
dongsheng@627
|
11 # Check translation:
|
|
dongsheng@627
|
12 # msgfmt --statistics -c -o zh.mo zh.po
|
|
dongsheng@627
|
13 #
|
|
dongsheng@627
|
14 # Please format your translation before commit:
|
|
dongsheng@627
|
15 # msgcat --sort-by-file --width=80 -o zh_new.po zh.po
|
|
dongsheng@627
|
16 # mv -f zh_new.po zh.po
|
|
dongsheng@627
|
17 #
|
|
dongsheng@627
|
18 # Dictionary:
|
|
dongsheng@627
|
19 # blame 追溯
|
|
dongsheng@627
|
20 # branch 分支
|
|
dongsheng@627
|
21 # changes 修改
|
|
dongsheng@627
|
22 # changeset 修改集
|
|
dongsheng@627
|
23 # checkout 检出
|
|
dongsheng@627
|
24 # remove 移除(从版本库删除)
|
|
dongsheng@627
|
25 # delete 删除(只从文件系统删除)
|
|
dongsheng@627
|
26 # patchset 补丁集
|
|
dongsheng@627
|
27 # pushing to 推到
|
|
dongsheng@635
|
28 # pulling from 拉自，抓取
|
|
dongsheng@627
|
29 # rename 改名
|
|
dongsheng@627
|
30 # repository 版本库
|
|
dongsheng@627
|
31 # revert 恢复
|
|
dongsheng@627
|
32 # revision 版本
|
|
dongsheng@627
|
33 # tag 标签
|
|
dongsheng@627
|
34 # tip 顶点
|
|
dongsheng@627
|
35 # undo 撤销
|
|
dongsheng@627
|
36 # unversioned 未版本控制
|
|
dongsheng@627
|
37 # versioned 受版本控制
|
|
dongsheng@627
|
38 # working copy 工作副本
|
|
dongsheng@627
|
39 # ...
|
|
dongsheng@627
|
40 #
|
|
dongsheng@627
|
41 msgid ""
|
|
dongsheng@627
|
42 msgstr ""
|
|
dongsheng@627
|
43 "Project-Id-Version: hgbook 1.2\n"
|
|
dongsheng@641
|
44 "POT-Creation-Date: 2009-03-17 10:44+0800\n"
|
|
dongsheng@636
|
45 "PO-Revision-Date: 2009-03-16 18:32+0800\n"
|
|
dongsheng@627
|
46 "Last-Translator: \n"
|
|
dongsheng@627
|
47 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
|
|
dongsheng@627
|
48 "MIME-Version: 1.0\n"
|
|
dongsheng@627
|
49 "Content-Type: text/plain; charset=UTF-8\n"
|
|
dongsheng@627
|
50 "Content-Transfer-Encoding: 8bit\n"
|
|
dongsheng@627
|
51 "X-Poedit-Language: Chinese\n"
|
|
dongsheng@627
|
52 "X-Poedit-Country: CHINA\n"
|
|
dongsheng@627
|
53 "X-Poedit-SourceCharset: utf-8\n"
|
|
dongsheng@627
|
54
|
|
dongsheng@627
|
55 #. type: Content of: <book><title>
|
|
dongsheng@627
|
56 #: ../en/00book.xml:41
|
|
dongsheng@627
|
57 msgid "Mercurial: The Definitive Guide"
|
|
dongsheng@627
|
58 msgstr "Mercurial 权威指南"
|
|
dongsheng@627
|
59
|
|
dongsheng@627
|
60 #. type: Content of: <book><subtitle>
|
|
dongsheng@627
|
61 #: ../en/00book.xml:46
|
|
dongsheng@627
|
62 msgid "Compiled from $rev_id$"
|
|
dongsheng@627
|
63 msgstr "编译自 $rev_id$"
|
|
dongsheng@627
|
64
|
|
dongsheng@627
|
65 #. type: Content of: <book><bookinfo><authorgroup><author><firstname>
|
|
dongsheng@627
|
66 #: ../en/00book.xml:50
|
|
dongsheng@627
|
67 msgid "Bryan"
|
|
dongsheng@643
|
68 msgstr "Bryan"
|
|
dongsheng@627
|
69
|
|
dongsheng@627
|
70 #. type: Content of: <book><bookinfo><authorgroup><author><surname>
|
|
dongsheng@627
|
71 #: ../en/00book.xml:51
|
|
dongsheng@627
|
72 msgid "O'Sullivan"
|
|
dongsheng@643
|
73 msgstr "O'Sullivan"
|
|
dongsheng@627
|
74
|
|
dongsheng@627
|
75 #. type: Content of: <book><bookinfo>
|
|
dongsheng@627
|
76 #: ../en/00book.xml:55
|
|
dongsheng@627
|
77 msgid ""
|
|
dongsheng@627
|
78 "<editor> <firstname>Mike</firstname> <surname>Loukides</surname> </editor> "
|
|
dongsheng@627
|
79 "<copyright> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</"
|
|
dongsheng@627
|
80 "year> <holder>Bryan O'Sullivan</holder> </copyright>"
|
|
dongsheng@627
|
81 msgstr ""
|
|
dongsheng@643
|
82 "<editor> <firstname>Mike</firstname> <surname>Loukides</surname> </editor> "
|
|
dongsheng@643
|
83 "<copyright> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</"
|
|
dongsheng@643
|
84 "year> <holder>Bryan O'Sullivan</holder> </copyright>"
|
|
dongsheng@627
|
85
|
|
dongsheng@627
|
86 #. type: Content of: <book><appendix><title>
|
|
dongsheng@627
|
87 #: ../en/appA-cmdref.xml:4
|
|
dongsheng@627
|
88 msgid "Command reference"
|
|
dongsheng@627
|
89 msgstr "命令参考"
|
|
dongsheng@627
|
90
|
|
dongsheng@627
|
91 #. type: Content of: <book><appendix><para>
|
|
dongsheng@627
|
92 #: ../en/appA-cmdref.xml:6
|
|
dongsheng@627
|
93 msgid ""
|
|
dongsheng@627
|
94 "\\cmdref{add}{add files at the next commit} \\optref{add}{I}{include} \\optref"
|
|
dongsheng@627
|
95 "{add}{X}{exclude} \\optref{add}{n}{dry-run}"
|
|
dongsheng@627
|
96 msgstr ""
|
|
dongsheng@627
|
97
|
|
dongsheng@627
|
98 #. type: Content of: <book><appendix><para>
|
|
dongsheng@627
|
99 #: ../en/appA-cmdref.xml:11
|
|
dongsheng@627
|
100 msgid "\\cmdref{diff}{print changes in history or working directory}"
|
|
dongsheng@627
|
101 msgstr ""
|
|
dongsheng@627
|
102
|
|
dongsheng@627
|
103 #. type: Content of: <book><appendix><para>
|
|
dongsheng@627
|
104 #: ../en/appA-cmdref.xml:13
|
|
dongsheng@627
|
105 msgid ""
|
|
dongsheng@627
|
106 "Show differences between revisions for the specified files or directories, "
|
|
dongsheng@627
|
107 "using the unified diff format. For a description of the unified diff format, "
|
|
dongsheng@627
|
108 "see section <xref linkend=\"sec.mq.patch\"/>."
|
|
dongsheng@627
|
109 msgstr ""
|
|
dongsheng@627
|
110
|
|
dongsheng@627
|
111 #. type: Content of: <book><appendix><para>
|
|
dongsheng@627
|
112 #: ../en/appA-cmdref.xml:17
|
|
dongsheng@627
|
113 msgid ""
|
|
dongsheng@627
|
114 "By default, this command does not print diffs for files that Mercurial "
|
|
dongsheng@627
|
115 "considers to contain binary data. To control this behaviour, see the <option "
|
|
dongsheng@627
|
116 "role=\"hg-opt-diff\">-a</option> and <option role=\"hg-opt-diff\">--git</"
|
|
dongsheng@627
|
117 "option> options."
|
|
dongsheng@627
|
118 msgstr ""
|
|
dongsheng@627
|
119
|
|
dongsheng@627
|
120 #. type: Content of: <book><appendix><sect2><title>
|
|
dongsheng@627
|
121 #: ../en/appA-cmdref.xml:22
|
|
dongsheng@627
|
122 msgid "Options"
|
|
dongsheng@627
|
123 msgstr "选项"
|
|
dongsheng@627
|
124
|
|
dongsheng@627
|
125 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
126 #: ../en/appA-cmdref.xml:24
|
|
dongsheng@627
|
127 msgid "\\loptref{diff}{nodates}"
|
|
dongsheng@627
|
128 msgstr ""
|
|
dongsheng@627
|
129
|
|
dongsheng@627
|
130 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
131 #: ../en/appA-cmdref.xml:26
|
|
dongsheng@627
|
132 msgid "Omit date and time information when printing diff headers."
|
|
dongsheng@627
|
133 msgstr ""
|
|
dongsheng@627
|
134
|
|
dongsheng@627
|
135 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
136 #: ../en/appA-cmdref.xml:28
|
|
dongsheng@627
|
137 msgid "\\optref{diff}{B}{ignore-blank-lines}"
|
|
dongsheng@627
|
138 msgstr ""
|
|
dongsheng@627
|
139
|
|
dongsheng@627
|
140 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
141 #: ../en/appA-cmdref.xml:30
|
|
dongsheng@627
|
142 msgid ""
|
|
dongsheng@627
|
143 "Do not print changes that only insert or delete blank lines. A line that "
|
|
dongsheng@627
|
144 "contains only whitespace is not considered blank."
|
|
dongsheng@627
|
145 msgstr ""
|
|
dongsheng@627
|
146
|
|
dongsheng@627
|
147 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
148 #: ../en/appA-cmdref.xml:34
|
|
dongsheng@627
|
149 msgid "\\optref{diff}{I}{include}"
|
|
dongsheng@627
|
150 msgstr ""
|
|
dongsheng@627
|
151
|
|
dongsheng@627
|
152 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
153 #: ../en/appA-cmdref.xml:37
|
|
dongsheng@627
|
154 msgid "Include files and directories whose names match the given patterns."
|
|
dongsheng@627
|
155 msgstr ""
|
|
dongsheng@627
|
156
|
|
dongsheng@627
|
157 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
158 #: ../en/appA-cmdref.xml:40
|
|
dongsheng@627
|
159 msgid "\\optref{diff}{X}{exclude}"
|
|
dongsheng@627
|
160 msgstr ""
|
|
dongsheng@627
|
161
|
|
dongsheng@627
|
162 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
163 #: ../en/appA-cmdref.xml:43
|
|
dongsheng@627
|
164 msgid "Exclude files and directories whose names match the given patterns."
|
|
dongsheng@627
|
165 msgstr ""
|
|
dongsheng@627
|
166
|
|
dongsheng@627
|
167 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
168 #: ../en/appA-cmdref.xml:46
|
|
dongsheng@627
|
169 msgid "\\optref{diff}{a}{text}"
|
|
dongsheng@627
|
170 msgstr ""
|
|
dongsheng@627
|
171
|
|
dongsheng@627
|
172 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
173 #: ../en/appA-cmdref.xml:49
|
|
dongsheng@627
|
174 msgid ""
|
|
dongsheng@627
|
175 "If this option is not specified, <command role=\"hg-cmd\">hg diff</command> "
|
|
dongsheng@627
|
176 "will refuse to print diffs for files that it detects as binary. Specifying "
|
|
dongsheng@627
|
177 "<option role=\"hg-opt-diff\">-a</option> forces <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
178 "diff</command> to treat all files as text, and generate diffs for all of them."
|
|
dongsheng@627
|
179 msgstr ""
|
|
dongsheng@627
|
180
|
|
dongsheng@627
|
181 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
182 #: ../en/appA-cmdref.xml:55
|
|
dongsheng@627
|
183 msgid ""
|
|
dongsheng@627
|
184 "This option is useful for files that are <quote>mostly text</quote> but have "
|
|
dongsheng@627
|
185 "a few embedded NUL characters. If you use it on files that contain a lot of "
|
|
dongsheng@627
|
186 "binary data, its output will be incomprehensible."
|
|
dongsheng@627
|
187 msgstr ""
|
|
dongsheng@627
|
188
|
|
dongsheng@627
|
189 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
190 #: ../en/appA-cmdref.xml:60
|
|
dongsheng@627
|
191 msgid "\\optref{diff}{b}{ignore-space-change}"
|
|
dongsheng@627
|
192 msgstr ""
|
|
dongsheng@627
|
193
|
|
dongsheng@627
|
194 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
195 #: ../en/appA-cmdref.xml:63
|
|
dongsheng@627
|
196 msgid ""
|
|
dongsheng@627
|
197 "Do not print a line if the only change to that line is in the amount of white "
|
|
dongsheng@627
|
198 "space it contains."
|
|
dongsheng@627
|
199 msgstr ""
|
|
dongsheng@627
|
200
|
|
dongsheng@627
|
201 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
202 #: ../en/appA-cmdref.xml:67
|
|
dongsheng@627
|
203 msgid "\\optref{diff}{g}{git}"
|
|
dongsheng@627
|
204 msgstr ""
|
|
dongsheng@627
|
205
|
|
dongsheng@627
|
206 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
207 #: ../en/appA-cmdref.xml:70
|
|
dongsheng@627
|
208 msgid ""
|
|
dongsheng@627
|
209 "Print <command>git</command>-compatible diffs. XXX reference a format "
|
|
dongsheng@627
|
210 "description."
|
|
dongsheng@627
|
211 msgstr ""
|
|
dongsheng@627
|
212
|
|
dongsheng@627
|
213 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
214 #: ../en/appA-cmdref.xml:74
|
|
dongsheng@627
|
215 msgid "\\optref{diff}{p}{show-function}"
|
|
dongsheng@627
|
216 msgstr ""
|
|
dongsheng@627
|
217
|
|
dongsheng@627
|
218 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
219 #: ../en/appA-cmdref.xml:77
|
|
dongsheng@627
|
220 msgid ""
|
|
dongsheng@627
|
221 "Display the name of the enclosing function in a hunk header, using a simple "
|
|
dongsheng@627
|
222 "heuristic. This functionality is enabled by default, so the <option role="
|
|
dongsheng@627
|
223 "\"hg-opt-diff\">-p</option> option has no effect unless you change the value "
|
|
dongsheng@627
|
224 "of the <envar role=\"rc-item-diff\">showfunc</envar> config item, as in the "
|
|
dongsheng@627
|
225 "following example."
|
|
dongsheng@627
|
226 msgstr ""
|
|
dongsheng@627
|
227
|
|
dongsheng@627
|
228 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
229 #: ../en/appA-cmdref.xml:84
|
|
dongsheng@627
|
230 msgid "\\optref{diff}{r}{rev}"
|
|
dongsheng@627
|
231 msgstr ""
|
|
dongsheng@627
|
232
|
|
dongsheng@627
|
233 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
234 #: ../en/appA-cmdref.xml:87
|
|
dongsheng@627
|
235 msgid ""
|
|
dongsheng@627
|
236 "Specify one or more revisions to compare. The <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
237 "diff</command> command accepts up to two <option role=\"hg-opt-diff\">-r</"
|
|
dongsheng@627
|
238 "option> options to specify the revisions to compare."
|
|
dongsheng@627
|
239 msgstr ""
|
|
dongsheng@627
|
240
|
|
dongsheng@627
|
241 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
|
|
dongsheng@627
|
242 #: ../en/appA-cmdref.xml:93
|
|
dongsheng@627
|
243 msgid ""
|
|
dongsheng@627
|
244 "Display the differences between the parent revision of the working directory "
|
|
dongsheng@627
|
245 "and the working directory."
|
|
dongsheng@627
|
246 msgstr ""
|
|
dongsheng@627
|
247
|
|
dongsheng@627
|
248 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
|
|
dongsheng@627
|
249 #: ../en/appA-cmdref.xml:97
|
|
dongsheng@627
|
250 msgid ""
|
|
dongsheng@627
|
251 "Display the differences between the specified changeset and the working "
|
|
dongsheng@627
|
252 "directory."
|
|
dongsheng@627
|
253 msgstr ""
|
|
dongsheng@627
|
254
|
|
dongsheng@627
|
255 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
|
|
dongsheng@627
|
256 #: ../en/appA-cmdref.xml:101
|
|
dongsheng@627
|
257 msgid "Display the differences between the two specified changesets."
|
|
dongsheng@627
|
258 msgstr ""
|
|
dongsheng@627
|
259
|
|
dongsheng@627
|
260 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
261 #: ../en/appA-cmdref.xml:105
|
|
dongsheng@627
|
262 msgid ""
|
|
dongsheng@627
|
263 "You can specify two revisions using either two <option role=\"hg-opt-diff\">-"
|
|
dongsheng@627
|
264 "r</option> options or revision range notation. For example, the two revision "
|
|
dongsheng@627
|
265 "specifications below are equivalent."
|
|
dongsheng@627
|
266 msgstr ""
|
|
dongsheng@627
|
267
|
|
dongsheng@627
|
268 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
269 #: ../en/appA-cmdref.xml:112
|
|
dongsheng@627
|
270 msgid ""
|
|
dongsheng@627
|
271 "When you provide two revisions, Mercurial treats the order of those revisions "
|
|
dongsheng@627
|
272 "as significant. Thus, <command role=\"hg-cmd\">hg diff -r10:20</command> "
|
|
dongsheng@627
|
273 "will produce a diff that will transform files from their contents as of "
|
|
dongsheng@627
|
274 "revision 10 to their contents as of revision 20, while <command role=\"hg-cmd"
|
|
dongsheng@627
|
275 "\">hg diff -r20:10</command> means the opposite: the diff that will transform "
|
|
dongsheng@627
|
276 "files from their revision 20 contents to their revision 10 contents. You "
|
|
dongsheng@627
|
277 "cannot reverse the ordering in this way if you are diffing against the "
|
|
dongsheng@627
|
278 "working directory."
|
|
dongsheng@627
|
279 msgstr ""
|
|
dongsheng@627
|
280
|
|
dongsheng@627
|
281 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
282 #: ../en/appA-cmdref.xml:122
|
|
dongsheng@627
|
283 msgid "\\optref{diff}{w}{ignore-all-space}"
|
|
dongsheng@627
|
284 msgstr ""
|
|
dongsheng@627
|
285
|
|
dongsheng@627
|
286 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
287 #: ../en/appA-cmdref.xml:125
|
|
dongsheng@627
|
288 msgid "\\cmdref{version}{print version and copyright information}"
|
|
dongsheng@627
|
289 msgstr ""
|
|
dongsheng@627
|
290
|
|
dongsheng@627
|
291 #. type: Content of: <book><appendix><sect2><para>
|
|
dongsheng@627
|
292 #: ../en/appA-cmdref.xml:128
|
|
dongsheng@627
|
293 msgid ""
|
|
dongsheng@627
|
294 "This command displays the version of Mercurial you are running, and its "
|
|
dongsheng@627
|
295 "copyright license. There are four kinds of version string that you may see."
|
|
dongsheng@627
|
296 msgstr ""
|
|
dongsheng@627
|
297
|
|
dongsheng@627
|
298 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
299 #: ../en/appA-cmdref.xml:133
|
|
dongsheng@627
|
300 msgid ""
|
|
dongsheng@627
|
301 "The string <quote><literal>unknown</literal></quote>. This version of "
|
|
dongsheng@627
|
302 "Mercurial was not built in a Mercurial repository, and cannot determine its "
|
|
dongsheng@627
|
303 "own version."
|
|
dongsheng@627
|
304 msgstr ""
|
|
dongsheng@627
|
305
|
|
dongsheng@627
|
306 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
307 #: ../en/appA-cmdref.xml:138
|
|
dongsheng@627
|
308 msgid ""
|
|
dongsheng@627
|
309 "A short numeric string, such as <quote><literal>1.1</literal></quote>. This "
|
|
dongsheng@627
|
310 "is a build of a revision of Mercurial that was identified by a specific tag "
|
|
dongsheng@627
|
311 "in the repository where it was built. (This doesn't necessarily mean that "
|
|
dongsheng@627
|
312 "you're running an official release; someone else could have added that tag to "
|
|
dongsheng@627
|
313 "any revision in the repository where they built Mercurial.)"
|
|
dongsheng@627
|
314 msgstr ""
|
|
dongsheng@627
|
315
|
|
dongsheng@627
|
316 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
317 #: ../en/appA-cmdref.xml:146
|
|
dongsheng@627
|
318 msgid ""
|
|
dongsheng@627
|
319 "A hexadecimal string, such as <quote><literal>875489e31abe</literal></"
|
|
dongsheng@627
|
320 "quote>. This is a build of the given revision of Mercurial."
|
|
dongsheng@627
|
321 msgstr ""
|
|
dongsheng@627
|
322
|
|
dongsheng@627
|
323 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
324 #: ../en/appA-cmdref.xml:150
|
|
dongsheng@627
|
325 msgid ""
|
|
dongsheng@627
|
326 "A hexadecimal string followed by a date, such as <quote><literal>875489e31abe"
|
|
dongsheng@627
|
327 "+20070205</literal></quote>. This is a build of the given revision of "
|
|
dongsheng@627
|
328 "Mercurial, where the build repository contained some local changes that had "
|
|
dongsheng@627
|
329 "not been committed."
|
|
dongsheng@627
|
330 msgstr ""
|
|
dongsheng@627
|
331
|
|
dongsheng@627
|
332 #. type: Content of: <book><appendix><sect2><title>
|
|
dongsheng@627
|
333 #: ../en/appA-cmdref.xml:159
|
|
dongsheng@627
|
334 msgid "Tips and tricks"
|
|
dongsheng@627
|
335 msgstr ""
|
|
dongsheng@627
|
336
|
|
dongsheng@627
|
337 #. type: Content of: <book><appendix><sect2><sect3><title>
|
|
dongsheng@627
|
338 #: ../en/appA-cmdref.xml:162
|
|
dongsheng@627
|
339 msgid ""
|
|
dongsheng@627
|
340 "Why do the results of <command role=\"hg-cmd\">hg diff</command> and <command "
|
|
dongsheng@627
|
341 "role=\"hg-cmd\">hg status</command> differ?"
|
|
dongsheng@627
|
342 msgstr ""
|
|
dongsheng@627
|
343 "为什么 <command role=\"hg-cmd\">hg diff</command> 与 <command role=\"hg-cmd"
|
|
dongsheng@627
|
344 "\">hg status</command> 的结果不同 ?"
|
|
dongsheng@627
|
345
|
|
dongsheng@627
|
346 #. type: Content of: <book><appendix><sect2><sect3><para>
|
|
dongsheng@627
|
347 #: ../en/appA-cmdref.xml:164
|
|
dongsheng@627
|
348 msgid ""
|
|
dongsheng@627
|
349 "When you run the <command role=\"hg-cmd\">hg status</command> command, you'll "
|
|
dongsheng@627
|
350 "see a list of files that Mercurial will record changes for the next time you "
|
|
dongsheng@627
|
351 "perform a commit. If you run the <command role=\"hg-cmd\">hg diff</command> "
|
|
dongsheng@627
|
352 "command, you may notice that it prints diffs for only a <emphasis>subset</"
|
|
dongsheng@627
|
353 "emphasis> of the files that <command role=\"hg-cmd\">hg status</command> "
|
|
dongsheng@627
|
354 "listed. There are two possible reasons for this."
|
|
dongsheng@627
|
355 msgstr ""
|
|
dongsheng@627
|
356
|
|
dongsheng@627
|
357 #. type: Content of: <book><appendix><sect2><sect3><para>
|
|
dongsheng@627
|
358 #: ../en/appA-cmdref.xml:171
|
|
dongsheng@627
|
359 msgid ""
|
|
dongsheng@627
|
360 "The first is that <command role=\"hg-cmd\">hg status</command> prints some "
|
|
dongsheng@627
|
361 "kinds of modifications that <command role=\"hg-cmd\">hg diff</command> "
|
|
dongsheng@627
|
362 "doesn't normally display. The <command role=\"hg-cmd\">hg diff</command> "
|
|
dongsheng@627
|
363 "command normally outputs unified diffs, which don't have the ability to "
|
|
dongsheng@627
|
364 "represent some changes that Mercurial can track. Most notably, traditional "
|
|
dongsheng@627
|
365 "diffs can't represent a change in whether or not a file is executable, but "
|
|
dongsheng@627
|
366 "Mercurial records this information."
|
|
dongsheng@627
|
367 msgstr ""
|
|
dongsheng@627
|
368
|
|
dongsheng@627
|
369 #. type: Content of: <book><appendix><sect2><sect3><para>
|
|
dongsheng@627
|
370 #: ../en/appA-cmdref.xml:179
|
|
dongsheng@627
|
371 msgid ""
|
|
dongsheng@627
|
372 "If you use the <option role=\"hg-opt-diff\">--git</option> option to <command "
|
|
dongsheng@627
|
373 "role=\"hg-cmd\">hg diff</command>, it will display <command>git</command>-"
|
|
dongsheng@627
|
374 "compatible diffs that <emphasis>can</emphasis> display this extra information."
|
|
dongsheng@627
|
375 msgstr ""
|
|
dongsheng@627
|
376
|
|
dongsheng@627
|
377 #. type: Content of: <book><appendix><sect2><sect3><para>
|
|
dongsheng@627
|
378 #: ../en/appA-cmdref.xml:184
|
|
dongsheng@627
|
379 msgid ""
|
|
dongsheng@627
|
380 "The second possible reason that <command role=\"hg-cmd\">hg diff</command> "
|
|
dongsheng@627
|
381 "might be printing diffs for a subset of the files displayed by <command role="
|
|
dongsheng@627
|
382 "\"hg-cmd\">hg status</command> is that if you invoke it without any "
|
|
dongsheng@627
|
383 "arguments, <command role=\"hg-cmd\">hg diff</command> prints diffs against "
|
|
dongsheng@627
|
384 "the first parent of the working directory. If you have run <command role="
|
|
dongsheng@627
|
385 "\"hg-cmd\">hg merge</command> to merge two changesets, but you haven't yet "
|
|
dongsheng@627
|
386 "committed the results of the merge, your working directory has two parents "
|
|
dongsheng@627
|
387 "(use <command role=\"hg-cmd\">hg parents</command> to see them). While "
|
|
dongsheng@627
|
388 "<command role=\"hg-cmd\">hg status</command> prints modifications relative to "
|
|
dongsheng@627
|
389 "<emphasis>both</emphasis> parents after an uncommitted merge, <command role="
|
|
dongsheng@627
|
390 "\"hg-cmd\">hg diff</command> still operates relative only to the first "
|
|
dongsheng@627
|
391 "parent. You can get it to print diffs relative to the second parent by "
|
|
dongsheng@627
|
392 "specifying that parent with the <option role=\"hg-opt-diff\">-r</option> "
|
|
dongsheng@627
|
393 "option. There is no way to print diffs relative to both parents."
|
|
dongsheng@627
|
394 msgstr ""
|
|
dongsheng@627
|
395
|
|
dongsheng@627
|
396 #. type: Content of: <book><appendix><sect2><sect3><title>
|
|
dongsheng@627
|
397 #: ../en/appA-cmdref.xml:200
|
|
dongsheng@627
|
398 msgid "Generating safe binary diffs"
|
|
dongsheng@627
|
399 msgstr "生成安全的二进制差异"
|
|
dongsheng@627
|
400
|
|
dongsheng@627
|
401 #. type: Content of: <book><appendix><sect2><sect3><para>
|
|
dongsheng@627
|
402 #: ../en/appA-cmdref.xml:202
|
|
dongsheng@627
|
403 msgid ""
|
|
dongsheng@627
|
404 "If you use the <option role=\"hg-opt-diff\">-a</option> option to force "
|
|
dongsheng@627
|
405 "Mercurial to print diffs of files that are either <quote>mostly text</quote> "
|
|
dongsheng@627
|
406 "or contain lots of binary data, those diffs cannot subsequently be applied by "
|
|
dongsheng@627
|
407 "either Mercurial's <command role=\"hg-cmd\">hg import</command> command or "
|
|
dongsheng@627
|
408 "the system's <command>patch</command> command."
|
|
dongsheng@627
|
409 msgstr ""
|
|
dongsheng@627
|
410
|
|
dongsheng@627
|
411 #. type: Content of: <book><appendix><sect2><sect3><para>
|
|
dongsheng@627
|
412 #: ../en/appA-cmdref.xml:209
|
|
dongsheng@627
|
413 msgid ""
|
|
dongsheng@627
|
414 "If you want to generate a diff of a binary file that is safe to use as input "
|
|
dongsheng@627
|
415 "for <command role=\"hg-cmd\">hg import</command>, use the <command role=\"hg-"
|
|
dongsheng@627
|
416 "cmd\">hg diff</command>{--git} option when you generate the patch. The "
|
|
dongsheng@627
|
417 "system <command>patch</command> command cannot handle binary patches at all."
|
|
dongsheng@627
|
418 msgstr ""
|
|
dongsheng@627
|
419
|
|
dongsheng@627
|
420 #. type: Content of: <book><appendix><title>
|
|
dongsheng@627
|
421 #: ../en/appB-mq-ref.xml:5
|
|
dongsheng@627
|
422 msgid "Mercurial Queues reference"
|
|
dongsheng@627
|
423 msgstr "Mercurial 队列参考"
|
|
dongsheng@627
|
424
|
|
dongsheng@627
|
425 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
426 #: ../en/appB-mq-ref.xml:8
|
|
dongsheng@627
|
427 msgid "MQ command reference"
|
|
dongsheng@627
|
428 msgstr "MQ 命令参考"
|
|
dongsheng@627
|
429
|
|
dongsheng@627
|
430 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
431 #: ../en/appB-mq-ref.xml:10
|
|
dongsheng@627
|
432 msgid ""
|
|
dongsheng@627
|
433 "For an overview of the commands provided by MQ, use the command <command role="
|
|
dongsheng@627
|
434 "\"hg-cmd\">hg help mq</command>."
|
|
dongsheng@627
|
435 msgstr ""
|
|
dongsheng@627
|
436
|
|
dongsheng@627
|
437 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
438 #: ../en/appB-mq-ref.xml:14
|
|
dongsheng@627
|
439 msgid ""
|
|
dongsheng@627
|
440 "<command role=\"hg-ext-mq\">qapplied</command>&emdash;print applied patches"
|
|
dongsheng@627
|
441 msgstr "<command role=\"hg-ext-mq\">qapplied</command>&emdash;显示已应用的补丁"
|
|
dongsheng@627
|
442
|
|
dongsheng@627
|
443 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
444 #: ../en/appB-mq-ref.xml:17
|
|
dongsheng@627
|
445 msgid ""
|
|
dongsheng@627
|
446 "The <command role=\"hg-ext-mq\">qapplied</command> command prints the current "
|
|
dongsheng@627
|
447 "stack of applied patches. Patches are printed in oldest-to-newest order, so "
|
|
dongsheng@627
|
448 "the last patch in the list is the <quote>top</quote> patch."
|
|
dongsheng@627
|
449 msgstr ""
|
|
dongsheng@627
|
450
|
|
dongsheng@627
|
451 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
452 #: ../en/appB-mq-ref.xml:24
|
|
dongsheng@627
|
453 msgid ""
|
|
dongsheng@627
|
454 "<command role=\"hg-ext-mq\">qcommit</command>&emdash;commit changes in the "
|
|
dongsheng@627
|
455 "queue repository"
|
|
dongsheng@627
|
456 msgstr "<command role=\"hg-ext-mq\">qcommit</command>&emdash;提交队列中的修改"
|
|
dongsheng@627
|
457
|
|
dongsheng@627
|
458 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
459 #: ../en/appB-mq-ref.xml:27
|
|
dongsheng@627
|
460 msgid ""
|
|
dongsheng@627
|
461 "The <command role=\"hg-ext-mq\">qcommit</command> command commits any "
|
|
dongsheng@627
|
462 "outstanding changes in the <filename role=\"special\" class=\"directory\">.hg/"
|
|
dongsheng@627
|
463 "patches</filename> repository. This command only works if the <filename role="
|
|
dongsheng@627
|
464 "\"special\" class=\"directory\">.hg/patches</filename> directory is a "
|
|
dongsheng@627
|
465 "repository, i.e. you created the directory using <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
466 "qinit <option role=\"hg-ext-mq-cmd-qinit-opt\">-c</option></command> or ran "
|
|
dongsheng@627
|
467 "<command role=\"hg-cmd\">hg init</command> in the directory after running "
|
|
dongsheng@627
|
468 "<command role=\"hg-ext-mq\">qinit</command>."
|
|
dongsheng@627
|
469 msgstr ""
|
|
dongsheng@627
|
470
|
|
dongsheng@627
|
471 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
472 #: ../en/appB-mq-ref.xml:39
|
|
dongsheng@627
|
473 msgid ""
|
|
dongsheng@627
|
474 "This command is shorthand for <command role=\"hg-cmd\">hg commit --cwd .hg/"
|
|
dongsheng@627
|
475 "patches</command>."
|
|
dongsheng@627
|
476 msgstr ""
|
|
dongsheng@627
|
477
|
|
dongsheng@627
|
478 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
479 #: ../en/appB-mq-ref.xml:42
|
|
dongsheng@627
|
480 msgid ""
|
|
dongsheng@627
|
481 "\\subsection{<command role=\"hg-ext-mq\">qdelete</command>&emdash;delete a "
|
|
dongsheng@627
|
482 "patch from the <filename role=\"special\">series</filename> file}"
|
|
dongsheng@627
|
483 msgstr ""
|
|
dongsheng@627
|
484
|
|
dongsheng@627
|
485 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
486 #: ../en/appB-mq-ref.xml:47
|
|
dongsheng@627
|
487 msgid ""
|
|
dongsheng@627
|
488 "The <command role=\"hg-ext-mq\">qdelete</command> command removes the entry "
|
|
dongsheng@627
|
489 "for a patch from the <filename role=\"special\">series</filename> file in the "
|
|
dongsheng@627
|
490 "<filename role=\"special\" class=\"directory\">.hg/patches</filename> "
|
|
dongsheng@627
|
491 "directory. It does not pop the patch if the patch is already applied. By "
|
|
dongsheng@627
|
492 "default, it does not delete the patch file; use the <option role=\"hg-ext-mq-"
|
|
dongsheng@627
|
493 "cmd-qdel-opt\">-f</option> option to do that."
|
|
dongsheng@627
|
494 msgstr ""
|
|
dongsheng@627
|
495
|
|
dongsheng@627
|
496 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
497 #: ../en/appB-mq-ref.xml:56 ../en/appB-mq-ref.xml:98 ../en/appB-mq-ref.xml:156
|
|
dongsheng@627
|
498 #: ../en/appB-mq-ref.xml:196 ../en/appB-mq-ref.xml:263
|
|
dongsheng@627
|
499 #: ../en/appB-mq-ref.xml:334 ../en/appB-mq-ref.xml:403
|
|
dongsheng@627
|
500 #: ../en/appB-mq-ref.xml:496
|
|
dongsheng@627
|
501 msgid "Options:"
|
|
dongsheng@627
|
502 msgstr ""
|
|
dongsheng@627
|
503
|
|
dongsheng@627
|
504 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
505 #: ../en/appB-mq-ref.xml:58
|
|
dongsheng@627
|
506 msgid ""
|
|
dongsheng@627
|
507 "<option role=\"hg-ext-mq-cmd-qdel-opt\">-f</option>: Delete the patch file."
|
|
dongsheng@627
|
508 msgstr ""
|
|
dongsheng@627
|
509
|
|
dongsheng@627
|
510 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
511 #: ../en/appB-mq-ref.xml:65
|
|
dongsheng@627
|
512 msgid ""
|
|
dongsheng@627
|
513 "<command role=\"hg-ext-mq\">qdiff</command>&emdash;print a diff of the "
|
|
dongsheng@627
|
514 "topmost applied patch"
|
|
dongsheng@627
|
515 msgstr ""
|
|
dongsheng@627
|
516 "<command role=\"hg-ext-mq\">qdiff</command>&emdash;显示最新应用补丁的差异"
|
|
dongsheng@627
|
517
|
|
dongsheng@627
|
518 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
519 #: ../en/appB-mq-ref.xml:68
|
|
dongsheng@627
|
520 msgid ""
|
|
dongsheng@627
|
521 "The <command role=\"hg-ext-mq\">qdiff</command> command prints a diff of the "
|
|
dongsheng@627
|
522 "topmost applied patch. It is equivalent to <command role=\"hg-cmd\">hg diff -"
|
|
dongsheng@627
|
523 "r-2:-1</command>."
|
|
dongsheng@627
|
524 msgstr ""
|
|
dongsheng@627
|
525
|
|
dongsheng@627
|
526 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
527 #: ../en/appB-mq-ref.xml:74
|
|
dongsheng@627
|
528 msgid ""
|
|
dongsheng@627
|
529 "<command role=\"hg-ext-mq\">qfold</command>&emdash;merge (<quote>fold</"
|
|
dongsheng@627
|
530 "quote>) several patches into one"
|
|
dongsheng@627
|
531 msgstr ""
|
|
dongsheng@627
|
532 "<command role=\"hg-ext-mq\">qfold</command>&emdash;将多个补丁合并(<quote>折叠"
|
|
dongsheng@627
|
533 "</quote>)成一个"
|
|
dongsheng@627
|
534
|
|
dongsheng@627
|
535 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
536 #: ../en/appB-mq-ref.xml:77
|
|
dongsheng@627
|
537 msgid ""
|
|
dongsheng@627
|
538 "The <command role=\"hg-ext-mq\">qfold</command> command merges multiple "
|
|
dongsheng@627
|
539 "patches into the topmost applied patch, so that the topmost applied patch "
|
|
dongsheng@627
|
540 "makes the union of all of the changes in the patches in question."
|
|
dongsheng@627
|
541 msgstr ""
|
|
dongsheng@627
|
542
|
|
dongsheng@627
|
543 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
544 #: ../en/appB-mq-ref.xml:82
|
|
dongsheng@627
|
545 msgid ""
|
|
dongsheng@627
|
546 "The patches to fold must not be applied; <command role=\"hg-ext-mq\">qfold</"
|
|
dongsheng@627
|
547 "command> will exit with an error if any is. The order in which patches are "
|
|
dongsheng@627
|
548 "folded is significant; <command role=\"hg-cmd\">hg qfold a b</command> means "
|
|
dongsheng@627
|
549 "<quote>apply the current topmost patch, followed by <literal>a</literal>, "
|
|
dongsheng@627
|
550 "followed by <literal>b</literal></quote>."
|
|
dongsheng@627
|
551 msgstr ""
|
|
dongsheng@627
|
552
|
|
dongsheng@627
|
553 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
554 #: ../en/appB-mq-ref.xml:90
|
|
dongsheng@627
|
555 msgid ""
|
|
dongsheng@627
|
556 "The comments from the folded patches are appended to the comments of the "
|
|
dongsheng@627
|
557 "destination patch, with each block of comments separated by three asterisk "
|
|
dongsheng@627
|
558 "(<quote><literal>*</literal></quote>) characters. Use the <option role=\"hg-"
|
|
dongsheng@627
|
559 "ext-mq-cmd-qfold-opt\">-e</option> option to edit the commit message for the "
|
|
dongsheng@627
|
560 "combined patch/changeset after the folding has completed."
|
|
dongsheng@627
|
561 msgstr ""
|
|
dongsheng@627
|
562
|
|
dongsheng@627
|
563 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
564 #: ../en/appB-mq-ref.xml:100
|
|
dongsheng@627
|
565 msgid ""
|
|
dongsheng@627
|
566 "<option role=\"hg-ext-mq-cmd-qfold-opt\">-e</option>: Edit the commit message "
|
|
dongsheng@627
|
567 "and patch description for the newly folded patch."
|
|
dongsheng@627
|
568 msgstr ""
|
|
dongsheng@627
|
569
|
|
dongsheng@627
|
570 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
571 #: ../en/appB-mq-ref.xml:105
|
|
dongsheng@627
|
572 msgid ""
|
|
dongsheng@627
|
573 "<option role=\"hg-ext-mq-cmd-qfold-opt\">-l</option>: Use the contents of the "
|
|
dongsheng@627
|
574 "given file as the new commit message and patch description for the folded "
|
|
dongsheng@627
|
575 "patch."
|
|
dongsheng@627
|
576 msgstr ""
|
|
dongsheng@627
|
577
|
|
dongsheng@627
|
578 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
579 #: ../en/appB-mq-ref.xml:110
|
|
dongsheng@627
|
580 msgid ""
|
|
dongsheng@627
|
581 "<option role=\"hg-ext-mq-cmd-qfold-opt\">-m</option>: Use the given text as "
|
|
dongsheng@627
|
582 "the new commit message and patch description for the folded patch."
|
|
dongsheng@627
|
583 msgstr ""
|
|
dongsheng@627
|
584
|
|
dongsheng@627
|
585 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
586 #: ../en/appB-mq-ref.xml:118
|
|
dongsheng@627
|
587 msgid ""
|
|
dongsheng@627
|
588 "<command role=\"hg-ext-mq\">qheader</command>&emdash;display the header/"
|
|
dongsheng@627
|
589 "description of a patch"
|
|
dongsheng@627
|
590 msgstr "<command role=\"hg-ext-mq\">qheader</command>&emdash;显示补丁头部描述"
|
|
dongsheng@627
|
591
|
|
dongsheng@627
|
592 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
593 #: ../en/appB-mq-ref.xml:122
|
|
dongsheng@627
|
594 msgid ""
|
|
dongsheng@627
|
595 "The <command role=\"hg-ext-mq\">qheader</command> command prints the header, "
|
|
dongsheng@627
|
596 "or description, of a patch. By default, it prints the header of the topmost "
|
|
dongsheng@627
|
597 "applied patch. Given an argument, it prints the header of the named patch."
|
|
dongsheng@627
|
598 msgstr ""
|
|
dongsheng@627
|
599
|
|
dongsheng@627
|
600 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
601 #: ../en/appB-mq-ref.xml:129
|
|
dongsheng@627
|
602 msgid ""
|
|
dongsheng@627
|
603 "<command role=\"hg-ext-mq\">qimport</command>&emdash;import a third-party "
|
|
dongsheng@627
|
604 "patch into the queue"
|
|
dongsheng@627
|
605 msgstr ""
|
|
dongsheng@627
|
606 "<command role=\"hg-ext-mq\">qimport</command>&emdash;将第三方补丁导入队列"
|
|
dongsheng@627
|
607
|
|
dongsheng@627
|
608 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
609 #: ../en/appB-mq-ref.xml:132
|
|
dongsheng@627
|
610 msgid ""
|
|
dongsheng@627
|
611 "The <command role=\"hg-ext-mq\">qimport</command> command adds an entry for "
|
|
dongsheng@627
|
612 "an external patch to the <filename role=\"special\">series</filename> file, "
|
|
dongsheng@627
|
613 "and copies the patch into the <filename role=\"special\" class=\"directory\">."
|
|
dongsheng@627
|
614 "hg/patches</filename> directory. It adds the entry immediately after the "
|
|
dongsheng@627
|
615 "topmost applied patch, but does not push the patch."
|
|
dongsheng@627
|
616 msgstr ""
|
|
dongsheng@627
|
617
|
|
dongsheng@627
|
618 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
619 #: ../en/appB-mq-ref.xml:140
|
|
dongsheng@627
|
620 msgid ""
|
|
dongsheng@627
|
621 "If the <filename role=\"special\" class=\"directory\">.hg/patches</filename> "
|
|
dongsheng@627
|
622 "directory is a repository, <command role=\"hg-ext-mq\">qimport</command> "
|
|
dongsheng@627
|
623 "automatically does an <command role=\"hg-cmd\">hg add</command> of the "
|
|
dongsheng@627
|
624 "imported patch."
|
|
dongsheng@627
|
625 msgstr ""
|
|
dongsheng@627
|
626
|
|
dongsheng@627
|
627 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
628 #: ../en/appB-mq-ref.xml:148
|
|
dongsheng@627
|
629 msgid ""
|
|
dongsheng@627
|
630 "<command role=\"hg-ext-mq\">qinit</command>&emdash;prepare a repository to "
|
|
dongsheng@627
|
631 "work with MQ"
|
|
dongsheng@627
|
632 msgstr "<command role=\"hg-ext-mq\">qinit</command>&emdash;为使用 MQ 配置版本库"
|
|
dongsheng@627
|
633
|
|
dongsheng@627
|
634 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
635 #: ../en/appB-mq-ref.xml:151
|
|
dongsheng@627
|
636 msgid ""
|
|
dongsheng@627
|
637 "The <command role=\"hg-ext-mq\">qinit</command> command prepares a repository "
|
|
dongsheng@627
|
638 "to work with MQ. It creates a directory called <filename role=\"special\" "
|
|
dongsheng@627
|
639 "class=\"directory\">.hg/patches</filename>."
|
|
dongsheng@627
|
640 msgstr ""
|
|
dongsheng@627
|
641
|
|
dongsheng@627
|
642 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
643 #: ../en/appB-mq-ref.xml:158
|
|
dongsheng@627
|
644 msgid ""
|
|
dongsheng@627
|
645 "<option role=\"hg-ext-mq-cmd-qinit-opt\">-c</option>: Create <filename role="
|
|
dongsheng@627
|
646 "\"special\" class=\"directory\">.hg/patches</filename> as a repository in its "
|
|
dongsheng@627
|
647 "own right. Also creates a <filename role=\"special\">.hgignore</filename> "
|
|
dongsheng@627
|
648 "file that will ignore the <filename role=\"special\">status</filename> file."
|
|
dongsheng@627
|
649 msgstr ""
|
|
dongsheng@627
|
650
|
|
dongsheng@627
|
651 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
652 #: ../en/appB-mq-ref.xml:168
|
|
dongsheng@627
|
653 msgid ""
|
|
dongsheng@627
|
654 "When the <filename role=\"special\" class=\"directory\">.hg/patches</"
|
|
dongsheng@627
|
655 "filename> directory is a repository, the <command role=\"hg-ext-mq\">qimport</"
|
|
dongsheng@627
|
656 "command> and <command role=\"hg-ext-mq\">qnew</command> commands "
|
|
dongsheng@627
|
657 "automatically <command role=\"hg-cmd\">hg add</command> new patches."
|
|
dongsheng@627
|
658 msgstr ""
|
|
dongsheng@627
|
659
|
|
dongsheng@627
|
660 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
661 #: ../en/appB-mq-ref.xml:177
|
|
dongsheng@627
|
662 msgid "<command role=\"hg-ext-mq\">qnew</command>&emdash;create a new patch"
|
|
dongsheng@627
|
663 msgstr "<command role=\"hg-ext-mq\">qnew</command>&emdash;创建新补丁"
|
|
dongsheng@627
|
664
|
|
dongsheng@627
|
665 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
666 #: ../en/appB-mq-ref.xml:180
|
|
dongsheng@627
|
667 msgid ""
|
|
dongsheng@627
|
668 "The <command role=\"hg-ext-mq\">qnew</command> command creates a new patch. "
|
|
dongsheng@627
|
669 "It takes one mandatory argument, the name to use for the patch file. The "
|
|
dongsheng@627
|
670 "newly created patch is created empty by default. It is added to the "
|
|
dongsheng@627
|
671 "<filename role=\"special\">series</filename> file after the current topmost "
|
|
dongsheng@627
|
672 "applied patch, and is immediately pushed on top of that patch."
|
|
dongsheng@627
|
673 msgstr ""
|
|
dongsheng@627
|
674
|
|
dongsheng@627
|
675 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
676 #: ../en/appB-mq-ref.xml:188
|
|
dongsheng@627
|
677 msgid ""
|
|
dongsheng@627
|
678 "If <command role=\"hg-ext-mq\">qnew</command> finds modified files in the "
|
|
dongsheng@627
|
679 "working directory, it will refuse to create a new patch unless the <option "
|
|
dongsheng@627
|
680 "role=\"hg-ext-mq-cmd-qnew-opt\">-f</option> option is used (see below). This "
|
|
dongsheng@627
|
681 "behaviour allows you to <command role=\"hg-ext-mq\">qrefresh</command> your "
|
|
dongsheng@627
|
682 "topmost applied patch before you apply a new patch on top of it."
|
|
dongsheng@627
|
683 msgstr ""
|
|
dongsheng@627
|
684
|
|
dongsheng@627
|
685 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
686 #: ../en/appB-mq-ref.xml:198
|
|
dongsheng@627
|
687 msgid ""
|
|
dongsheng@627
|
688 "<option role=\"hg-ext-mq-cmd-qnew-opt\">-f</option>: Create a new patch if "
|
|
dongsheng@627
|
689 "the contents of the working directory are modified. Any outstanding "
|
|
dongsheng@627
|
690 "modifications are added to the newly created patch, so after this command "
|
|
dongsheng@627
|
691 "completes, the working directory will no longer be modified."
|
|
dongsheng@627
|
692 msgstr ""
|
|
dongsheng@627
|
693
|
|
dongsheng@627
|
694 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
695 #: ../en/appB-mq-ref.xml:205
|
|
dongsheng@627
|
696 msgid ""
|
|
dongsheng@627
|
697 "<option role=\"hg-ext-mq-cmd-qnew-opt\">-m</option>: Use the given text as "
|
|
dongsheng@627
|
698 "the commit message. This text will be stored at the beginning of the patch "
|
|
dongsheng@627
|
699 "file, before the patch data."
|
|
dongsheng@627
|
700 msgstr ""
|
|
dongsheng@627
|
701
|
|
dongsheng@627
|
702 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
703 #: ../en/appB-mq-ref.xml:214
|
|
dongsheng@627
|
704 msgid ""
|
|
dongsheng@627
|
705 "<command role=\"hg-ext-mq\">qnext</command>&emdash;print the name of the next "
|
|
dongsheng@627
|
706 "patch"
|
|
dongsheng@627
|
707 msgstr "<command role=\"hg-ext-mq\">qnext</command>&emdash;显示下个补丁的名称"
|
|
dongsheng@627
|
708
|
|
dongsheng@627
|
709 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
710 #: ../en/appB-mq-ref.xml:217
|
|
dongsheng@627
|
711 msgid ""
|
|
dongsheng@627
|
712 "The <command role=\"hg-ext-mq\">qnext</command> command prints the name name "
|
|
dongsheng@627
|
713 "of the next patch in the <filename role=\"special\">series</filename> file "
|
|
dongsheng@627
|
714 "after the topmost applied patch. This patch will become the topmost applied "
|
|
dongsheng@627
|
715 "patch if you run <command role=\"hg-ext-mq\">qpush</command>."
|
|
dongsheng@627
|
716 msgstr ""
|
|
dongsheng@627
|
717
|
|
dongsheng@627
|
718 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
719 #: ../en/appB-mq-ref.xml:226
|
|
dongsheng@627
|
720 msgid ""
|
|
dongsheng@627
|
721 "<command role=\"hg-ext-mq\">qpop</command>&emdash;pop patches off the stack"
|
|
dongsheng@627
|
722 msgstr "<command role=\"hg-ext-mq\">qpop</command>&emdash;删除堆栈顶部的补丁"
|
|
dongsheng@627
|
723
|
|
dongsheng@627
|
724 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
725 #: ../en/appB-mq-ref.xml:229
|
|
dongsheng@627
|
726 msgid ""
|
|
dongsheng@627
|
727 "The <command role=\"hg-ext-mq\">qpop</command> command removes applied "
|
|
dongsheng@627
|
728 "patches from the top of the stack of applied patches. By default, it removes "
|
|
dongsheng@627
|
729 "only one patch."
|
|
dongsheng@627
|
730 msgstr ""
|
|
dongsheng@627
|
731
|
|
dongsheng@627
|
732 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
733 #: ../en/appB-mq-ref.xml:233
|
|
dongsheng@627
|
734 msgid ""
|
|
dongsheng@627
|
735 "This command removes the changesets that represent the popped patches from "
|
|
dongsheng@627
|
736 "the repository, and updates the working directory to undo the effects of the "
|
|
dongsheng@627
|
737 "patches."
|
|
dongsheng@627
|
738 msgstr ""
|
|
dongsheng@627
|
739
|
|
dongsheng@627
|
740 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
741 #: ../en/appB-mq-ref.xml:237
|
|
dongsheng@627
|
742 msgid ""
|
|
dongsheng@627
|
743 "This command takes an optional argument, which it uses as the name or index "
|
|
dongsheng@627
|
744 "of the patch to pop to. If given a name, it will pop patches until the named "
|
|
dongsheng@627
|
745 "patch is the topmost applied patch. If given a number, <command role=\"hg-"
|
|
dongsheng@627
|
746 "ext-mq\">qpop</command> treats the number as an index into the entries in the "
|
|
dongsheng@627
|
747 "series file, counting from zero (empty lines and lines containing only "
|
|
dongsheng@627
|
748 "comments do not count). It pops patches until the patch identified by the "
|
|
dongsheng@627
|
749 "given index is the topmost applied patch."
|
|
dongsheng@627
|
750 msgstr ""
|
|
dongsheng@627
|
751
|
|
dongsheng@627
|
752 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
753 #: ../en/appB-mq-ref.xml:247
|
|
dongsheng@627
|
754 msgid ""
|
|
dongsheng@627
|
755 "The <command role=\"hg-ext-mq\">qpop</command> command does not read or write "
|
|
dongsheng@627
|
756 "patches or the <filename role=\"special\">series</filename> file. It is thus "
|
|
dongsheng@627
|
757 "safe to <command role=\"hg-ext-mq\">qpop</command> a patch that you have "
|
|
dongsheng@627
|
758 "removed from the <filename role=\"special\">series</filename> file, or a "
|
|
dongsheng@627
|
759 "patch that you have renamed or deleted entirely. In the latter two cases, "
|
|
dongsheng@627
|
760 "use the name of the patch as it was when you applied it."
|
|
dongsheng@627
|
761 msgstr ""
|
|
dongsheng@627
|
762
|
|
dongsheng@627
|
763 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
764 #: ../en/appB-mq-ref.xml:256
|
|
dongsheng@627
|
765 msgid ""
|
|
dongsheng@627
|
766 "By default, the <command role=\"hg-ext-mq\">qpop</command> command will not "
|
|
dongsheng@627
|
767 "pop any patches if the working directory has been modified. You can override "
|
|
dongsheng@627
|
768 "this behaviour using the <option role=\"hg-ext-mq-cmd-qpop-opt\">-f</option> "
|
|
dongsheng@627
|
769 "option, which reverts all modifications in the working directory."
|
|
dongsheng@627
|
770 msgstr ""
|
|
dongsheng@627
|
771
|
|
dongsheng@627
|
772 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
773 #: ../en/appB-mq-ref.xml:265
|
|
dongsheng@627
|
774 msgid ""
|
|
dongsheng@627
|
775 "<option role=\"hg-ext-mq-cmd-qpop-opt\">-a</option>: Pop all applied "
|
|
dongsheng@627
|
776 "patches. This returns the repository to its state before you applied any "
|
|
dongsheng@627
|
777 "patches."
|
|
dongsheng@627
|
778 msgstr ""
|
|
dongsheng@627
|
779
|
|
dongsheng@627
|
780 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
781 #: ../en/appB-mq-ref.xml:270
|
|
dongsheng@627
|
782 msgid ""
|
|
dongsheng@627
|
783 "<option role=\"hg-ext-mq-cmd-qpop-opt\">-f</option>: Forcibly revert any "
|
|
dongsheng@627
|
784 "modifications to the working directory when popping."
|
|
dongsheng@627
|
785 msgstr ""
|
|
dongsheng@627
|
786
|
|
dongsheng@627
|
787 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
788 #: ../en/appB-mq-ref.xml:275
|
|
dongsheng@627
|
789 msgid ""
|
|
dongsheng@627
|
790 "<option role=\"hg-ext-mq-cmd-qpop-opt\">-n</option>: Pop a patch from the "
|
|
dongsheng@627
|
791 "named queue."
|
|
dongsheng@627
|
792 msgstr ""
|
|
dongsheng@627
|
793
|
|
dongsheng@627
|
794 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
795 #: ../en/appB-mq-ref.xml:280
|
|
dongsheng@627
|
796 msgid ""
|
|
dongsheng@627
|
797 "The <command role=\"hg-ext-mq\">qpop</command> command removes one line from "
|
|
dongsheng@627
|
798 "the end of the <filename role=\"special\">status</filename> file for each "
|
|
dongsheng@627
|
799 "patch that it pops."
|
|
dongsheng@627
|
800 msgstr ""
|
|
dongsheng@627
|
801
|
|
dongsheng@627
|
802 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
803 #: ../en/appB-mq-ref.xml:287
|
|
dongsheng@627
|
804 msgid ""
|
|
dongsheng@627
|
805 "<command role=\"hg-ext-mq\">qprev</command>&emdash;print the name of the "
|
|
dongsheng@627
|
806 "previous patch"
|
|
dongsheng@627
|
807 msgstr "<command role=\"hg-ext-mq\">qprev</command>&emdash;显示上个补丁的名称"
|
|
dongsheng@627
|
808
|
|
dongsheng@627
|
809 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
810 #: ../en/appB-mq-ref.xml:290
|
|
dongsheng@627
|
811 msgid ""
|
|
dongsheng@627
|
812 "The <command role=\"hg-ext-mq\">qprev</command> command prints the name of "
|
|
dongsheng@627
|
813 "the patch in the <filename role=\"special\">series</filename> file that comes "
|
|
dongsheng@627
|
814 "before the topmost applied patch. This will become the topmost applied patch "
|
|
dongsheng@627
|
815 "if you run <command role=\"hg-ext-mq\">qpop</command>."
|
|
dongsheng@627
|
816 msgstr ""
|
|
dongsheng@627
|
817
|
|
dongsheng@627
|
818 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
819 #: ../en/appB-mq-ref.xml:299
|
|
dongsheng@627
|
820 msgid ""
|
|
dongsheng@627
|
821 "<command role=\"hg-ext-mq\">qpush</command>&emdash;push patches onto the stack"
|
|
dongsheng@627
|
822 msgstr "<command role=\"hg-ext-mq\">qpush</command>&emdash;增加补丁到堆栈"
|
|
dongsheng@627
|
823
|
|
dongsheng@627
|
824 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
825 #: ../en/appB-mq-ref.xml:302
|
|
dongsheng@627
|
826 msgid ""
|
|
dongsheng@627
|
827 "The <command role=\"hg-ext-mq\">qpush</command> command adds patches onto the "
|
|
dongsheng@627
|
828 "applied stack. By default, it adds only one patch."
|
|
dongsheng@627
|
829 msgstr ""
|
|
dongsheng@627
|
830
|
|
dongsheng@627
|
831 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
832 #: ../en/appB-mq-ref.xml:306
|
|
dongsheng@627
|
833 msgid ""
|
|
dongsheng@627
|
834 "This command creates a new changeset to represent each applied patch, and "
|
|
dongsheng@627
|
835 "updates the working directory to apply the effects of the patches."
|
|
dongsheng@627
|
836 msgstr ""
|
|
dongsheng@627
|
837
|
|
dongsheng@627
|
838 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
839 #: ../en/appB-mq-ref.xml:310
|
|
dongsheng@627
|
840 msgid "The default data used when creating a changeset are as follows:"
|
|
dongsheng@627
|
841 msgstr ""
|
|
dongsheng@627
|
842
|
|
dongsheng@627
|
843 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
844 #: ../en/appB-mq-ref.xml:313
|
|
dongsheng@627
|
845 msgid ""
|
|
dongsheng@627
|
846 "The commit date and time zone are the current date and time zone. Because "
|
|
dongsheng@627
|
847 "these data are used to compute the identity of a changeset, this means that "
|
|
dongsheng@627
|
848 "if you <command role=\"hg-ext-mq\">qpop</command> a patch and <command role="
|
|
dongsheng@627
|
849 "\"hg-ext-mq\">qpush</command> it again, the changeset that you push will have "
|
|
dongsheng@627
|
850 "a different identity than the changeset you popped."
|
|
dongsheng@627
|
851 msgstr ""
|
|
dongsheng@627
|
852
|
|
dongsheng@627
|
853 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
854 #: ../en/appB-mq-ref.xml:321
|
|
dongsheng@627
|
855 msgid ""
|
|
dongsheng@627
|
856 "The author is the same as the default used by the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
857 "commit</command> command."
|
|
dongsheng@627
|
858 msgstr ""
|
|
dongsheng@627
|
859
|
|
dongsheng@627
|
860 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
861 #: ../en/appB-mq-ref.xml:325
|
|
dongsheng@627
|
862 msgid ""
|
|
dongsheng@627
|
863 "The commit message is any text from the patch file that comes before the "
|
|
dongsheng@627
|
864 "first diff header. If there is no such text, a default commit message is "
|
|
dongsheng@627
|
865 "used that identifies the name of the patch."
|
|
dongsheng@627
|
866 msgstr ""
|
|
dongsheng@627
|
867
|
|
dongsheng@627
|
868 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
869 #: ../en/appB-mq-ref.xml:330
|
|
dongsheng@627
|
870 msgid ""
|
|
dongsheng@627
|
871 "If a patch contains a Mercurial patch header (XXX add link), the information "
|
|
dongsheng@627
|
872 "in the patch header overrides these defaults."
|
|
dongsheng@627
|
873 msgstr ""
|
|
dongsheng@627
|
874
|
|
dongsheng@627
|
875 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
876 #: ../en/appB-mq-ref.xml:336
|
|
dongsheng@627
|
877 msgid ""
|
|
dongsheng@627
|
878 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-a</option>: Push all unapplied "
|
|
dongsheng@627
|
879 "patches from the <filename role=\"special\">series</filename> file until "
|
|
dongsheng@627
|
880 "there are none left to push."
|
|
dongsheng@627
|
881 msgstr ""
|
|
dongsheng@627
|
882
|
|
dongsheng@627
|
883 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
884 #: ../en/appB-mq-ref.xml:342
|
|
dongsheng@627
|
885 msgid ""
|
|
dongsheng@627
|
886 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-l</option>: Add the name of the "
|
|
dongsheng@627
|
887 "patch to the end of the commit message."
|
|
dongsheng@627
|
888 msgstr ""
|
|
dongsheng@627
|
889
|
|
dongsheng@627
|
890 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
891 #: ../en/appB-mq-ref.xml:346
|
|
dongsheng@627
|
892 msgid ""
|
|
dongsheng@627
|
893 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-m</option>: If a patch fails to "
|
|
dongsheng@627
|
894 "apply cleanly, use the entry for the patch in another saved queue to compute "
|
|
dongsheng@627
|
895 "the parameters for a three-way merge, and perform a three-way merge using the "
|
|
dongsheng@627
|
896 "normal Mercurial merge machinery. Use the resolution of the merge as the new "
|
|
dongsheng@627
|
897 "patch content."
|
|
dongsheng@627
|
898 msgstr ""
|
|
dongsheng@627
|
899
|
|
dongsheng@627
|
900 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
901 #: ../en/appB-mq-ref.xml:354
|
|
dongsheng@627
|
902 msgid ""
|
|
dongsheng@627
|
903 "<option role=\"hg-ext-mq-cmd-qpush-opt\">-n</option>: Use the named queue if "
|
|
dongsheng@627
|
904 "merging while pushing."
|
|
dongsheng@627
|
905 msgstr ""
|
|
dongsheng@627
|
906
|
|
dongsheng@627
|
907 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
908 #: ../en/appB-mq-ref.xml:359
|
|
dongsheng@627
|
909 msgid ""
|
|
dongsheng@627
|
910 "The <command role=\"hg-ext-mq\">qpush</command> command reads, but does not "
|
|
dongsheng@627
|
911 "modify, the <filename role=\"special\">series</filename> file. It appends "
|
|
dongsheng@627
|
912 "one line to the <command role=\"hg-cmd\">hg status</command> file for each "
|
|
dongsheng@627
|
913 "patch that it pushes."
|
|
dongsheng@627
|
914 msgstr ""
|
|
dongsheng@627
|
915
|
|
dongsheng@627
|
916 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
917 #: ../en/appB-mq-ref.xml:367
|
|
dongsheng@627
|
918 msgid ""
|
|
dongsheng@627
|
919 "<command role=\"hg-ext-mq\">qrefresh</command>&emdash;update the topmost "
|
|
dongsheng@627
|
920 "applied patch"
|
|
dongsheng@627
|
921 msgstr "<command role=\"hg-ext-mq\">qrefresh</command>&emdash;更新最新的补丁"
|
|
dongsheng@627
|
922
|
|
dongsheng@627
|
923 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
924 #: ../en/appB-mq-ref.xml:371
|
|
dongsheng@627
|
925 msgid ""
|
|
dongsheng@627
|
926 "The <command role=\"hg-ext-mq\">qrefresh</command> command updates the "
|
|
dongsheng@627
|
927 "topmost applied patch. It modifies the patch, removes the old changeset that "
|
|
dongsheng@627
|
928 "represented the patch, and creates a new changeset to represent the modified "
|
|
dongsheng@627
|
929 "patch."
|
|
dongsheng@627
|
930 msgstr ""
|
|
dongsheng@627
|
931
|
|
dongsheng@627
|
932 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
933 #: ../en/appB-mq-ref.xml:377
|
|
dongsheng@627
|
934 msgid ""
|
|
dongsheng@627
|
935 "The <command role=\"hg-ext-mq\">qrefresh</command> command looks for the "
|
|
dongsheng@627
|
936 "following modifications:"
|
|
dongsheng@627
|
937 msgstr ""
|
|
dongsheng@627
|
938
|
|
dongsheng@627
|
939 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
940 #: ../en/appB-mq-ref.xml:380
|
|
dongsheng@627
|
941 msgid ""
|
|
dongsheng@627
|
942 "Changes to the commit message, i.e. the text before the first diff header in "
|
|
dongsheng@627
|
943 "the patch file, are reflected in the new changeset that represents the patch."
|
|
dongsheng@627
|
944 msgstr ""
|
|
dongsheng@627
|
945
|
|
dongsheng@627
|
946 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
947 #: ../en/appB-mq-ref.xml:385
|
|
dongsheng@627
|
948 msgid ""
|
|
dongsheng@627
|
949 "Modifications to tracked files in the working directory are added to the "
|
|
dongsheng@627
|
950 "patch."
|
|
dongsheng@627
|
951 msgstr ""
|
|
dongsheng@627
|
952
|
|
dongsheng@627
|
953 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
954 #: ../en/appB-mq-ref.xml:388
|
|
dongsheng@627
|
955 msgid ""
|
|
dongsheng@627
|
956 "Changes to the files tracked using <command role=\"hg-cmd\">hg add</command>, "
|
|
dongsheng@627
|
957 "<command role=\"hg-cmd\">hg copy</command>, <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
958 "remove</command>, or <command role=\"hg-cmd\">hg rename</command>. Added "
|
|
dongsheng@627
|
959 "files and copy and rename destinations are added to the patch, while removed "
|
|
dongsheng@627
|
960 "files and rename sources are removed."
|
|
dongsheng@627
|
961 msgstr ""
|
|
dongsheng@627
|
962
|
|
dongsheng@627
|
963 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
964 #: ../en/appB-mq-ref.xml:397
|
|
dongsheng@627
|
965 msgid ""
|
|
dongsheng@627
|
966 "Even if <command role=\"hg-ext-mq\">qrefresh</command> detects no changes, it "
|
|
dongsheng@627
|
967 "still recreates the changeset that represents the patch. This causes the "
|
|
dongsheng@627
|
968 "identity of the changeset to differ from the previous changeset that "
|
|
dongsheng@627
|
969 "identified the patch."
|
|
dongsheng@627
|
970 msgstr ""
|
|
dongsheng@627
|
971
|
|
dongsheng@627
|
972 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
973 #: ../en/appB-mq-ref.xml:405
|
|
dongsheng@627
|
974 msgid ""
|
|
dongsheng@627
|
975 "<option role=\"hg-ext-mq-cmd-qrefresh-opt\">-e</option>: Modify the commit "
|
|
dongsheng@627
|
976 "and patch description, using the preferred text editor."
|
|
dongsheng@627
|
977 msgstr ""
|
|
dongsheng@627
|
978
|
|
dongsheng@627
|
979 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
980 #: ../en/appB-mq-ref.xml:410
|
|
dongsheng@627
|
981 msgid ""
|
|
dongsheng@627
|
982 "<option role=\"hg-ext-mq-cmd-qrefresh-opt\">-m</option>: Modify the commit "
|
|
dongsheng@627
|
983 "message and patch description, using the given text."
|
|
dongsheng@627
|
984 msgstr ""
|
|
dongsheng@627
|
985
|
|
dongsheng@627
|
986 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
987 #: ../en/appB-mq-ref.xml:415
|
|
dongsheng@627
|
988 msgid ""
|
|
dongsheng@627
|
989 "<option role=\"hg-ext-mq-cmd-qrefresh-opt\">-l</option>: Modify the commit "
|
|
dongsheng@627
|
990 "message and patch description, using text from the given file."
|
|
dongsheng@627
|
991 msgstr ""
|
|
dongsheng@627
|
992
|
|
dongsheng@627
|
993 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
994 #: ../en/appB-mq-ref.xml:423
|
|
dongsheng@627
|
995 msgid "<command role=\"hg-ext-mq\">qrename</command>&emdash;rename a patch"
|
|
dongsheng@627
|
996 msgstr "<command role=\"hg-ext-mq\">qrename</command>&emdash;改名补丁"
|
|
dongsheng@627
|
997
|
|
dongsheng@627
|
998 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
999 #: ../en/appB-mq-ref.xml:426
|
|
dongsheng@627
|
1000 msgid ""
|
|
dongsheng@627
|
1001 "The <command role=\"hg-ext-mq\">qrename</command> command renames a patch, "
|
|
dongsheng@627
|
1002 "and changes the entry for the patch in the <filename role=\"special\">series</"
|
|
dongsheng@627
|
1003 "filename> file."
|
|
dongsheng@627
|
1004 msgstr ""
|
|
dongsheng@627
|
1005
|
|
dongsheng@627
|
1006 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1007 #: ../en/appB-mq-ref.xml:430
|
|
dongsheng@627
|
1008 msgid ""
|
|
dongsheng@627
|
1009 "With a single argument, <command role=\"hg-ext-mq\">qrename</command> renames "
|
|
dongsheng@627
|
1010 "the topmost applied patch. With two arguments, it renames its first argument "
|
|
dongsheng@627
|
1011 "to its second."
|
|
dongsheng@627
|
1012 msgstr ""
|
|
dongsheng@627
|
1013
|
|
dongsheng@627
|
1014 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1015 #: ../en/appB-mq-ref.xml:437
|
|
dongsheng@627
|
1016 msgid ""
|
|
dongsheng@627
|
1017 "<command role=\"hg-ext-mq\">qrestore</command>&emdash;restore saved queue "
|
|
dongsheng@627
|
1018 "state"
|
|
dongsheng@627
|
1019 msgstr "<command role=\"hg-ext-mq\">qrestore</command>&emdash;恢复保存的队列"
|
|
dongsheng@627
|
1020
|
|
dongsheng@627
|
1021 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1022 #: ../en/appB-mq-ref.xml:441
|
|
dongsheng@627
|
1023 msgid "XXX No idea what this does."
|
|
dongsheng@627
|
1024 msgstr ""
|
|
dongsheng@627
|
1025
|
|
dongsheng@627
|
1026 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1027 #: ../en/appB-mq-ref.xml:445
|
|
dongsheng@627
|
1028 msgid ""
|
|
dongsheng@627
|
1029 "<command role=\"hg-ext-mq\">qsave</command>&emdash;save current queue state"
|
|
dongsheng@627
|
1030 msgstr "<command role=\"hg-ext-mq\">qsave</command>&emdash;保存当前的队列状态"
|
|
dongsheng@627
|
1031
|
|
dongsheng@627
|
1032 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1033 #: ../en/appB-mq-ref.xml:448
|
|
dongsheng@627
|
1034 msgid "XXX Likewise."
|
|
dongsheng@627
|
1035 msgstr ""
|
|
dongsheng@627
|
1036
|
|
dongsheng@627
|
1037 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1038 #: ../en/appB-mq-ref.xml:452
|
|
dongsheng@627
|
1039 msgid ""
|
|
dongsheng@627
|
1040 "<command role=\"hg-ext-mq\">qseries</command>&emdash;print the entire patch "
|
|
dongsheng@627
|
1041 "series"
|
|
dongsheng@627
|
1042 msgstr "<command role=\"hg-ext-mq\">qseries</command>&emdash;显示补丁序列"
|
|
dongsheng@627
|
1043
|
|
dongsheng@627
|
1044 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1045 #: ../en/appB-mq-ref.xml:455
|
|
dongsheng@627
|
1046 msgid ""
|
|
dongsheng@627
|
1047 "The <command role=\"hg-ext-mq\">qseries</command> command prints the entire "
|
|
dongsheng@627
|
1048 "patch series from the <filename role=\"special\">series</filename> file. It "
|
|
dongsheng@627
|
1049 "prints only patch names, not empty lines or comments. It prints in order "
|
|
dongsheng@627
|
1050 "from first to be applied to last."
|
|
dongsheng@627
|
1051 msgstr ""
|
|
dongsheng@627
|
1052
|
|
dongsheng@627
|
1053 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1054 #: ../en/appB-mq-ref.xml:463
|
|
dongsheng@627
|
1055 msgid ""
|
|
dongsheng@627
|
1056 "<command role=\"hg-ext-mq\">qtop</command>&emdash;print the name of the "
|
|
dongsheng@627
|
1057 "current patch"
|
|
dongsheng@627
|
1058 msgstr "<command role=\"hg-ext-mq\">qtop</command>&emdash;显示当前补丁的名称"
|
|
dongsheng@627
|
1059
|
|
dongsheng@627
|
1060 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1061 #: ../en/appB-mq-ref.xml:466
|
|
dongsheng@627
|
1062 msgid ""
|
|
dongsheng@627
|
1063 "The <command role=\"hg-ext-mq\">qtop</command> prints the name of the topmost "
|
|
dongsheng@627
|
1064 "currently applied patch."
|
|
dongsheng@627
|
1065 msgstr ""
|
|
dongsheng@627
|
1066
|
|
dongsheng@627
|
1067 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1068 #: ../en/appB-mq-ref.xml:471
|
|
dongsheng@627
|
1069 msgid ""
|
|
dongsheng@627
|
1070 "<command role=\"hg-ext-mq\">qunapplied</command>&emdash;print patches not yet "
|
|
dongsheng@627
|
1071 "applied"
|
|
dongsheng@627
|
1072 msgstr ""
|
|
dongsheng@627
|
1073 "<command role=\"hg-ext-mq\">qunapplied</command>&emdash;显示尚未应用的补丁"
|
|
dongsheng@627
|
1074
|
|
dongsheng@627
|
1075 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1076 #: ../en/appB-mq-ref.xml:475
|
|
dongsheng@627
|
1077 msgid ""
|
|
dongsheng@627
|
1078 "The <command role=\"hg-ext-mq\">qunapplied</command> command prints the names "
|
|
dongsheng@627
|
1079 "of patches from the <filename role=\"special\">series</filename> file that "
|
|
dongsheng@627
|
1080 "are not yet applied. It prints them in order from the next patch that will "
|
|
dongsheng@627
|
1081 "be pushed to the last."
|
|
dongsheng@627
|
1082 msgstr ""
|
|
dongsheng@627
|
1083
|
|
dongsheng@627
|
1084 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1085 #: ../en/appB-mq-ref.xml:483
|
|
dongsheng@627
|
1086 msgid ""
|
|
dongsheng@627
|
1087 "<command role=\"hg-cmd\">hg strip</command>&emdash;remove a revision and "
|
|
dongsheng@627
|
1088 "descendants"
|
|
dongsheng@627
|
1089 msgstr "<command role=\"hg-cmd\">hg strip</command>&emdash;删除一个版本及其后继"
|
|
dongsheng@627
|
1090
|
|
dongsheng@627
|
1091 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1092 #: ../en/appB-mq-ref.xml:486
|
|
dongsheng@627
|
1093 msgid ""
|
|
dongsheng@627
|
1094 "The <command role=\"hg-cmd\">hg strip</command> command removes a revision, "
|
|
dongsheng@627
|
1095 "and all of its descendants, from the repository. It undoes the effects of "
|
|
dongsheng@627
|
1096 "the removed revisions from the repository, and updates the working directory "
|
|
dongsheng@627
|
1097 "to the first parent of the removed revision."
|
|
dongsheng@627
|
1098 msgstr ""
|
|
dongsheng@627
|
1099
|
|
dongsheng@627
|
1100 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1101 #: ../en/appB-mq-ref.xml:492
|
|
dongsheng@627
|
1102 msgid ""
|
|
dongsheng@627
|
1103 "The <command role=\"hg-cmd\">hg strip</command> command saves a backup of the "
|
|
dongsheng@627
|
1104 "removed changesets in a bundle, so that they can be reapplied if removed in "
|
|
dongsheng@627
|
1105 "error."
|
|
dongsheng@627
|
1106 msgstr ""
|
|
dongsheng@627
|
1107
|
|
dongsheng@627
|
1108 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1109 #: ../en/appB-mq-ref.xml:498
|
|
dongsheng@627
|
1110 msgid ""
|
|
dongsheng@627
|
1111 "<option role=\"hg-opt-strip\">-b</option>: Save unrelated changesets that are "
|
|
dongsheng@627
|
1112 "intermixed with the stripped changesets in the backup bundle."
|
|
dongsheng@627
|
1113 msgstr ""
|
|
dongsheng@627
|
1114
|
|
dongsheng@627
|
1115 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1116 #: ../en/appB-mq-ref.xml:502
|
|
dongsheng@627
|
1117 msgid ""
|
|
dongsheng@627
|
1118 "<option role=\"hg-opt-strip\">-f</option>: If a branch has multiple heads, "
|
|
dongsheng@627
|
1119 "remove all heads. XXX This should be renamed, and use <literal>-f</literal> "
|
|
dongsheng@627
|
1120 "to strip revs when there are pending changes."
|
|
dongsheng@627
|
1121 msgstr ""
|
|
dongsheng@627
|
1122
|
|
dongsheng@627
|
1123 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1124 #: ../en/appB-mq-ref.xml:507
|
|
dongsheng@627
|
1125 msgid "<option role=\"hg-opt-strip\">-n</option>: Do not save a backup bundle."
|
|
dongsheng@627
|
1126 msgstr ""
|
|
dongsheng@627
|
1127
|
|
dongsheng@627
|
1128 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1129 #: ../en/appB-mq-ref.xml:514
|
|
dongsheng@627
|
1130 msgid "MQ file reference"
|
|
dongsheng@627
|
1131 msgstr "MQ 文件参考"
|
|
dongsheng@627
|
1132
|
|
dongsheng@627
|
1133 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1134 #: ../en/appB-mq-ref.xml:517
|
|
dongsheng@627
|
1135 msgid "The <filename role=\"special\">series</filename> file"
|
|
dongsheng@627
|
1136 msgstr "<filename role=\"special\">序列</filename>文件"
|
|
dongsheng@627
|
1137
|
|
dongsheng@627
|
1138 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1139 #: ../en/appB-mq-ref.xml:520
|
|
dongsheng@627
|
1140 msgid ""
|
|
dongsheng@627
|
1141 "The <filename role=\"special\">series</filename> file contains a list of the "
|
|
dongsheng@627
|
1142 "names of all patches that MQ can apply. It is represented as a list of "
|
|
dongsheng@627
|
1143 "names, with one name saved per line. Leading and trailing white space in "
|
|
dongsheng@627
|
1144 "each line are ignored."
|
|
dongsheng@627
|
1145 msgstr ""
|
|
dongsheng@627
|
1146
|
|
dongsheng@627
|
1147 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1148 #: ../en/appB-mq-ref.xml:526
|
|
dongsheng@627
|
1149 msgid ""
|
|
dongsheng@627
|
1150 "Lines may contain comments. A comment begins with the <quote><literal>#</"
|
|
dongsheng@627
|
1151 "literal></quote> character, and extends to the end of the line. Empty lines, "
|
|
dongsheng@627
|
1152 "and lines that contain only comments, are ignored."
|
|
dongsheng@627
|
1153 msgstr ""
|
|
dongsheng@627
|
1154
|
|
dongsheng@627
|
1155 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1156 #: ../en/appB-mq-ref.xml:531
|
|
dongsheng@627
|
1157 msgid ""
|
|
dongsheng@627
|
1158 "You will often need to edit the <filename role=\"special\">series</filename> "
|
|
dongsheng@627
|
1159 "file by hand, hence the support for comments and empty lines noted above. "
|
|
dongsheng@627
|
1160 "For example, you can comment out a patch temporarily, and <command role=\"hg-"
|
|
dongsheng@627
|
1161 "ext-mq\">qpush</command> will skip over that patch when applying patches. "
|
|
dongsheng@627
|
1162 "You can also change the order in which patches are applied by reordering "
|
|
dongsheng@627
|
1163 "their entries in the <filename role=\"special\">series</filename> file."
|
|
dongsheng@627
|
1164 msgstr ""
|
|
dongsheng@627
|
1165
|
|
dongsheng@627
|
1166 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1167 #: ../en/appB-mq-ref.xml:540
|
|
dongsheng@627
|
1168 msgid ""
|
|
dongsheng@627
|
1169 "Placing the <filename role=\"special\">series</filename> file under revision "
|
|
dongsheng@627
|
1170 "control is also supported; it is a good idea to place all of the patches that "
|
|
dongsheng@627
|
1171 "it refers to under revision control, as well. If you create a patch "
|
|
dongsheng@627
|
1172 "directory using the <option role=\"hg-ext-mq-cmd-qinit-opt\">-c</option> "
|
|
dongsheng@627
|
1173 "option to <command role=\"hg-ext-mq\">qinit</command>, this will be done for "
|
|
dongsheng@627
|
1174 "you automatically."
|
|
dongsheng@627
|
1175 msgstr ""
|
|
dongsheng@627
|
1176
|
|
dongsheng@627
|
1177 #. type: Content of: <book><appendix><sect1><sect2><title>
|
|
dongsheng@627
|
1178 #: ../en/appB-mq-ref.xml:550
|
|
dongsheng@627
|
1179 msgid "The <filename role=\"special\">status</filename> file"
|
|
dongsheng@627
|
1180 msgstr "<filename role=\"special\">状态</filename>文件"
|
|
dongsheng@627
|
1181
|
|
dongsheng@627
|
1182 #. type: Content of: <book><appendix><sect1><sect2><para>
|
|
dongsheng@627
|
1183 #: ../en/appB-mq-ref.xml:553
|
|
dongsheng@627
|
1184 msgid ""
|
|
dongsheng@627
|
1185 "The <filename role=\"special\">status</filename> file contains the names and "
|
|
dongsheng@627
|
1186 "changeset hashes of all patches that MQ currently has applied. Unlike the "
|
|
dongsheng@627
|
1187 "<filename role=\"special\">series</filename> file, this file is not intended "
|
|
dongsheng@627
|
1188 "for editing. You should not place this file under revision control, or "
|
|
dongsheng@627
|
1189 "modify it in any way. It is used by MQ strictly for internal book-keeping."
|
|
dongsheng@627
|
1190 msgstr ""
|
|
dongsheng@627
|
1191
|
|
dongsheng@627
|
1192 #. type: Content of: <book><appendix><title>
|
|
dongsheng@627
|
1193 #: ../en/appC-srcinstall.xml:5
|
|
dongsheng@627
|
1194 msgid "Installing Mercurial from source"
|
|
dongsheng@627
|
1195 msgstr "从源代码安装 Mercurial"
|
|
dongsheng@627
|
1196
|
|
dongsheng@627
|
1197 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1198 #: ../en/appC-srcinstall.xml:8
|
|
dongsheng@627
|
1199 msgid "On a Unix-like system"
|
|
dongsheng@627
|
1200 msgstr "类 Unix 系统"
|
|
dongsheng@627
|
1201
|
|
dongsheng@627
|
1202 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1203 #: ../en/appC-srcinstall.xml:10
|
|
dongsheng@627
|
1204 msgid ""
|
|
dongsheng@627
|
1205 "If you are using a Unix-like system that has a sufficiently recent version of "
|
|
dongsheng@627
|
1206 "Python (2.3 or newer) available, it is easy to install Mercurial from source."
|
|
dongsheng@627
|
1207 msgstr ""
|
|
dongsheng@627
|
1208
|
|
dongsheng@627
|
1209 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1210 #: ../en/appC-srcinstall.xml:14
|
|
dongsheng@627
|
1211 msgid ""
|
|
dongsheng@627
|
1212 "Download a recent source tarball from <ulink url=\"http://www.selenic.com/"
|
|
dongsheng@627
|
1213 "mercurial/download\">http://www.selenic.com/mercurial/download</ulink>."
|
|
dongsheng@627
|
1214 msgstr ""
|
|
dongsheng@627
|
1215
|
|
dongsheng@627
|
1216 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1217 #: ../en/appC-srcinstall.xml:17
|
|
dongsheng@627
|
1218 msgid "Unpack the tarball:"
|
|
dongsheng@627
|
1219 msgstr ""
|
|
dongsheng@627
|
1220
|
|
dongsheng@627
|
1221 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1222 #: ../en/appC-srcinstall.xml:20
|
|
dongsheng@627
|
1223 msgid ""
|
|
dongsheng@627
|
1224 "Go into the source directory and run the installer script. This will build "
|
|
dongsheng@627
|
1225 "Mercurial and install it in your home directory."
|
|
dongsheng@627
|
1226 msgstr ""
|
|
dongsheng@627
|
1227
|
|
dongsheng@627
|
1228 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1229 #: ../en/appC-srcinstall.xml:27
|
|
dongsheng@627
|
1230 msgid ""
|
|
dongsheng@627
|
1231 "Once the install finishes, Mercurial will be in the <literal>bin</literal> "
|
|
dongsheng@627
|
1232 "subdirectory of your home directory. Don't forget to make sure that this "
|
|
dongsheng@627
|
1233 "directory is present in your shell's search path."
|
|
dongsheng@627
|
1234 msgstr ""
|
|
dongsheng@627
|
1235
|
|
dongsheng@627
|
1236 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1237 #: ../en/appC-srcinstall.xml:32
|
|
dongsheng@627
|
1238 msgid ""
|
|
dongsheng@627
|
1239 "You will probably need to set the <envar>PYTHONPATH</envar> environment "
|
|
dongsheng@627
|
1240 "variable so that the Mercurial executable can find the rest of the Mercurial "
|
|
dongsheng@627
|
1241 "packages. For example, on my laptop, I have set it to <literal>/home/bos/lib/"
|
|
dongsheng@627
|
1242 "python</literal>. The exact path that you will need to use depends on how "
|
|
dongsheng@627
|
1243 "Python was built for your system, but should be easy to figure out. If "
|
|
dongsheng@627
|
1244 "you're uncertain, look through the output of the installer script above, and "
|
|
dongsheng@627
|
1245 "see where the contents of the <literal>mercurial</literal> directory were "
|
|
dongsheng@627
|
1246 "installed to."
|
|
dongsheng@627
|
1247 msgstr ""
|
|
dongsheng@627
|
1248
|
|
dongsheng@627
|
1249 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1250 #: ../en/appC-srcinstall.xml:44
|
|
dongsheng@627
|
1251 msgid "On Windows"
|
|
dongsheng@627
|
1252 msgstr "Windows 系统"
|
|
dongsheng@627
|
1253
|
|
dongsheng@627
|
1254 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1255 #: ../en/appC-srcinstall.xml:46
|
|
dongsheng@627
|
1256 msgid ""
|
|
dongsheng@627
|
1257 "Building and installing Mercurial on Windows requires a variety of tools, a "
|
|
dongsheng@627
|
1258 "fair amount of technical knowledge, and considerable patience. I very much "
|
|
dongsheng@627
|
1259 "<emphasis>do not recommend</emphasis> this route if you are a <quote>casual "
|
|
dongsheng@627
|
1260 "user</quote>. Unless you intend to hack on Mercurial, I strongly suggest "
|
|
dongsheng@627
|
1261 "that you use a binary package instead."
|
|
dongsheng@627
|
1262 msgstr ""
|
|
dongsheng@627
|
1263
|
|
dongsheng@627
|
1264 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1265 #: ../en/appC-srcinstall.xml:53
|
|
dongsheng@627
|
1266 msgid ""
|
|
dongsheng@627
|
1267 "If you are intent on building Mercurial from source on Windows, follow the "
|
|
dongsheng@627
|
1268 "<quote>hard way</quote> directions on the Mercurial wiki at <ulink url="
|
|
dongsheng@627
|
1269 "\"http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall\">http://www."
|
|
dongsheng@627
|
1270 "selenic.com/mercurial/wiki/index.cgi/WindowsInstall</ulink>, and expect the "
|
|
dongsheng@627
|
1271 "process to involve a lot of fiddly work."
|
|
dongsheng@627
|
1272 msgstr ""
|
|
dongsheng@627
|
1273
|
|
dongsheng@627
|
1274 #. type: Content of: <book><appendix><title>
|
|
dongsheng@627
|
1275 #: ../en/appD-license.xml:5
|
|
dongsheng@627
|
1276 msgid "Open Publication License"
|
|
dongsheng@627
|
1277 msgstr ""
|
|
dongsheng@627
|
1278
|
|
dongsheng@627
|
1279 #. type: Content of: <book><appendix><para>
|
|
dongsheng@627
|
1280 #: ../en/appD-license.xml:7
|
|
dongsheng@627
|
1281 msgid "Version 1.0, 8 June 1999"
|
|
dongsheng@627
|
1282 msgstr ""
|
|
dongsheng@627
|
1283
|
|
dongsheng@627
|
1284 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1285 #: ../en/appD-license.xml:10
|
|
dongsheng@627
|
1286 msgid "Requirements on both unmodified and modified versions"
|
|
dongsheng@627
|
1287 msgstr ""
|
|
dongsheng@627
|
1288
|
|
dongsheng@627
|
1289 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1290 #: ../en/appD-license.xml:13
|
|
dongsheng@627
|
1291 msgid ""
|
|
dongsheng@627
|
1292 "The Open Publication works may be reproduced and distributed in whole or in "
|
|
dongsheng@627
|
1293 "part, in any medium physical or electronic, provided that the terms of this "
|
|
dongsheng@627
|
1294 "license are adhered to, and that this license or an incorporation of it by "
|
|
dongsheng@627
|
1295 "reference (with any options elected by the author(s) and/or publisher) is "
|
|
dongsheng@627
|
1296 "displayed in the reproduction."
|
|
dongsheng@627
|
1297 msgstr ""
|
|
dongsheng@627
|
1298
|
|
dongsheng@627
|
1299 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1300 #: ../en/appD-license.xml:20
|
|
dongsheng@627
|
1301 msgid "Proper form for an incorporation by reference is as follows:"
|
|
dongsheng@627
|
1302 msgstr ""
|
|
dongsheng@627
|
1303
|
|
dongsheng@627
|
1304 #. type: Content of: <book><appendix><sect1><blockquote><para>
|
|
dongsheng@627
|
1305 #: ../en/appD-license.xml:24
|
|
dongsheng@627
|
1306 msgid ""
|
|
dongsheng@627
|
1307 "Copyright (c) <emphasis>year</emphasis> by <emphasis>author's name or "
|
|
dongsheng@627
|
1308 "designee</emphasis>. This material may be distributed only subject to the "
|
|
dongsheng@627
|
1309 "terms and conditions set forth in the Open Publication License, v<emphasis>x."
|
|
dongsheng@627
|
1310 "y</emphasis> or later (the latest version is presently available at <ulink "
|
|
dongsheng@627
|
1311 "url=\"http://www.opencontent.org/openpub/\">http://www.opencontent.org/"
|
|
dongsheng@627
|
1312 "openpub/</ulink>)."
|
|
dongsheng@627
|
1313 msgstr ""
|
|
dongsheng@627
|
1314
|
|
dongsheng@627
|
1315 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1316 #: ../en/appD-license.xml:33
|
|
dongsheng@627
|
1317 msgid ""
|
|
dongsheng@627
|
1318 "The reference must be immediately followed with any options elected by the "
|
|
dongsheng@627
|
1319 "author(s) and/or publisher of the document (see section <xref linkend=\"sec."
|
|
dongsheng@627
|
1320 "opl.options\"/>)."
|
|
dongsheng@627
|
1321 msgstr ""
|
|
dongsheng@627
|
1322
|
|
dongsheng@627
|
1323 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1324 #: ../en/appD-license.xml:37
|
|
dongsheng@627
|
1325 msgid ""
|
|
dongsheng@627
|
1326 "Commercial redistribution of Open Publication-licensed material is permitted."
|
|
dongsheng@627
|
1327 msgstr ""
|
|
dongsheng@627
|
1328
|
|
dongsheng@627
|
1329 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1330 #: ../en/appD-license.xml:40
|
|
dongsheng@627
|
1331 msgid ""
|
|
dongsheng@627
|
1332 "Any publication in standard (paper) book form shall require the citation of "
|
|
dongsheng@627
|
1333 "the original publisher and author. The publisher and author's names shall "
|
|
dongsheng@627
|
1334 "appear on all outer surfaces of the book. On all outer surfaces of the book "
|
|
dongsheng@627
|
1335 "the original publisher's name shall be as large as the title of the work and "
|
|
dongsheng@627
|
1336 "cited as possessive with respect to the title."
|
|
dongsheng@627
|
1337 msgstr ""
|
|
dongsheng@627
|
1338
|
|
dongsheng@627
|
1339 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1340 #: ../en/appD-license.xml:49
|
|
dongsheng@627
|
1341 msgid "Copyright"
|
|
dongsheng@627
|
1342 msgstr ""
|
|
dongsheng@627
|
1343
|
|
dongsheng@627
|
1344 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1345 #: ../en/appD-license.xml:51
|
|
dongsheng@627
|
1346 msgid ""
|
|
dongsheng@627
|
1347 "The copyright to each Open Publication is owned by its author(s) or designee."
|
|
dongsheng@627
|
1348 msgstr ""
|
|
dongsheng@627
|
1349
|
|
dongsheng@627
|
1350 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1351 #: ../en/appD-license.xml:56
|
|
dongsheng@627
|
1352 msgid "Scope of license"
|
|
dongsheng@627
|
1353 msgstr ""
|
|
dongsheng@627
|
1354
|
|
dongsheng@627
|
1355 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1356 #: ../en/appD-license.xml:58
|
|
dongsheng@627
|
1357 msgid ""
|
|
dongsheng@627
|
1358 "The following license terms apply to all Open Publication works, unless "
|
|
dongsheng@627
|
1359 "otherwise explicitly stated in the document."
|
|
dongsheng@627
|
1360 msgstr ""
|
|
dongsheng@627
|
1361
|
|
dongsheng@627
|
1362 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1363 #: ../en/appD-license.xml:62
|
|
dongsheng@627
|
1364 msgid ""
|
|
dongsheng@627
|
1365 "Mere aggregation of Open Publication works or a portion of an Open "
|
|
dongsheng@627
|
1366 "Publication work with other works or programs on the same media shall not "
|
|
dongsheng@627
|
1367 "cause this license to apply to those other works. The aggregate work shall "
|
|
dongsheng@627
|
1368 "contain a notice specifying the inclusion of the Open Publication material "
|
|
dongsheng@627
|
1369 "and appropriate copyright notice."
|
|
dongsheng@627
|
1370 msgstr ""
|
|
dongsheng@627
|
1371
|
|
dongsheng@627
|
1372 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1373 #: ../en/appD-license.xml:69
|
|
dongsheng@627
|
1374 msgid ""
|
|
dongsheng@627
|
1375 "<emphasis role=\"bold\">Severability</emphasis>. If any part of this license "
|
|
dongsheng@627
|
1376 "is found to be unenforceable in any jurisdiction, the remaining portions of "
|
|
dongsheng@627
|
1377 "the license remain in force."
|
|
dongsheng@627
|
1378 msgstr ""
|
|
dongsheng@627
|
1379
|
|
dongsheng@627
|
1380 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1381 #: ../en/appD-license.xml:74
|
|
dongsheng@627
|
1382 msgid ""
|
|
dongsheng@627
|
1383 "<emphasis role=\"bold\">No warranty</emphasis>. Open Publication works are "
|
|
dongsheng@627
|
1384 "licensed and provided <quote>as is</quote> without warranty of any kind, "
|
|
dongsheng@627
|
1385 "express or implied, including, but not limited to, the implied warranties of "
|
|
dongsheng@627
|
1386 "merchantability and fitness for a particular purpose or a warranty of non-"
|
|
dongsheng@627
|
1387 "infringement."
|
|
dongsheng@627
|
1388 msgstr ""
|
|
dongsheng@627
|
1389
|
|
dongsheng@627
|
1390 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1391 #: ../en/appD-license.xml:83
|
|
dongsheng@627
|
1392 msgid "Requirements on modified works"
|
|
dongsheng@627
|
1393 msgstr ""
|
|
dongsheng@627
|
1394
|
|
dongsheng@627
|
1395 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1396 #: ../en/appD-license.xml:85
|
|
dongsheng@627
|
1397 msgid ""
|
|
dongsheng@627
|
1398 "All modified versions of documents covered by this license, including "
|
|
dongsheng@627
|
1399 "translations, anthologies, compilations and partial documents, must meet the "
|
|
dongsheng@627
|
1400 "following requirements:"
|
|
dongsheng@627
|
1401 msgstr ""
|
|
dongsheng@627
|
1402
|
|
dongsheng@627
|
1403 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1404 #: ../en/appD-license.xml:90
|
|
dongsheng@627
|
1405 msgid "The modified version must be labeled as such."
|
|
dongsheng@627
|
1406 msgstr ""
|
|
dongsheng@627
|
1407
|
|
dongsheng@627
|
1408 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1409 #: ../en/appD-license.xml:93
|
|
dongsheng@627
|
1410 msgid ""
|
|
dongsheng@627
|
1411 "The person making the modifications must be identified and the modifications "
|
|
dongsheng@627
|
1412 "dated."
|
|
dongsheng@627
|
1413 msgstr ""
|
|
dongsheng@627
|
1414
|
|
dongsheng@627
|
1415 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1416 #: ../en/appD-license.xml:96
|
|
dongsheng@627
|
1417 msgid ""
|
|
dongsheng@627
|
1418 "Acknowledgement of the original author and publisher if applicable must be "
|
|
dongsheng@627
|
1419 "retained according to normal academic citation practices."
|
|
dongsheng@627
|
1420 msgstr ""
|
|
dongsheng@627
|
1421
|
|
dongsheng@627
|
1422 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1423 #: ../en/appD-license.xml:100
|
|
dongsheng@627
|
1424 msgid "The location of the original unmodified document must be identified."
|
|
dongsheng@627
|
1425 msgstr ""
|
|
dongsheng@627
|
1426
|
|
dongsheng@627
|
1427 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1428 #: ../en/appD-license.xml:103
|
|
dongsheng@627
|
1429 msgid ""
|
|
dongsheng@627
|
1430 "The original author's (or authors') name(s) may not be used to assert or "
|
|
dongsheng@627
|
1431 "imply endorsement of the resulting document without the original author's (or "
|
|
dongsheng@627
|
1432 "authors') permission."
|
|
dongsheng@627
|
1433 msgstr ""
|
|
dongsheng@627
|
1434
|
|
dongsheng@627
|
1435 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1436 #: ../en/appD-license.xml:111
|
|
dongsheng@627
|
1437 msgid "Good-practice recommendations"
|
|
dongsheng@627
|
1438 msgstr ""
|
|
dongsheng@627
|
1439
|
|
dongsheng@627
|
1440 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1441 #: ../en/appD-license.xml:113
|
|
dongsheng@627
|
1442 msgid ""
|
|
dongsheng@627
|
1443 "In addition to the requirements of this license, it is requested from and "
|
|
dongsheng@627
|
1444 "strongly recommended of redistributors that:"
|
|
dongsheng@627
|
1445 msgstr ""
|
|
dongsheng@627
|
1446
|
|
dongsheng@627
|
1447 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1448 #: ../en/appD-license.xml:118
|
|
dongsheng@627
|
1449 msgid ""
|
|
dongsheng@627
|
1450 "If you are distributing Open Publication works on hardcopy or CD-ROM, you "
|
|
dongsheng@627
|
1451 "provide email notification to the authors of your intent to redistribute at "
|
|
dongsheng@627
|
1452 "least thirty days before your manuscript or media freeze, to give the authors "
|
|
dongsheng@627
|
1453 "time to provide updated documents. This notification should describe "
|
|
dongsheng@627
|
1454 "modifications, if any, made to the document."
|
|
dongsheng@627
|
1455 msgstr ""
|
|
dongsheng@627
|
1456
|
|
dongsheng@627
|
1457 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1458 #: ../en/appD-license.xml:125
|
|
dongsheng@627
|
1459 msgid ""
|
|
dongsheng@627
|
1460 "All substantive modifications (including deletions) be either clearly marked "
|
|
dongsheng@627
|
1461 "up in the document or else described in an attachment to the document."
|
|
dongsheng@627
|
1462 msgstr ""
|
|
dongsheng@627
|
1463
|
|
dongsheng@627
|
1464 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1465 #: ../en/appD-license.xml:129
|
|
dongsheng@627
|
1466 msgid ""
|
|
dongsheng@627
|
1467 "Finally, while it is not mandatory under this license, it is considered good "
|
|
dongsheng@627
|
1468 "form to offer a free copy of any hardcopy and CD-ROM expression of an Open "
|
|
dongsheng@627
|
1469 "Publication-licensed work to its author(s)."
|
|
dongsheng@627
|
1470 msgstr ""
|
|
dongsheng@627
|
1471
|
|
dongsheng@627
|
1472 #. type: Content of: <book><appendix><sect1><title>
|
|
dongsheng@627
|
1473 #: ../en/appD-license.xml:137
|
|
dongsheng@627
|
1474 msgid "License options"
|
|
dongsheng@627
|
1475 msgstr ""
|
|
dongsheng@627
|
1476
|
|
dongsheng@627
|
1477 #. type: Content of: <book><appendix><sect1><para>
|
|
dongsheng@627
|
1478 #: ../en/appD-license.xml:139
|
|
dongsheng@627
|
1479 msgid ""
|
|
dongsheng@627
|
1480 "The author(s) and/or publisher of an Open Publication-licensed document may "
|
|
dongsheng@627
|
1481 "elect certain options by appending language to the reference to or copy of "
|
|
dongsheng@627
|
1482 "the license. These options are considered part of the license instance and "
|
|
dongsheng@627
|
1483 "must be included with the license (or its incorporation by reference) in "
|
|
dongsheng@627
|
1484 "derived works."
|
|
dongsheng@627
|
1485 msgstr ""
|
|
dongsheng@627
|
1486
|
|
dongsheng@627
|
1487 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1488 #: ../en/appD-license.xml:147
|
|
dongsheng@627
|
1489 msgid ""
|
|
dongsheng@627
|
1490 "To prohibit distribution of substantively modified versions without the "
|
|
dongsheng@627
|
1491 "explicit permission of the author(s). <quote>Substantive modification</quote> "
|
|
dongsheng@627
|
1492 "is defined as a change to the semantic content of the document, and excludes "
|
|
dongsheng@627
|
1493 "mere changes in format or typographical corrections."
|
|
dongsheng@627
|
1494 msgstr ""
|
|
dongsheng@627
|
1495
|
|
dongsheng@627
|
1496 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1497 #: ../en/appD-license.xml:154
|
|
dongsheng@627
|
1498 msgid ""
|
|
dongsheng@627
|
1499 "To accomplish this, add the phrase <quote>Distribution of substantively "
|
|
dongsheng@627
|
1500 "modified versions of this document is prohibited without the explicit "
|
|
dongsheng@627
|
1501 "permission of the copyright holder.</quote> to the license reference or copy."
|
|
dongsheng@627
|
1502 msgstr ""
|
|
dongsheng@627
|
1503
|
|
dongsheng@627
|
1504 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1505 #: ../en/appD-license.xml:160
|
|
dongsheng@627
|
1506 msgid ""
|
|
dongsheng@627
|
1507 "To prohibit any publication of this work or derivative works in whole or in "
|
|
dongsheng@627
|
1508 "part in standard (paper) book form for commercial purposes is prohibited "
|
|
dongsheng@627
|
1509 "unless prior permission is obtained from the copyright holder."
|
|
dongsheng@627
|
1510 msgstr ""
|
|
dongsheng@627
|
1511
|
|
dongsheng@627
|
1512 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
1513 #: ../en/appD-license.xml:165
|
|
dongsheng@627
|
1514 msgid ""
|
|
dongsheng@627
|
1515 "To accomplish this, add the phrase <quote>Distribution of the work or "
|
|
dongsheng@627
|
1516 "derivative of the work in any standard (paper) book form is prohibited unless "
|
|
dongsheng@627
|
1517 "prior permission is obtained from the copyright holder.</quote> to the "
|
|
dongsheng@627
|
1518 "license reference or copy."
|
|
dongsheng@627
|
1519 msgstr ""
|
|
dongsheng@627
|
1520
|
|
dongsheng@627
|
1521 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
1522 #: ../en/ch01-intro.xml:5
|
|
dongsheng@627
|
1523 msgid "Introduction"
|
|
dongsheng@627
|
1524 msgstr "简介"
|
|
dongsheng@627
|
1525
|
|
dongsheng@627
|
1526 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
1527 #: ../en/ch01-intro.xml:8
|
|
dongsheng@627
|
1528 msgid "About revision control"
|
|
dongsheng@627
|
1529 msgstr "关于版本控制"
|
|
dongsheng@627
|
1530
|
|
dongsheng@627
|
1531 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1532 #: ../en/ch01-intro.xml:10
|
|
dongsheng@627
|
1533 msgid ""
|
|
dongsheng@627
|
1534 "Revision control is the process of managing multiple versions of a piece of "
|
|
dongsheng@627
|
1535 "information. In its simplest form, this is something that many people do by "
|
|
dongsheng@627
|
1536 "hand: every time you modify a file, save it under a new name that contains a "
|
|
dongsheng@627
|
1537 "number, each one higher than the number of the preceding version."
|
|
dongsheng@627
|
1538 msgstr ""
|
|
dongsheng@627
|
1539
|
|
dongsheng@627
|
1540 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1541 #: ../en/ch01-intro.xml:16
|
|
dongsheng@627
|
1542 msgid ""
|
|
dongsheng@627
|
1543 "Manually managing multiple versions of even a single file is an error-prone "
|
|
dongsheng@627
|
1544 "task, though, so software tools to help automate this process have long been "
|
|
dongsheng@627
|
1545 "available. The earliest automated revision control tools were intended to "
|
|
dongsheng@627
|
1546 "help a single user to manage revisions of a single file. Over the past few "
|
|
dongsheng@627
|
1547 "decades, the scope of revision control tools has expanded greatly; they now "
|
|
dongsheng@627
|
1548 "manage multiple files, and help multiple people to work together. The best "
|
|
dongsheng@627
|
1549 "modern revision control tools have no problem coping with thousands of people "
|
|
dongsheng@627
|
1550 "working together on projects that consist of hundreds of thousands of files."
|
|
dongsheng@627
|
1551 msgstr ""
|
|
dongsheng@627
|
1552
|
|
dongsheng@627
|
1553 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
1554 #: ../en/ch01-intro.xml:28
|
|
dongsheng@627
|
1555 msgid "Why use revision control?"
|
|
dongsheng@627
|
1556 msgstr "为什么使用版本控制?"
|
|
dongsheng@627
|
1557
|
|
dongsheng@627
|
1558 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1559 #: ../en/ch01-intro.xml:30
|
|
dongsheng@627
|
1560 msgid ""
|
|
dongsheng@627
|
1561 "There are a number of reasons why you or your team might want to use an "
|
|
dongsheng@627
|
1562 "automated revision control tool for a project."
|
|
dongsheng@627
|
1563 msgstr ""
|
|
dongsheng@627
|
1564
|
|
dongsheng@627
|
1565 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1566 #: ../en/ch01-intro.xml:34
|
|
dongsheng@627
|
1567 msgid ""
|
|
dongsheng@627
|
1568 "It will track the history and evolution of your project, so you don't have "
|
|
dongsheng@627
|
1569 "to. For every change, you'll have a log of <emphasis>who</emphasis> made it; "
|
|
dongsheng@627
|
1570 "<emphasis>why</emphasis> they made it; <emphasis>when</emphasis> they made "
|
|
dongsheng@627
|
1571 "it; and <emphasis>what</emphasis> the change was."
|
|
dongsheng@627
|
1572 msgstr ""
|
|
dongsheng@627
|
1573
|
|
dongsheng@627
|
1574 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1575 #: ../en/ch01-intro.xml:41
|
|
dongsheng@627
|
1576 msgid ""
|
|
dongsheng@627
|
1577 "When you're working with other people, revision control software makes it "
|
|
dongsheng@627
|
1578 "easier for you to collaborate. For example, when people more or less "
|
|
dongsheng@627
|
1579 "simultaneously make potentially incompatible changes, the software will help "
|
|
dongsheng@627
|
1580 "you to identify and resolve those conflicts."
|
|
dongsheng@627
|
1581 msgstr ""
|
|
dongsheng@627
|
1582
|
|
dongsheng@627
|
1583 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1584 #: ../en/ch01-intro.xml:47
|
|
dongsheng@627
|
1585 msgid ""
|
|
dongsheng@627
|
1586 "It can help you to recover from mistakes. If you make a change that later "
|
|
dongsheng@627
|
1587 "turns out to be in error, you can revert to an earlier version of one or more "
|
|
dongsheng@627
|
1588 "files. In fact, a <emphasis>really</emphasis> good revision control tool "
|
|
dongsheng@627
|
1589 "will even help you to efficiently figure out exactly when a problem was "
|
|
dongsheng@627
|
1590 "introduced (see section <xref linkend=\"sec.undo.bisect\"/> for details)."
|
|
dongsheng@627
|
1591 msgstr ""
|
|
dongsheng@627
|
1592
|
|
dongsheng@627
|
1593 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1594 #: ../en/ch01-intro.xml:54
|
|
dongsheng@627
|
1595 msgid ""
|
|
dongsheng@627
|
1596 "It will help you to work simultaneously on, and manage the drift between, "
|
|
dongsheng@627
|
1597 "multiple versions of your project."
|
|
dongsheng@627
|
1598 msgstr ""
|
|
dongsheng@627
|
1599
|
|
dongsheng@627
|
1600 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1601 #: ../en/ch01-intro.xml:57
|
|
dongsheng@627
|
1602 msgid ""
|
|
dongsheng@627
|
1603 "Most of these reasons are equally valid---at least in theory---whether you're "
|
|
dongsheng@627
|
1604 "working on a project by yourself, or with a hundred other people."
|
|
dongsheng@627
|
1605 msgstr ""
|
|
dongsheng@627
|
1606
|
|
dongsheng@627
|
1607 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1608 #: ../en/ch01-intro.xml:61
|
|
dongsheng@627
|
1609 msgid ""
|
|
dongsheng@627
|
1610 "A key question about the practicality of revision control at these two "
|
|
dongsheng@627
|
1611 "different scales (<quote>lone hacker</quote> and <quote>huge team</quote>) is "
|
|
dongsheng@627
|
1612 "how its <emphasis>benefits</emphasis> compare to its <emphasis>costs</"
|
|
dongsheng@627
|
1613 "emphasis>. A revision control tool that's difficult to understand or use is "
|
|
dongsheng@627
|
1614 "going to impose a high cost."
|
|
dongsheng@627
|
1615 msgstr ""
|
|
dongsheng@627
|
1616
|
|
dongsheng@627
|
1617 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1618 #: ../en/ch01-intro.xml:69
|
|
dongsheng@627
|
1619 msgid ""
|
|
dongsheng@627
|
1620 "A five-hundred-person project is likely to collapse under its own weight "
|
|
dongsheng@627
|
1621 "almost immediately without a revision control tool and process. In this case, "
|
|
dongsheng@627
|
1622 "the cost of using revision control might hardly seem worth considering, since "
|
|
dongsheng@627
|
1623 "<emphasis>without</emphasis> it, failure is almost guaranteed."
|
|
dongsheng@627
|
1624 msgstr ""
|
|
dongsheng@627
|
1625
|
|
dongsheng@627
|
1626 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1627 #: ../en/ch01-intro.xml:76
|
|
dongsheng@627
|
1628 msgid ""
|
|
dongsheng@627
|
1629 "On the other hand, a one-person <quote>quick hack</quote> might seem like a "
|
|
dongsheng@627
|
1630 "poor place to use a revision control tool, because surely the cost of using "
|
|
dongsheng@627
|
1631 "one must be close to the overall cost of the project. Right?"
|
|
dongsheng@627
|
1632 msgstr ""
|
|
dongsheng@627
|
1633
|
|
dongsheng@627
|
1634 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1635 #: ../en/ch01-intro.xml:81
|
|
dongsheng@627
|
1636 msgid ""
|
|
dongsheng@627
|
1637 "Mercurial uniquely supports <emphasis>both</emphasis> of these scales of "
|
|
dongsheng@627
|
1638 "development. You can learn the basics in just a few minutes, and due to its "
|
|
dongsheng@627
|
1639 "low overhead, you can apply revision control to the smallest of projects with "
|
|
dongsheng@627
|
1640 "ease. Its simplicity means you won't have a lot of abstruse concepts or "
|
|
dongsheng@627
|
1641 "command sequences competing for mental space with whatever you're "
|
|
dongsheng@627
|
1642 "<emphasis>really</emphasis> trying to do. At the same time, Mercurial's high "
|
|
dongsheng@627
|
1643 "performance and peer-to-peer nature let you scale painlessly to handle large "
|
|
dongsheng@627
|
1644 "projects."
|
|
dongsheng@627
|
1645 msgstr ""
|
|
dongsheng@627
|
1646
|
|
dongsheng@627
|
1647 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1648 #: ../en/ch01-intro.xml:91
|
|
dongsheng@627
|
1649 msgid ""
|
|
dongsheng@627
|
1650 "No revision control tool can rescue a poorly run project, but a good choice "
|
|
dongsheng@627
|
1651 "of tools can make a huge difference to the fluidity with which you can work "
|
|
dongsheng@627
|
1652 "on a project."
|
|
dongsheng@627
|
1653 msgstr ""
|
|
dongsheng@627
|
1654
|
|
dongsheng@627
|
1655 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
1656 #: ../en/ch01-intro.xml:97
|
|
dongsheng@627
|
1657 msgid "The many names of revision control"
|
|
dongsheng@627
|
1658 msgstr "版本控制的别名"
|
|
dongsheng@627
|
1659
|
|
dongsheng@627
|
1660 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1661 #: ../en/ch01-intro.xml:99
|
|
dongsheng@627
|
1662 msgid ""
|
|
dongsheng@627
|
1663 "Revision control is a diverse field, so much so that it doesn't actually have "
|
|
dongsheng@627
|
1664 "a single name or acronym. Here are a few of the more common names and "
|
|
dongsheng@627
|
1665 "acronyms you'll encounter:"
|
|
dongsheng@627
|
1666 msgstr ""
|
|
dongsheng@627
|
1667
|
|
dongsheng@627
|
1668 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1669 #: ../en/ch01-intro.xml:104
|
|
dongsheng@627
|
1670 msgid "Revision control (RCS)"
|
|
dongsheng@643
|
1671 msgstr "版本控制(RCS)"
|
|
dongsheng@627
|
1672
|
|
dongsheng@627
|
1673 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1674 #: ../en/ch01-intro.xml:105
|
|
dongsheng@627
|
1675 msgid "Software configuration management (SCM), or configuration management"
|
|
dongsheng@643
|
1676 msgstr "软件配置管理(SCM)，或配置管理"
|
|
dongsheng@627
|
1677
|
|
dongsheng@627
|
1678 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1679 #: ../en/ch01-intro.xml:107
|
|
dongsheng@627
|
1680 msgid "Source code management"
|
|
dongsheng@643
|
1681 msgstr "源代码管理"
|
|
dongsheng@627
|
1682
|
|
dongsheng@627
|
1683 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1684 #: ../en/ch01-intro.xml:108
|
|
dongsheng@627
|
1685 msgid "Source code control, or source control"
|
|
dongsheng@643
|
1686 msgstr "源代码控制，或源控制"
|
|
dongsheng@627
|
1687
|
|
dongsheng@627
|
1688 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1689 #: ../en/ch01-intro.xml:110
|
|
dongsheng@627
|
1690 msgid "Version control (VCS)"
|
|
dongsheng@643
|
1691 msgstr "版本控制(VCS)"
|
|
dongsheng@627
|
1692
|
|
dongsheng@627
|
1693 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1694 #: ../en/ch01-intro.xml:112
|
|
dongsheng@627
|
1695 msgid ""
|
|
dongsheng@627
|
1696 "Some people claim that these terms actually have different meanings, but in "
|
|
dongsheng@627
|
1697 "practice they overlap so much that there's no agreed or even useful way to "
|
|
dongsheng@627
|
1698 "tease them apart."
|
|
dongsheng@627
|
1699 msgstr ""
|
|
dongsheng@627
|
1700
|
|
dongsheng@627
|
1701 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
1702 #: ../en/ch01-intro.xml:119
|
|
dongsheng@627
|
1703 msgid "A short history of revision control"
|
|
dongsheng@627
|
1704 msgstr "版本控制简史"
|
|
dongsheng@627
|
1705
|
|
dongsheng@627
|
1706 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1707 #: ../en/ch01-intro.xml:121
|
|
dongsheng@627
|
1708 msgid ""
|
|
dongsheng@627
|
1709 "The best known of the old-time revision control tools is SCCS (Source Code "
|
|
dongsheng@627
|
1710 "Control System), which Marc Rochkind wrote at Bell Labs, in the early 1970s. "
|
|
dongsheng@627
|
1711 "SCCS operated on individual files, and required every person working on a "
|
|
dongsheng@627
|
1712 "project to have access to a shared workspace on a single system. Only one "
|
|
dongsheng@627
|
1713 "person could modify a file at any time; arbitration for access to files was "
|
|
dongsheng@627
|
1714 "via locks. It was common for people to lock files, and later forget to "
|
|
dongsheng@627
|
1715 "unlock them, preventing anyone else from modifying those files without the "
|
|
dongsheng@627
|
1716 "help of an administrator."
|
|
dongsheng@627
|
1717 msgstr ""
|
|
dongsheng@627
|
1718
|
|
dongsheng@627
|
1719 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1720 #: ../en/ch01-intro.xml:132
|
|
dongsheng@627
|
1721 msgid ""
|
|
dongsheng@627
|
1722 "Walter Tichy developed a free alternative to SCCS in the early 1980s; he "
|
|
dongsheng@627
|
1723 "called his program RCS (Revision Control System). Like SCCS, RCS required "
|
|
dongsheng@627
|
1724 "developers to work in a single shared workspace, and to lock files to prevent "
|
|
dongsheng@627
|
1725 "multiple people from modifying them simultaneously."
|
|
dongsheng@627
|
1726 msgstr ""
|
|
dongsheng@627
|
1727
|
|
dongsheng@627
|
1728 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1729 #: ../en/ch01-intro.xml:138
|
|
dongsheng@627
|
1730 msgid ""
|
|
dongsheng@627
|
1731 "Later in the 1980s, Dick Grune used RCS as a building block for a set of "
|
|
dongsheng@627
|
1732 "shell scripts he initially called cmt, but then renamed to CVS (Concurrent "
|
|
dongsheng@627
|
1733 "Versions System). The big innovation of CVS was that it let developers work "
|
|
dongsheng@627
|
1734 "simultaneously and somewhat independently in their own personal workspaces. "
|
|
dongsheng@627
|
1735 "The personal workspaces prevented developers from stepping on each other's "
|
|
dongsheng@627
|
1736 "toes all the time, as was common with SCCS and RCS. Each developer had a copy "
|
|
dongsheng@627
|
1737 "of every project file, and could modify their copies independently. They had "
|
|
dongsheng@627
|
1738 "to merge their edits prior to committing changes to the central repository."
|
|
dongsheng@627
|
1739 msgstr ""
|
|
dongsheng@627
|
1740
|
|
dongsheng@627
|
1741 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1742 #: ../en/ch01-intro.xml:149
|
|
dongsheng@627
|
1743 msgid ""
|
|
dongsheng@627
|
1744 "Brian Berliner took Grune's original scripts and rewrote them in C, releasing "
|
|
dongsheng@627
|
1745 "in 1989 the code that has since developed into the modern version of CVS. "
|
|
dongsheng@627
|
1746 "CVS subsequently acquired the ability to operate over a network connection, "
|
|
dongsheng@627
|
1747 "giving it a client/server architecture. CVS's architecture is centralised; "
|
|
dongsheng@627
|
1748 "only the server has a copy of the history of the project. Client workspaces "
|
|
dongsheng@627
|
1749 "just contain copies of recent versions of the project's files, and a little "
|
|
dongsheng@627
|
1750 "metadata to tell them where the server is. CVS has been enormously "
|
|
dongsheng@627
|
1751 "successful; it is probably the world's most widely used revision control "
|
|
dongsheng@627
|
1752 "system."
|
|
dongsheng@627
|
1753 msgstr ""
|
|
dongsheng@627
|
1754
|
|
dongsheng@627
|
1755 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1756 #: ../en/ch01-intro.xml:160
|
|
dongsheng@627
|
1757 msgid ""
|
|
dongsheng@627
|
1758 "In the early 1990s, Sun Microsystems developed an early distributed revision "
|
|
dongsheng@627
|
1759 "control system, called TeamWare. A TeamWare workspace contains a complete "
|
|
dongsheng@627
|
1760 "copy of the project's history. TeamWare has no notion of a central "
|
|
dongsheng@627
|
1761 "repository. (CVS relied upon RCS for its history storage; TeamWare used "
|
|
dongsheng@627
|
1762 "SCCS.)"
|
|
dongsheng@627
|
1763 msgstr ""
|
|
dongsheng@627
|
1764
|
|
dongsheng@627
|
1765 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1766 #: ../en/ch01-intro.xml:167
|
|
dongsheng@627
|
1767 msgid ""
|
|
dongsheng@627
|
1768 "As the 1990s progressed, awareness grew of a number of problems with CVS. It "
|
|
dongsheng@627
|
1769 "records simultaneous changes to multiple files individually, instead of "
|
|
dongsheng@627
|
1770 "grouping them together as a single logically atomic operation. It does not "
|
|
dongsheng@627
|
1771 "manage its file hierarchy well; it is easy to make a mess of a repository by "
|
|
dongsheng@627
|
1772 "renaming files and directories. Worse, its source code is difficult to read "
|
|
dongsheng@627
|
1773 "and maintain, which made the <quote>pain level</quote> of fixing these "
|
|
dongsheng@627
|
1774 "architectural problems prohibitive."
|
|
dongsheng@627
|
1775 msgstr ""
|
|
dongsheng@627
|
1776
|
|
dongsheng@627
|
1777 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1778 #: ../en/ch01-intro.xml:177
|
|
dongsheng@627
|
1779 msgid ""
|
|
dongsheng@627
|
1780 "In 2001, Jim Blandy and Karl Fogel, two developers who had worked on CVS, "
|
|
dongsheng@627
|
1781 "started a project to replace it with a tool that would have a better "
|
|
dongsheng@627
|
1782 "architecture and cleaner code. The result, Subversion, does not stray from "
|
|
dongsheng@627
|
1783 "CVS's centralised client/server model, but it adds multi-file atomic commits, "
|
|
dongsheng@627
|
1784 "better namespace management, and a number of other features that make it a "
|
|
dongsheng@627
|
1785 "generally better tool than CVS. Since its initial release, it has rapidly "
|
|
dongsheng@627
|
1786 "grown in popularity."
|
|
dongsheng@627
|
1787 msgstr ""
|
|
dongsheng@627
|
1788
|
|
dongsheng@627
|
1789 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1790 #: ../en/ch01-intro.xml:186
|
|
dongsheng@627
|
1791 msgid ""
|
|
dongsheng@627
|
1792 "More or less simultaneously, Graydon Hoare began working on an ambitious "
|
|
dongsheng@627
|
1793 "distributed revision control system that he named Monotone. While Monotone "
|
|
dongsheng@627
|
1794 "addresses many of CVS's design flaws and has a peer-to-peer architecture, it "
|
|
dongsheng@627
|
1795 "goes beyond earlier (and subsequent) revision control tools in a number of "
|
|
dongsheng@627
|
1796 "innovative ways. It uses cryptographic hashes as identifiers, and has an "
|
|
dongsheng@627
|
1797 "integral notion of <quote>trust</quote> for code from different sources."
|
|
dongsheng@627
|
1798 msgstr ""
|
|
dongsheng@627
|
1799
|
|
dongsheng@627
|
1800 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1801 #: ../en/ch01-intro.xml:195
|
|
dongsheng@627
|
1802 msgid ""
|
|
dongsheng@627
|
1803 "Mercurial began life in 2005. While a few aspects of its design are "
|
|
dongsheng@627
|
1804 "influenced by Monotone, Mercurial focuses on ease of use, high performance, "
|
|
dongsheng@627
|
1805 "and scalability to very large projects."
|
|
dongsheng@627
|
1806 msgstr ""
|
|
dongsheng@627
|
1807
|
|
dongsheng@627
|
1808 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
1809 #: ../en/ch01-intro.xml:202
|
|
dongsheng@627
|
1810 msgid "Trends in revision control"
|
|
dongsheng@627
|
1811 msgstr "版本控制的发展趋势"
|
|
dongsheng@627
|
1812
|
|
dongsheng@627
|
1813 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1814 #: ../en/ch01-intro.xml:204
|
|
dongsheng@627
|
1815 msgid ""
|
|
dongsheng@627
|
1816 "There has been an unmistakable trend in the development and use of revision "
|
|
dongsheng@627
|
1817 "control tools over the past four decades, as people have become familiar with "
|
|
dongsheng@627
|
1818 "the capabilities of their tools and constrained by their limitations."
|
|
dongsheng@627
|
1819 msgstr ""
|
|
dongsheng@627
|
1820
|
|
dongsheng@627
|
1821 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1822 #: ../en/ch01-intro.xml:209
|
|
dongsheng@627
|
1823 msgid ""
|
|
dongsheng@627
|
1824 "The first generation began by managing single files on individual computers. "
|
|
dongsheng@627
|
1825 "Although these tools represented a huge advance over ad-hoc manual revision "
|
|
dongsheng@627
|
1826 "control, their locking model and reliance on a single computer limited them "
|
|
dongsheng@627
|
1827 "to small, tightly-knit teams."
|
|
dongsheng@627
|
1828 msgstr ""
|
|
dongsheng@627
|
1829
|
|
dongsheng@627
|
1830 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1831 #: ../en/ch01-intro.xml:215
|
|
dongsheng@627
|
1832 msgid ""
|
|
dongsheng@627
|
1833 "The second generation loosened these constraints by moving to network-"
|
|
dongsheng@627
|
1834 "centered architectures, and managing entire projects at a time. As projects "
|
|
dongsheng@627
|
1835 "grew larger, they ran into new problems. With clients needing to talk to "
|
|
dongsheng@627
|
1836 "servers very frequently, server scaling became an issue for large projects. "
|
|
dongsheng@627
|
1837 "An unreliable network connection could prevent remote users from being able "
|
|
dongsheng@627
|
1838 "to talk to the server at all. As open source projects started making read-"
|
|
dongsheng@627
|
1839 "only access available anonymously to anyone, people without commit privileges "
|
|
dongsheng@627
|
1840 "found that they could not use the tools to interact with a project in a "
|
|
dongsheng@627
|
1841 "natural way, as they could not record their changes."
|
|
dongsheng@627
|
1842 msgstr ""
|
|
dongsheng@627
|
1843
|
|
dongsheng@627
|
1844 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1845 #: ../en/ch01-intro.xml:227
|
|
dongsheng@627
|
1846 msgid ""
|
|
dongsheng@627
|
1847 "The current generation of revision control tools is peer-to-peer in nature. "
|
|
dongsheng@627
|
1848 "All of these systems have dropped the dependency on a single central server, "
|
|
dongsheng@627
|
1849 "and allow people to distribute their revision control data to where it's "
|
|
dongsheng@627
|
1850 "actually needed. Collaboration over the Internet has moved from constrained "
|
|
dongsheng@627
|
1851 "by technology to a matter of choice and consensus. Modern tools can operate "
|
|
dongsheng@627
|
1852 "offline indefinitely and autonomously, with a network connection only needed "
|
|
dongsheng@627
|
1853 "when syncing changes with another repository."
|
|
dongsheng@627
|
1854 msgstr ""
|
|
dongsheng@627
|
1855
|
|
dongsheng@627
|
1856 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
1857 #: ../en/ch01-intro.xml:239
|
|
dongsheng@627
|
1858 msgid "A few of the advantages of distributed revision control"
|
|
dongsheng@627
|
1859 msgstr "分布版本控制的优点"
|
|
dongsheng@627
|
1860
|
|
dongsheng@627
|
1861 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1862 #: ../en/ch01-intro.xml:242
|
|
dongsheng@627
|
1863 msgid ""
|
|
dongsheng@627
|
1864 "Even though distributed revision control tools have for several years been as "
|
|
dongsheng@627
|
1865 "robust and usable as their previous-generation counterparts, people using "
|
|
dongsheng@627
|
1866 "older tools have not yet necessarily woken up to their advantages. There are "
|
|
dongsheng@627
|
1867 "a number of ways in which distributed tools shine relative to centralised "
|
|
dongsheng@627
|
1868 "ones."
|
|
dongsheng@627
|
1869 msgstr ""
|
|
dongsheng@627
|
1870
|
|
dongsheng@627
|
1871 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1872 #: ../en/ch01-intro.xml:249
|
|
dongsheng@627
|
1873 msgid ""
|
|
dongsheng@627
|
1874 "For an individual developer, distributed tools are almost always much faster "
|
|
dongsheng@627
|
1875 "than centralised tools. This is for a simple reason: a centralised tool "
|
|
dongsheng@627
|
1876 "needs to talk over the network for many common operations, because most "
|
|
dongsheng@627
|
1877 "metadata is stored in a single copy on the central server. A distributed "
|
|
dongsheng@627
|
1878 "tool stores all of its metadata locally. All else being equal, talking over "
|
|
dongsheng@627
|
1879 "the network adds overhead to a centralised tool. Don't underestimate the "
|
|
dongsheng@627
|
1880 "value of a snappy, responsive tool: you're going to spend a lot of time "
|
|
dongsheng@627
|
1881 "interacting with your revision control software."
|
|
dongsheng@627
|
1882 msgstr ""
|
|
dongsheng@627
|
1883
|
|
dongsheng@627
|
1884 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1885 #: ../en/ch01-intro.xml:260
|
|
dongsheng@627
|
1886 msgid ""
|
|
dongsheng@627
|
1887 "Distributed tools are indifferent to the vagaries of your server "
|
|
dongsheng@627
|
1888 "infrastructure, again because they replicate metadata to so many locations. "
|
|
dongsheng@627
|
1889 "If you use a centralised system and your server catches fire, you'd better "
|
|
dongsheng@627
|
1890 "hope that your backup media are reliable, and that your last backup was "
|
|
dongsheng@627
|
1891 "recent and actually worked. With a distributed tool, you have many backups "
|
|
dongsheng@627
|
1892 "available on every contributor's computer."
|
|
dongsheng@627
|
1893 msgstr ""
|
|
dongsheng@627
|
1894
|
|
dongsheng@627
|
1895 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
1896 #: ../en/ch01-intro.xml:268
|
|
dongsheng@627
|
1897 msgid ""
|
|
dongsheng@627
|
1898 "The reliability of your network will affect distributed tools far less than "
|
|
dongsheng@627
|
1899 "it will centralised tools. You can't even use a centralised tool without a "
|
|
dongsheng@627
|
1900 "network connection, except for a few highly constrained commands. With a "
|
|
dongsheng@627
|
1901 "distributed tool, if your network connection goes down while you're working, "
|
|
dongsheng@627
|
1902 "you may not even notice. The only thing you won't be able to do is talk to "
|
|
dongsheng@627
|
1903 "repositories on other computers, something that is relatively rare compared "
|
|
dongsheng@627
|
1904 "with local operations. If you have a far-flung team of collaborators, this "
|
|
dongsheng@627
|
1905 "may be significant."
|
|
dongsheng@627
|
1906 msgstr ""
|
|
dongsheng@627
|
1907
|
|
dongsheng@627
|
1908 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
1909 #: ../en/ch01-intro.xml:279
|
|
dongsheng@627
|
1910 msgid "Advantages for open source projects"
|
|
dongsheng@627
|
1911 msgstr "开源项目的优点"
|
|
dongsheng@627
|
1912
|
|
dongsheng@627
|
1913 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
1914 #: ../en/ch01-intro.xml:281
|
|
dongsheng@627
|
1915 msgid ""
|
|
dongsheng@627
|
1916 "If you take a shine to an open source project and decide that you would like "
|
|
dongsheng@627
|
1917 "to start hacking on it, and that project uses a distributed revision control "
|
|
dongsheng@627
|
1918 "tool, you are at once a peer with the people who consider themselves the "
|
|
dongsheng@627
|
1919 "<quote>core</quote> of that project. If they publish their repositories, you "
|
|
dongsheng@627
|
1920 "can immediately copy their project history, start making changes, and record "
|
|
dongsheng@627
|
1921 "your work, using the same tools in the same ways as insiders. By contrast, "
|
|
dongsheng@627
|
1922 "with a centralised tool, you must use the software in a <quote>read only</"
|
|
dongsheng@627
|
1923 "quote> mode unless someone grants you permission to commit changes to their "
|
|
dongsheng@627
|
1924 "central server. Until then, you won't be able to record changes, and your "
|
|
dongsheng@627
|
1925 "local modifications will be at risk of corruption any time you try to update "
|
|
dongsheng@627
|
1926 "your client's view of the repository."
|
|
dongsheng@627
|
1927 msgstr ""
|
|
dongsheng@627
|
1928
|
|
dongsheng@627
|
1929 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
1930 #: ../en/ch01-intro.xml:297
|
|
dongsheng@627
|
1931 msgid "The forking non-problem"
|
|
dongsheng@627
|
1932 msgstr ""
|
|
dongsheng@627
|
1933
|
|
dongsheng@627
|
1934 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
1935 #: ../en/ch01-intro.xml:299
|
|
dongsheng@627
|
1936 msgid ""
|
|
dongsheng@627
|
1937 "It has been suggested that distributed revision control tools pose some sort "
|
|
dongsheng@627
|
1938 "of risk to open source projects because they make it easy to <quote>fork</"
|
|
dongsheng@627
|
1939 "quote> the development of a project. A fork happens when there are "
|
|
dongsheng@627
|
1940 "differences in opinion or attitude between groups of developers that cause "
|
|
dongsheng@627
|
1941 "them to decide that they can't work together any longer. Each side takes a "
|
|
dongsheng@627
|
1942 "more or less complete copy of the project's source code, and goes off in its "
|
|
dongsheng@627
|
1943 "own direction."
|
|
dongsheng@627
|
1944 msgstr ""
|
|
dongsheng@627
|
1945
|
|
dongsheng@627
|
1946 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
1947 #: ../en/ch01-intro.xml:309
|
|
dongsheng@627
|
1948 msgid ""
|
|
dongsheng@627
|
1949 "Sometimes the camps in a fork decide to reconcile their differences. With a "
|
|
dongsheng@627
|
1950 "centralised revision control system, the <emphasis>technical</emphasis> "
|
|
dongsheng@627
|
1951 "process of reconciliation is painful, and has to be performed largely by "
|
|
dongsheng@627
|
1952 "hand. You have to decide whose revision history is going to <quote>win</"
|
|
dongsheng@627
|
1953 "quote>, and graft the other team's changes into the tree somehow. This "
|
|
dongsheng@627
|
1954 "usually loses some or all of one side's revision history."
|
|
dongsheng@627
|
1955 msgstr ""
|
|
dongsheng@627
|
1956
|
|
dongsheng@627
|
1957 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
1958 #: ../en/ch01-intro.xml:318
|
|
dongsheng@627
|
1959 msgid ""
|
|
dongsheng@627
|
1960 "What distributed tools do with respect to forking is they make forking the "
|
|
dongsheng@627
|
1961 "<emphasis>only</emphasis> way to develop a project. Every single change that "
|
|
dongsheng@627
|
1962 "you make is potentially a fork point. The great strength of this approach is "
|
|
dongsheng@627
|
1963 "that a distributed revision control tool has to be really good at "
|
|
dongsheng@627
|
1964 "<emphasis>merging</emphasis> forks, because forks are absolutely fundamental: "
|
|
dongsheng@627
|
1965 "they happen all the time."
|
|
dongsheng@627
|
1966 msgstr ""
|
|
dongsheng@627
|
1967
|
|
dongsheng@627
|
1968 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
1969 #: ../en/ch01-intro.xml:327
|
|
dongsheng@627
|
1970 msgid ""
|
|
dongsheng@627
|
1971 "If every piece of work that everybody does, all the time, is framed in terms "
|
|
dongsheng@627
|
1972 "of forking and merging, then what the open source world refers to as a "
|
|
dongsheng@627
|
1973 "<quote>fork</quote> becomes <emphasis>purely</emphasis> a social issue. If "
|
|
dongsheng@627
|
1974 "anything, distributed tools <emphasis>lower</emphasis> the likelihood of a "
|
|
dongsheng@627
|
1975 "fork:"
|
|
dongsheng@627
|
1976 msgstr ""
|
|
dongsheng@627
|
1977
|
|
dongsheng@627
|
1978 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1979 #: ../en/ch01-intro.xml:334
|
|
dongsheng@627
|
1980 msgid ""
|
|
dongsheng@627
|
1981 "They eliminate the social distinction that centralised tools impose: that "
|
|
dongsheng@627
|
1982 "between insiders (people with commit access) and outsiders (people without)."
|
|
dongsheng@627
|
1983 msgstr ""
|
|
dongsheng@627
|
1984
|
|
dongsheng@627
|
1985 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
1986 #: ../en/ch01-intro.xml:338
|
|
dongsheng@627
|
1987 msgid ""
|
|
dongsheng@627
|
1988 "They make it easier to reconcile after a social fork, because all that's "
|
|
dongsheng@627
|
1989 "involved from the perspective of the revision control software is just "
|
|
dongsheng@627
|
1990 "another merge."
|
|
dongsheng@627
|
1991 msgstr ""
|
|
dongsheng@627
|
1992
|
|
dongsheng@627
|
1993 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
1994 #: ../en/ch01-intro.xml:343
|
|
dongsheng@627
|
1995 msgid ""
|
|
dongsheng@627
|
1996 "Some people resist distributed tools because they want to retain tight "
|
|
dongsheng@627
|
1997 "control over their projects, and they believe that centralised tools give "
|
|
dongsheng@627
|
1998 "them this control. However, if you're of this belief, and you publish your "
|
|
dongsheng@627
|
1999 "CVS or Subversion repositories publicly, there are plenty of tools available "
|
|
dongsheng@627
|
2000 "that can pull out your entire project's history (albeit slowly) and recreate "
|
|
dongsheng@627
|
2001 "it somewhere that you don't control. So while your control in this case is "
|
|
dongsheng@627
|
2002 "illusory, you are forgoing the ability to fluidly collaborate with whatever "
|
|
dongsheng@627
|
2003 "people feel compelled to mirror and fork your history."
|
|
dongsheng@627
|
2004 msgstr ""
|
|
dongsheng@627
|
2005
|
|
dongsheng@627
|
2006 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2007 #: ../en/ch01-intro.xml:358
|
|
dongsheng@627
|
2008 msgid "Advantages for commercial projects"
|
|
dongsheng@627
|
2009 msgstr "商业项目的优点"
|
|
dongsheng@627
|
2010
|
|
dongsheng@627
|
2011 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2012 #: ../en/ch01-intro.xml:360
|
|
dongsheng@627
|
2013 msgid ""
|
|
dongsheng@627
|
2014 "Many commercial projects are undertaken by teams that are scattered across "
|
|
dongsheng@627
|
2015 "the globe. Contributors who are far from a central server will see slower "
|
|
dongsheng@627
|
2016 "command execution and perhaps less reliability. Commercial revision control "
|
|
dongsheng@627
|
2017 "systems attempt to ameliorate these problems with remote-site replication add-"
|
|
dongsheng@627
|
2018 "ons that are typically expensive to buy and cantankerous to administer. A "
|
|
dongsheng@627
|
2019 "distributed system doesn't suffer from these problems in the first place. "
|
|
dongsheng@627
|
2020 "Better yet, you can easily set up multiple authoritative servers, say one per "
|
|
dongsheng@627
|
2021 "site, so that there's no redundant communication between repositories over "
|
|
dongsheng@627
|
2022 "expensive long-haul network links."
|
|
dongsheng@627
|
2023 msgstr ""
|
|
dongsheng@627
|
2024
|
|
dongsheng@627
|
2025 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2026 #: ../en/ch01-intro.xml:372
|
|
dongsheng@627
|
2027 msgid ""
|
|
dongsheng@627
|
2028 "Centralised revision control systems tend to have relatively low "
|
|
dongsheng@627
|
2029 "scalability. It's not unusual for an expensive centralised system to fall "
|
|
dongsheng@627
|
2030 "over under the combined load of just a few dozen concurrent users. Once "
|
|
dongsheng@627
|
2031 "again, the typical response tends to be an expensive and clunky replication "
|
|
dongsheng@627
|
2032 "facility. Since the load on a central server---if you have one at all---is "
|
|
dongsheng@627
|
2033 "many times lower with a distributed tool (because all of the data is "
|
|
dongsheng@627
|
2034 "replicated everywhere), a single cheap server can handle the needs of a much "
|
|
dongsheng@627
|
2035 "larger team, and replication to balance load becomes a simple matter of "
|
|
dongsheng@627
|
2036 "scripting."
|
|
dongsheng@627
|
2037 msgstr ""
|
|
dongsheng@627
|
2038
|
|
dongsheng@627
|
2039 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2040 #: ../en/ch01-intro.xml:384
|
|
dongsheng@627
|
2041 msgid ""
|
|
dongsheng@627
|
2042 "If you have an employee in the field, troubleshooting a problem at a "
|
|
dongsheng@627
|
2043 "customer's site, they'll benefit from distributed revision control. The tool "
|
|
dongsheng@627
|
2044 "will let them generate custom builds, try different fixes in isolation from "
|
|
dongsheng@627
|
2045 "each other, and search efficiently through history for the sources of bugs "
|
|
dongsheng@627
|
2046 "and regressions in the customer's environment, all without needing to connect "
|
|
dongsheng@627
|
2047 "to your company's network."
|
|
dongsheng@627
|
2048 msgstr ""
|
|
dongsheng@627
|
2049
|
|
dongsheng@627
|
2050 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
2051 #: ../en/ch01-intro.xml:395
|
|
dongsheng@627
|
2052 msgid "Why choose Mercurial?"
|
|
dongsheng@627
|
2053 msgstr "为什么选择 Mercurial?"
|
|
dongsheng@627
|
2054
|
|
dongsheng@627
|
2055 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2056 #: ../en/ch01-intro.xml:397
|
|
dongsheng@627
|
2057 msgid ""
|
|
dongsheng@627
|
2058 "Mercurial has a unique set of properties that make it a particularly good "
|
|
dongsheng@627
|
2059 "choice as a revision control system."
|
|
dongsheng@627
|
2060 msgstr ""
|
|
dongsheng@627
|
2061
|
|
dongsheng@627
|
2062 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2063 #: ../en/ch01-intro.xml:400
|
|
dongsheng@627
|
2064 msgid "It is easy to learn and use."
|
|
dongsheng@627
|
2065 msgstr ""
|
|
dongsheng@627
|
2066
|
|
dongsheng@627
|
2067 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2068 #: ../en/ch01-intro.xml:401
|
|
dongsheng@627
|
2069 msgid "It is lightweight."
|
|
dongsheng@627
|
2070 msgstr ""
|
|
dongsheng@627
|
2071
|
|
dongsheng@627
|
2072 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2073 #: ../en/ch01-intro.xml:402
|
|
dongsheng@627
|
2074 msgid "It scales excellently."
|
|
dongsheng@627
|
2075 msgstr ""
|
|
dongsheng@627
|
2076
|
|
dongsheng@627
|
2077 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2078 #: ../en/ch01-intro.xml:403
|
|
dongsheng@627
|
2079 msgid "It is easy to customise."
|
|
dongsheng@627
|
2080 msgstr ""
|
|
dongsheng@627
|
2081
|
|
dongsheng@627
|
2082 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2083 #: ../en/ch01-intro.xml:406
|
|
dongsheng@627
|
2084 msgid ""
|
|
dongsheng@627
|
2085 "If you are at all familiar with revision control systems, you should be able "
|
|
dongsheng@627
|
2086 "to get up and running with Mercurial in less than five minutes. Even if not, "
|
|
dongsheng@627
|
2087 "it will take no more than a few minutes longer. Mercurial's command and "
|
|
dongsheng@627
|
2088 "feature sets are generally uniform and consistent, so you can keep track of a "
|
|
dongsheng@627
|
2089 "few general rules instead of a host of exceptions."
|
|
dongsheng@627
|
2090 msgstr ""
|
|
dongsheng@627
|
2091
|
|
dongsheng@627
|
2092 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2093 #: ../en/ch01-intro.xml:413
|
|
dongsheng@627
|
2094 msgid ""
|
|
dongsheng@627
|
2095 "On a small project, you can start working with Mercurial in moments. Creating "
|
|
dongsheng@627
|
2096 "new changes and branches; transferring changes around (whether locally or "
|
|
dongsheng@627
|
2097 "over a network); and history and status operations are all fast. Mercurial "
|
|
dongsheng@627
|
2098 "attempts to stay nimble and largely out of your way by combining low "
|
|
dongsheng@627
|
2099 "cognitive overhead with blazingly fast operations."
|
|
dongsheng@627
|
2100 msgstr ""
|
|
dongsheng@627
|
2101
|
|
dongsheng@627
|
2102 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2103 #: ../en/ch01-intro.xml:420
|
|
dongsheng@627
|
2104 msgid ""
|
|
dongsheng@627
|
2105 "The usefulness of Mercurial is not limited to small projects: it is used by "
|
|
dongsheng@627
|
2106 "projects with hundreds to thousands of contributors, each containing tens of "
|
|
dongsheng@627
|
2107 "thousands of files and hundreds of megabytes of source code."
|
|
dongsheng@627
|
2108 msgstr ""
|
|
dongsheng@627
|
2109
|
|
dongsheng@627
|
2110 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2111 #: ../en/ch01-intro.xml:425
|
|
dongsheng@627
|
2112 msgid ""
|
|
dongsheng@627
|
2113 "If the core functionality of Mercurial is not enough for you, it's easy to "
|
|
dongsheng@627
|
2114 "build on. Mercurial is well suited to scripting tasks, and its clean "
|
|
dongsheng@627
|
2115 "internals and implementation in Python make it easy to add features in the "
|
|
dongsheng@627
|
2116 "form of extensions. There are a number of popular and useful extensions "
|
|
dongsheng@627
|
2117 "already available, ranging from helping to identify bugs to improving "
|
|
dongsheng@627
|
2118 "performance."
|
|
dongsheng@627
|
2119 msgstr ""
|
|
dongsheng@627
|
2120
|
|
dongsheng@627
|
2121 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
2122 #: ../en/ch01-intro.xml:435
|
|
dongsheng@627
|
2123 msgid "Mercurial compared with other tools"
|
|
dongsheng@627
|
2124 msgstr "Mercurial 与其它工具的比较"
|
|
dongsheng@627
|
2125
|
|
dongsheng@627
|
2126 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2127 #: ../en/ch01-intro.xml:437
|
|
dongsheng@627
|
2128 msgid ""
|
|
dongsheng@627
|
2129 "Before you read on, please understand that this section necessarily reflects "
|
|
dongsheng@627
|
2130 "my own experiences, interests, and (dare I say it) biases. I have used every "
|
|
dongsheng@627
|
2131 "one of the revision control tools listed below, in most cases for several "
|
|
dongsheng@627
|
2132 "years at a time."
|
|
dongsheng@627
|
2133 msgstr ""
|
|
dongsheng@627
|
2134
|
|
dongsheng@627
|
2135 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2136 #: ../en/ch01-intro.xml:445 ../en/ch01-intro.xml:656
|
|
dongsheng@627
|
2137 msgid "Subversion"
|
|
dongsheng@627
|
2138 msgstr ""
|
|
dongsheng@627
|
2139
|
|
dongsheng@627
|
2140 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2141 #: ../en/ch01-intro.xml:447
|
|
dongsheng@627
|
2142 msgid ""
|
|
dongsheng@627
|
2143 "Subversion is a popular revision control tool, developed to replace CVS. It "
|
|
dongsheng@627
|
2144 "has a centralised client/server architecture."
|
|
dongsheng@627
|
2145 msgstr ""
|
|
dongsheng@627
|
2146
|
|
dongsheng@627
|
2147 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2148 #: ../en/ch01-intro.xml:451
|
|
dongsheng@627
|
2149 msgid ""
|
|
dongsheng@627
|
2150 "Subversion and Mercurial have similarly named commands for performing the "
|
|
dongsheng@627
|
2151 "same operations, so if you're familiar with one, it is easy to learn to use "
|
|
dongsheng@627
|
2152 "the other. Both tools are portable to all popular operating systems."
|
|
dongsheng@627
|
2153 msgstr ""
|
|
dongsheng@627
|
2154
|
|
dongsheng@627
|
2155 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2156 #: ../en/ch01-intro.xml:456
|
|
dongsheng@627
|
2157 msgid ""
|
|
dongsheng@627
|
2158 "Prior to version 1.5, Subversion had no useful support for merges. At the "
|
|
dongsheng@627
|
2159 "time of writing, its merge tracking capability is new, and known to be <ulink "
|
|
dongsheng@627
|
2160 "url=\"http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced."
|
|
dongsheng@627
|
2161 "html#svn.branchmerge.advanced.finalword\">complicated and buggy</ulink>."
|
|
dongsheng@627
|
2162 msgstr ""
|
|
dongsheng@627
|
2163
|
|
dongsheng@627
|
2164 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2165 #: ../en/ch01-intro.xml:462
|
|
dongsheng@627
|
2166 msgid ""
|
|
dongsheng@627
|
2167 "Mercurial has a substantial performance advantage over Subversion on every "
|
|
dongsheng@627
|
2168 "revision control operation I have benchmarked. I have measured its advantage "
|
|
dongsheng@627
|
2169 "as ranging from a factor of two to a factor of six when compared with "
|
|
dongsheng@627
|
2170 "Subversion 1.4.3's <emphasis>ra_local</emphasis> file store, which is the "
|
|
dongsheng@627
|
2171 "fastest access method available. In more realistic deployments involving a "
|
|
dongsheng@627
|
2172 "network-based store, Subversion will be at a substantially larger "
|
|
dongsheng@627
|
2173 "disadvantage. Because many Subversion commands must talk to the server and "
|
|
dongsheng@627
|
2174 "Subversion does not have useful replication facilities, server capacity and "
|
|
dongsheng@627
|
2175 "network bandwidth become bottlenecks for modestly large projects."
|
|
dongsheng@627
|
2176 msgstr ""
|
|
dongsheng@627
|
2177
|
|
dongsheng@627
|
2178 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2179 #: ../en/ch01-intro.xml:475
|
|
dongsheng@627
|
2180 msgid ""
|
|
dongsheng@627
|
2181 "Additionally, Subversion incurs substantial storage overhead to avoid network "
|
|
dongsheng@627
|
2182 "transactions for a few common operations, such as finding modified files "
|
|
dongsheng@627
|
2183 "(<literal>status</literal>) and displaying modifications against the current "
|
|
dongsheng@627
|
2184 "revision (<literal>diff</literal>). As a result, a Subversion working copy "
|
|
dongsheng@627
|
2185 "is often the same size as, or larger than, a Mercurial repository and working "
|
|
dongsheng@627
|
2186 "directory, even though the Mercurial repository contains a complete history "
|
|
dongsheng@627
|
2187 "of the project."
|
|
dongsheng@627
|
2188 msgstr ""
|
|
dongsheng@627
|
2189
|
|
dongsheng@627
|
2190 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2191 #: ../en/ch01-intro.xml:485
|
|
dongsheng@627
|
2192 msgid ""
|
|
dongsheng@627
|
2193 "Subversion is widely supported by third party tools. Mercurial currently "
|
|
dongsheng@627
|
2194 "lags considerably in this area. This gap is closing, however, and indeed "
|
|
dongsheng@627
|
2195 "some of Mercurial's GUI tools now outshine their Subversion equivalents. "
|
|
dongsheng@627
|
2196 "Like Mercurial, Subversion has an excellent user manual."
|
|
dongsheng@627
|
2197 msgstr ""
|
|
dongsheng@627
|
2198
|
|
dongsheng@627
|
2199 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2200 #: ../en/ch01-intro.xml:491
|
|
dongsheng@627
|
2201 msgid ""
|
|
dongsheng@627
|
2202 "Because Subversion doesn't store revision history on the client, it is well "
|
|
dongsheng@627
|
2203 "suited to managing projects that deal with lots of large, opaque binary "
|
|
dongsheng@627
|
2204 "files. If you check in fifty revisions to an incompressible 10MB file, "
|
|
dongsheng@627
|
2205 "Subversion's client-side space usage stays constant The space used by any "
|
|
dongsheng@627
|
2206 "distributed SCM will grow rapidly in proportion to the number of revisions, "
|
|
dongsheng@627
|
2207 "because the differences between each revision are large."
|
|
dongsheng@627
|
2208 msgstr ""
|
|
dongsheng@627
|
2209
|
|
dongsheng@627
|
2210 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2211 #: ../en/ch01-intro.xml:500
|
|
dongsheng@627
|
2212 msgid ""
|
|
dongsheng@627
|
2213 "In addition, it's often difficult or, more usually, impossible to merge "
|
|
dongsheng@627
|
2214 "different versions of a binary file. Subversion's ability to let a user lock "
|
|
dongsheng@627
|
2215 "a file, so that they temporarily have the exclusive right to commit changes "
|
|
dongsheng@627
|
2216 "to it, can be a significant advantage to a project where binary files are "
|
|
dongsheng@627
|
2217 "widely used."
|
|
dongsheng@627
|
2218 msgstr ""
|
|
dongsheng@627
|
2219
|
|
dongsheng@627
|
2220 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2221 #: ../en/ch01-intro.xml:507
|
|
dongsheng@627
|
2222 msgid ""
|
|
dongsheng@627
|
2223 "Mercurial can import revision history from a Subversion repository. It can "
|
|
dongsheng@627
|
2224 "also export revision history to a Subversion repository. This makes it easy "
|
|
dongsheng@627
|
2225 "to <quote>test the waters</quote> and use Mercurial and Subversion in "
|
|
dongsheng@627
|
2226 "parallel before deciding to switch. History conversion is incremental, so "
|
|
dongsheng@627
|
2227 "you can perform an initial conversion, then small additional conversions "
|
|
dongsheng@627
|
2228 "afterwards to bring in new changes."
|
|
dongsheng@627
|
2229 msgstr ""
|
|
dongsheng@627
|
2230
|
|
dongsheng@627
|
2231 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2232 #: ../en/ch01-intro.xml:519 ../en/ch01-intro.xml:658
|
|
dongsheng@627
|
2233 msgid "Git"
|
|
dongsheng@627
|
2234 msgstr ""
|
|
dongsheng@627
|
2235
|
|
dongsheng@627
|
2236 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2237 #: ../en/ch01-intro.xml:521
|
|
dongsheng@627
|
2238 msgid ""
|
|
dongsheng@627
|
2239 "Git is a distributed revision control tool that was developed for managing "
|
|
dongsheng@627
|
2240 "the Linux kernel source tree. Like Mercurial, its early design was somewhat "
|
|
dongsheng@627
|
2241 "influenced by Monotone."
|
|
dongsheng@627
|
2242 msgstr ""
|
|
dongsheng@627
|
2243
|
|
dongsheng@627
|
2244 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2245 #: ../en/ch01-intro.xml:526
|
|
dongsheng@627
|
2246 msgid ""
|
|
dongsheng@627
|
2247 "Git has a very large command set, with version 1.5.0 providing 139 individual "
|
|
dongsheng@627
|
2248 "commands. It has something of a reputation for being difficult to learn. "
|
|
dongsheng@627
|
2249 "Compared to Git, Mercurial has a strong focus on simplicity."
|
|
dongsheng@627
|
2250 msgstr ""
|
|
dongsheng@627
|
2251
|
|
dongsheng@627
|
2252 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2253 #: ../en/ch01-intro.xml:531
|
|
dongsheng@627
|
2254 msgid ""
|
|
dongsheng@627
|
2255 "In terms of performance, Git is extremely fast. In several cases, it is "
|
|
dongsheng@627
|
2256 "faster than Mercurial, at least on Linux, while Mercurial performs better on "
|
|
dongsheng@627
|
2257 "other operations. However, on Windows, the performance and general level of "
|
|
dongsheng@627
|
2258 "support that Git provides is, at the time of writing, far behind that of "
|
|
dongsheng@627
|
2259 "Mercurial."
|
|
dongsheng@627
|
2260 msgstr ""
|
|
dongsheng@627
|
2261
|
|
dongsheng@627
|
2262 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2263 #: ../en/ch01-intro.xml:538
|
|
dongsheng@627
|
2264 msgid ""
|
|
dongsheng@627
|
2265 "While a Mercurial repository needs no maintenance, a Git repository requires "
|
|
dongsheng@627
|
2266 "frequent manual <quote>repacks</quote> of its metadata. Without these, "
|
|
dongsheng@627
|
2267 "performance degrades, while space usage grows rapidly. A server that "
|
|
dongsheng@627
|
2268 "contains many Git repositories that are not rigorously and frequently "
|
|
dongsheng@627
|
2269 "repacked will become heavily disk-bound during backups, and there have been "
|
|
dongsheng@627
|
2270 "instances of daily backups taking far longer than 24 hours as a result. A "
|
|
dongsheng@627
|
2271 "freshly packed Git repository is slightly smaller than a Mercurial "
|
|
dongsheng@627
|
2272 "repository, but an unpacked repository is several orders of magnitude larger."
|
|
dongsheng@627
|
2273 msgstr ""
|
|
dongsheng@627
|
2274
|
|
dongsheng@627
|
2275 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2276 #: ../en/ch01-intro.xml:549
|
|
dongsheng@627
|
2277 msgid ""
|
|
dongsheng@627
|
2278 "The core of Git is written in C. Many Git commands are implemented as shell "
|
|
dongsheng@627
|
2279 "or Perl scripts, and the quality of these scripts varies widely. I have "
|
|
dongsheng@627
|
2280 "encountered several instances where scripts charged along blindly in the "
|
|
dongsheng@627
|
2281 "presence of errors that should have been fatal."
|
|
dongsheng@627
|
2282 msgstr ""
|
|
dongsheng@627
|
2283
|
|
dongsheng@627
|
2284 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2285 #: ../en/ch01-intro.xml:555
|
|
dongsheng@627
|
2286 msgid "Mercurial can import revision history from a Git repository."
|
|
dongsheng@627
|
2287 msgstr ""
|
|
dongsheng@627
|
2288
|
|
dongsheng@627
|
2289 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2290 #: ../en/ch01-intro.xml:561 ../en/ch01-intro.xml:657
|
|
dongsheng@627
|
2291 msgid "CVS"
|
|
dongsheng@627
|
2292 msgstr ""
|
|
dongsheng@627
|
2293
|
|
dongsheng@627
|
2294 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2295 #: ../en/ch01-intro.xml:563
|
|
dongsheng@627
|
2296 msgid ""
|
|
dongsheng@627
|
2297 "CVS is probably the most widely used revision control tool in the world. Due "
|
|
dongsheng@627
|
2298 "to its age and internal untidiness, it has been only lightly maintained for "
|
|
dongsheng@627
|
2299 "many years."
|
|
dongsheng@627
|
2300 msgstr ""
|
|
dongsheng@627
|
2301
|
|
dongsheng@627
|
2302 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2303 #: ../en/ch01-intro.xml:567
|
|
dongsheng@627
|
2304 msgid ""
|
|
dongsheng@627
|
2305 "It has a centralised client/server architecture. It does not group related "
|
|
dongsheng@627
|
2306 "file changes into atomic commits, making it easy for people to <quote>break "
|
|
dongsheng@627
|
2307 "the build</quote>: one person can successfully commit part of a change and "
|
|
dongsheng@627
|
2308 "then be blocked by the need for a merge, causing other people to see only a "
|
|
dongsheng@627
|
2309 "portion of the work they intended to do. This also affects how you work with "
|
|
dongsheng@627
|
2310 "project history. If you want to see all of the modifications someone made as "
|
|
dongsheng@627
|
2311 "part of a task, you will need to manually inspect the descriptions and "
|
|
dongsheng@627
|
2312 "timestamps of the changes made to each file involved (if you even know what "
|
|
dongsheng@627
|
2313 "those files were)."
|
|
dongsheng@627
|
2314 msgstr ""
|
|
dongsheng@627
|
2315
|
|
dongsheng@627
|
2316 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2317 #: ../en/ch01-intro.xml:579
|
|
dongsheng@627
|
2318 msgid ""
|
|
dongsheng@627
|
2319 "CVS has a muddled notion of tags and branches that I will not attempt to even "
|
|
dongsheng@627
|
2320 "describe. It does not support renaming of files or directories well, making "
|
|
dongsheng@627
|
2321 "it easy to corrupt a repository. It has almost no internal consistency "
|
|
dongsheng@627
|
2322 "checking capabilities, so it is usually not even possible to tell whether or "
|
|
dongsheng@627
|
2323 "how a repository is corrupt. I would not recommend CVS for any project, "
|
|
dongsheng@627
|
2324 "existing or new."
|
|
dongsheng@627
|
2325 msgstr ""
|
|
dongsheng@627
|
2326
|
|
dongsheng@627
|
2327 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2328 #: ../en/ch01-intro.xml:587
|
|
dongsheng@627
|
2329 msgid ""
|
|
dongsheng@627
|
2330 "Mercurial can import CVS revision history. However, there are a few caveats "
|
|
dongsheng@627
|
2331 "that apply; these are true of every other revision control tool's CVS "
|
|
dongsheng@627
|
2332 "importer, too. Due to CVS's lack of atomic changes and unversioned "
|
|
dongsheng@627
|
2333 "filesystem hierarchy, it is not possible to reconstruct CVS history "
|
|
dongsheng@627
|
2334 "completely accurately; some guesswork is involved, and renames will usually "
|
|
dongsheng@627
|
2335 "not show up. Because a lot of advanced CVS administration has to be done by "
|
|
dongsheng@627
|
2336 "hand and is hence error-prone, it's common for CVS importers to run into "
|
|
dongsheng@627
|
2337 "multiple problems with corrupted repositories (completely bogus revision "
|
|
dongsheng@627
|
2338 "timestamps and files that have remained locked for over a decade are just two "
|
|
dongsheng@627
|
2339 "of the less interesting problems I can recall from personal experience)."
|
|
dongsheng@627
|
2340 msgstr ""
|
|
dongsheng@627
|
2341
|
|
dongsheng@627
|
2342 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2343 #: ../en/ch01-intro.xml:601
|
|
dongsheng@627
|
2344 msgid "Mercurial can import revision history from a CVS repository."
|
|
dongsheng@627
|
2345 msgstr ""
|
|
dongsheng@627
|
2346
|
|
dongsheng@627
|
2347 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2348 #: ../en/ch01-intro.xml:607
|
|
dongsheng@627
|
2349 msgid "Commercial tools"
|
|
dongsheng@627
|
2350 msgstr "商业工具"
|
|
dongsheng@627
|
2351
|
|
dongsheng@627
|
2352 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2353 #: ../en/ch01-intro.xml:609
|
|
dongsheng@627
|
2354 msgid ""
|
|
dongsheng@627
|
2355 "Perforce has a centralised client/server architecture, with no client-side "
|
|
dongsheng@627
|
2356 "caching of any data. Unlike modern revision control tools, Perforce requires "
|
|
dongsheng@627
|
2357 "that a user run a command to inform the server about every file they intend "
|
|
dongsheng@627
|
2358 "to edit."
|
|
dongsheng@627
|
2359 msgstr ""
|
|
dongsheng@627
|
2360
|
|
dongsheng@627
|
2361 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2362 #: ../en/ch01-intro.xml:615
|
|
dongsheng@627
|
2363 msgid ""
|
|
dongsheng@627
|
2364 "The performance of Perforce is quite good for small teams, but it falls off "
|
|
dongsheng@627
|
2365 "rapidly as the number of users grows beyond a few dozen. Modestly large "
|
|
dongsheng@627
|
2366 "Perforce installations require the deployment of proxies to cope with the "
|
|
dongsheng@627
|
2367 "load their users generate."
|
|
dongsheng@627
|
2368 msgstr ""
|
|
dongsheng@627
|
2369
|
|
dongsheng@627
|
2370 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2371 #: ../en/ch01-intro.xml:624
|
|
dongsheng@627
|
2372 msgid "Choosing a revision control tool"
|
|
dongsheng@627
|
2373 msgstr "选择版本控制工具"
|
|
dongsheng@627
|
2374
|
|
dongsheng@627
|
2375 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2376 #: ../en/ch01-intro.xml:626
|
|
dongsheng@627
|
2377 msgid ""
|
|
dongsheng@627
|
2378 "With the exception of CVS, all of the tools listed above have unique "
|
|
dongsheng@627
|
2379 "strengths that suit them to particular styles of work. There is no single "
|
|
dongsheng@627
|
2380 "revision control tool that is best in all situations."
|
|
dongsheng@627
|
2381 msgstr ""
|
|
dongsheng@627
|
2382
|
|
dongsheng@627
|
2383 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2384 #: ../en/ch01-intro.xml:631
|
|
dongsheng@627
|
2385 msgid ""
|
|
dongsheng@627
|
2386 "As an example, Subversion is a good choice for working with frequently edited "
|
|
dongsheng@627
|
2387 "binary files, due to its centralised nature and support for file locking."
|
|
dongsheng@627
|
2388 msgstr ""
|
|
dongsheng@627
|
2389
|
|
dongsheng@627
|
2390 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2391 #: ../en/ch01-intro.xml:635
|
|
dongsheng@627
|
2392 msgid ""
|
|
dongsheng@627
|
2393 "I personally find Mercurial's properties of simplicity, performance, and good "
|
|
dongsheng@627
|
2394 "merge support to be a compelling combination that has served me well for "
|
|
dongsheng@627
|
2395 "several years."
|
|
dongsheng@627
|
2396 msgstr ""
|
|
dongsheng@627
|
2397
|
|
dongsheng@627
|
2398 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
2399 #: ../en/ch01-intro.xml:643
|
|
dongsheng@627
|
2400 msgid "Switching from another tool to Mercurial"
|
|
dongsheng@627
|
2401 msgstr "从其它工具切换到 Mercurial"
|
|
dongsheng@627
|
2402
|
|
dongsheng@627
|
2403 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2404 #: ../en/ch01-intro.xml:645
|
|
dongsheng@627
|
2405 msgid ""
|
|
dongsheng@627
|
2406 "Mercurial is bundled with an extension named <literal role=\"hg-ext"
|
|
dongsheng@627
|
2407 "\">convert</literal>, which can incrementally import revision history from "
|
|
dongsheng@627
|
2408 "several other revision control tools. By <quote>incremental</quote>, I mean "
|
|
dongsheng@627
|
2409 "that you can convert all of a project's history to date in one go, then rerun "
|
|
dongsheng@627
|
2410 "the conversion later to obtain new changes that happened after the initial "
|
|
dongsheng@627
|
2411 "conversion."
|
|
dongsheng@627
|
2412 msgstr ""
|
|
dongsheng@627
|
2413
|
|
dongsheng@627
|
2414 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2415 #: ../en/ch01-intro.xml:653
|
|
dongsheng@627
|
2416 msgid ""
|
|
dongsheng@627
|
2417 "The revision control tools supported by <literal role=\"hg-ext\">convert</"
|
|
dongsheng@627
|
2418 "literal> are as follows:"
|
|
dongsheng@627
|
2419 msgstr ""
|
|
dongsheng@627
|
2420
|
|
dongsheng@627
|
2421 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2422 #: ../en/ch01-intro.xml:659
|
|
dongsheng@627
|
2423 msgid "Darcs"
|
|
dongsheng@627
|
2424 msgstr ""
|
|
dongsheng@627
|
2425
|
|
dongsheng@627
|
2426 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2427 #: ../en/ch01-intro.xml:661
|
|
dongsheng@627
|
2428 msgid ""
|
|
dongsheng@627
|
2429 "In addition, <literal role=\"hg-ext\">convert</literal> can export changes "
|
|
dongsheng@627
|
2430 "from Mercurial to Subversion. This makes it possible to try Subversion and "
|
|
dongsheng@627
|
2431 "Mercurial in parallel before committing to a switchover, without risking the "
|
|
dongsheng@627
|
2432 "loss of any work."
|
|
dongsheng@627
|
2433 msgstr ""
|
|
dongsheng@627
|
2434
|
|
dongsheng@627
|
2435 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2436 #: ../en/ch01-intro.xml:667
|
|
dongsheng@627
|
2437 msgid ""
|
|
dongsheng@627
|
2438 "The <command role=\"hg-ext-conver\">convert</command> command is easy to "
|
|
dongsheng@627
|
2439 "use. Simply point it at the path or URL of the source repository, optionally "
|
|
dongsheng@627
|
2440 "give it the name of the destination repository, and it will start working. "
|
|
dongsheng@627
|
2441 "After the initial conversion, just run the same command again to import new "
|
|
dongsheng@627
|
2442 "changes."
|
|
dongsheng@627
|
2443 msgstr ""
|
|
dongsheng@627
|
2444
|
|
dongsheng@627
|
2445 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
2446 #: ../en/ch02-tour-basic.xml:5
|
|
dongsheng@627
|
2447 msgid "A tour of Mercurial: the basics"
|
|
dongsheng@627
|
2448 msgstr "Mercurial 教程: 基础知识"
|
|
dongsheng@627
|
2449
|
|
dongsheng@627
|
2450 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
2451 #: ../en/ch02-tour-basic.xml:8
|
|
dongsheng@627
|
2452 msgid "Installing Mercurial on your system"
|
|
dongsheng@627
|
2453 msgstr "安装 Mercurial"
|
|
dongsheng@627
|
2454
|
|
dongsheng@627
|
2455 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2456 #: ../en/ch02-tour-basic.xml:10
|
|
dongsheng@627
|
2457 msgid ""
|
|
dongsheng@627
|
2458 "Prebuilt binary packages of Mercurial are available for every popular "
|
|
dongsheng@627
|
2459 "operating system. These make it easy to start using Mercurial on your "
|
|
dongsheng@627
|
2460 "computer immediately."
|
|
dongsheng@627
|
2461 msgstr ""
|
|
dongsheng@627
|
2462
|
|
dongsheng@627
|
2463 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2464 #: ../en/ch02-tour-basic.xml:15
|
|
dongsheng@627
|
2465 msgid "Linux"
|
|
dongsheng@627
|
2466 msgstr ""
|
|
dongsheng@627
|
2467
|
|
dongsheng@627
|
2468 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2469 #: ../en/ch02-tour-basic.xml:17
|
|
dongsheng@627
|
2470 msgid ""
|
|
dongsheng@627
|
2471 "Because each Linux distribution has its own packaging tools, policies, and "
|
|
dongsheng@627
|
2472 "rate of development, it's difficult to give a comprehensive set of "
|
|
dongsheng@627
|
2473 "instructions on how to install Mercurial binaries. The version of Mercurial "
|
|
dongsheng@627
|
2474 "that you will end up with can vary depending on how active the person is who "
|
|
dongsheng@627
|
2475 "maintains the package for your distribution."
|
|
dongsheng@627
|
2476 msgstr ""
|
|
dongsheng@627
|
2477
|
|
dongsheng@627
|
2478 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2479 #: ../en/ch02-tour-basic.xml:24
|
|
dongsheng@627
|
2480 msgid ""
|
|
dongsheng@627
|
2481 "To keep things simple, I will focus on installing Mercurial from the command "
|
|
dongsheng@627
|
2482 "line under the most popular Linux distributions. Most of these distributions "
|
|
dongsheng@627
|
2483 "provide graphical package managers that will let you install Mercurial with a "
|
|
dongsheng@627
|
2484 "single click; the package name to look for is <literal>mercurial</literal>."
|
|
dongsheng@627
|
2485 msgstr ""
|
|
dongsheng@627
|
2486
|
|
dongsheng@627
|
2487 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2488 #: ../en/ch02-tour-basic.xml:32
|
|
dongsheng@627
|
2489 msgid "Debian:"
|
|
dongsheng@627
|
2490 msgstr ""
|
|
dongsheng@627
|
2491
|
|
dongsheng@627
|
2492 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2493 #: ../en/ch02-tour-basic.xml:35
|
|
dongsheng@627
|
2494 msgid "Fedora Core:"
|
|
dongsheng@627
|
2495 msgstr ""
|
|
dongsheng@627
|
2496
|
|
dongsheng@627
|
2497 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2498 #: ../en/ch02-tour-basic.xml:38
|
|
dongsheng@627
|
2499 msgid "Gentoo:"
|
|
dongsheng@627
|
2500 msgstr ""
|
|
dongsheng@627
|
2501
|
|
dongsheng@627
|
2502 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2503 #: ../en/ch02-tour-basic.xml:40
|
|
dongsheng@627
|
2504 msgid "OpenSUSE:"
|
|
dongsheng@627
|
2505 msgstr ""
|
|
dongsheng@627
|
2506
|
|
dongsheng@627
|
2507 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2508 #: ../en/ch02-tour-basic.xml:43
|
|
dongsheng@627
|
2509 msgid ""
|
|
dongsheng@627
|
2510 "Ubuntu: Ubuntu's Mercurial package is based on Debian's. To install it, run "
|
|
dongsheng@627
|
2511 "the following command."
|
|
dongsheng@627
|
2512 msgstr ""
|
|
dongsheng@627
|
2513
|
|
dongsheng@627
|
2514 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2515 #: ../en/ch02-tour-basic.xml:52
|
|
dongsheng@627
|
2516 msgid "Solaris"
|
|
dongsheng@627
|
2517 msgstr ""
|
|
dongsheng@627
|
2518
|
|
dongsheng@627
|
2519 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2520 #: ../en/ch02-tour-basic.xml:54
|
|
dongsheng@627
|
2521 msgid ""
|
|
dongsheng@627
|
2522 "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www."
|
|
dongsheng@627
|
2523 "sunfreeware.com</ulink>, is a good source for a large number of pre-built "
|
|
dongsheng@627
|
2524 "Solaris packages for 32 and 64 bit Intel and Sparc architectures, including "
|
|
dongsheng@627
|
2525 "current versions of Mercurial."
|
|
dongsheng@627
|
2526 msgstr ""
|
|
dongsheng@627
|
2527
|
|
dongsheng@627
|
2528 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2529 #: ../en/ch02-tour-basic.xml:62
|
|
dongsheng@627
|
2530 msgid "Mac OS X"
|
|
dongsheng@627
|
2531 msgstr ""
|
|
dongsheng@627
|
2532
|
|
dongsheng@627
|
2533 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2534 #: ../en/ch02-tour-basic.xml:64
|
|
dongsheng@627
|
2535 msgid ""
|
|
dongsheng@627
|
2536 "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url="
|
|
dongsheng@627
|
2537 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. "
|
|
dongsheng@627
|
2538 "This package works on both Intel- and Power-based Macs. Before you can use "
|
|
dongsheng@627
|
2539 "it, you must install a compatible version of Universal MacPython "
|
|
dongsheng@627
|
2540 "<citation>web:macpython</citation>. This is easy to do; simply follow the "
|
|
dongsheng@627
|
2541 "instructions on Lee's site."
|
|
dongsheng@627
|
2542 msgstr ""
|
|
dongsheng@627
|
2543
|
|
dongsheng@627
|
2544 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2545 #: ../en/ch02-tour-basic.xml:73
|
|
dongsheng@627
|
2546 msgid ""
|
|
dongsheng@627
|
2547 "It's also possible to install Mercurial using Fink or MacPorts, two popular "
|
|
dongsheng@627
|
2548 "free package managers for Mac OS X. If you have Fink, use <command>sudo apt-"
|
|
dongsheng@627
|
2549 "get install mercurial-py25</command>. If MacPorts, <command>sudo port "
|
|
dongsheng@627
|
2550 "install mercurial</command>."
|
|
dongsheng@627
|
2551 msgstr ""
|
|
dongsheng@627
|
2552
|
|
dongsheng@627
|
2553 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2554 #: ../en/ch02-tour-basic.xml:81
|
|
dongsheng@627
|
2555 msgid "Windows"
|
|
dongsheng@627
|
2556 msgstr ""
|
|
dongsheng@627
|
2557
|
|
dongsheng@627
|
2558 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2559 #: ../en/ch02-tour-basic.xml:83
|
|
dongsheng@627
|
2560 msgid ""
|
|
dongsheng@627
|
2561 "Lee Cantey publishes an installer of Mercurial for Windows at <ulink url="
|
|
dongsheng@627
|
2562 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. "
|
|
dongsheng@627
|
2563 "This package has no external dependencies; it <quote>just works</quote>."
|
|
dongsheng@627
|
2564 msgstr ""
|
|
dongsheng@627
|
2565
|
|
dongsheng@627
|
2566 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@627
|
2567 #: ../en/ch02-tour-basic.xml:90
|
|
dongsheng@627
|
2568 msgid ""
|
|
dongsheng@627
|
2569 "The Windows version of Mercurial does not automatically convert line endings "
|
|
dongsheng@627
|
2570 "between Windows and Unix styles. If you want to share work with Unix users, "
|
|
dongsheng@627
|
2571 "you must do a little additional configuration work. XXX Flesh this out."
|
|
dongsheng@627
|
2572 msgstr ""
|
|
dongsheng@627
|
2573
|
|
dongsheng@627
|
2574 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
2575 #: ../en/ch02-tour-basic.xml:100
|
|
dongsheng@627
|
2576 msgid "Getting started"
|
|
dongsheng@627
|
2577 msgstr "开始"
|
|
dongsheng@627
|
2578
|
|
dongsheng@627
|
2579 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2580 #: ../en/ch02-tour-basic.xml:102
|
|
dongsheng@627
|
2581 msgid ""
|
|
dongsheng@627
|
2582 "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command "
|
|
dongsheng@627
|
2583 "to find out whether Mercurial is actually installed properly. The actual "
|
|
dongsheng@627
|
2584 "version information that it prints isn't so important; it's whether it prints "
|
|
dongsheng@627
|
2585 "anything at all that we care about."
|
|
dongsheng@627
|
2586 msgstr ""
|
|
dongsheng@627
|
2587
|
|
dongsheng@627
|
2588 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2589 #: ../en/ch02-tour-basic.xml:111
|
|
dongsheng@627
|
2590 msgid "Built-in help"
|
|
dongsheng@627
|
2591 msgstr "内置帮助"
|
|
dongsheng@627
|
2592
|
|
dongsheng@627
|
2593 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2594 #: ../en/ch02-tour-basic.xml:113
|
|
dongsheng@627
|
2595 msgid ""
|
|
dongsheng@627
|
2596 "Mercurial provides a built-in help system. This is invaluable for those "
|
|
dongsheng@627
|
2597 "times when you find yourself stuck trying to remember how to run a command. "
|
|
dongsheng@627
|
2598 "If you are completely stuck, simply run <command role=\"hg-cmd\">hg help</"
|
|
dongsheng@627
|
2599 "command>; it will print a brief list of commands, along with a description of "
|
|
dongsheng@627
|
2600 "what each does. If you ask for help on a specific command (as below), it "
|
|
dongsheng@627
|
2601 "prints more detailed information."
|
|
dongsheng@627
|
2602 msgstr ""
|
|
dongsheng@627
|
2603
|
|
dongsheng@627
|
2604 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2605 #: ../en/ch02-tour-basic.xml:124
|
|
dongsheng@627
|
2606 msgid ""
|
|
dongsheng@627
|
2607 "For a more impressive level of detail (which you won't usually need) run "
|
|
dongsheng@627
|
2608 "<command role=\"hg-cmd\">hg help <option role=\"hg-opt-global\">-v</option></"
|
|
dongsheng@627
|
2609 "command>. The <option role=\"hg-opt-global\">-v</option> option is short for "
|
|
dongsheng@627
|
2610 "<option role=\"hg-opt-global\">--verbose</option>, and tells Mercurial to "
|
|
dongsheng@627
|
2611 "print more information than it usually would."
|
|
dongsheng@627
|
2612 msgstr ""
|
|
dongsheng@627
|
2613
|
|
dongsheng@627
|
2614 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
2615 #: ../en/ch02-tour-basic.xml:135
|
|
dongsheng@627
|
2616 msgid "Working with a repository"
|
|
dongsheng@627
|
2617 msgstr "使用版本库"
|
|
dongsheng@627
|
2618
|
|
dongsheng@627
|
2619 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2620 #: ../en/ch02-tour-basic.xml:137
|
|
dongsheng@627
|
2621 msgid ""
|
|
dongsheng@627
|
2622 "In Mercurial, everything happens inside a <emphasis>repository</emphasis>. "
|
|
dongsheng@627
|
2623 "The repository for a project contains all of the files that <quote>belong to</"
|
|
dongsheng@627
|
2624 "quote> that project, along with a historical record of the project's files."
|
|
dongsheng@627
|
2625 msgstr ""
|
|
dongsheng@627
|
2626
|
|
dongsheng@627
|
2627 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2628 #: ../en/ch02-tour-basic.xml:143
|
|
dongsheng@627
|
2629 msgid ""
|
|
dongsheng@627
|
2630 "There's nothing particularly magical about a repository; it is simply a "
|
|
dongsheng@627
|
2631 "directory tree in your filesystem that Mercurial treats as special. You can "
|
|
dongsheng@627
|
2632 "rename or delete a repository any time you like, using either the command "
|
|
dongsheng@627
|
2633 "line or your file browser."
|
|
dongsheng@627
|
2634 msgstr ""
|
|
dongsheng@627
|
2635
|
|
dongsheng@627
|
2636 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2637 #: ../en/ch02-tour-basic.xml:150
|
|
dongsheng@627
|
2638 msgid "Making a local copy of a repository"
|
|
dongsheng@627
|
2639 msgstr "创建版本库的工作副本"
|
|
dongsheng@627
|
2640
|
|
dongsheng@627
|
2641 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2642 #: ../en/ch02-tour-basic.xml:152
|
|
dongsheng@627
|
2643 msgid ""
|
|
dongsheng@627
|
2644 "<emphasis>Copying</emphasis> a repository is just a little bit special. "
|
|
dongsheng@627
|
2645 "While you could use a normal file copying command to make a copy of a "
|
|
dongsheng@627
|
2646 "repository, it's best to use a built-in command that Mercurial provides. "
|
|
dongsheng@627
|
2647 "This command is called <command role=\"hg-cmd\">hg clone</command>, because "
|
|
dongsheng@627
|
2648 "it creates an identical copy of an existing repository."
|
|
dongsheng@627
|
2649 msgstr ""
|
|
dongsheng@627
|
2650
|
|
dongsheng@627
|
2651 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2652 #: ../en/ch02-tour-basic.xml:161
|
|
dongsheng@627
|
2653 msgid ""
|
|
dongsheng@627
|
2654 "If our clone succeeded, we should now have a local directory called <filename "
|
|
dongsheng@627
|
2655 "class=\"directory\">hello</filename>. This directory will contain some files."
|
|
dongsheng@627
|
2656 msgstr ""
|
|
dongsheng@627
|
2657
|
|
dongsheng@627
|
2658 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2659 #: ../en/ch02-tour-basic.xml:167
|
|
dongsheng@627
|
2660 msgid ""
|
|
dongsheng@627
|
2661 "These files have the same contents and history in our repository as they do "
|
|
dongsheng@627
|
2662 "in the repository we cloned."
|
|
dongsheng@627
|
2663 msgstr ""
|
|
dongsheng@627
|
2664
|
|
dongsheng@627
|
2665 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2666 #: ../en/ch02-tour-basic.xml:170
|
|
dongsheng@627
|
2667 msgid ""
|
|
dongsheng@627
|
2668 "Every Mercurial repository is complete, self-contained, and independent. It "
|
|
dongsheng@627
|
2669 "contains its own private copy of a project's files and history. A cloned "
|
|
dongsheng@627
|
2670 "repository remembers the location of the repository it was cloned from, but "
|
|
dongsheng@627
|
2671 "it does not communicate with that repository, or any other, unless you tell "
|
|
dongsheng@627
|
2672 "it to."
|
|
dongsheng@627
|
2673 msgstr ""
|
|
dongsheng@627
|
2674
|
|
dongsheng@627
|
2675 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2676 #: ../en/ch02-tour-basic.xml:177
|
|
dongsheng@627
|
2677 msgid ""
|
|
dongsheng@627
|
2678 "What this means for now is that we're free to experiment with our repository, "
|
|
dongsheng@627
|
2679 "safe in the knowledge that it's a private <quote>sandbox</quote> that won't "
|
|
dongsheng@627
|
2680 "affect anyone else."
|
|
dongsheng@627
|
2681 msgstr ""
|
|
dongsheng@627
|
2682
|
|
dongsheng@627
|
2683 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
2684 #: ../en/ch02-tour-basic.xml:183
|
|
dongsheng@627
|
2685 msgid "What's in a repository?"
|
|
dongsheng@627
|
2686 msgstr "什么是版本库?"
|
|
dongsheng@627
|
2687
|
|
dongsheng@627
|
2688 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2689 #: ../en/ch02-tour-basic.xml:185
|
|
dongsheng@627
|
2690 msgid ""
|
|
dongsheng@627
|
2691 "When we take a more detailed look inside a repository, we can see that it "
|
|
dongsheng@627
|
2692 "contains a directory named <filename class=\"directory\">.hg</filename>. "
|
|
dongsheng@627
|
2693 "This is where Mercurial keeps all of its metadata for the repository."
|
|
dongsheng@627
|
2694 msgstr ""
|
|
dongsheng@627
|
2695
|
|
dongsheng@627
|
2696 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2697 #: ../en/ch02-tour-basic.xml:192
|
|
dongsheng@627
|
2698 msgid ""
|
|
dongsheng@627
|
2699 "The contents of the <filename class=\"directory\">.hg</filename> directory "
|
|
dongsheng@627
|
2700 "and its subdirectories are private to Mercurial. Every other file and "
|
|
dongsheng@627
|
2701 "directory in the repository is yours to do with as you please."
|
|
dongsheng@627
|
2702 msgstr ""
|
|
dongsheng@627
|
2703
|
|
dongsheng@627
|
2704 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
2705 #: ../en/ch02-tour-basic.xml:198
|
|
dongsheng@627
|
2706 msgid ""
|
|
dongsheng@627
|
2707 "To introduce a little terminology, the <filename class=\"directory\">.hg</"
|
|
dongsheng@627
|
2708 "filename> directory is the <quote>real</quote> repository, and all of the "
|
|
dongsheng@627
|
2709 "files and directories that coexist with it are said to live in the "
|
|
dongsheng@627
|
2710 "<emphasis>working directory</emphasis>. An easy way to remember the "
|
|
dongsheng@627
|
2711 "distinction is that the <emphasis>repository</emphasis> contains the "
|
|
dongsheng@627
|
2712 "<emphasis>history</emphasis> of your project, while the <emphasis>working "
|
|
dongsheng@627
|
2713 "directory</emphasis> contains a <emphasis>snapshot</emphasis> of your project "
|
|
dongsheng@627
|
2714 "at a particular point in history."
|
|
dongsheng@627
|
2715 msgstr ""
|
|
dongsheng@627
|
2716
|
|
dongsheng@627
|
2717 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
2718 #: ../en/ch02-tour-basic.xml:213
|
|
dongsheng@627
|
2719 msgid "A tour through history"
|
|
dongsheng@627
|
2720 msgstr "回溯历史"
|
|
dongsheng@627
|
2721
|
|
dongsheng@627
|
2722 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2723 #: ../en/ch02-tour-basic.xml:215
|
|
dongsheng@627
|
2724 msgid ""
|
|
dongsheng@627
|
2725 "One of the first things we might want to do with a new, unfamiliar repository "
|
|
dongsheng@627
|
2726 "is understand its history. The <command role=\"hg-cmd\">hg log</command> "
|
|
dongsheng@627
|
2727 "command gives us a view of history."
|
|
dongsheng@627
|
2728 msgstr ""
|
|
dongsheng@627
|
2729
|
|
dongsheng@627
|
2730 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2731 #: ../en/ch02-tour-basic.xml:222
|
|
dongsheng@627
|
2732 msgid ""
|
|
dongsheng@627
|
2733 "By default, this command prints a brief paragraph of output for each change "
|
|
dongsheng@627
|
2734 "to the project that was recorded. In Mercurial terminology, we call each of "
|
|
dongsheng@627
|
2735 "these recorded events a <emphasis>changeset</emphasis>, because it can "
|
|
dongsheng@627
|
2736 "contain a record of changes to several files."
|
|
dongsheng@627
|
2737 msgstr ""
|
|
dongsheng@627
|
2738
|
|
dongsheng@627
|
2739 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2740 #: ../en/ch02-tour-basic.xml:228
|
|
dongsheng@627
|
2741 msgid ""
|
|
dongsheng@627
|
2742 "The fields in a record of output from <command role=\"hg-cmd\">hg log</"
|
|
dongsheng@627
|
2743 "command> are as follows."
|
|
dongsheng@627
|
2744 msgstr ""
|
|
dongsheng@627
|
2745
|
|
dongsheng@627
|
2746 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2747 #: ../en/ch02-tour-basic.xml:231
|
|
dongsheng@627
|
2748 msgid ""
|
|
dongsheng@627
|
2749 "<literal>changeset</literal>: This field has the format of a number, followed "
|
|
dongsheng@627
|
2750 "by a colon, followed by a hexadecimal string. These are "
|
|
dongsheng@627
|
2751 "<emphasis>identifiers</emphasis> for the changeset. There are two "
|
|
dongsheng@627
|
2752 "identifiers because the number is shorter and easier to type than the hex "
|
|
dongsheng@627
|
2753 "string."
|
|
dongsheng@627
|
2754 msgstr ""
|
|
dongsheng@627
|
2755
|
|
dongsheng@627
|
2756 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2757 #: ../en/ch02-tour-basic.xml:237
|
|
dongsheng@627
|
2758 msgid ""
|
|
dongsheng@627
|
2759 "<literal>user</literal>: The identity of the person who created the "
|
|
dongsheng@627
|
2760 "changeset. This is a free-form field, but it most often contains a person's "
|
|
dongsheng@627
|
2761 "name and email address."
|
|
dongsheng@627
|
2762 msgstr ""
|
|
dongsheng@627
|
2763
|
|
dongsheng@627
|
2764 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2765 #: ../en/ch02-tour-basic.xml:241
|
|
dongsheng@627
|
2766 msgid ""
|
|
dongsheng@627
|
2767 "<literal>date</literal>: The date and time on which the changeset was "
|
|
dongsheng@627
|
2768 "created, and the timezone in which it was created. (The date and time are "
|
|
dongsheng@627
|
2769 "local to that timezone; they display what time and date it was for the person "
|
|
dongsheng@627
|
2770 "who created the changeset.)"
|
|
dongsheng@627
|
2771 msgstr ""
|
|
dongsheng@627
|
2772
|
|
dongsheng@627
|
2773 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
2774 #: ../en/ch02-tour-basic.xml:246
|
|
dongsheng@627
|
2775 msgid ""
|
|
dongsheng@627
|
2776 "<literal>summary</literal>: The first line of the text message that the "
|
|
dongsheng@627
|
2777 "creator of the changeset entered to describe the changeset."
|
|
dongsheng@627
|
2778 msgstr ""
|
|
dongsheng@627
|
2779
|
|
dongsheng@627
|
2780 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2781 #: ../en/ch02-tour-basic.xml:249
|
|
dongsheng@627
|
2782 msgid ""
|
|
dongsheng@627
|
2783 "The default output printed by <command role=\"hg-cmd\">hg log</command> is "
|
|
dongsheng@627
|
2784 "purely a summary; it is missing a lot of detail."
|
|
dongsheng@627
|
2785 msgstr ""
|
|
dongsheng@627
|
2786
|
|
dongsheng@627
|
2787 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
2788 #: ../en/ch02-tour-basic.xml:253
|
|
dongsheng@627
|
2789 msgid ""
|
|
dongsheng@641
|
2790 "Figure <xref endterm=\"fig.tour-basic.history.caption\" linkend=\"fig.tour-"
|
|
dongsheng@641
|
2791 "basic.history\"/> provides a graphical representation of the history of the "
|
|
dongsheng@641
|
2792 "<filename class=\"directory\">hello</filename> repository, to make it a "
|
|
dongsheng@641
|
2793 "little easier to see which direction history is <quote>flowing</quote> in. "
|
|
dongsheng@641
|
2794 "We'll be returning to this figure several times in this chapter and the "
|
|
dongsheng@641
|
2795 "chapter that follows."
|
|
dongsheng@627
|
2796 msgstr ""
|
|
dongsheng@627
|
2797
|
|
dongsheng@627
|
2798 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
|
|
dongsheng@641
|
2799 #: ../en/ch02-tour-basic.xml:264
|
|
dongsheng@627
|
2800 msgid ""
|
|
dongsheng@627
|
2801 "<imageobject><imagedata fileref=\"images/tour-history.png\"/></imageobject>"
|
|
dongsheng@627
|
2802 msgstr ""
|
|
dongsheng@627
|
2803
|
|
dongsheng@627
|
2804 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><textobject><phrase>
|
|
dongsheng@641
|
2805 #: ../en/ch02-tour-basic.xml:265 ../en/ch03-tour-merge.xml:48
|
|
dongsheng@641
|
2806 #: ../en/ch03-tour-merge.xml:78 ../en/ch03-tour-merge.xml:126
|
|
dongsheng@641
|
2807 #: ../en/ch03-tour-merge.xml:182 ../en/ch03-tour-merge.xml:254
|
|
dongsheng@641
|
2808 #: ../en/ch04-concepts.xml:56 ../en/ch04-concepts.xml:108
|
|
dongsheng@641
|
2809 #: ../en/ch04-concepts.xml:194 ../en/ch04-concepts.xml:301
|
|
dongsheng@641
|
2810 #: ../en/ch04-concepts.xml:353 ../en/ch04-concepts.xml:370
|
|
dongsheng@641
|
2811 #: ../en/ch04-concepts.xml:414 ../en/ch04-concepts.xml:436
|
|
dongsheng@641
|
2812 #: ../en/ch04-concepts.xml:480 ../en/ch06-collab.xml:277
|
|
dongsheng@641
|
2813 #: ../en/ch09-undo.xml:366 ../en/ch09-undo.xml:417 ../en/ch09-undo.xml:485
|
|
dongsheng@641
|
2814 #: ../en/ch09-undo.xml:527 ../en/ch12-mq.xml:409
|
|
dongsheng@627
|
2815 msgid "XXX add text"
|
|
dongsheng@627
|
2816 msgstr ""
|
|
dongsheng@627
|
2817
|
|
dongsheng@627
|
2818 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
2819 #: ../en/ch02-tour-basic.xml:266
|
|
dongsheng@627
|
2820 msgid ""
|
|
dongsheng@627
|
2821 "Graphical history of the <filename class=\"directory\">hello</filename> "
|
|
dongsheng@627
|
2822 "repository"
|
|
dongsheng@627
|
2823 msgstr ""
|
|
dongsheng@627
|
2824
|
|
dongsheng@627
|
2825 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
2826 #: ../en/ch02-tour-basic.xml:273
|
|
dongsheng@627
|
2827 msgid "Changesets, revisions, and talking to other people"
|
|
dongsheng@627
|
2828 msgstr "改变集，版本，与其它用户交互"
|
|
dongsheng@627
|
2829
|
|
dongsheng@627
|
2830 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2831 #: ../en/ch02-tour-basic.xml:276
|
|
dongsheng@627
|
2832 msgid ""
|
|
dongsheng@627
|
2833 "As English is a notoriously sloppy language, and computer science has a "
|
|
dongsheng@627
|
2834 "hallowed history of terminological confusion (why use one term when four will "
|
|
dongsheng@627
|
2835 "do?), revision control has a variety of words and phrases that mean the same "
|
|
dongsheng@627
|
2836 "thing. If you are talking about Mercurial history with other people, you "
|
|
dongsheng@627
|
2837 "will find that the word <quote>changeset</quote> is often compressed to "
|
|
dongsheng@627
|
2838 "<quote>change</quote> or (when written) <quote>cset</quote>, and sometimes a "
|
|
dongsheng@627
|
2839 "changeset is referred to as a <quote>revision</quote> or a <quote>rev</quote>."
|
|
dongsheng@627
|
2840 msgstr ""
|
|
dongsheng@627
|
2841
|
|
dongsheng@627
|
2842 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2843 #: ../en/ch02-tour-basic.xml:286
|
|
dongsheng@627
|
2844 msgid ""
|
|
dongsheng@627
|
2845 "While it doesn't matter what <emphasis>word</emphasis> you use to refer to "
|
|
dongsheng@627
|
2846 "the concept of <quote>a changeset</quote>, the <emphasis>identifier</"
|
|
dongsheng@627
|
2847 "emphasis> that you use to refer to <quote>a <emphasis>specific</emphasis> "
|
|
dongsheng@627
|
2848 "changeset</quote> is of great importance. Recall that the <literal>changeset</"
|
|
dongsheng@627
|
2849 "literal> field in the output from <command role=\"hg-cmd\">hg log</command> "
|
|
dongsheng@627
|
2850 "identifies a changeset using both a number and a hexadecimal string."
|
|
dongsheng@627
|
2851 msgstr ""
|
|
dongsheng@627
|
2852
|
|
dongsheng@627
|
2853 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
2854 #: ../en/ch02-tour-basic.xml:295
|
|
dongsheng@627
|
2855 msgid ""
|
|
dongsheng@627
|
2856 "The revision number is <emphasis>only valid in that repository</emphasis>,"
|
|
dongsheng@627
|
2857 msgstr ""
|
|
dongsheng@627
|
2858
|
|
dongsheng@627
|
2859 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
2860 #: ../en/ch02-tour-basic.xml:297
|
|
dongsheng@627
|
2861 msgid ""
|
|
dongsheng@627
|
2862 "while the hex string is the <emphasis>permanent, unchanging identifier</"
|
|
dongsheng@627
|
2863 "emphasis> that will always identify that exact changeset in <emphasis>every</"
|
|
dongsheng@627
|
2864 "emphasis> copy of the repository."
|
|
dongsheng@627
|
2865 msgstr ""
|
|
dongsheng@627
|
2866
|
|
dongsheng@627
|
2867 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2868 #: ../en/ch02-tour-basic.xml:302
|
|
dongsheng@627
|
2869 msgid ""
|
|
dongsheng@627
|
2870 "This distinction is important. If you send someone an email talking about "
|
|
dongsheng@627
|
2871 "<quote>revision 33</quote>, there's a high likelihood that their revision 33 "
|
|
dongsheng@627
|
2872 "will <emphasis>not be the same</emphasis> as yours. The reason for this is "
|
|
dongsheng@627
|
2873 "that a revision number depends on the order in which changes arrived in a "
|
|
dongsheng@627
|
2874 "repository, and there is no guarantee that the same changes will happen in "
|
|
dongsheng@627
|
2875 "the same order in different repositories. Three changes $a,b,c$ can easily "
|
|
dongsheng@627
|
2876 "appear in one repository as $0,1,2$, while in another as $1,0,2$."
|
|
dongsheng@627
|
2877 msgstr ""
|
|
dongsheng@627
|
2878
|
|
dongsheng@627
|
2879 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2880 #: ../en/ch02-tour-basic.xml:312
|
|
dongsheng@627
|
2881 msgid ""
|
|
dongsheng@627
|
2882 "Mercurial uses revision numbers purely as a convenient shorthand. If you "
|
|
dongsheng@627
|
2883 "need to discuss a changeset with someone, or make a record of a changeset for "
|
|
dongsheng@627
|
2884 "some other reason (for example, in a bug report), use the hexadecimal "
|
|
dongsheng@627
|
2885 "identifier."
|
|
dongsheng@627
|
2886 msgstr ""
|
|
dongsheng@627
|
2887
|
|
dongsheng@627
|
2888 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
2889 #: ../en/ch02-tour-basic.xml:320
|
|
dongsheng@627
|
2890 msgid "Viewing specific revisions"
|
|
dongsheng@627
|
2891 msgstr "察看指定版本"
|
|
dongsheng@627
|
2892
|
|
dongsheng@627
|
2893 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2894 #: ../en/ch02-tour-basic.xml:322
|
|
dongsheng@627
|
2895 msgid ""
|
|
dongsheng@627
|
2896 "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a "
|
|
dongsheng@627
|
2897 "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option "
|
|
dongsheng@627
|
2898 "role=\"hg-opt-log\">--rev</option>) option. You can use either a revision "
|
|
dongsheng@627
|
2899 "number or a long-form changeset identifier, and you can provide as many "
|
|
dongsheng@627
|
2900 "revisions as you want."
|
|
dongsheng@627
|
2901 msgstr ""
|
|
dongsheng@627
|
2902
|
|
dongsheng@627
|
2903 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2904 #: ../en/ch02-tour-basic.xml:331
|
|
dongsheng@627
|
2905 msgid ""
|
|
dongsheng@627
|
2906 "If you want to see the history of several revisions without having to list "
|
|
dongsheng@627
|
2907 "each one, you can use <emphasis>range notation</emphasis>; this lets you "
|
|
dongsheng@627
|
2908 "express the idea <quote>I want all revisions between <literal>abc</literal> "
|
|
dongsheng@627
|
2909 "and <literal>def</literal>, inclusive</quote>."
|
|
dongsheng@627
|
2910 msgstr ""
|
|
dongsheng@627
|
2911
|
|
dongsheng@627
|
2912 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2913 #: ../en/ch02-tour-basic.xml:339
|
|
dongsheng@627
|
2914 msgid ""
|
|
dongsheng@627
|
2915 "Mercurial also honours the order in which you specify revisions, so <command "
|
|
dongsheng@627
|
2916 "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command "
|
|
dongsheng@627
|
2917 "role=\"hg-cmd\">hg log -r 4:2</command> prints 4, 3, and 2."
|
|
dongsheng@627
|
2918 msgstr ""
|
|
dongsheng@627
|
2919
|
|
dongsheng@627
|
2920 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
2921 #: ../en/ch02-tour-basic.xml:346
|
|
dongsheng@627
|
2922 msgid "More detailed information"
|
|
dongsheng@627
|
2923 msgstr "更详细的信息"
|
|
dongsheng@627
|
2924
|
|
dongsheng@627
|
2925 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2926 #: ../en/ch02-tour-basic.xml:348
|
|
dongsheng@627
|
2927 msgid ""
|
|
dongsheng@627
|
2928 "While the summary information printed by <command role=\"hg-cmd\">hg log</"
|
|
dongsheng@627
|
2929 "command> is useful if you already know what you're looking for, you may need "
|
|
dongsheng@627
|
2930 "to see a complete description of the change, or a list of the files changed, "
|
|
dongsheng@627
|
2931 "if you're trying to decide whether a changeset is the one you're looking for. "
|
|
dongsheng@627
|
2932 "The <command role=\"hg-cmd\">hg log</command> command's <option role=\"hg-opt-"
|
|
dongsheng@627
|
2933 "global\">-v</option> (or <option role=\"hg-opt-global\">--verbose</option>) "
|
|
dongsheng@627
|
2934 "option gives you this extra detail."
|
|
dongsheng@627
|
2935 msgstr ""
|
|
dongsheng@627
|
2936
|
|
dongsheng@627
|
2937 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
2938 #: ../en/ch02-tour-basic.xml:360
|
|
dongsheng@627
|
2939 msgid ""
|
|
dongsheng@627
|
2940 "If you want to see both the description and content of a change, add the "
|
|
dongsheng@627
|
2941 "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--"
|
|
dongsheng@627
|
2942 "patch</option>) option. This displays the content of a change as a "
|
|
dongsheng@627
|
2943 "<emphasis>unified diff</emphasis> (if you've never seen a unified diff "
|
|
dongsheng@627
|
2944 "before, see section <xref linkend=\"sec.mq.patch\"/> for an overview)."
|
|
dongsheng@627
|
2945 msgstr ""
|
|
dongsheng@627
|
2946
|
|
dongsheng@627
|
2947 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
2948 #: ../en/ch02-tour-basic.xml:373
|
|
dongsheng@627
|
2949 msgid "All about command options"
|
|
dongsheng@627
|
2950 msgstr "命令选项"
|
|
dongsheng@627
|
2951
|
|
dongsheng@627
|
2952 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
2953 #: ../en/ch02-tour-basic.xml:375
|
|
dongsheng@627
|
2954 msgid ""
|
|
dongsheng@627
|
2955 "Let's take a brief break from exploring Mercurial commands to discuss a "
|
|
dongsheng@627
|
2956 "pattern in the way that they work; you may find this useful to keep in mind "
|
|
dongsheng@627
|
2957 "as we continue our tour."
|
|
dongsheng@627
|
2958 msgstr ""
|
|
dongsheng@627
|
2959
|
|
dongsheng@627
|
2960 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
2961 #: ../en/ch02-tour-basic.xml:379
|
|
dongsheng@627
|
2962 msgid ""
|
|
dongsheng@627
|
2963 "Mercurial has a consistent and straightforward approach to dealing with the "
|
|
dongsheng@627
|
2964 "options that you can pass to commands. It follows the conventions for "
|
|
dongsheng@627
|
2965 "options that are common to modern Linux and Unix systems."
|
|
dongsheng@627
|
2966 msgstr ""
|
|
dongsheng@627
|
2967
|
|
dongsheng@627
|
2968 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
2969 #: ../en/ch02-tour-basic.xml:384
|
|
dongsheng@627
|
2970 msgid ""
|
|
dongsheng@627
|
2971 "Every option has a long name. For example, as we've already seen, the "
|
|
dongsheng@627
|
2972 "<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-"
|
|
dongsheng@627
|
2973 "opt-log\">--rev</option> option."
|
|
dongsheng@627
|
2974 msgstr ""
|
|
dongsheng@627
|
2975
|
|
dongsheng@627
|
2976 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
2977 #: ../en/ch02-tour-basic.xml:388
|
|
dongsheng@627
|
2978 msgid ""
|
|
dongsheng@627
|
2979 "Most options have short names, too. Instead of <option role=\"hg-opt-log\">--"
|
|
dongsheng@627
|
2980 "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>. (The "
|
|
dongsheng@627
|
2981 "reason that some options don't have short names is that the options in "
|
|
dongsheng@627
|
2982 "question are rarely used.)"
|
|
dongsheng@627
|
2983 msgstr ""
|
|
dongsheng@627
|
2984
|
|
dongsheng@627
|
2985 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
2986 #: ../en/ch02-tour-basic.xml:393
|
|
dongsheng@627
|
2987 msgid ""
|
|
dongsheng@627
|
2988 "Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</"
|
|
dongsheng@627
|
2989 "option>), while short options start with one (e.g. <option role=\"hg-opt-log"
|
|
dongsheng@627
|
2990 "\">-r</option>)."
|
|
dongsheng@627
|
2991 msgstr ""
|
|
dongsheng@627
|
2992
|
|
dongsheng@627
|
2993 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
2994 #: ../en/ch02-tour-basic.xml:397
|
|
dongsheng@627
|
2995 msgid ""
|
|
dongsheng@627
|
2996 "Option naming and usage is consistent across commands. For example, every "
|
|
dongsheng@627
|
2997 "command that lets you specify a changeset ID or revision number accepts both "
|
|
dongsheng@627
|
2998 "<option role=\"hg-opt-log\">-r</option> and <option role=\"hg-opt-log\">--"
|
|
dongsheng@627
|
2999 "rev</option> arguments."
|
|
dongsheng@627
|
3000 msgstr ""
|
|
dongsheng@627
|
3001
|
|
dongsheng@627
|
3002 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3003 #: ../en/ch02-tour-basic.xml:403
|
|
dongsheng@627
|
3004 msgid ""
|
|
dongsheng@627
|
3005 "In the examples throughout this book, I use short options instead of long. "
|
|
dongsheng@627
|
3006 "This just reflects my own preference, so don't read anything significant into "
|
|
dongsheng@627
|
3007 "it."
|
|
dongsheng@627
|
3008 msgstr ""
|
|
dongsheng@627
|
3009
|
|
dongsheng@627
|
3010 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3011 #: ../en/ch02-tour-basic.xml:407
|
|
dongsheng@627
|
3012 msgid ""
|
|
dongsheng@627
|
3013 "Most commands that print output of some kind will print more output when "
|
|
dongsheng@627
|
3014 "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-"
|
|
dongsheng@627
|
3015 "global\">--verbose</option>) option, and less when passed <option role=\"hg-"
|
|
dongsheng@627
|
3016 "opt-global\">-q</option> (or <option role=\"hg-opt-global\">--quiet</option>)."
|
|
dongsheng@627
|
3017 msgstr ""
|
|
dongsheng@627
|
3018
|
|
dongsheng@627
|
3019 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
3020 #: ../en/ch02-tour-basic.xml:415
|
|
dongsheng@627
|
3021 msgid "Making and reviewing changes"
|
|
dongsheng@627
|
3022 msgstr "创建和复审修改"
|
|
dongsheng@627
|
3023
|
|
dongsheng@627
|
3024 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3025 #: ../en/ch02-tour-basic.xml:417
|
|
dongsheng@627
|
3026 msgid ""
|
|
dongsheng@627
|
3027 "Now that we have a grasp of viewing history in Mercurial, let's take a look "
|
|
dongsheng@627
|
3028 "at making some changes and examining them."
|
|
dongsheng@627
|
3029 msgstr ""
|
|
dongsheng@627
|
3030
|
|
dongsheng@627
|
3031 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3032 #: ../en/ch02-tour-basic.xml:421
|
|
dongsheng@627
|
3033 msgid ""
|
|
dongsheng@627
|
3034 "The first thing we'll do is isolate our experiment in a repository of its "
|
|
dongsheng@627
|
3035 "own. We use the <command role=\"hg-cmd\">hg clone</command> command, but we "
|
|
dongsheng@627
|
3036 "don't need to clone a copy of the remote repository. Since we already have a "
|
|
dongsheng@627
|
3037 "copy of it locally, we can just clone that instead. This is much faster than "
|
|
dongsheng@627
|
3038 "cloning over the network, and cloning a local repository uses less disk space "
|
|
dongsheng@627
|
3039 "in most cases, too."
|
|
dongsheng@627
|
3040 msgstr ""
|
|
dongsheng@627
|
3041
|
|
dongsheng@627
|
3042 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3043 #: ../en/ch02-tour-basic.xml:431
|
|
dongsheng@627
|
3044 msgid ""
|
|
dongsheng@627
|
3045 "As an aside, it's often good practice to keep a <quote>pristine</quote> copy "
|
|
dongsheng@627
|
3046 "of a remote repository around, which you can then make temporary clones of to "
|
|
dongsheng@627
|
3047 "create sandboxes for each task you want to work on. This lets you work on "
|
|
dongsheng@627
|
3048 "multiple tasks in parallel, each isolated from the others until it's complete "
|
|
dongsheng@627
|
3049 "and you're ready to integrate it back. Because local clones are so cheap, "
|
|
dongsheng@627
|
3050 "there's almost no overhead to cloning and destroying repositories whenever "
|
|
dongsheng@627
|
3051 "you want."
|
|
dongsheng@627
|
3052 msgstr ""
|
|
dongsheng@627
|
3053
|
|
dongsheng@627
|
3054 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3055 #: ../en/ch02-tour-basic.xml:440
|
|
dongsheng@627
|
3056 msgid ""
|
|
dongsheng@627
|
3057 "In our <filename class=\"directory\">my-hello</filename> repository, we have "
|
|
dongsheng@627
|
3058 "a file <filename>hello.c</filename> that contains the classic <quote>hello, "
|
|
dongsheng@627
|
3059 "world</quote> program. Let's use the ancient and venerable <command>sed</"
|
|
dongsheng@627
|
3060 "command> command to edit this file so that it prints a second line of "
|
|
dongsheng@627
|
3061 "output. (I'm only using <command>sed</command> to do this because it's easy "
|
|
dongsheng@627
|
3062 "to write a scripted example this way. Since you're not under the same "
|
|
dongsheng@627
|
3063 "constraint, you probably won't want to use <command>sed</command>; simply use "
|
|
dongsheng@627
|
3064 "your preferred text editor to do the same thing.)"
|
|
dongsheng@627
|
3065 msgstr ""
|
|
dongsheng@627
|
3066
|
|
dongsheng@627
|
3067 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3068 #: ../en/ch02-tour-basic.xml:453
|
|
dongsheng@627
|
3069 msgid ""
|
|
dongsheng@627
|
3070 "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us "
|
|
dongsheng@627
|
3071 "what Mercurial knows about the files in the repository."
|
|
dongsheng@627
|
3072 msgstr ""
|
|
dongsheng@627
|
3073
|
|
dongsheng@627
|
3074 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3075 #: ../en/ch02-tour-basic.xml:459
|
|
dongsheng@627
|
3076 msgid ""
|
|
dongsheng@627
|
3077 "The <command role=\"hg-cmd\">hg status</command> command prints no output for "
|
|
dongsheng@627
|
3078 "some files, but a line starting with <quote><literal>M</literal></quote> for "
|
|
dongsheng@627
|
3079 "<filename>hello.c</filename>. Unless you tell it to, <command role=\"hg-cmd"
|
|
dongsheng@627
|
3080 "\">hg status</command> will not print any output for files that have not been "
|
|
dongsheng@627
|
3081 "modified."
|
|
dongsheng@627
|
3082 msgstr ""
|
|
dongsheng@627
|
3083
|
|
dongsheng@627
|
3084 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3085 #: ../en/ch02-tour-basic.xml:466
|
|
dongsheng@627
|
3086 msgid ""
|
|
dongsheng@627
|
3087 "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed "
|
|
dongsheng@627
|
3088 "that we modified <filename>hello.c</filename>. We didn't need to "
|
|
dongsheng@627
|
3089 "<emphasis>inform</emphasis> Mercurial that we were going to modify the file "
|
|
dongsheng@627
|
3090 "before we started, or that we had modified the file after we were done; it "
|
|
dongsheng@627
|
3091 "was able to figure this out itself."
|
|
dongsheng@627
|
3092 msgstr ""
|
|
dongsheng@627
|
3093
|
|
dongsheng@627
|
3094 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3095 #: ../en/ch02-tour-basic.xml:474
|
|
dongsheng@627
|
3096 msgid ""
|
|
dongsheng@627
|
3097 "It's a little bit helpful to know that we've modified <filename>hello.c</"
|
|
dongsheng@627
|
3098 "filename>, but we might prefer to know exactly <emphasis>what</emphasis> "
|
|
dongsheng@627
|
3099 "changes we've made to it. To do this, we use the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
3100 "diff</command> command."
|
|
dongsheng@627
|
3101 msgstr ""
|
|
dongsheng@627
|
3102
|
|
dongsheng@627
|
3103 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
3104 #: ../en/ch02-tour-basic.xml:484
|
|
dongsheng@627
|
3105 msgid "Recording changes in a new changeset"
|
|
dongsheng@627
|
3106 msgstr "在新修改集中记录修改"
|
|
dongsheng@627
|
3107
|
|
dongsheng@627
|
3108 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3109 #: ../en/ch02-tour-basic.xml:486
|
|
dongsheng@627
|
3110 msgid ""
|
|
dongsheng@627
|
3111 "We can modify files, build and test our changes, and use <command role=\"hg-"
|
|
dongsheng@627
|
3112 "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to "
|
|
dongsheng@627
|
3113 "review our changes, until we're satisfied with what we've done and arrive at "
|
|
dongsheng@627
|
3114 "a natural stopping point where we want to record our work in a new changeset."
|
|
dongsheng@627
|
3115 msgstr ""
|
|
dongsheng@627
|
3116
|
|
dongsheng@627
|
3117 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3118 #: ../en/ch02-tour-basic.xml:493
|
|
dongsheng@627
|
3119 msgid ""
|
|
dongsheng@627
|
3120 "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new "
|
|
dongsheng@627
|
3121 "changeset; we'll usually refer to this as <quote>making a commit</quote> or "
|
|
dongsheng@627
|
3122 "<quote>committing</quote>."
|
|
dongsheng@627
|
3123 msgstr ""
|
|
dongsheng@627
|
3124
|
|
dongsheng@627
|
3125 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3126 #: ../en/ch02-tour-basic.xml:499
|
|
dongsheng@627
|
3127 msgid "Setting up a username"
|
|
dongsheng@627
|
3128 msgstr "配置用户名称"
|
|
dongsheng@627
|
3129
|
|
dongsheng@627
|
3130 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3131 #: ../en/ch02-tour-basic.xml:501
|
|
dongsheng@627
|
3132 msgid ""
|
|
dongsheng@627
|
3133 "When you try to run <command role=\"hg-cmd\">hg commit</command> for the "
|
|
dongsheng@627
|
3134 "first time, it is not guaranteed to succeed. Mercurial records your name and "
|
|
dongsheng@627
|
3135 "address with each change that you commit, so that you and others will later "
|
|
dongsheng@627
|
3136 "be able to tell who made each change. Mercurial tries to automatically "
|
|
dongsheng@627
|
3137 "figure out a sensible username to commit the change with. It will attempt "
|
|
dongsheng@627
|
3138 "each of the following methods, in order:"
|
|
dongsheng@627
|
3139 msgstr ""
|
|
dongsheng@627
|
3140
|
|
dongsheng@627
|
3141 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
3142 #: ../en/ch02-tour-basic.xml:510
|
|
dongsheng@627
|
3143 msgid ""
|
|
dongsheng@627
|
3144 "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the "
|
|
dongsheng@627
|
3145 "<command role=\"hg-cmd\">hg commit</command> command on the command line, "
|
|
dongsheng@627
|
3146 "followed by a username, this is always given the highest precedence."
|
|
dongsheng@627
|
3147 msgstr ""
|
|
dongsheng@627
|
3148
|
|
dongsheng@627
|
3149 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
3150 #: ../en/ch02-tour-basic.xml:515
|
|
dongsheng@627
|
3151 msgid ""
|
|
dongsheng@627
|
3152 "If you have set the <envar>HGUSER</envar> environment variable, this is "
|
|
dongsheng@627
|
3153 "checked next."
|
|
dongsheng@627
|
3154 msgstr ""
|
|
dongsheng@627
|
3155
|
|
dongsheng@627
|
3156 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
3157 #: ../en/ch02-tour-basic.xml:518
|
|
dongsheng@627
|
3158 msgid ""
|
|
dongsheng@627
|
3159 "If you create a file in your home directory called <filename role=\"special"
|
|
dongsheng@627
|
3160 "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> "
|
|
dongsheng@627
|
3161 "entry, that will be used next. To see what the contents of this file should "
|
|
dongsheng@627
|
3162 "look like, refer to section <xref linkend=\"sec.tour-basic.username\"/> below."
|
|
dongsheng@627
|
3163 msgstr ""
|
|
dongsheng@627
|
3164
|
|
dongsheng@627
|
3165 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
3166 #: ../en/ch02-tour-basic.xml:525
|
|
dongsheng@627
|
3167 msgid ""
|
|
dongsheng@627
|
3168 "If you have set the <envar>EMAIL</envar> environment variable, this will be "
|
|
dongsheng@627
|
3169 "used next."
|
|
dongsheng@627
|
3170 msgstr ""
|
|
dongsheng@627
|
3171
|
|
dongsheng@627
|
3172 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
3173 #: ../en/ch02-tour-basic.xml:528
|
|
dongsheng@627
|
3174 msgid ""
|
|
dongsheng@627
|
3175 "Mercurial will query your system to find out your local user name and host "
|
|
dongsheng@627
|
3176 "name, and construct a username from these components. Since this often "
|
|
dongsheng@627
|
3177 "results in a username that is not very useful, it will print a warning if it "
|
|
dongsheng@627
|
3178 "has to do this."
|
|
dongsheng@627
|
3179 msgstr ""
|
|
dongsheng@627
|
3180
|
|
dongsheng@627
|
3181 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3182 #: ../en/ch02-tour-basic.xml:535
|
|
dongsheng@627
|
3183 msgid ""
|
|
dongsheng@627
|
3184 "If all of these mechanisms fail, Mercurial will fail, printing an error "
|
|
dongsheng@627
|
3185 "message. In this case, it will not let you commit until you set up a "
|
|
dongsheng@627
|
3186 "username."
|
|
dongsheng@627
|
3187 msgstr ""
|
|
dongsheng@627
|
3188
|
|
dongsheng@627
|
3189 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3190 #: ../en/ch02-tour-basic.xml:539
|
|
dongsheng@627
|
3191 msgid ""
|
|
dongsheng@627
|
3192 "You should think of the <envar>HGUSER</envar> environment variable and the "
|
|
dongsheng@627
|
3193 "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-"
|
|
dongsheng@627
|
3194 "cmd\">hg commit</command> command as ways to <emphasis>override</emphasis> "
|
|
dongsheng@627
|
3195 "Mercurial's default selection of username. For normal use, the simplest and "
|
|
dongsheng@627
|
3196 "most robust way to set a username for yourself is by creating a <filename "
|
|
dongsheng@627
|
3197 "role=\"special\">.hgrc</filename> file; see below for details."
|
|
dongsheng@627
|
3198 msgstr ""
|
|
dongsheng@627
|
3199
|
|
dongsheng@627
|
3200 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
3201 #: ../en/ch02-tour-basic.xml:548
|
|
dongsheng@627
|
3202 msgid "Creating a Mercurial configuration file"
|
|
dongsheng@627
|
3203 msgstr "创建 Mercurial 的配置文件"
|
|
dongsheng@627
|
3204
|
|
dongsheng@627
|
3205 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
3206 #: ../en/ch02-tour-basic.xml:550
|
|
dongsheng@627
|
3207 msgid ""
|
|
dongsheng@627
|
3208 "To set a user name, use your favourite editor to create a file called "
|
|
dongsheng@627
|
3209 "<filename role=\"special\">.hgrc</filename> in your home directory. "
|
|
dongsheng@627
|
3210 "Mercurial will use this file to look up your personalised configuration "
|
|
dongsheng@627
|
3211 "settings. The initial contents of your <filename role=\"special\">.hgrc</"
|
|
dongsheng@627
|
3212 "filename> should look like this."
|
|
dongsheng@627
|
3213 msgstr ""
|
|
dongsheng@627
|
3214
|
|
dongsheng@627
|
3215 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
3216 #: ../en/ch02-tour-basic.xml:561
|
|
dongsheng@627
|
3217 msgid ""
|
|
dongsheng@627
|
3218 "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</"
|
|
dongsheng@627
|
3219 "emphasis> of the config file, so you can read the <quote><literal>username "
|
|
dongsheng@627
|
3220 "= ...</literal></quote> line as meaning <quote>set the value of the "
|
|
dongsheng@627
|
3221 "<literal>username</literal> item in the <literal>ui</literal> section</"
|
|
dongsheng@627
|
3222 "quote>. A section continues until a new section begins, or the end of the "
|
|
dongsheng@627
|
3223 "file. Mercurial ignores empty lines and treats any text from "
|
|
dongsheng@627
|
3224 "<quote><literal>#</literal></quote> to the end of a line as a comment."
|
|
dongsheng@627
|
3225 msgstr ""
|
|
dongsheng@627
|
3226
|
|
dongsheng@627
|
3227 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
3228 #: ../en/ch02-tour-basic.xml:574
|
|
dongsheng@627
|
3229 msgid "Choosing a user name"
|
|
dongsheng@627
|
3230 msgstr "选择用户名称"
|
|
dongsheng@627
|
3231
|
|
dongsheng@627
|
3232 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
3233 #: ../en/ch02-tour-basic.xml:576
|
|
dongsheng@627
|
3234 msgid ""
|
|
dongsheng@627
|
3235 "You can use any text you like as the value of the <literal>username</literal> "
|
|
dongsheng@627
|
3236 "config item, since this information is for reading by other people, but for "
|
|
dongsheng@627
|
3237 "interpreting by Mercurial. The convention that most people follow is to use "
|
|
dongsheng@627
|
3238 "their name and email address, as in the example above."
|
|
dongsheng@627
|
3239 msgstr ""
|
|
dongsheng@627
|
3240
|
|
dongsheng@627
|
3241 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
|
|
dongsheng@641
|
3242 #: ../en/ch02-tour-basic.xml:583
|
|
dongsheng@627
|
3243 msgid ""
|
|
dongsheng@627
|
3244 "Mercurial's built-in web server obfuscates email addresses, to make it more "
|
|
dongsheng@627
|
3245 "difficult for the email harvesting tools that spammers use. This reduces the "
|
|
dongsheng@627
|
3246 "likelihood that you'll start receiving more junk email if you publish a "
|
|
dongsheng@627
|
3247 "Mercurial repository on the web."
|
|
dongsheng@627
|
3248 msgstr ""
|
|
dongsheng@627
|
3249
|
|
dongsheng@627
|
3250 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3251 #: ../en/ch02-tour-basic.xml:593
|
|
dongsheng@627
|
3252 msgid "Writing a commit message"
|
|
dongsheng@627
|
3253 msgstr "写提交日志"
|
|
dongsheng@627
|
3254
|
|
dongsheng@627
|
3255 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3256 #: ../en/ch02-tour-basic.xml:595
|
|
dongsheng@627
|
3257 msgid ""
|
|
dongsheng@627
|
3258 "When we commit a change, Mercurial drops us into a text editor, to enter a "
|
|
dongsheng@627
|
3259 "message that will describe the modifications we've made in this changeset. "
|
|
dongsheng@627
|
3260 "This is called the <emphasis>commit message</emphasis>. It will be a record "
|
|
dongsheng@627
|
3261 "for readers of what we did and why, and it will be printed by <command role="
|
|
dongsheng@627
|
3262 "\"hg-cmd\">hg log</command> after we've finished committing."
|
|
dongsheng@627
|
3263 msgstr ""
|
|
dongsheng@627
|
3264
|
|
dongsheng@627
|
3265 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3266 #: ../en/ch02-tour-basic.xml:605
|
|
dongsheng@627
|
3267 msgid ""
|
|
dongsheng@627
|
3268 "The editor that the <command role=\"hg-cmd\">hg commit</command> command "
|
|
dongsheng@627
|
3269 "drops us into will contain an empty line, followed by a number of lines "
|
|
dongsheng@627
|
3270 "starting with <quote><literal>HG:</literal></quote>."
|
|
dongsheng@627
|
3271 msgstr ""
|
|
dongsheng@627
|
3272
|
|
dongsheng@627
|
3273 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3274 #: ../en/ch02-tour-basic.xml:612
|
|
dongsheng@627
|
3275 msgid ""
|
|
dongsheng@627
|
3276 "Mercurial ignores the lines that start with <quote><literal>HG:</literal></"
|
|
dongsheng@627
|
3277 "quote>; it uses them only to tell us which files it's recording changes to. "
|
|
dongsheng@627
|
3278 "Modifying or deleting these lines has no effect."
|
|
dongsheng@627
|
3279 msgstr ""
|
|
dongsheng@627
|
3280
|
|
dongsheng@627
|
3281 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3282 #: ../en/ch02-tour-basic.xml:618
|
|
dongsheng@627
|
3283 msgid "Writing a good commit message"
|
|
dongsheng@627
|
3284 msgstr "写好提交日志"
|
|
dongsheng@627
|
3285
|
|
dongsheng@627
|
3286 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3287 #: ../en/ch02-tour-basic.xml:620
|
|
dongsheng@627
|
3288 msgid ""
|
|
dongsheng@627
|
3289 "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of "
|
|
dongsheng@627
|
3290 "a commit message by default, it's best to write a commit message whose first "
|
|
dongsheng@627
|
3291 "line stands alone. Here's a real example of a commit message that "
|
|
dongsheng@627
|
3292 "<emphasis>doesn't</emphasis> follow this guideline, and hence has a summary "
|
|
dongsheng@627
|
3293 "that is not readable."
|
|
dongsheng@627
|
3294 msgstr ""
|
|
dongsheng@627
|
3295
|
|
dongsheng@627
|
3296 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3297 #: ../en/ch02-tour-basic.xml:634
|
|
dongsheng@627
|
3298 msgid ""
|
|
dongsheng@627
|
3299 "As far as the remainder of the contents of the commit message are concerned, "
|
|
dongsheng@627
|
3300 "there are no hard-and-fast rules. Mercurial itself doesn't interpret or care "
|
|
dongsheng@627
|
3301 "about the contents of the commit message, though your project may have "
|
|
dongsheng@627
|
3302 "policies that dictate a certain kind of formatting."
|
|
dongsheng@627
|
3303 msgstr ""
|
|
dongsheng@627
|
3304
|
|
dongsheng@627
|
3305 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3306 #: ../en/ch02-tour-basic.xml:640
|
|
dongsheng@627
|
3307 msgid ""
|
|
dongsheng@627
|
3308 "My personal preference is for short, but informative, commit messages that "
|
|
dongsheng@627
|
3309 "tell me something that I can't figure out with a quick glance at the output "
|
|
dongsheng@627
|
3310 "of <command role=\"hg-cmd\">hg log --patch</command>."
|
|
dongsheng@627
|
3311 msgstr ""
|
|
dongsheng@627
|
3312
|
|
dongsheng@627
|
3313 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3314 #: ../en/ch02-tour-basic.xml:647
|
|
dongsheng@627
|
3315 msgid "Aborting a commit"
|
|
dongsheng@627
|
3316 msgstr "终止提交"
|
|
dongsheng@627
|
3317
|
|
dongsheng@627
|
3318 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3319 #: ../en/ch02-tour-basic.xml:649
|
|
dongsheng@627
|
3320 msgid ""
|
|
dongsheng@627
|
3321 "If you decide that you don't want to commit while in the middle of editing a "
|
|
dongsheng@627
|
3322 "commit message, simply exit from your editor without saving the file that "
|
|
dongsheng@627
|
3323 "it's editing. This will cause nothing to happen to either the repository or "
|
|
dongsheng@627
|
3324 "the working directory."
|
|
dongsheng@627
|
3325 msgstr ""
|
|
dongsheng@627
|
3326
|
|
dongsheng@627
|
3327 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3328 #: ../en/ch02-tour-basic.xml:654
|
|
dongsheng@627
|
3329 msgid ""
|
|
dongsheng@627
|
3330 "If we run the <command role=\"hg-cmd\">hg commit</command> command without "
|
|
dongsheng@627
|
3331 "any arguments, it records all of the changes we've made, as reported by "
|
|
dongsheng@627
|
3332 "<command role=\"hg-cmd\">hg status</command> and <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
3333 "diff</command>."
|
|
dongsheng@627
|
3334 msgstr ""
|
|
dongsheng@627
|
3335
|
|
dongsheng@627
|
3336 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3337 #: ../en/ch02-tour-basic.xml:661
|
|
dongsheng@627
|
3338 msgid "Admiring our new handiwork"
|
|
dongsheng@627
|
3339 msgstr "欣赏我们的新手艺"
|
|
dongsheng@627
|
3340
|
|
dongsheng@627
|
3341 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3342 #: ../en/ch02-tour-basic.xml:663
|
|
dongsheng@627
|
3343 msgid ""
|
|
dongsheng@627
|
3344 "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
3345 "tip</command> command to display the changeset we just created. This command "
|
|
dongsheng@627
|
3346 "produces output that is identical to <command role=\"hg-cmd\">hg log</"
|
|
dongsheng@627
|
3347 "command>, but it only displays the newest revision in the repository."
|
|
dongsheng@627
|
3348 msgstr ""
|
|
dongsheng@627
|
3349
|
|
dongsheng@627
|
3350 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3351 #: ../en/ch02-tour-basic.xml:672
|
|
dongsheng@627
|
3352 msgid ""
|
|
dongsheng@627
|
3353 "We refer to the newest revision in the repository as the tip revision, or "
|
|
dongsheng@627
|
3354 "simply the tip."
|
|
dongsheng@627
|
3355 msgstr ""
|
|
dongsheng@627
|
3356
|
|
dongsheng@627
|
3357 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
3358 #: ../en/ch02-tour-basic.xml:679
|
|
dongsheng@627
|
3359 msgid "Sharing changes"
|
|
dongsheng@627
|
3360 msgstr "共享修改"
|
|
dongsheng@627
|
3361
|
|
dongsheng@627
|
3362 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3363 #: ../en/ch02-tour-basic.xml:681
|
|
dongsheng@627
|
3364 msgid ""
|
|
dongsheng@627
|
3365 "We mentioned earlier that repositories in Mercurial are self-contained. This "
|
|
dongsheng@627
|
3366 "means that the changeset we just created exists only in our <filename class="
|
|
dongsheng@627
|
3367 "\"directory\">my-hello</filename> repository. Let's look at a few ways that "
|
|
dongsheng@627
|
3368 "we can propagate this change into other repositories."
|
|
dongsheng@627
|
3369 msgstr ""
|
|
dongsheng@627
|
3370
|
|
dongsheng@627
|
3371 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3372 #: ../en/ch02-tour-basic.xml:689
|
|
dongsheng@627
|
3373 msgid "Pulling changes from another repository"
|
|
dongsheng@627
|
3374 msgstr "从其它版本库取得修改"
|
|
dongsheng@627
|
3375
|
|
dongsheng@627
|
3376 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3377 #: ../en/ch02-tour-basic.xml:690
|
|
dongsheng@627
|
3378 msgid ""
|
|
dongsheng@627
|
3379 "To get started, let's clone our original <filename class=\"directory\">hello</"
|
|
dongsheng@627
|
3380 "filename> repository, which does not contain the change we just committed. "
|
|
dongsheng@627
|
3381 "We'll call our temporary repository <filename class=\"directory\">hello-pull</"
|
|
dongsheng@627
|
3382 "filename>."
|
|
dongsheng@627
|
3383 msgstr ""
|
|
dongsheng@627
|
3384
|
|
dongsheng@627
|
3385 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3386 #: ../en/ch02-tour-basic.xml:698
|
|
dongsheng@627
|
3387 msgid ""
|
|
dongsheng@627
|
3388 "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring "
|
|
dongsheng@627
|
3389 "changes from <filename class=\"directory\">my-hello</filename> into <filename "
|
|
dongsheng@627
|
3390 "class=\"directory\">hello-pull</filename>. However, blindly pulling unknown "
|
|
dongsheng@627
|
3391 "changes into a repository is a somewhat scary prospect. Mercurial provides "
|
|
dongsheng@627
|
3392 "the <command role=\"hg-cmd\">hg incoming</command> command to tell us what "
|
|
dongsheng@627
|
3393 "changes the <command role=\"hg-cmd\">hg pull</command> command "
|
|
dongsheng@627
|
3394 "<emphasis>would</emphasis> pull into the repository, without actually pulling "
|
|
dongsheng@627
|
3395 "the changes in."
|
|
dongsheng@627
|
3396 msgstr ""
|
|
dongsheng@627
|
3397
|
|
dongsheng@627
|
3398 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3399 #: ../en/ch02-tour-basic.xml:711
|
|
dongsheng@627
|
3400 msgid ""
|
|
dongsheng@627
|
3401 "(Of course, someone could cause more changesets to appear in the repository "
|
|
dongsheng@627
|
3402 "that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get "
|
|
dongsheng@627
|
3403 "a chance to <command role=\"hg-cmd\">hg pull</command> the changes, so that "
|
|
dongsheng@627
|
3404 "we could end up pulling changes that we didn't expect.)"
|
|
dongsheng@627
|
3405 msgstr ""
|
|
dongsheng@627
|
3406
|
|
dongsheng@627
|
3407 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3408 #: ../en/ch02-tour-basic.xml:718
|
|
dongsheng@627
|
3409 msgid ""
|
|
dongsheng@627
|
3410 "Bringing changes into a repository is a simple matter of running the <command "
|
|
dongsheng@627
|
3411 "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to "
|
|
dongsheng@627
|
3412 "pull from."
|
|
dongsheng@627
|
3413 msgstr ""
|
|
dongsheng@627
|
3414
|
|
dongsheng@627
|
3415 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3416 #: ../en/ch02-tour-basic.xml:725
|
|
dongsheng@627
|
3417 msgid ""
|
|
dongsheng@627
|
3418 "As you can see from the before-and-after output of <command role=\"hg-cmd"
|
|
dongsheng@627
|
3419 "\">hg tip</command>, we have successfully pulled changes into our "
|
|
dongsheng@627
|
3420 "repository. There remains one step before we can see these changes in the "
|
|
dongsheng@627
|
3421 "working directory."
|
|
dongsheng@627
|
3422 msgstr ""
|
|
dongsheng@627
|
3423
|
|
dongsheng@627
|
3424 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3425 #: ../en/ch02-tour-basic.xml:733
|
|
dongsheng@627
|
3426 msgid "Updating the working directory"
|
|
dongsheng@627
|
3427 msgstr "更新工作目录"
|
|
dongsheng@627
|
3428
|
|
dongsheng@627
|
3429 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3430 #: ../en/ch02-tour-basic.xml:735
|
|
dongsheng@627
|
3431 msgid ""
|
|
dongsheng@627
|
3432 "We have so far glossed over the relationship between a repository and its "
|
|
dongsheng@627
|
3433 "working directory. The <command role=\"hg-cmd\">hg pull</command> command "
|
|
dongsheng@627
|
3434 "that we ran in section <xref linkend=\"sec.tour.pull\"/> brought changes into "
|
|
dongsheng@627
|
3435 "the repository, but if we check, there's no sign of those changes in the "
|
|
dongsheng@627
|
3436 "working directory. This is because <command role=\"hg-cmd\">hg pull</"
|
|
dongsheng@627
|
3437 "command> does not (by default) touch the working directory. Instead, we use "
|
|
dongsheng@627
|
3438 "the <command role=\"hg-cmd\">hg update</command> command to do this."
|
|
dongsheng@627
|
3439 msgstr ""
|
|
dongsheng@627
|
3440
|
|
dongsheng@627
|
3441 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3442 #: ../en/ch02-tour-basic.xml:747
|
|
dongsheng@627
|
3443 msgid ""
|
|
dongsheng@627
|
3444 "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> "
|
|
dongsheng@627
|
3445 "doesn't update the working directory automatically. There's actually a good "
|
|
dongsheng@627
|
3446 "reason for this: you can use <command role=\"hg-cmd\">hg update</command> to "
|
|
dongsheng@627
|
3447 "update the working directory to the state it was in at <emphasis>any "
|
|
dongsheng@627
|
3448 "revision</emphasis> in the history of the repository. If you had the working "
|
|
dongsheng@627
|
3449 "directory updated to an old revision---to hunt down the origin of a bug, "
|
|
dongsheng@627
|
3450 "say---and ran a <command role=\"hg-cmd\">hg pull</command> which "
|
|
dongsheng@627
|
3451 "automatically updated the working directory to a new revision, you might not "
|
|
dongsheng@627
|
3452 "be terribly happy."
|
|
dongsheng@627
|
3453 msgstr ""
|
|
dongsheng@627
|
3454
|
|
dongsheng@627
|
3455 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3456 #: ../en/ch02-tour-basic.xml:758
|
|
dongsheng@627
|
3457 msgid ""
|
|
dongsheng@627
|
3458 "However, since pull-then-update is such a common thing to do, Mercurial lets "
|
|
dongsheng@627
|
3459 "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> "
|
|
dongsheng@627
|
3460 "option to <command role=\"hg-cmd\">hg pull</command>."
|
|
dongsheng@627
|
3461 msgstr ""
|
|
dongsheng@627
|
3462
|
|
dongsheng@627
|
3463 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3464 #: ../en/ch02-tour-basic.xml:763
|
|
dongsheng@627
|
3465 msgid ""
|
|
dongsheng@627
|
3466 "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> "
|
|
dongsheng@627
|
3467 "in section <xref linkend=\"sec.tour.pull\"/> when we ran it without <option "
|
|
dongsheng@627
|
3468 "role=\"hg-opt-pull\">-u</option>, you can see that it printed a helpful "
|
|
dongsheng@627
|
3469 "reminder that we'd have to take an explicit step to update the working "
|
|
dongsheng@627
|
3470 "directory:"
|
|
dongsheng@627
|
3471 msgstr ""
|
|
dongsheng@627
|
3472
|
|
dongsheng@627
|
3473 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3474 #: ../en/ch02-tour-basic.xml:772
|
|
dongsheng@627
|
3475 msgid ""
|
|
dongsheng@627
|
3476 "To find out what revision the working directory is at, use the <command role="
|
|
dongsheng@627
|
3477 "\"hg-cmd\">hg parents</command> command."
|
|
dongsheng@627
|
3478 msgstr ""
|
|
dongsheng@627
|
3479
|
|
dongsheng@627
|
3480 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3481 #: ../en/ch02-tour-basic.xml:778
|
|
dongsheng@641
|
3482 msgid ""
|
|
dongsheng@641
|
3483 "If you look back at figure <xref endterm=\"fig.tour-basic.history.caption\" "
|
|
dongsheng@641
|
3484 "linkend=\"fig.tour-basic.history\"/>, you'll see arrows connecting each "
|
|
dongsheng@641
|
3485 "changeset. The node that the arrow leads <emphasis>from</emphasis> in each "
|
|
dongsheng@641
|
3486 "case is a parent, and the node that the arrow leads <emphasis>to</emphasis> "
|
|
dongsheng@641
|
3487 "is its child. The working directory has a parent in just the same way; this "
|
|
dongsheng@641
|
3488 "is the changeset that the working directory currently contains."
|
|
dongsheng@641
|
3489 msgstr ""
|
|
dongsheng@641
|
3490
|
|
dongsheng@641
|
3491 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3492 #: ../en/ch02-tour-basic.xml:788
|
|
dongsheng@627
|
3493 msgid ""
|
|
dongsheng@627
|
3494 "To update the working directory to a particular revision, give a revision "
|
|
dongsheng@627
|
3495 "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> "
|
|
dongsheng@627
|
3496 "command."
|
|
dongsheng@627
|
3497 msgstr ""
|
|
dongsheng@627
|
3498
|
|
dongsheng@627
|
3499 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3500 #: ../en/ch02-tour-basic.xml:795
|
|
dongsheng@627
|
3501 msgid ""
|
|
dongsheng@627
|
3502 "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</"
|
|
dongsheng@627
|
3503 "command> will update to the tip revision, as shown by the second call to "
|
|
dongsheng@627
|
3504 "<command role=\"hg-cmd\">hg update</command> in the example above."
|
|
dongsheng@627
|
3505 msgstr ""
|
|
dongsheng@627
|
3506
|
|
dongsheng@627
|
3507 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3508 #: ../en/ch02-tour-basic.xml:803
|
|
dongsheng@627
|
3509 msgid "Pushing changes to another repository"
|
|
dongsheng@627
|
3510 msgstr "发布修改到其它版本库"
|
|
dongsheng@627
|
3511
|
|
dongsheng@627
|
3512 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3513 #: ../en/ch02-tour-basic.xml:805
|
|
dongsheng@627
|
3514 msgid ""
|
|
dongsheng@627
|
3515 "Mercurial lets us push changes to another repository, from the repository "
|
|
dongsheng@627
|
3516 "we're currently visiting. As with the example of <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
3517 "pull</command> above, we'll create a temporary repository to push our changes "
|
|
dongsheng@627
|
3518 "into."
|
|
dongsheng@627
|
3519 msgstr ""
|
|
dongsheng@627
|
3520
|
|
dongsheng@627
|
3521 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3522 #: ../en/ch02-tour-basic.xml:813
|
|
dongsheng@627
|
3523 msgid ""
|
|
dongsheng@627
|
3524 "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what "
|
|
dongsheng@627
|
3525 "changes would be pushed into another repository."
|
|
dongsheng@627
|
3526 msgstr ""
|
|
dongsheng@627
|
3527
|
|
dongsheng@627
|
3528 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3529 #: ../en/ch02-tour-basic.xml:819
|
|
dongsheng@627
|
3530 msgid ""
|
|
dongsheng@627
|
3531 "And the <command role=\"hg-cmd\">hg push</command> command does the actual "
|
|
dongsheng@627
|
3532 "push."
|
|
dongsheng@627
|
3533 msgstr ""
|
|
dongsheng@627
|
3534
|
|
dongsheng@627
|
3535 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3536 #: ../en/ch02-tour-basic.xml:825
|
|
dongsheng@627
|
3537 msgid ""
|
|
dongsheng@627
|
3538 "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd"
|
|
dongsheng@627
|
3539 "\">hg push</command> command does not update the working directory in the "
|
|
dongsheng@627
|
3540 "repository that it's pushing changes into. (Unlike <command role=\"hg-cmd"
|
|
dongsheng@627
|
3541 "\">hg pull</command>, <command role=\"hg-cmd\">hg push</command> does not "
|
|
dongsheng@627
|
3542 "provide a <literal>-u</literal> option that updates the other repository's "
|
|
dongsheng@627
|
3543 "working directory.)"
|
|
dongsheng@627
|
3544 msgstr ""
|
|
dongsheng@627
|
3545
|
|
dongsheng@627
|
3546 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3547 #: ../en/ch02-tour-basic.xml:834
|
|
dongsheng@627
|
3548 msgid ""
|
|
dongsheng@627
|
3549 "What happens if we try to pull or push changes and the receiving repository "
|
|
dongsheng@627
|
3550 "already has those changes? Nothing too exciting."
|
|
dongsheng@627
|
3551 msgstr ""
|
|
dongsheng@627
|
3552
|
|
dongsheng@627
|
3553 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3554 #: ../en/ch02-tour-basic.xml:841
|
|
dongsheng@627
|
3555 msgid "Sharing changes over a network"
|
|
dongsheng@627
|
3556 msgstr "通过网络共享修改"
|
|
dongsheng@627
|
3557
|
|
dongsheng@627
|
3558 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3559 #: ../en/ch02-tour-basic.xml:843
|
|
dongsheng@627
|
3560 msgid ""
|
|
dongsheng@627
|
3561 "The commands we have covered in the previous few sections are not limited to "
|
|
dongsheng@627
|
3562 "working with local repositories. Each works in exactly the same fashion over "
|
|
dongsheng@627
|
3563 "a network connection; simply pass in a URL instead of a local path."
|
|
dongsheng@627
|
3564 msgstr ""
|
|
dongsheng@627
|
3565
|
|
dongsheng@627
|
3566 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3567 #: ../en/ch02-tour-basic.xml:851
|
|
dongsheng@627
|
3568 msgid ""
|
|
dongsheng@627
|
3569 "In this example, we can see what changes we could push to the remote "
|
|
dongsheng@627
|
3570 "repository, but the repository is understandably not set up to let anonymous "
|
|
dongsheng@627
|
3571 "users push to it."
|
|
dongsheng@627
|
3572 msgstr ""
|
|
dongsheng@627
|
3573
|
|
dongsheng@627
|
3574 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
3575 #: ../en/ch03-tour-merge.xml:5
|
|
dongsheng@627
|
3576 msgid "A tour of Mercurial: merging work"
|
|
dongsheng@627
|
3577 msgstr "Mercurial 教程: 合并工作"
|
|
dongsheng@627
|
3578
|
|
dongsheng@627
|
3579 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
3580 #: ../en/ch03-tour-merge.xml:7
|
|
dongsheng@627
|
3581 msgid ""
|
|
dongsheng@627
|
3582 "We've now covered cloning a repository, making changes in a repository, and "
|
|
dongsheng@627
|
3583 "pulling or pushing changes from one repository into another. Our next step "
|
|
dongsheng@627
|
3584 "is <emphasis>merging</emphasis> changes from separate repositories."
|
|
dongsheng@627
|
3585 msgstr ""
|
|
dongsheng@627
|
3586
|
|
dongsheng@627
|
3587 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
3588 #: ../en/ch03-tour-merge.xml:13
|
|
dongsheng@627
|
3589 msgid "Merging streams of work"
|
|
dongsheng@627
|
3590 msgstr "合并的流程"
|
|
dongsheng@627
|
3591
|
|
dongsheng@627
|
3592 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
3593 #: ../en/ch03-tour-merge.xml:15
|
|
dongsheng@627
|
3594 msgid ""
|
|
dongsheng@627
|
3595 "Merging is a fundamental part of working with a distributed revision control "
|
|
dongsheng@627
|
3596 "tool."
|
|
dongsheng@627
|
3597 msgstr ""
|
|
dongsheng@627
|
3598
|
|
dongsheng@627
|
3599 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
3600 #: ../en/ch03-tour-merge.xml:18
|
|
dongsheng@627
|
3601 msgid ""
|
|
dongsheng@627
|
3602 "Alice and Bob each have a personal copy of a repository for a project they're "
|
|
dongsheng@627
|
3603 "collaborating on. Alice fixes a bug in her repository; Bob adds a new "
|
|
dongsheng@627
|
3604 "feature in his. They want the shared repository to contain both the bug fix "
|
|
dongsheng@627
|
3605 "and the new feature."
|
|
dongsheng@627
|
3606 msgstr ""
|
|
dongsheng@627
|
3607
|
|
dongsheng@627
|
3608 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
3609 #: ../en/ch03-tour-merge.xml:24
|
|
dongsheng@627
|
3610 msgid ""
|
|
dongsheng@627
|
3611 "I frequently work on several different tasks for a single project at once, "
|
|
dongsheng@627
|
3612 "each safely isolated in its own repository. Working this way means that I "
|
|
dongsheng@627
|
3613 "often need to merge one piece of my own work with another."
|
|
dongsheng@627
|
3614 msgstr ""
|
|
dongsheng@627
|
3615
|
|
dongsheng@627
|
3616 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
3617 #: ../en/ch03-tour-merge.xml:30
|
|
dongsheng@627
|
3618 msgid ""
|
|
dongsheng@627
|
3619 "Because merging is such a common thing to need to do, Mercurial makes it "
|
|
dongsheng@627
|
3620 "easy. Let's walk through the process. We'll begin by cloning yet another "
|
|
dongsheng@627
|
3621 "repository (see how often they spring up?) and making a change in it."
|
|
dongsheng@627
|
3622 msgstr ""
|
|
dongsheng@627
|
3623
|
|
dongsheng@627
|
3624 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
3625 #: ../en/ch03-tour-merge.xml:37
|
|
dongsheng@627
|
3626 msgid ""
|
|
dongsheng@627
|
3627 "We should now have two copies of <filename>hello.c</filename> with different "
|
|
dongsheng@627
|
3628 "contents. The histories of the two repositories have also diverged, as "
|
|
dongsheng@641
|
3629 "illustrated in figure <xref endterm=\"fig.tour-merge.sep-repos.caption\" "
|
|
dongsheng@641
|
3630 "linkend=\"fig.tour-merge.sep-repos\"/>."
|
|
dongsheng@627
|
3631 msgstr ""
|
|
dongsheng@627
|
3632
|
|
dongsheng@627
|
3633 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
|
|
dongsheng@627
|
3634 #: ../en/ch03-tour-merge.xml:47
|
|
dongsheng@627
|
3635 msgid ""
|
|
dongsheng@627
|
3636 "<imageobject><imagedata fileref=\"images/tour-merge-sep-repos.png\"/></"
|
|
dongsheng@627
|
3637 "imageobject>"
|
|
dongsheng@627
|
3638 msgstr ""
|
|
dongsheng@627
|
3639
|
|
dongsheng@627
|
3640 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
|
|
dongsheng@627
|
3641 #: ../en/ch03-tour-merge.xml:49
|
|
dongsheng@627
|
3642 msgid ""
|
|
dongsheng@627
|
3643 "Divergent recent histories of the <filename class=\"directory\">my-hello</"
|
|
dongsheng@627
|
3644 "filename> and <filename class=\"directory\">my-new-hello</filename> "
|
|
dongsheng@627
|
3645 "repositories"
|
|
dongsheng@627
|
3646 msgstr ""
|
|
dongsheng@627
|
3647
|
|
dongsheng@627
|
3648 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3649 #: ../en/ch03-tour-merge.xml:57
|
|
dongsheng@627
|
3650 msgid ""
|
|
dongsheng@627
|
3651 "We already know that pulling changes from our <filename class=\"directory"
|
|
dongsheng@627
|
3652 "\">my-hello</filename> repository will have no effect on the working "
|
|
dongsheng@627
|
3653 "directory."
|
|
dongsheng@627
|
3654 msgstr ""
|
|
dongsheng@627
|
3655
|
|
dongsheng@627
|
3656 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3657 #: ../en/ch03-tour-merge.xml:63
|
|
dongsheng@627
|
3658 msgid ""
|
|
dongsheng@627
|
3659 "However, the <command role=\"hg-cmd\">hg pull</command> command says "
|
|
dongsheng@627
|
3660 "something about <quote>heads</quote>."
|
|
dongsheng@627
|
3661 msgstr ""
|
|
dongsheng@627
|
3662
|
|
dongsheng@627
|
3663 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3664 #: ../en/ch03-tour-merge.xml:67
|
|
dongsheng@627
|
3665 msgid "Head changesets"
|
|
dongsheng@627
|
3666 msgstr "顶点改变集"
|
|
dongsheng@627
|
3667
|
|
dongsheng@627
|
3668 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3669 #: ../en/ch03-tour-merge.xml:69
|
|
dongsheng@627
|
3670 msgid ""
|
|
dongsheng@627
|
3671 "A head is a change that has no descendants, or children, as they're also "
|
|
dongsheng@627
|
3672 "known. The tip revision is thus a head, because the newest revision in a "
|
|
dongsheng@627
|
3673 "repository doesn't have any children, but a repository can contain more than "
|
|
dongsheng@627
|
3674 "one head."
|
|
dongsheng@627
|
3675 msgstr ""
|
|
dongsheng@627
|
3676
|
|
dongsheng@627
|
3677 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
3678 #: ../en/ch03-tour-merge.xml:77
|
|
dongsheng@627
|
3679 msgid ""
|
|
dongsheng@627
|
3680 "<imageobject><imagedata fileref=\"images/tour-merge-pull.png\"/></imageobject>"
|
|
dongsheng@627
|
3681 msgstr ""
|
|
dongsheng@627
|
3682
|
|
dongsheng@627
|
3683 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
3684 #: ../en/ch03-tour-merge.xml:79
|
|
dongsheng@627
|
3685 msgid ""
|
|
dongsheng@627
|
3686 "Repository contents after pulling from <filename class=\"directory\">my-"
|
|
dongsheng@627
|
3687 "hello</filename> into <filename class=\"directory\">my-new-hello</filename>"
|
|
dongsheng@627
|
3688 msgstr ""
|
|
dongsheng@627
|
3689
|
|
dongsheng@627
|
3690 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
3691 #: ../en/ch03-tour-merge.xml:85
|
|
dongsheng@627
|
3692 msgid ""
|
|
dongsheng@641
|
3693 "In figure <xref endterm=\"fig.tour-merge.pull.caption\" linkend=\"fig.tour-"
|
|
dongsheng@641
|
3694 "merge.pull\"/>, you can see the effect of the pull from <filename class="
|
|
dongsheng@641
|
3695 "\"directory\">my-hello</filename> into <filename class=\"directory\">my-new-"
|
|
dongsheng@641
|
3696 "hello</filename>. The history that was already present in <filename class="
|
|
dongsheng@641
|
3697 "\"directory\">my-new-hello</filename> is untouched, but a new revision has "
|
|
dongsheng@641
|
3698 "been added. By referring to figure <xref endterm=\"fig.tour-merge.sep-repos."
|
|
dongsheng@641
|
3699 "caption\" linkend=\"fig.tour-merge.sep-repos\"/>, we can see that the "
|
|
dongsheng@627
|
3700 "<emphasis>changeset ID</emphasis> remains the same in the new repository, but "
|
|
dongsheng@627
|
3701 "the <emphasis>revision number</emphasis> has changed. (This, incidentally, "
|
|
dongsheng@627
|
3702 "is a fine example of why it's not safe to use revision numbers when "
|
|
dongsheng@627
|
3703 "discussing changesets.) We can view the heads in a repository using the "
|
|
dongsheng@627
|
3704 "<command role=\"hg-cmd\">hg heads</command> command."
|
|
dongsheng@627
|
3705 msgstr ""
|
|
dongsheng@627
|
3706
|
|
dongsheng@627
|
3707 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3708 #: ../en/ch03-tour-merge.xml:106
|
|
dongsheng@627
|
3709 msgid "Performing the merge"
|
|
dongsheng@627
|
3710 msgstr "执行合并"
|
|
dongsheng@627
|
3711
|
|
dongsheng@627
|
3712 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3713 #: ../en/ch03-tour-merge.xml:108
|
|
dongsheng@627
|
3714 msgid ""
|
|
dongsheng@627
|
3715 "What happens if we try to use the normal <command role=\"hg-cmd\">hg update</"
|
|
dongsheng@627
|
3716 "command> command to update to the new tip?"
|
|
dongsheng@627
|
3717 msgstr ""
|
|
dongsheng@627
|
3718
|
|
dongsheng@627
|
3719 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3720 #: ../en/ch03-tour-merge.xml:114
|
|
dongsheng@627
|
3721 msgid ""
|
|
dongsheng@627
|
3722 "Mercurial is telling us that the <command role=\"hg-cmd\">hg update</command> "
|
|
dongsheng@627
|
3723 "command won't do a merge; it won't update the working directory when it "
|
|
dongsheng@627
|
3724 "thinks we might be wanting to do a merge, unless we force it to do so. "
|
|
dongsheng@627
|
3725 "Instead, we use the <command role=\"hg-cmd\">hg merge</command> command to "
|
|
dongsheng@627
|
3726 "merge the two heads."
|
|
dongsheng@627
|
3727 msgstr ""
|
|
dongsheng@627
|
3728
|
|
dongsheng@627
|
3729 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
3730 #: ../en/ch03-tour-merge.xml:125
|
|
dongsheng@627
|
3731 msgid ""
|
|
dongsheng@627
|
3732 "<imageobject><imagedata fileref=\"images/tour-merge-merge.png\"/></"
|
|
dongsheng@627
|
3733 "imageobject>"
|
|
dongsheng@627
|
3734 msgstr ""
|
|
dongsheng@627
|
3735
|
|
dongsheng@627
|
3736 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
3737 #: ../en/ch03-tour-merge.xml:127
|
|
dongsheng@627
|
3738 msgid "Working directory and repository during merge, and following commit"
|
|
dongsheng@627
|
3739 msgstr ""
|
|
dongsheng@627
|
3740
|
|
dongsheng@627
|
3741 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3742 #: ../en/ch03-tour-merge.xml:132
|
|
dongsheng@627
|
3743 msgid ""
|
|
dongsheng@627
|
3744 "This updates the working directory so that it contains changes from "
|
|
dongsheng@627
|
3745 "<emphasis>both</emphasis> heads, which is reflected in both the output of "
|
|
dongsheng@627
|
3746 "<command role=\"hg-cmd\">hg parents</command> and the contents of "
|
|
dongsheng@627
|
3747 "<filename>hello.c</filename>."
|
|
dongsheng@627
|
3748 msgstr ""
|
|
dongsheng@627
|
3749
|
|
dongsheng@627
|
3750 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3751 #: ../en/ch03-tour-merge.xml:142
|
|
dongsheng@627
|
3752 msgid "Committing the results of the merge"
|
|
dongsheng@627
|
3753 msgstr "提交合并结果"
|
|
dongsheng@627
|
3754
|
|
dongsheng@627
|
3755 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3756 #: ../en/ch03-tour-merge.xml:144
|
|
dongsheng@627
|
3757 msgid ""
|
|
dongsheng@627
|
3758 "Whenever we've done a merge, <command role=\"hg-cmd\">hg parents</command> "
|
|
dongsheng@627
|
3759 "will display two parents until we <command role=\"hg-cmd\">hg commit</"
|
|
dongsheng@627
|
3760 "command> the results of the merge."
|
|
dongsheng@627
|
3761 msgstr ""
|
|
dongsheng@627
|
3762
|
|
dongsheng@627
|
3763 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3764 #: ../en/ch03-tour-merge.xml:151
|
|
dongsheng@627
|
3765 msgid ""
|
|
dongsheng@627
|
3766 "We now have a new tip revision; notice that it has <emphasis>both</emphasis> "
|
|
dongsheng@627
|
3767 "of our former heads as its parents. These are the same revisions that were "
|
|
dongsheng@627
|
3768 "previously displayed by <command role=\"hg-cmd\">hg parents</command>."
|
|
dongsheng@627
|
3769 msgstr ""
|
|
dongsheng@627
|
3770
|
|
dongsheng@627
|
3771 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3772 #: ../en/ch03-tour-merge.xml:158
|
|
dongsheng@641
|
3773 msgid ""
|
|
dongsheng@641
|
3774 "In figure <xref endterm=\"fig.tour-merge.merge.caption\" linkend=\"fig.tour-"
|
|
dongsheng@641
|
3775 "merge.merge\"/>, you can see a representation of what happens to the working "
|
|
dongsheng@641
|
3776 "directory during the merge, and how this affects the repository when the "
|
|
dongsheng@641
|
3777 "commit happens. During the merge, the working directory has two parent "
|
|
dongsheng@641
|
3778 "changesets, and these become the parents of the new changeset."
|
|
dongsheng@627
|
3779 msgstr ""
|
|
dongsheng@627
|
3780
|
|
dongsheng@627
|
3781 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
3782 #: ../en/ch03-tour-merge.xml:169
|
|
dongsheng@627
|
3783 msgid "Merging conflicting changes"
|
|
dongsheng@627
|
3784 msgstr "合并有冲突的改变"
|
|
dongsheng@627
|
3785
|
|
dongsheng@627
|
3786 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3787 #: ../en/ch03-tour-merge.xml:171
|
|
dongsheng@627
|
3788 msgid ""
|
|
dongsheng@627
|
3789 "Most merges are simple affairs, but sometimes you'll find yourself merging "
|
|
dongsheng@627
|
3790 "changes where each modifies the same portions of the same files. Unless both "
|
|
dongsheng@627
|
3791 "modifications are identical, this results in a <emphasis>conflict</emphasis>, "
|
|
dongsheng@627
|
3792 "where you have to decide how to reconcile the different changes into "
|
|
dongsheng@627
|
3793 "something coherent."
|
|
dongsheng@627
|
3794 msgstr ""
|
|
dongsheng@627
|
3795
|
|
dongsheng@627
|
3796 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
|
|
dongsheng@627
|
3797 #: ../en/ch03-tour-merge.xml:180
|
|
dongsheng@627
|
3798 msgid ""
|
|
dongsheng@641
|
3799 "<imageobject><imagedata fileref=\"images/tour-merge-conflict.png\"/> </"
|
|
dongsheng@627
|
3800 "imageobject>"
|
|
dongsheng@627
|
3801 msgstr ""
|
|
dongsheng@627
|
3802
|
|
dongsheng@627
|
3803 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
3804 #: ../en/ch03-tour-merge.xml:183
|
|
dongsheng@627
|
3805 msgid "Conflicting changes to a document"
|
|
dongsheng@627
|
3806 msgstr ""
|
|
dongsheng@627
|
3807
|
|
dongsheng@627
|
3808 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3809 #: ../en/ch03-tour-merge.xml:188
|
|
dongsheng@641
|
3810 msgid ""
|
|
dongsheng@641
|
3811 "Figure <xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-"
|
|
dongsheng@641
|
3812 "merge.conflict\"/> illustrates an instance of two conflicting changes to a "
|
|
dongsheng@641
|
3813 "document. We started with a single version of the file; then we made some "
|
|
dongsheng@641
|
3814 "changes; while someone else made different changes to the same text. Our "
|
|
dongsheng@641
|
3815 "task in resolving the conflicting changes is to decide what the file should "
|
|
dongsheng@641
|
3816 "look like."
|
|
dongsheng@641
|
3817 msgstr ""
|
|
dongsheng@641
|
3818
|
|
dongsheng@641
|
3819 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3820 #: ../en/ch03-tour-merge.xml:196
|
|
dongsheng@627
|
3821 msgid ""
|
|
dongsheng@627
|
3822 "Mercurial doesn't have a built-in facility for handling conflicts. Instead, "
|
|
dongsheng@627
|
3823 "it runs an external program called <command>hgmerge</command>. This is a "
|
|
dongsheng@627
|
3824 "shell script that is bundled with Mercurial; you can change it to behave "
|
|
dongsheng@627
|
3825 "however you please. What it does by default is try to find one of several "
|
|
dongsheng@627
|
3826 "different merging tools that are likely to be installed on your system. It "
|
|
dongsheng@627
|
3827 "first tries a few fully automatic merging tools; if these don't succeed "
|
|
dongsheng@627
|
3828 "(because the resolution process requires human guidance) or aren't present, "
|
|
dongsheng@627
|
3829 "the script tries a few different graphical merging tools."
|
|
dongsheng@627
|
3830 msgstr ""
|
|
dongsheng@627
|
3831
|
|
dongsheng@627
|
3832 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
3833 #: ../en/ch03-tour-merge.xml:207
|
|
dongsheng@627
|
3834 msgid ""
|
|
dongsheng@627
|
3835 "It's also possible to get Mercurial to run another program or script instead "
|
|
dongsheng@627
|
3836 "of <command>hgmerge</command>, by setting the <envar>HGMERGE</envar> "
|
|
dongsheng@627
|
3837 "environment variable to the name of your preferred program."
|
|
dongsheng@627
|
3838 msgstr ""
|
|
dongsheng@627
|
3839
|
|
dongsheng@627
|
3840 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3841 #: ../en/ch03-tour-merge.xml:213
|
|
dongsheng@627
|
3842 msgid "Using a graphical merge tool"
|
|
dongsheng@627
|
3843 msgstr "使用图形合并工具"
|
|
dongsheng@627
|
3844
|
|
dongsheng@627
|
3845 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3846 #: ../en/ch03-tour-merge.xml:215
|
|
dongsheng@627
|
3847 msgid ""
|
|
dongsheng@627
|
3848 "My preferred graphical merge tool is <command>kdiff3</command>, which I'll "
|
|
dongsheng@627
|
3849 "use to describe the features that are common to graphical file merging "
|
|
dongsheng@627
|
3850 "tools. You can see a screenshot of <command>kdiff3</command> in action in "
|
|
dongsheng@641
|
3851 "figure <xref endterm=\"fig.tour-merge.kdiff3.caption\" linkend=\"fig.tour-"
|
|
dongsheng@641
|
3852 "merge.kdiff3\"/>. The kind of merge it is performing is called a "
|
|
dongsheng@641
|
3853 "<emphasis>three-way merge</emphasis>, because there are three different "
|
|
dongsheng@641
|
3854 "versions of the file of interest to us. The tool thus splits the upper "
|
|
dongsheng@641
|
3855 "portion of the window into three panes:"
|
|
dongsheng@627
|
3856 msgstr ""
|
|
dongsheng@627
|
3857
|
|
dongsheng@627
|
3858 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
3859 #: ../en/ch03-tour-merge.xml:226
|
|
dongsheng@627
|
3860 msgid ""
|
|
dongsheng@627
|
3861 "At the left is the <emphasis>base</emphasis> version of the file, i.e. the "
|
|
dongsheng@627
|
3862 "most recent version from which the two versions we're trying to merge are "
|
|
dongsheng@627
|
3863 "descended."
|
|
dongsheng@627
|
3864 msgstr ""
|
|
dongsheng@627
|
3865
|
|
dongsheng@627
|
3866 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
3867 #: ../en/ch03-tour-merge.xml:231
|
|
dongsheng@627
|
3868 msgid ""
|
|
dongsheng@627
|
3869 "In the middle is <quote>our</quote> version of the file, with the contents "
|
|
dongsheng@627
|
3870 "that we modified."
|
|
dongsheng@627
|
3871 msgstr ""
|
|
dongsheng@627
|
3872
|
|
dongsheng@627
|
3873 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
3874 #: ../en/ch03-tour-merge.xml:234
|
|
dongsheng@627
|
3875 msgid ""
|
|
dongsheng@627
|
3876 "On the right is <quote>their</quote> version of the file, the one that from "
|
|
dongsheng@627
|
3877 "the changeset that we're trying to merge with."
|
|
dongsheng@627
|
3878 msgstr ""
|
|
dongsheng@627
|
3879
|
|
dongsheng@627
|
3880 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3881 #: ../en/ch03-tour-merge.xml:238
|
|
dongsheng@627
|
3882 msgid ""
|
|
dongsheng@627
|
3883 "In the pane below these is the current <emphasis>result</emphasis> of the "
|
|
dongsheng@627
|
3884 "merge. Our task is to replace all of the red text, which indicates unresolved "
|
|
dongsheng@627
|
3885 "conflicts, with some sensible merger of the <quote>ours</quote> and "
|
|
dongsheng@627
|
3886 "<quote>theirs</quote> versions of the file."
|
|
dongsheng@627
|
3887 msgstr ""
|
|
dongsheng@627
|
3888
|
|
dongsheng@627
|
3889 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3890 #: ../en/ch03-tour-merge.xml:245
|
|
dongsheng@627
|
3891 msgid ""
|
|
dongsheng@627
|
3892 "All four of these panes are <emphasis>locked together</emphasis>; if we "
|
|
dongsheng@627
|
3893 "scroll vertically or horizontally in any of them, the others are updated to "
|
|
dongsheng@627
|
3894 "display the corresponding sections of their respective files."
|
|
dongsheng@627
|
3895 msgstr ""
|
|
dongsheng@627
|
3896
|
|
dongsheng@627
|
3897 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
3898 #: ../en/ch03-tour-merge.xml:252
|
|
dongsheng@641
|
3899 msgid ""
|
|
dongsheng@641
|
3900 "<imageobject><imagedata width=\"100%\" fileref=\"images/kdiff3.png\"/> </"
|
|
dongsheng@630
|
3901 "imageobject>"
|
|
dongsheng@627
|
3902 msgstr ""
|
|
dongsheng@627
|
3903
|
|
dongsheng@627
|
3904 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
3905 #: ../en/ch03-tour-merge.xml:255
|
|
dongsheng@627
|
3906 msgid "Using <command>kdiff3</command> to merge versions of a file"
|
|
dongsheng@627
|
3907 msgstr ""
|
|
dongsheng@627
|
3908
|
|
dongsheng@627
|
3909 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3910 #: ../en/ch03-tour-merge.xml:261
|
|
dongsheng@627
|
3911 msgid ""
|
|
dongsheng@627
|
3912 "For each conflicting portion of the file, we can choose to resolve the "
|
|
dongsheng@627
|
3913 "conflict using some combination of text from the base version, ours, or "
|
|
dongsheng@627
|
3914 "theirs. We can also manually edit the merged file at any time, in case we "
|
|
dongsheng@627
|
3915 "need to make further modifications."
|
|
dongsheng@627
|
3916 msgstr ""
|
|
dongsheng@627
|
3917
|
|
dongsheng@627
|
3918 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3919 #: ../en/ch03-tour-merge.xml:267
|
|
dongsheng@627
|
3920 msgid ""
|
|
dongsheng@627
|
3921 "There are <emphasis>many</emphasis> file merging tools available, too many to "
|
|
dongsheng@627
|
3922 "cover here. They vary in which platforms they are available for, and in "
|
|
dongsheng@627
|
3923 "their particular strengths and weaknesses. Most are tuned for merging files "
|
|
dongsheng@627
|
3924 "containing plain text, while a few are aimed at specialised file formats "
|
|
dongsheng@627
|
3925 "(generally XML)."
|
|
dongsheng@627
|
3926 msgstr ""
|
|
dongsheng@627
|
3927
|
|
dongsheng@627
|
3928 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
3929 #: ../en/ch03-tour-merge.xml:276
|
|
dongsheng@627
|
3930 msgid "A worked example"
|
|
dongsheng@627
|
3931 msgstr "合并实例"
|
|
dongsheng@627
|
3932
|
|
dongsheng@627
|
3933 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3934 #: ../en/ch03-tour-merge.xml:278
|
|
dongsheng@627
|
3935 msgid ""
|
|
dongsheng@627
|
3936 "In this example, we will reproduce the file modification history of figure "
|
|
dongsheng@641
|
3937 "<xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-merge."
|
|
dongsheng@641
|
3938 "conflict\"/> above. Let's begin by creating a repository with a base version "
|
|
dongsheng@641
|
3939 "of our document."
|
|
dongsheng@641
|
3940 msgstr ""
|
|
dongsheng@641
|
3941
|
|
dongsheng@641
|
3942 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3943 #: ../en/ch03-tour-merge.xml:286
|
|
dongsheng@627
|
3944 msgid "We'll clone the repository and make a change to the file."
|
|
dongsheng@627
|
3945 msgstr ""
|
|
dongsheng@627
|
3946
|
|
dongsheng@627
|
3947 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3948 #: ../en/ch03-tour-merge.xml:291
|
|
dongsheng@627
|
3949 msgid ""
|
|
dongsheng@627
|
3950 "And another clone, to simulate someone else making a change to the file. "
|
|
dongsheng@627
|
3951 "(This hints at the idea that it's not all that unusual to merge with yourself "
|
|
dongsheng@627
|
3952 "when you isolate tasks in separate repositories, and indeed to find and "
|
|
dongsheng@627
|
3953 "resolve conflicts while doing so.)"
|
|
dongsheng@627
|
3954 msgstr ""
|
|
dongsheng@627
|
3955
|
|
dongsheng@627
|
3956 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3957 #: ../en/ch03-tour-merge.xml:299
|
|
dongsheng@627
|
3958 msgid ""
|
|
dongsheng@627
|
3959 "Having created two different versions of the file, we'll set up an "
|
|
dongsheng@627
|
3960 "environment suitable for running our merge."
|
|
dongsheng@627
|
3961 msgstr ""
|
|
dongsheng@627
|
3962
|
|
dongsheng@627
|
3963 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3964 #: ../en/ch03-tour-merge.xml:305
|
|
dongsheng@627
|
3965 msgid ""
|
|
dongsheng@627
|
3966 "In this example, I won't use Mercurial's normal <command>hgmerge</command> "
|
|
dongsheng@627
|
3967 "program to do the merge, because it would drop my nice automated example-"
|
|
dongsheng@627
|
3968 "running tool into a graphical user interface. Instead, I'll set "
|
|
dongsheng@627
|
3969 "<envar>HGMERGE</envar> to tell Mercurial to use the non-interactive "
|
|
dongsheng@627
|
3970 "<command>merge</command> command. This is bundled with many Unix-like "
|
|
dongsheng@627
|
3971 "systems. If you're following this example on your computer, don't bother "
|
|
dongsheng@627
|
3972 "setting <envar>HGMERGE</envar>."
|
|
dongsheng@627
|
3973 msgstr ""
|
|
dongsheng@627
|
3974
|
|
dongsheng@627
|
3975 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3976 #: ../en/ch03-tour-merge.xml:315
|
|
dongsheng@627
|
3977 msgid "<emphasis role=\"bold\">XXX FIX THIS EXAMPLE.</emphasis>"
|
|
dongsheng@627
|
3978 msgstr ""
|
|
dongsheng@627
|
3979
|
|
dongsheng@627
|
3980 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3981 #: ../en/ch03-tour-merge.xml:320
|
|
dongsheng@627
|
3982 msgid ""
|
|
dongsheng@627
|
3983 "Because <command>merge</command> can't resolve the conflicting changes, it "
|
|
dongsheng@627
|
3984 "leaves <emphasis>merge markers</emphasis> inside the file that has conflicts, "
|
|
dongsheng@627
|
3985 "indicating which lines have conflicts, and whether they came from our version "
|
|
dongsheng@627
|
3986 "of the file or theirs."
|
|
dongsheng@627
|
3987 msgstr ""
|
|
dongsheng@627
|
3988
|
|
dongsheng@627
|
3989 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
3990 #: ../en/ch03-tour-merge.xml:326
|
|
dongsheng@627
|
3991 msgid ""
|
|
dongsheng@627
|
3992 "Mercurial can tell from the way <command>merge</command> exits that it wasn't "
|
|
dongsheng@627
|
3993 "able to merge successfully, so it tells us what commands we'll need to run if "
|
|
dongsheng@627
|
3994 "we want to redo the merging operation. This could be useful if, for example, "
|
|
dongsheng@627
|
3995 "we were running a graphical merge tool and quit because we were confused or "
|
|
dongsheng@627
|
3996 "realised we had made a mistake."
|
|
dongsheng@627
|
3997 msgstr ""
|
|
dongsheng@627
|
3998
|
|
dongsheng@627
|
3999 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4000 #: ../en/ch03-tour-merge.xml:333
|
|
dongsheng@627
|
4001 msgid ""
|
|
dongsheng@627
|
4002 "If automatic or manual merges fail, there's nothing to prevent us from "
|
|
dongsheng@627
|
4003 "<quote>fixing up</quote> the affected files ourselves, and committing the "
|
|
dongsheng@627
|
4004 "results of our merge:"
|
|
dongsheng@627
|
4005 msgstr ""
|
|
dongsheng@627
|
4006
|
|
dongsheng@627
|
4007 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
4008 #: ../en/ch03-tour-merge.xml:342
|
|
dongsheng@627
|
4009 msgid "Simplifying the pull-merge-commit sequence"
|
|
dongsheng@627
|
4010 msgstr "简化拉-合并-提交程序"
|
|
dongsheng@627
|
4011
|
|
dongsheng@627
|
4012 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4013 #: ../en/ch03-tour-merge.xml:344
|
|
dongsheng@627
|
4014 msgid ""
|
|
dongsheng@627
|
4015 "The process of merging changes as outlined above is straightforward, but "
|
|
dongsheng@627
|
4016 "requires running three commands in sequence."
|
|
dongsheng@627
|
4017 msgstr ""
|
|
dongsheng@627
|
4018
|
|
dongsheng@627
|
4019 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4020 #: ../en/ch03-tour-merge.xml:350
|
|
dongsheng@627
|
4021 msgid ""
|
|
dongsheng@627
|
4022 "In the case of the final commit, you also need to enter a commit message, "
|
|
dongsheng@627
|
4023 "which is almost always going to be a piece of uninteresting "
|
|
dongsheng@627
|
4024 "<quote>boilerplate</quote> text."
|
|
dongsheng@627
|
4025 msgstr ""
|
|
dongsheng@627
|
4026
|
|
dongsheng@627
|
4027 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4028 #: ../en/ch03-tour-merge.xml:354
|
|
dongsheng@627
|
4029 msgid ""
|
|
dongsheng@627
|
4030 "It would be nice to reduce the number of steps needed, if this were "
|
|
dongsheng@627
|
4031 "possible. Indeed, Mercurial is distributed with an extension called <literal "
|
|
dongsheng@627
|
4032 "role=\"hg-ext\">fetch</literal> that does just this."
|
|
dongsheng@627
|
4033 msgstr ""
|
|
dongsheng@627
|
4034
|
|
dongsheng@627
|
4035 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4036 #: ../en/ch03-tour-merge.xml:359
|
|
dongsheng@627
|
4037 msgid ""
|
|
dongsheng@627
|
4038 "Mercurial provides a flexible extension mechanism that lets people extend its "
|
|
dongsheng@627
|
4039 "functionality, while keeping the core of Mercurial small and easy to deal "
|
|
dongsheng@627
|
4040 "with. Some extensions add new commands that you can use from the command "
|
|
dongsheng@627
|
4041 "line, while others work <quote>behind the scenes,</quote> for example adding "
|
|
dongsheng@627
|
4042 "capabilities to the server."
|
|
dongsheng@627
|
4043 msgstr ""
|
|
dongsheng@627
|
4044
|
|
dongsheng@627
|
4045 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4046 #: ../en/ch03-tour-merge.xml:366
|
|
dongsheng@627
|
4047 msgid ""
|
|
dongsheng@627
|
4048 "The <literal role=\"hg-ext\">fetch</literal> extension adds a new command "
|
|
dongsheng@627
|
4049 "called, not surprisingly, <command role=\"hg-cmd\">hg fetch</command>. This "
|
|
dongsheng@627
|
4050 "extension acts as a combination of <command role=\"hg-cmd\">hg pull</"
|
|
dongsheng@627
|
4051 "command>, <command role=\"hg-cmd\">hg update</command> and <command role=\"hg-"
|
|
dongsheng@627
|
4052 "cmd\">hg merge</command>. It begins by pulling changes from another "
|
|
dongsheng@627
|
4053 "repository into the current repository. If it finds that the changes added a "
|
|
dongsheng@627
|
4054 "new head to the repository, it begins a merge, then commits the result of the "
|
|
dongsheng@627
|
4055 "merge with an automatically-generated commit message. If no new heads were "
|
|
dongsheng@627
|
4056 "added, it updates the working directory to the new tip changeset."
|
|
dongsheng@627
|
4057 msgstr ""
|
|
dongsheng@627
|
4058
|
|
dongsheng@627
|
4059 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4060 #: ../en/ch03-tour-merge.xml:379
|
|
dongsheng@627
|
4061 msgid ""
|
|
dongsheng@627
|
4062 "Enabling the <literal role=\"hg-ext\">fetch</literal> extension is easy. "
|
|
dongsheng@627
|
4063 "Edit your <filename role=\"special\">.hgrc</filename>, and either go to the "
|
|
dongsheng@627
|
4064 "<literal role=\"rc-extensions\">extensions</literal> section or create an "
|
|
dongsheng@627
|
4065 "<literal role=\"rc-extensions\">extensions</literal> section. Then add a line "
|
|
dongsheng@627
|
4066 "that simply reads <quote><literal>fetch </literal></quote>."
|
|
dongsheng@627
|
4067 msgstr ""
|
|
dongsheng@627
|
4068
|
|
dongsheng@627
|
4069 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4070 #: ../en/ch03-tour-merge.xml:389
|
|
dongsheng@627
|
4071 msgid ""
|
|
dongsheng@627
|
4072 "(Normally, on the right-hand side of the <quote><literal>=</literal></quote> "
|
|
dongsheng@627
|
4073 "would appear the location of the extension, but since the <literal role=\"hg-"
|
|
dongsheng@627
|
4074 "ext\">fetch</literal> extension is in the standard distribution, Mercurial "
|
|
dongsheng@627
|
4075 "knows where to search for it.)"
|
|
dongsheng@627
|
4076 msgstr ""
|
|
dongsheng@627
|
4077
|
|
dongsheng@627
|
4078 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
4079 #: ../en/ch04-concepts.xml:5
|
|
dongsheng@627
|
4080 msgid "Behind the scenes"
|
|
dongsheng@627
|
4081 msgstr "Mercurial 内幕"
|
|
dongsheng@627
|
4082
|
|
dongsheng@627
|
4083 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
4084 #: ../en/ch04-concepts.xml:7
|
|
dongsheng@627
|
4085 msgid ""
|
|
dongsheng@627
|
4086 "Unlike many revision control systems, the concepts upon which Mercurial is "
|
|
dongsheng@627
|
4087 "built are simple enough that it's easy to understand how the software really "
|
|
dongsheng@627
|
4088 "works. Knowing this certainly isn't necessary, but I find it useful to have "
|
|
dongsheng@627
|
4089 "a <quote>mental model</quote> of what's going on."
|
|
dongsheng@627
|
4090 msgstr ""
|
|
dongsheng@627
|
4091
|
|
dongsheng@627
|
4092 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
4093 #: ../en/ch04-concepts.xml:13
|
|
dongsheng@627
|
4094 msgid ""
|
|
dongsheng@627
|
4095 "This understanding gives me confidence that Mercurial has been carefully "
|
|
dongsheng@627
|
4096 "designed to be both <emphasis>safe</emphasis> and <emphasis>efficient</"
|
|
dongsheng@627
|
4097 "emphasis>. And just as importantly, if it's easy for me to retain a good "
|
|
dongsheng@627
|
4098 "idea of what the software is doing when I perform a revision control task, "
|
|
dongsheng@627
|
4099 "I'm less likely to be surprised by its behaviour."
|
|
dongsheng@627
|
4100 msgstr ""
|
|
dongsheng@627
|
4101
|
|
dongsheng@627
|
4102 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
4103 #: ../en/ch04-concepts.xml:20
|
|
dongsheng@627
|
4104 msgid ""
|
|
dongsheng@627
|
4105 "In this chapter, we'll initially cover the core concepts behind Mercurial's "
|
|
dongsheng@627
|
4106 "design, then continue to discuss some of the interesting details of its "
|
|
dongsheng@627
|
4107 "implementation."
|
|
dongsheng@627
|
4108 msgstr ""
|
|
dongsheng@627
|
4109
|
|
dongsheng@627
|
4110 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
4111 #: ../en/ch04-concepts.xml:25
|
|
dongsheng@627
|
4112 msgid "Mercurial's historical record"
|
|
dongsheng@627
|
4113 msgstr "Mercurial 的历史记录"
|
|
dongsheng@627
|
4114
|
|
dongsheng@627
|
4115 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
4116 #: ../en/ch04-concepts.xml:28
|
|
dongsheng@627
|
4117 msgid "Tracking the history of a single file"
|
|
dongsheng@627
|
4118 msgstr "跟踪单一文件的历史"
|
|
dongsheng@627
|
4119
|
|
dongsheng@627
|
4120 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
4121 #: ../en/ch04-concepts.xml:30
|
|
dongsheng@627
|
4122 msgid ""
|
|
dongsheng@627
|
4123 "When Mercurial tracks modifications to a file, it stores the history of that "
|
|
dongsheng@627
|
4124 "file in a metadata object called a <emphasis>filelog</emphasis>. Each entry "
|
|
dongsheng@627
|
4125 "in the filelog contains enough information to reconstruct one revision of the "
|
|
dongsheng@627
|
4126 "file that is being tracked. Filelogs are stored as files in the <filename "
|
|
dongsheng@627
|
4127 "role=\"special\" class=\"directory\">.hg/store/data</filename> directory. A "
|
|
dongsheng@627
|
4128 "filelog contains two kinds of information: revision data, and an index to "
|
|
dongsheng@627
|
4129 "help Mercurial to find a revision efficiently."
|
|
dongsheng@627
|
4130 msgstr ""
|
|
dongsheng@627
|
4131
|
|
dongsheng@627
|
4132 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
4133 #: ../en/ch04-concepts.xml:41
|
|
dongsheng@627
|
4134 msgid ""
|
|
dongsheng@627
|
4135 "A file that is large, or has a lot of history, has its filelog stored in "
|
|
dongsheng@627
|
4136 "separate data (<quote><literal>.d</literal></quote> suffix) and index "
|
|
dongsheng@627
|
4137 "(<quote><literal>.i</literal></quote> suffix) files. For small files without "
|
|
dongsheng@627
|
4138 "much history, the revision data and index are combined in a single "
|
|
dongsheng@627
|
4139 "<quote><literal>.i</literal></quote> file. The correspondence between a file "
|
|
dongsheng@627
|
4140 "in the working directory and the filelog that tracks its history in the "
|
|
dongsheng@641
|
4141 "repository is illustrated in figure <xref endterm=\"fig.concepts.filelog."
|
|
dongsheng@641
|
4142 "caption\" linkend=\"fig.concepts.filelog\"/>."
|
|
dongsheng@627
|
4143 msgstr ""
|
|
dongsheng@627
|
4144
|
|
dongsheng@627
|
4145 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4146 #: ../en/ch04-concepts.xml:55
|
|
dongsheng@627
|
4147 msgid "<imageobject><imagedata fileref=\"images/filelog.png\"/></imageobject>"
|
|
dongsheng@627
|
4148 msgstr ""
|
|
dongsheng@627
|
4149
|
|
dongsheng@627
|
4150 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4151 #: ../en/ch04-concepts.xml:57
|
|
dongsheng@627
|
4152 msgid ""
|
|
dongsheng@627
|
4153 "Relationships between files in working directory and filelogs in repository"
|
|
dongsheng@627
|
4154 msgstr ""
|
|
dongsheng@627
|
4155
|
|
dongsheng@627
|
4156 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4157 #: ../en/ch04-concepts.xml:65
|
|
dongsheng@627
|
4158 msgid "Managing tracked files"
|
|
dongsheng@627
|
4159 msgstr "管理跟踪的文件"
|
|
dongsheng@627
|
4160
|
|
dongsheng@627
|
4161 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4162 #: ../en/ch04-concepts.xml:67
|
|
dongsheng@627
|
4163 msgid ""
|
|
dongsheng@627
|
4164 "Mercurial uses a structure called a <emphasis>manifest</emphasis> to collect "
|
|
dongsheng@627
|
4165 "together information about the files that it tracks. Each entry in the "
|
|
dongsheng@627
|
4166 "manifest contains information about the files present in a single changeset. "
|
|
dongsheng@627
|
4167 "An entry records which files are present in the changeset, the revision of "
|
|
dongsheng@627
|
4168 "each file, and a few other pieces of file metadata."
|
|
dongsheng@627
|
4169 msgstr ""
|
|
dongsheng@627
|
4170
|
|
dongsheng@627
|
4171 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4172 #: ../en/ch04-concepts.xml:77
|
|
dongsheng@627
|
4173 msgid "Recording changeset information"
|
|
dongsheng@627
|
4174 msgstr "记录修改集信息"
|
|
dongsheng@627
|
4175
|
|
dongsheng@627
|
4176 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4177 #: ../en/ch04-concepts.xml:79
|
|
dongsheng@627
|
4178 msgid ""
|
|
dongsheng@627
|
4179 "The <emphasis>changelog</emphasis> contains information about each "
|
|
dongsheng@627
|
4180 "changeset. Each revision records who committed a change, the changeset "
|
|
dongsheng@627
|
4181 "comment, other pieces of changeset-related information, and the revision of "
|
|
dongsheng@627
|
4182 "the manifest to use."
|
|
dongsheng@627
|
4183 msgstr ""
|
|
dongsheng@627
|
4184
|
|
dongsheng@627
|
4185 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4186 #: ../en/ch04-concepts.xml:87
|
|
dongsheng@627
|
4187 msgid "Relationships between revisions"
|
|
dongsheng@627
|
4188 msgstr "版本之间的关系"
|
|
dongsheng@627
|
4189
|
|
dongsheng@627
|
4190 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4191 #: ../en/ch04-concepts.xml:89
|
|
dongsheng@627
|
4192 msgid ""
|
|
dongsheng@627
|
4193 "Within a changelog, a manifest, or a filelog, each revision stores a pointer "
|
|
dongsheng@627
|
4194 "to its immediate parent (or to its two parents, if it's a merge revision). "
|
|
dongsheng@627
|
4195 "As I mentioned above, there are also relationships between revisions "
|
|
dongsheng@627
|
4196 "<emphasis>across</emphasis> these structures, and they are hierarchical in "
|
|
dongsheng@627
|
4197 "nature."
|
|
dongsheng@627
|
4198 msgstr ""
|
|
dongsheng@627
|
4199
|
|
dongsheng@627
|
4200 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4201 #: ../en/ch04-concepts.xml:96
|
|
dongsheng@627
|
4202 msgid ""
|
|
dongsheng@627
|
4203 "For every changeset in a repository, there is exactly one revision stored in "
|
|
dongsheng@627
|
4204 "the changelog. Each revision of the changelog contains a pointer to a single "
|
|
dongsheng@627
|
4205 "revision of the manifest. A revision of the manifest stores a pointer to a "
|
|
dongsheng@627
|
4206 "single revision of each filelog tracked when that changeset was created. "
|
|
dongsheng@641
|
4207 "These relationships are illustrated in figure <xref endterm=\"fig.concepts."
|
|
dongsheng@641
|
4208 "metadata.caption\" linkend=\"fig.concepts.metadata\"/>."
|
|
dongsheng@627
|
4209 msgstr ""
|
|
dongsheng@627
|
4210
|
|
dongsheng@627
|
4211 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4212 #: ../en/ch04-concepts.xml:107
|
|
dongsheng@627
|
4213 msgid "<imageobject><imagedata fileref=\"images/metadata.png\"/></imageobject>"
|
|
dongsheng@627
|
4214 msgstr ""
|
|
dongsheng@627
|
4215
|
|
dongsheng@627
|
4216 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4217 #: ../en/ch04-concepts.xml:109
|
|
dongsheng@627
|
4218 msgid "Metadata relationships"
|
|
dongsheng@627
|
4219 msgstr ""
|
|
dongsheng@627
|
4220
|
|
dongsheng@627
|
4221 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4222 #: ../en/ch04-concepts.xml:114
|
|
dongsheng@627
|
4223 msgid ""
|
|
dongsheng@627
|
4224 "As the illustration shows, there is <emphasis>not</emphasis> a <quote>one to "
|
|
dongsheng@627
|
4225 "one</quote> relationship between revisions in the changelog, manifest, or "
|
|
dongsheng@627
|
4226 "filelog. If the manifest hasn't changed between two changesets, the changelog "
|
|
dongsheng@627
|
4227 "entries for those changesets will point to the same revision of the "
|
|
dongsheng@627
|
4228 "manifest. If a file that Mercurial tracks hasn't changed between two "
|
|
dongsheng@627
|
4229 "changesets, the entry for that file in the two revisions of the manifest will "
|
|
dongsheng@627
|
4230 "point to the same revision of its filelog."
|
|
dongsheng@627
|
4231 msgstr ""
|
|
dongsheng@627
|
4232
|
|
dongsheng@627
|
4233 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
4234 #: ../en/ch04-concepts.xml:127
|
|
dongsheng@627
|
4235 msgid "Safe, efficient storage"
|
|
dongsheng@627
|
4236 msgstr "安全，高效的存储"
|
|
dongsheng@627
|
4237
|
|
dongsheng@627
|
4238 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4239 #: ../en/ch04-concepts.xml:129
|
|
dongsheng@627
|
4240 msgid ""
|
|
dongsheng@627
|
4241 "The underpinnings of changelogs, manifests, and filelogs are provided by a "
|
|
dongsheng@627
|
4242 "single structure called the <emphasis>revlog</emphasis>."
|
|
dongsheng@627
|
4243 msgstr ""
|
|
dongsheng@627
|
4244
|
|
dongsheng@627
|
4245 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4246 #: ../en/ch04-concepts.xml:134
|
|
dongsheng@627
|
4247 msgid "Efficient storage"
|
|
dongsheng@627
|
4248 msgstr "高效存储"
|
|
dongsheng@627
|
4249
|
|
dongsheng@627
|
4250 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4251 #: ../en/ch04-concepts.xml:136
|
|
dongsheng@627
|
4252 msgid ""
|
|
dongsheng@627
|
4253 "The revlog provides efficient storage of revisions using a <emphasis>delta</"
|
|
dongsheng@627
|
4254 "emphasis> mechanism. Instead of storing a complete copy of a file for each "
|
|
dongsheng@627
|
4255 "revision, it stores the changes needed to transform an older revision into "
|
|
dongsheng@627
|
4256 "the new revision. For many kinds of file data, these deltas are typically a "
|
|
dongsheng@627
|
4257 "fraction of a percent of the size of a full copy of a file."
|
|
dongsheng@627
|
4258 msgstr ""
|
|
dongsheng@627
|
4259
|
|
dongsheng@627
|
4260 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4261 #: ../en/ch04-concepts.xml:144
|
|
dongsheng@627
|
4262 msgid ""
|
|
dongsheng@627
|
4263 "Some obsolete revision control systems can only work with deltas of text "
|
|
dongsheng@627
|
4264 "files. They must either store binary files as complete snapshots or encoded "
|
|
dongsheng@627
|
4265 "into a text representation, both of which are wasteful approaches. Mercurial "
|
|
dongsheng@627
|
4266 "can efficiently handle deltas of files with arbitrary binary contents; it "
|
|
dongsheng@627
|
4267 "doesn't need to treat text as special."
|
|
dongsheng@627
|
4268 msgstr ""
|
|
dongsheng@627
|
4269
|
|
dongsheng@627
|
4270 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4271 #: ../en/ch04-concepts.xml:153
|
|
dongsheng@627
|
4272 msgid "Safe operation"
|
|
dongsheng@627
|
4273 msgstr "安全操作"
|
|
dongsheng@627
|
4274
|
|
dongsheng@627
|
4275 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4276 #: ../en/ch04-concepts.xml:155
|
|
dongsheng@627
|
4277 msgid ""
|
|
dongsheng@627
|
4278 "Mercurial only ever <emphasis>appends</emphasis> data to the end of a revlog "
|
|
dongsheng@627
|
4279 "file. It never modifies a section of a file after it has written it. This is "
|
|
dongsheng@627
|
4280 "both more robust and efficient than schemes that need to modify or rewrite "
|
|
dongsheng@627
|
4281 "data."
|
|
dongsheng@627
|
4282 msgstr ""
|
|
dongsheng@627
|
4283
|
|
dongsheng@627
|
4284 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4285 #: ../en/ch04-concepts.xml:161
|
|
dongsheng@627
|
4286 msgid ""
|
|
dongsheng@627
|
4287 "In addition, Mercurial treats every write as part of a <emphasis>transaction</"
|
|
dongsheng@627
|
4288 "emphasis> that can span a number of files. A transaction is "
|
|
dongsheng@627
|
4289 "<emphasis>atomic</emphasis>: either the entire transaction succeeds and its "
|
|
dongsheng@627
|
4290 "effects are all visible to readers in one go, or the whole thing is undone. "
|
|
dongsheng@627
|
4291 "This guarantee of atomicity means that if you're running two copies of "
|
|
dongsheng@627
|
4292 "Mercurial, where one is reading data and one is writing it, the reader will "
|
|
dongsheng@627
|
4293 "never see a partially written result that might confuse it."
|
|
dongsheng@627
|
4294 msgstr ""
|
|
dongsheng@627
|
4295
|
|
dongsheng@627
|
4296 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4297 #: ../en/ch04-concepts.xml:171
|
|
dongsheng@627
|
4298 msgid ""
|
|
dongsheng@627
|
4299 "The fact that Mercurial only appends to files makes it easier to provide this "
|
|
dongsheng@627
|
4300 "transactional guarantee. The easier it is to do stuff like this, the more "
|
|
dongsheng@627
|
4301 "confident you should be that it's done correctly."
|
|
dongsheng@627
|
4302 msgstr ""
|
|
dongsheng@627
|
4303
|
|
dongsheng@627
|
4304 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4305 #: ../en/ch04-concepts.xml:178
|
|
dongsheng@627
|
4306 msgid "Fast retrieval"
|
|
dongsheng@627
|
4307 msgstr "快速检索"
|
|
dongsheng@627
|
4308
|
|
dongsheng@627
|
4309 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4310 #: ../en/ch04-concepts.xml:180
|
|
dongsheng@627
|
4311 msgid ""
|
|
dongsheng@627
|
4312 "Mercurial cleverly avoids a pitfall common to all earlier revision control "
|
|
dongsheng@627
|
4313 "systems: the problem of <emphasis>inefficient retrieval</emphasis>. Most "
|
|
dongsheng@627
|
4314 "revision control systems store the contents of a revision as an incremental "
|
|
dongsheng@627
|
4315 "series of modifications against a <quote>snapshot</quote>. To reconstruct a "
|
|
dongsheng@627
|
4316 "specific revision, you must first read the snapshot, and then every one of "
|
|
dongsheng@627
|
4317 "the revisions between the snapshot and your target revision. The more "
|
|
dongsheng@627
|
4318 "history that a file accumulates, the more revisions you must read, hence the "
|
|
dongsheng@627
|
4319 "longer it takes to reconstruct a particular revision."
|
|
dongsheng@627
|
4320 msgstr ""
|
|
dongsheng@627
|
4321
|
|
dongsheng@627
|
4322 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4323 #: ../en/ch04-concepts.xml:193
|
|
dongsheng@627
|
4324 msgid "<imageobject><imagedata fileref=\"images/snapshot.png\"/></imageobject>"
|
|
dongsheng@627
|
4325 msgstr ""
|
|
dongsheng@627
|
4326
|
|
dongsheng@627
|
4327 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4328 #: ../en/ch04-concepts.xml:195
|
|
dongsheng@627
|
4329 msgid "Snapshot of a revlog, with incremental deltas"
|
|
dongsheng@627
|
4330 msgstr ""
|
|
dongsheng@627
|
4331
|
|
dongsheng@627
|
4332 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4333 #: ../en/ch04-concepts.xml:200
|
|
dongsheng@627
|
4334 msgid ""
|
|
dongsheng@627
|
4335 "The innovation that Mercurial applies to this problem is simple but "
|
|
dongsheng@627
|
4336 "effective. Once the cumulative amount of delta information stored since the "
|
|
dongsheng@627
|
4337 "last snapshot exceeds a fixed threshold, it stores a new snapshot "
|
|
dongsheng@627
|
4338 "(compressed, of course), instead of another delta. This makes it possible to "
|
|
dongsheng@627
|
4339 "reconstruct <emphasis>any</emphasis> revision of a file quickly. This "
|
|
dongsheng@627
|
4340 "approach works so well that it has since been copied by several other "
|
|
dongsheng@627
|
4341 "revision control systems."
|
|
dongsheng@627
|
4342 msgstr ""
|
|
dongsheng@627
|
4343
|
|
dongsheng@627
|
4344 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4345 #: ../en/ch04-concepts.xml:209
|
|
dongsheng@641
|
4346 msgid ""
|
|
dongsheng@641
|
4347 "Figure <xref endterm=\"fig.concepts.snapshot.caption\" linkend=\"fig.concepts."
|
|
dongsheng@641
|
4348 "snapshot\"/> illustrates the idea. In an entry in a revlog's index file, "
|
|
dongsheng@641
|
4349 "Mercurial stores the range of entries from the data file that it must read to "
|
|
dongsheng@641
|
4350 "reconstruct a particular revision."
|
|
dongsheng@627
|
4351 msgstr ""
|
|
dongsheng@627
|
4352
|
|
dongsheng@627
|
4353 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
4354 #: ../en/ch04-concepts.xml:216
|
|
dongsheng@627
|
4355 msgid "Aside: the influence of video compression"
|
|
dongsheng@627
|
4356 msgstr ""
|
|
dongsheng@627
|
4357
|
|
dongsheng@627
|
4358 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
4359 #: ../en/ch04-concepts.xml:218
|
|
dongsheng@627
|
4360 msgid ""
|
|
dongsheng@627
|
4361 "If you're familiar with video compression or have ever watched a TV feed "
|
|
dongsheng@627
|
4362 "through a digital cable or satellite service, you may know that most video "
|
|
dongsheng@627
|
4363 "compression schemes store each frame of video as a delta against its "
|
|
dongsheng@627
|
4364 "predecessor frame. In addition, these schemes use <quote>lossy</quote> "
|
|
dongsheng@627
|
4365 "compression techniques to increase the compression ratio, so visual errors "
|
|
dongsheng@627
|
4366 "accumulate over the course of a number of inter-frame deltas."
|
|
dongsheng@627
|
4367 msgstr ""
|
|
dongsheng@627
|
4368
|
|
dongsheng@627
|
4369 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
4370 #: ../en/ch04-concepts.xml:227
|
|
dongsheng@627
|
4371 msgid ""
|
|
dongsheng@627
|
4372 "Because it's possible for a video stream to <quote>drop out</quote> "
|
|
dongsheng@627
|
4373 "occasionally due to signal glitches, and to limit the accumulation of "
|
|
dongsheng@627
|
4374 "artefacts introduced by the lossy compression process, video encoders "
|
|
dongsheng@627
|
4375 "periodically insert a complete frame (called a <quote>key frame</quote>) into "
|
|
dongsheng@627
|
4376 "the video stream; the next delta is generated against that frame. This means "
|
|
dongsheng@627
|
4377 "that if the video signal gets interrupted, it will resume once the next key "
|
|
dongsheng@627
|
4378 "frame is received. Also, the accumulation of encoding errors restarts anew "
|
|
dongsheng@627
|
4379 "with each key frame."
|
|
dongsheng@627
|
4380 msgstr ""
|
|
dongsheng@627
|
4381
|
|
dongsheng@627
|
4382 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4383 #: ../en/ch04-concepts.xml:241
|
|
dongsheng@627
|
4384 msgid "Identification and strong integrity"
|
|
dongsheng@627
|
4385 msgstr "鉴别和强完整性"
|
|
dongsheng@627
|
4386
|
|
dongsheng@627
|
4387 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4388 #: ../en/ch04-concepts.xml:243
|
|
dongsheng@627
|
4389 msgid ""
|
|
dongsheng@627
|
4390 "Along with delta or snapshot information, a revlog entry contains a "
|
|
dongsheng@627
|
4391 "cryptographic hash of the data that it represents. This makes it difficult "
|
|
dongsheng@627
|
4392 "to forge the contents of a revision, and easy to detect accidental corruption."
|
|
dongsheng@627
|
4393 msgstr ""
|
|
dongsheng@627
|
4394
|
|
dongsheng@627
|
4395 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4396 #: ../en/ch04-concepts.xml:248
|
|
dongsheng@627
|
4397 msgid ""
|
|
dongsheng@627
|
4398 "Hashes provide more than a mere check against corruption; they are used as "
|
|
dongsheng@627
|
4399 "the identifiers for revisions. The changeset identification hashes that you "
|
|
dongsheng@627
|
4400 "see as an end user are from revisions of the changelog. Although filelogs "
|
|
dongsheng@627
|
4401 "and the manifest also use hashes, Mercurial only uses these behind the scenes."
|
|
dongsheng@627
|
4402 msgstr ""
|
|
dongsheng@627
|
4403
|
|
dongsheng@627
|
4404 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4405 #: ../en/ch04-concepts.xml:255
|
|
dongsheng@627
|
4406 msgid ""
|
|
dongsheng@627
|
4407 "Mercurial verifies that hashes are correct when it retrieves file revisions "
|
|
dongsheng@627
|
4408 "and when it pulls changes from another repository. If it encounters an "
|
|
dongsheng@627
|
4409 "integrity problem, it will complain and stop whatever it's doing."
|
|
dongsheng@627
|
4410 msgstr ""
|
|
dongsheng@627
|
4411
|
|
dongsheng@627
|
4412 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4413 #: ../en/ch04-concepts.xml:260
|
|
dongsheng@627
|
4414 msgid ""
|
|
dongsheng@627
|
4415 "In addition to the effect it has on retrieval efficiency, Mercurial's use of "
|
|
dongsheng@627
|
4416 "periodic snapshots makes it more robust against partial data corruption. If "
|
|
dongsheng@627
|
4417 "a revlog becomes partly corrupted due to a hardware error or system bug, it's "
|
|
dongsheng@627
|
4418 "often possible to reconstruct some or most revisions from the uncorrupted "
|
|
dongsheng@627
|
4419 "sections of the revlog, both before and after the corrupted section. This "
|
|
dongsheng@627
|
4420 "would not be possible with a delta-only storage model."
|
|
dongsheng@627
|
4421 msgstr ""
|
|
dongsheng@627
|
4422
|
|
dongsheng@627
|
4423 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
4424 #: ../en/ch04-concepts.xml:272
|
|
dongsheng@627
|
4425 msgid "Revision history, branching, and merging"
|
|
dongsheng@627
|
4426 msgstr "修订历史，分支与合并"
|
|
dongsheng@627
|
4427
|
|
dongsheng@627
|
4428 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4429 #: ../en/ch04-concepts.xml:274
|
|
dongsheng@627
|
4430 msgid ""
|
|
dongsheng@627
|
4431 "Every entry in a Mercurial revlog knows the identity of its immediate "
|
|
dongsheng@627
|
4432 "ancestor revision, usually referred to as its <emphasis>parent</emphasis>. "
|
|
dongsheng@627
|
4433 "In fact, a revision contains room for not one parent, but two. Mercurial "
|
|
dongsheng@627
|
4434 "uses a special hash, called the <quote>null ID</quote>, to represent the idea "
|
|
dongsheng@627
|
4435 "<quote>there is no parent here</quote>. This hash is simply a string of "
|
|
dongsheng@627
|
4436 "zeroes."
|
|
dongsheng@627
|
4437 msgstr ""
|
|
dongsheng@627
|
4438
|
|
dongsheng@627
|
4439 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
4440 #: ../en/ch04-concepts.xml:282
|
|
dongsheng@627
|
4441 msgid ""
|
|
dongsheng@641
|
4442 "In figure <xref endterm=\"fig.concepts.revlog.caption\" linkend=\"fig."
|
|
dongsheng@641
|
4443 "concepts.revlog\"/>, you can see an example of the conceptual structure of a "
|
|
dongsheng@641
|
4444 "revlog. Filelogs, manifests, and changelogs all have this same structure; "
|
|
dongsheng@641
|
4445 "they differ only in the kind of data stored in each delta or snapshot."
|
|
dongsheng@641
|
4446 msgstr ""
|
|
dongsheng@641
|
4447
|
|
dongsheng@641
|
4448 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4449 #: ../en/ch04-concepts.xml:289
|
|
dongsheng@641
|
4450 msgid ""
|
|
dongsheng@627
|
4451 "The first revision in a revlog (at the bottom of the image) has the null ID "
|
|
dongsheng@627
|
4452 "in both of its parent slots. For a <quote>normal</quote> revision, its first "
|
|
dongsheng@627
|
4453 "parent slot contains the ID of its parent revision, and its second contains "
|
|
dongsheng@627
|
4454 "the null ID, indicating that the revision has only one real parent. Any two "
|
|
dongsheng@627
|
4455 "revisions that have the same parent ID are branches. A revision that "
|
|
dongsheng@627
|
4456 "represents a merge between branches has two normal revision IDs in its parent "
|
|
dongsheng@627
|
4457 "slots."
|
|
dongsheng@627
|
4458 msgstr ""
|
|
dongsheng@627
|
4459
|
|
dongsheng@627
|
4460 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
|
|
dongsheng@641
|
4461 #: ../en/ch04-concepts.xml:300
|
|
dongsheng@627
|
4462 msgid "<imageobject><imagedata fileref=\"images/revlog.png\"/></imageobject>"
|
|
dongsheng@627
|
4463 msgstr ""
|
|
dongsheng@627
|
4464
|
|
dongsheng@641
|
4465 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4466 #: ../en/ch04-concepts.xml:302
|
|
dongsheng@641
|
4467 msgid "Revision in revlog"
|
|
dongsheng@641
|
4468 msgstr ""
|
|
dongsheng@641
|
4469
|
|
dongsheng@627
|
4470 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
4471 #: ../en/ch04-concepts.xml:309
|
|
dongsheng@627
|
4472 msgid "The working directory"
|
|
dongsheng@627
|
4473 msgstr "工作目录"
|
|
dongsheng@627
|
4474
|
|
dongsheng@627
|
4475 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4476 #: ../en/ch04-concepts.xml:311
|
|
dongsheng@627
|
4477 msgid ""
|
|
dongsheng@627
|
4478 "In the working directory, Mercurial stores a snapshot of the files from the "
|
|
dongsheng@627
|
4479 "repository as of a particular changeset."
|
|
dongsheng@627
|
4480 msgstr ""
|
|
dongsheng@627
|
4481
|
|
dongsheng@627
|
4482 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4483 #: ../en/ch04-concepts.xml:314
|
|
dongsheng@627
|
4484 msgid ""
|
|
dongsheng@627
|
4485 "The working directory <quote>knows</quote> which changeset it contains. When "
|
|
dongsheng@627
|
4486 "you update the working directory to contain a particular changeset, Mercurial "
|
|
dongsheng@627
|
4487 "looks up the appropriate revision of the manifest to find out which files it "
|
|
dongsheng@627
|
4488 "was tracking at the time that changeset was committed, and which revision of "
|
|
dongsheng@627
|
4489 "each file was then current. It then recreates a copy of each of those files, "
|
|
dongsheng@627
|
4490 "with the same contents it had when the changeset was committed."
|
|
dongsheng@627
|
4491 msgstr ""
|
|
dongsheng@627
|
4492
|
|
dongsheng@627
|
4493 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4494 #: ../en/ch04-concepts.xml:323
|
|
dongsheng@627
|
4495 msgid ""
|
|
dongsheng@627
|
4496 "The <emphasis>dirstate</emphasis> contains Mercurial's knowledge of the "
|
|
dongsheng@627
|
4497 "working directory. This details which changeset the working directory is "
|
|
dongsheng@627
|
4498 "updated to, and all of the files that Mercurial is tracking in the working "
|
|
dongsheng@627
|
4499 "directory."
|
|
dongsheng@627
|
4500 msgstr ""
|
|
dongsheng@627
|
4501
|
|
dongsheng@627
|
4502 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4503 #: ../en/ch04-concepts.xml:329
|
|
dongsheng@627
|
4504 msgid ""
|
|
dongsheng@627
|
4505 "Just as a revision of a revlog has room for two parents, so that it can "
|
|
dongsheng@627
|
4506 "represent either a normal revision (with one parent) or a merge of two "
|
|
dongsheng@627
|
4507 "earlier revisions, the dirstate has slots for two parents. When you use the "
|
|
dongsheng@627
|
4508 "<command role=\"hg-cmd\">hg update</command> command, the changeset that you "
|
|
dongsheng@627
|
4509 "update to is stored in the <quote>first parent</quote> slot, and the null ID "
|
|
dongsheng@627
|
4510 "in the second. When you <command role=\"hg-cmd\">hg merge</command> with "
|
|
dongsheng@627
|
4511 "another changeset, the first parent remains unchanged, and the second parent "
|
|
dongsheng@627
|
4512 "is filled in with the changeset you're merging with. The <command role=\"hg-"
|
|
dongsheng@627
|
4513 "cmd\">hg parents</command> command tells you what the parents of the dirstate "
|
|
dongsheng@627
|
4514 "are."
|
|
dongsheng@627
|
4515 msgstr ""
|
|
dongsheng@627
|
4516
|
|
dongsheng@627
|
4517 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4518 #: ../en/ch04-concepts.xml:343
|
|
dongsheng@627
|
4519 msgid "What happens when you commit"
|
|
dongsheng@627
|
4520 msgstr "当你提交时发生的事情"
|
|
dongsheng@627
|
4521
|
|
dongsheng@627
|
4522 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4523 #: ../en/ch04-concepts.xml:345
|
|
dongsheng@627
|
4524 msgid ""
|
|
dongsheng@627
|
4525 "The dirstate stores parent information for more than just book-keeping "
|
|
dongsheng@627
|
4526 "purposes. Mercurial uses the parents of the dirstate as <emphasis>the "
|
|
dongsheng@627
|
4527 "parents of a new changeset</emphasis> when you perform a commit."
|
|
dongsheng@627
|
4528 msgstr ""
|
|
dongsheng@627
|
4529
|
|
dongsheng@627
|
4530 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4531 #: ../en/ch04-concepts.xml:352
|
|
dongsheng@627
|
4532 msgid "<imageobject><imagedata fileref=\"images/wdir.png\"/></imageobject>"
|
|
dongsheng@627
|
4533 msgstr ""
|
|
dongsheng@627
|
4534
|
|
dongsheng@627
|
4535 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4536 #: ../en/ch04-concepts.xml:354
|
|
dongsheng@627
|
4537 msgid "The working directory can have two parents"
|
|
dongsheng@627
|
4538 msgstr ""
|
|
dongsheng@627
|
4539
|
|
dongsheng@627
|
4540 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4541 #: ../en/ch04-concepts.xml:359
|
|
dongsheng@641
|
4542 msgid ""
|
|
dongsheng@641
|
4543 "Figure <xref endterm=\"fig.concepts.wdir.caption\" linkend=\"fig.concepts.wdir"
|
|
dongsheng@641
|
4544 "\"/> shows the normal state of the working directory, where it has a single "
|
|
dongsheng@641
|
4545 "changeset as parent. That changeset is the <emphasis>tip</emphasis>, the "
|
|
dongsheng@641
|
4546 "newest changeset in the repository that has no children."
|
|
dongsheng@627
|
4547 msgstr ""
|
|
dongsheng@627
|
4548
|
|
dongsheng@627
|
4549 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4550 #: ../en/ch04-concepts.xml:368
|
|
dongsheng@641
|
4551 msgid ""
|
|
dongsheng@641
|
4552 "<imageobject><imagedata fileref=\"images/wdir-after-commit.png\"/> </"
|
|
dongsheng@627
|
4553 "imageobject>"
|
|
dongsheng@627
|
4554 msgstr ""
|
|
dongsheng@627
|
4555
|
|
dongsheng@627
|
4556 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4557 #: ../en/ch04-concepts.xml:371
|
|
dongsheng@627
|
4558 msgid "The working directory gains new parents after a commit"
|
|
dongsheng@627
|
4559 msgstr ""
|
|
dongsheng@627
|
4560
|
|
dongsheng@627
|
4561 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4562 #: ../en/ch04-concepts.xml:376
|
|
dongsheng@627
|
4563 msgid ""
|
|
dongsheng@627
|
4564 "It's useful to think of the working directory as <quote>the changeset I'm "
|
|
dongsheng@627
|
4565 "about to commit</quote>. Any files that you tell Mercurial that you've "
|
|
dongsheng@627
|
4566 "added, removed, renamed, or copied will be reflected in that changeset, as "
|
|
dongsheng@627
|
4567 "will modifications to any files that Mercurial is already tracking; the new "
|
|
dongsheng@627
|
4568 "changeset will have the parents of the working directory as its parents."
|
|
dongsheng@627
|
4569 msgstr ""
|
|
dongsheng@627
|
4570
|
|
dongsheng@627
|
4571 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4572 #: ../en/ch04-concepts.xml:384
|
|
dongsheng@627
|
4573 msgid ""
|
|
dongsheng@627
|
4574 "After a commit, Mercurial will update the parents of the working directory, "
|
|
dongsheng@627
|
4575 "so that the first parent is the ID of the new changeset, and the second is "
|
|
dongsheng@641
|
4576 "the null ID. This is shown in figure <xref endterm=\"fig.concepts.wdir-after-"
|
|
dongsheng@641
|
4577 "commit.caption\" linkend=\"fig.concepts.wdir-after-commit\"/>. Mercurial "
|
|
dongsheng@641
|
4578 "doesn't touch any of the files in the working directory when you commit; it "
|
|
dongsheng@641
|
4579 "just modifies the dirstate to note its new parents."
|
|
dongsheng@641
|
4580 msgstr ""
|
|
dongsheng@641
|
4581
|
|
dongsheng@641
|
4582 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4583 #: ../en/ch04-concepts.xml:396
|
|
dongsheng@627
|
4584 msgid "Creating a new head"
|
|
dongsheng@627
|
4585 msgstr "创建新顶点"
|
|
dongsheng@627
|
4586
|
|
dongsheng@627
|
4587 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4588 #: ../en/ch04-concepts.xml:398
|
|
dongsheng@627
|
4589 msgid ""
|
|
dongsheng@627
|
4590 "It's perfectly normal to update the working directory to a changeset other "
|
|
dongsheng@627
|
4591 "than the current tip. For example, you might want to know what your project "
|
|
dongsheng@627
|
4592 "looked like last Tuesday, or you could be looking through changesets to see "
|
|
dongsheng@627
|
4593 "which one introduced a bug. In cases like this, the natural thing to do is "
|
|
dongsheng@627
|
4594 "update the working directory to the changeset you're interested in, and then "
|
|
dongsheng@627
|
4595 "examine the files in the working directory directly to see their contents as "
|
|
dongsheng@627
|
4596 "they were when you committed that changeset. The effect of this is shown in "
|
|
dongsheng@641
|
4597 "figure <xref endterm=\"fig.concepts.wdir-pre-branch.caption\" linkend=\"fig."
|
|
dongsheng@641
|
4598 "concepts.wdir-pre-branch\"/>."
|
|
dongsheng@627
|
4599 msgstr ""
|
|
dongsheng@627
|
4600
|
|
dongsheng@627
|
4601 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4602 #: ../en/ch04-concepts.xml:412
|
|
dongsheng@641
|
4603 msgid ""
|
|
dongsheng@641
|
4604 "<imageobject><imagedata fileref=\"images/wdir-pre-branch.png\"/> </"
|
|
dongsheng@641
|
4605 "imageobject>"
|
|
dongsheng@627
|
4606 msgstr ""
|
|
dongsheng@627
|
4607
|
|
dongsheng@627
|
4608 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4609 #: ../en/ch04-concepts.xml:415
|
|
dongsheng@627
|
4610 msgid "The working directory, updated to an older changeset"
|
|
dongsheng@627
|
4611 msgstr ""
|
|
dongsheng@627
|
4612
|
|
dongsheng@627
|
4613 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4614 #: ../en/ch04-concepts.xml:420
|
|
dongsheng@627
|
4615 msgid ""
|
|
dongsheng@627
|
4616 "Having updated the working directory to an older changeset, what happens if "
|
|
dongsheng@627
|
4617 "you make some changes, and then commit? Mercurial behaves in the same way as "
|
|
dongsheng@627
|
4618 "I outlined above. The parents of the working directory become the parents of "
|
|
dongsheng@627
|
4619 "the new changeset. This new changeset has no children, so it becomes the new "
|
|
dongsheng@627
|
4620 "tip. And the repository now contains two changesets that have no children; "
|
|
dongsheng@627
|
4621 "we call these <emphasis>heads</emphasis>. You can see the structure that "
|
|
dongsheng@641
|
4622 "this creates in figure <xref endterm=\"fig.concepts.wdir-branch.caption\" "
|
|
dongsheng@641
|
4623 "linkend=\"fig.concepts.wdir-branch\"/>."
|
|
dongsheng@627
|
4624 msgstr ""
|
|
dongsheng@627
|
4625
|
|
dongsheng@627
|
4626 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4627 #: ../en/ch04-concepts.xml:434
|
|
dongsheng@641
|
4628 msgid ""
|
|
dongsheng@641
|
4629 "<imageobject><imagedata fileref=\"images/wdir-branch.png\"/> </imageobject>"
|
|
dongsheng@627
|
4630 msgstr ""
|
|
dongsheng@627
|
4631
|
|
dongsheng@627
|
4632 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4633 #: ../en/ch04-concepts.xml:437
|
|
dongsheng@627
|
4634 msgid "After a commit made while synced to an older changeset"
|
|
dongsheng@627
|
4635 msgstr ""
|
|
dongsheng@627
|
4636
|
|
dongsheng@627
|
4637 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@641
|
4638 #: ../en/ch04-concepts.xml:443
|
|
dongsheng@627
|
4639 msgid ""
|
|
dongsheng@627
|
4640 "If you're new to Mercurial, you should keep in mind a common <quote>error</"
|
|
dongsheng@627
|
4641 "quote>, which is to use the <command role=\"hg-cmd\">hg pull</command> "
|
|
dongsheng@627
|
4642 "command without any options. By default, the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
4643 "pull</command> command <emphasis>does not</emphasis> update the working "
|
|
dongsheng@627
|
4644 "directory, so you'll bring new changesets into your repository, but the "
|
|
dongsheng@627
|
4645 "working directory will stay synced at the same changeset as before the pull. "
|
|
dongsheng@627
|
4646 "If you make some changes and commit afterwards, you'll thus create a new "
|
|
dongsheng@627
|
4647 "head, because your working directory isn't synced to whatever the current tip "
|
|
dongsheng@627
|
4648 "is."
|
|
dongsheng@627
|
4649 msgstr ""
|
|
dongsheng@627
|
4650
|
|
dongsheng@627
|
4651 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@641
|
4652 #: ../en/ch04-concepts.xml:455
|
|
dongsheng@627
|
4653 msgid ""
|
|
dongsheng@627
|
4654 "I put the word <quote>error</quote> in quotes because all that you need to do "
|
|
dongsheng@627
|
4655 "to rectify this situation is <command role=\"hg-cmd\">hg merge</command>, "
|
|
dongsheng@627
|
4656 "then <command role=\"hg-cmd\">hg commit</command>. In other words, this "
|
|
dongsheng@627
|
4657 "almost never has negative consequences; it just surprises people. I'll "
|
|
dongsheng@627
|
4658 "discuss other ways to avoid this behaviour, and why Mercurial behaves in this "
|
|
dongsheng@627
|
4659 "initially surprising way, later on."
|
|
dongsheng@627
|
4660 msgstr ""
|
|
dongsheng@627
|
4661
|
|
dongsheng@627
|
4662 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4663 #: ../en/ch04-concepts.xml:467
|
|
dongsheng@627
|
4664 msgid "Merging heads"
|
|
dongsheng@627
|
4665 msgstr "合并顶点"
|
|
dongsheng@627
|
4666
|
|
dongsheng@627
|
4667 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4668 #: ../en/ch04-concepts.xml:469
|
|
dongsheng@627
|
4669 msgid ""
|
|
dongsheng@627
|
4670 "When you run the <command role=\"hg-cmd\">hg merge</command> command, "
|
|
dongsheng@627
|
4671 "Mercurial leaves the first parent of the working directory unchanged, and "
|
|
dongsheng@627
|
4672 "sets the second parent to the changeset you're merging with, as shown in "
|
|
dongsheng@641
|
4673 "figure <xref endterm=\"fig.concepts.wdir-merge.caption\" linkend=\"fig."
|
|
dongsheng@641
|
4674 "concepts.wdir-merge\"/>."
|
|
dongsheng@627
|
4675 msgstr ""
|
|
dongsheng@627
|
4676
|
|
dongsheng@627
|
4677 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
4678 #: ../en/ch04-concepts.xml:478
|
|
dongsheng@641
|
4679 msgid ""
|
|
dongsheng@641
|
4680 "<imageobject><imagedata fileref=\"images/wdir-merge.png\"/> </imageobject>"
|
|
dongsheng@627
|
4681 msgstr ""
|
|
dongsheng@627
|
4682
|
|
dongsheng@627
|
4683 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
4684 #: ../en/ch04-concepts.xml:481
|
|
dongsheng@627
|
4685 msgid "Merging two heads"
|
|
dongsheng@627
|
4686 msgstr ""
|
|
dongsheng@627
|
4687
|
|
dongsheng@627
|
4688 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4689 #: ../en/ch04-concepts.xml:486
|
|
dongsheng@627
|
4690 msgid ""
|
|
dongsheng@627
|
4691 "Mercurial also has to modify the working directory, to merge the files "
|
|
dongsheng@627
|
4692 "managed in the two changesets. Simplified a little, the merging process goes "
|
|
dongsheng@627
|
4693 "like this, for every file in the manifests of both changesets."
|
|
dongsheng@627
|
4694 msgstr ""
|
|
dongsheng@627
|
4695
|
|
dongsheng@627
|
4696 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
4697 #: ../en/ch04-concepts.xml:491
|
|
dongsheng@627
|
4698 msgid "If neither changeset has modified a file, do nothing with that file."
|
|
dongsheng@627
|
4699 msgstr ""
|
|
dongsheng@627
|
4700
|
|
dongsheng@627
|
4701 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
4702 #: ../en/ch04-concepts.xml:494
|
|
dongsheng@627
|
4703 msgid ""
|
|
dongsheng@627
|
4704 "If one changeset has modified a file, and the other hasn't, create the "
|
|
dongsheng@627
|
4705 "modified copy of the file in the working directory."
|
|
dongsheng@627
|
4706 msgstr ""
|
|
dongsheng@627
|
4707
|
|
dongsheng@627
|
4708 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
4709 #: ../en/ch04-concepts.xml:498
|
|
dongsheng@627
|
4710 msgid ""
|
|
dongsheng@627
|
4711 "If one changeset has removed a file, and the other hasn't (or has also "
|
|
dongsheng@627
|
4712 "deleted it), delete the file from the working directory."
|
|
dongsheng@627
|
4713 msgstr ""
|
|
dongsheng@627
|
4714
|
|
dongsheng@627
|
4715 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
4716 #: ../en/ch04-concepts.xml:502
|
|
dongsheng@627
|
4717 msgid ""
|
|
dongsheng@627
|
4718 "If one changeset has removed a file, but the other has modified the file, ask "
|
|
dongsheng@627
|
4719 "the user what to do: keep the modified file, or remove it?"
|
|
dongsheng@627
|
4720 msgstr ""
|
|
dongsheng@627
|
4721
|
|
dongsheng@627
|
4722 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
4723 #: ../en/ch04-concepts.xml:506
|
|
dongsheng@627
|
4724 msgid ""
|
|
dongsheng@627
|
4725 "If both changesets have modified a file, invoke an external merge program to "
|
|
dongsheng@627
|
4726 "choose the new contents for the merged file. This may require input from the "
|
|
dongsheng@627
|
4727 "user."
|
|
dongsheng@627
|
4728 msgstr ""
|
|
dongsheng@627
|
4729
|
|
dongsheng@627
|
4730 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
4731 #: ../en/ch04-concepts.xml:511
|
|
dongsheng@627
|
4732 msgid ""
|
|
dongsheng@627
|
4733 "If one changeset has modified a file, and the other has renamed or copied the "
|
|
dongsheng@627
|
4734 "file, make sure that the changes follow the new name of the file."
|
|
dongsheng@627
|
4735 msgstr ""
|
|
dongsheng@627
|
4736
|
|
dongsheng@627
|
4737 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4738 #: ../en/ch04-concepts.xml:515
|
|
dongsheng@627
|
4739 msgid ""
|
|
dongsheng@627
|
4740 "There are more details&emdash;merging has plenty of corner cases&emdash;but "
|
|
dongsheng@627
|
4741 "these are the most common choices that are involved in a merge. As you can "
|
|
dongsheng@627
|
4742 "see, most cases are completely automatic, and indeed most merges finish "
|
|
dongsheng@627
|
4743 "automatically, without requiring your input to resolve any conflicts."
|
|
dongsheng@627
|
4744 msgstr ""
|
|
dongsheng@627
|
4745
|
|
dongsheng@627
|
4746 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4747 #: ../en/ch04-concepts.xml:522
|
|
dongsheng@627
|
4748 msgid ""
|
|
dongsheng@627
|
4749 "When you're thinking about what happens when you commit after a merge, once "
|
|
dongsheng@627
|
4750 "again the working directory is <quote>the changeset I'm about to commit</"
|
|
dongsheng@627
|
4751 "quote>. After the <command role=\"hg-cmd\">hg merge</command> command "
|
|
dongsheng@627
|
4752 "completes, the working directory has two parents; these will become the "
|
|
dongsheng@627
|
4753 "parents of the new changeset."
|
|
dongsheng@627
|
4754 msgstr ""
|
|
dongsheng@627
|
4755
|
|
dongsheng@627
|
4756 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4757 #: ../en/ch04-concepts.xml:529
|
|
dongsheng@627
|
4758 msgid ""
|
|
dongsheng@627
|
4759 "Mercurial lets you perform multiple merges, but you must commit the results "
|
|
dongsheng@627
|
4760 "of each individual merge as you go. This is necessary because Mercurial only "
|
|
dongsheng@627
|
4761 "tracks two parents for both revisions and the working directory. While it "
|
|
dongsheng@627
|
4762 "would be technically possible to merge multiple changesets at once, the "
|
|
dongsheng@627
|
4763 "prospect of user confusion and making a terrible mess of a merge immediately "
|
|
dongsheng@627
|
4764 "becomes overwhelming."
|
|
dongsheng@627
|
4765 msgstr ""
|
|
dongsheng@627
|
4766
|
|
dongsheng@627
|
4767 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
4768 #: ../en/ch04-concepts.xml:540
|
|
dongsheng@627
|
4769 msgid "Other interesting design features"
|
|
dongsheng@627
|
4770 msgstr "其它有趣的设计特性"
|
|
dongsheng@627
|
4771
|
|
dongsheng@627
|
4772 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
4773 #: ../en/ch04-concepts.xml:542
|
|
dongsheng@627
|
4774 msgid ""
|
|
dongsheng@627
|
4775 "In the sections above, I've tried to highlight some of the most important "
|
|
dongsheng@627
|
4776 "aspects of Mercurial's design, to illustrate that it pays careful attention "
|
|
dongsheng@627
|
4777 "to reliability and performance. However, the attention to detail doesn't "
|
|
dongsheng@627
|
4778 "stop there. There are a number of other aspects of Mercurial's construction "
|
|
dongsheng@627
|
4779 "that I personally find interesting. I'll detail a few of them here, separate "
|
|
dongsheng@627
|
4780 "from the <quote>big ticket</quote> items above, so that if you're interested, "
|
|
dongsheng@627
|
4781 "you can gain a better idea of the amount of thinking that goes into a well-"
|
|
dongsheng@627
|
4782 "designed system."
|
|
dongsheng@627
|
4783 msgstr ""
|
|
dongsheng@627
|
4784
|
|
dongsheng@627
|
4785 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4786 #: ../en/ch04-concepts.xml:553
|
|
dongsheng@627
|
4787 msgid "Clever compression"
|
|
dongsheng@627
|
4788 msgstr "智能压缩"
|
|
dongsheng@627
|
4789
|
|
dongsheng@627
|
4790 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4791 #: ../en/ch04-concepts.xml:555
|
|
dongsheng@627
|
4792 msgid ""
|
|
dongsheng@627
|
4793 "When appropriate, Mercurial will store both snapshots and deltas in "
|
|
dongsheng@627
|
4794 "compressed form. It does this by always <emphasis>trying to</emphasis> "
|
|
dongsheng@627
|
4795 "compress a snapshot or delta, but only storing the compressed version if it's "
|
|
dongsheng@627
|
4796 "smaller than the uncompressed version."
|
|
dongsheng@627
|
4797 msgstr ""
|
|
dongsheng@627
|
4798
|
|
dongsheng@627
|
4799 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4800 #: ../en/ch04-concepts.xml:561
|
|
dongsheng@627
|
4801 msgid ""
|
|
dongsheng@627
|
4802 "This means that Mercurial does <quote>the right thing</quote> when storing a "
|
|
dongsheng@627
|
4803 "file whose native form is compressed, such as a <literal>zip</literal> "
|
|
dongsheng@627
|
4804 "archive or a JPEG image. When these types of files are compressed a second "
|
|
dongsheng@627
|
4805 "time, the resulting file is usually bigger than the once-compressed form, and "
|
|
dongsheng@627
|
4806 "so Mercurial will store the plain <literal>zip</literal> or JPEG."
|
|
dongsheng@627
|
4807 msgstr ""
|
|
dongsheng@627
|
4808
|
|
dongsheng@627
|
4809 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4810 #: ../en/ch04-concepts.xml:569
|
|
dongsheng@627
|
4811 msgid ""
|
|
dongsheng@627
|
4812 "Deltas between revisions of a compressed file are usually larger than "
|
|
dongsheng@627
|
4813 "snapshots of the file, and Mercurial again does <quote>the right thing</"
|
|
dongsheng@627
|
4814 "quote> in these cases. It finds that such a delta exceeds the threshold at "
|
|
dongsheng@627
|
4815 "which it should store a complete snapshot of the file, so it stores the "
|
|
dongsheng@627
|
4816 "snapshot, again saving space compared to a naive delta-only approach."
|
|
dongsheng@627
|
4817 msgstr ""
|
|
dongsheng@627
|
4818
|
|
dongsheng@627
|
4819 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
4820 #: ../en/ch04-concepts.xml:578
|
|
dongsheng@627
|
4821 msgid "Network recompression"
|
|
dongsheng@627
|
4822 msgstr "网络重新压缩"
|
|
dongsheng@627
|
4823
|
|
dongsheng@627
|
4824 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
4825 #: ../en/ch04-concepts.xml:580
|
|
dongsheng@627
|
4826 msgid ""
|
|
dongsheng@627
|
4827 "When storing revisions on disk, Mercurial uses the <quote>deflate</quote> "
|
|
dongsheng@627
|
4828 "compression algorithm (the same one used by the popular <literal>zip</"
|
|
dongsheng@627
|
4829 "literal> archive format), which balances good speed with a respectable "
|
|
dongsheng@627
|
4830 "compression ratio. However, when transmitting revision data over a network "
|
|
dongsheng@627
|
4831 "connection, Mercurial uncompresses the compressed revision data."
|
|
dongsheng@627
|
4832 msgstr ""
|
|
dongsheng@627
|
4833
|
|
dongsheng@627
|
4834 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
4835 #: ../en/ch04-concepts.xml:588
|
|
dongsheng@627
|
4836 msgid ""
|
|
dongsheng@627
|
4837 "If the connection is over HTTP, Mercurial recompresses the entire stream of "
|
|
dongsheng@627
|
4838 "data using a compression algorithm that gives a better compression ratio (the "
|
|
dongsheng@627
|
4839 "Burrows-Wheeler algorithm from the widely used <literal>bzip2</literal> "
|
|
dongsheng@627
|
4840 "compression package). This combination of algorithm and compression of the "
|
|
dongsheng@627
|
4841 "entire stream (instead of a revision at a time) substantially reduces the "
|
|
dongsheng@627
|
4842 "number of bytes to be transferred, yielding better network performance over "
|
|
dongsheng@627
|
4843 "almost all kinds of network."
|
|
dongsheng@627
|
4844 msgstr ""
|
|
dongsheng@627
|
4845
|
|
dongsheng@627
|
4846 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
4847 #: ../en/ch04-concepts.xml:598
|
|
dongsheng@627
|
4848 msgid ""
|
|
dongsheng@627
|
4849 "(If the connection is over <command>ssh</command>, Mercurial "
|
|
dongsheng@627
|
4850 "<emphasis>doesn't</emphasis> recompress the stream, because <command>ssh</"
|
|
dongsheng@627
|
4851 "command> can already do this itself.)"
|
|
dongsheng@627
|
4852 msgstr ""
|
|
dongsheng@627
|
4853
|
|
dongsheng@627
|
4854 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4855 #: ../en/ch04-concepts.xml:606
|
|
dongsheng@627
|
4856 msgid "Read/write ordering and atomicity"
|
|
dongsheng@627
|
4857 msgstr "读写顺序与原子性"
|
|
dongsheng@627
|
4858
|
|
dongsheng@627
|
4859 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4860 #: ../en/ch04-concepts.xml:608
|
|
dongsheng@627
|
4861 msgid ""
|
|
dongsheng@627
|
4862 "Appending to files isn't the whole story when it comes to guaranteeing that a "
|
|
dongsheng@641
|
4863 "reader won't see a partial write. If you recall figure <xref endterm=\"fig."
|
|
dongsheng@641
|
4864 "concepts.metadata.caption\" linkend=\"fig.concepts.metadata\"/>, revisions in "
|
|
dongsheng@641
|
4865 "the changelog point to revisions in the manifest, and revisions in the "
|
|
dongsheng@641
|
4866 "manifest point to revisions in filelogs. This hierarchy is deliberate."
|
|
dongsheng@641
|
4867 msgstr ""
|
|
dongsheng@641
|
4868
|
|
dongsheng@641
|
4869 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4870 #: ../en/ch04-concepts.xml:616
|
|
dongsheng@627
|
4871 msgid ""
|
|
dongsheng@627
|
4872 "A writer starts a transaction by writing filelog and manifest data, and "
|
|
dongsheng@627
|
4873 "doesn't write any changelog data until those are finished. A reader starts "
|
|
dongsheng@627
|
4874 "by reading changelog data, then manifest data, followed by filelog data."
|
|
dongsheng@627
|
4875 msgstr ""
|
|
dongsheng@627
|
4876
|
|
dongsheng@627
|
4877 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4878 #: ../en/ch04-concepts.xml:621
|
|
dongsheng@627
|
4879 msgid ""
|
|
dongsheng@627
|
4880 "Since the writer has always finished writing filelog and manifest data before "
|
|
dongsheng@627
|
4881 "it writes to the changelog, a reader will never read a pointer to a partially "
|
|
dongsheng@627
|
4882 "written manifest revision from the changelog, and it will never read a "
|
|
dongsheng@627
|
4883 "pointer to a partially written filelog revision from the manifest."
|
|
dongsheng@627
|
4884 msgstr ""
|
|
dongsheng@627
|
4885
|
|
dongsheng@627
|
4886 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4887 #: ../en/ch04-concepts.xml:629
|
|
dongsheng@627
|
4888 msgid "Concurrent access"
|
|
dongsheng@627
|
4889 msgstr "并发访问"
|
|
dongsheng@627
|
4890
|
|
dongsheng@627
|
4891 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4892 #: ../en/ch04-concepts.xml:631
|
|
dongsheng@627
|
4893 msgid ""
|
|
dongsheng@627
|
4894 "The read/write ordering and atomicity guarantees mean that Mercurial never "
|
|
dongsheng@627
|
4895 "needs to <emphasis>lock</emphasis> a repository when it's reading data, even "
|
|
dongsheng@627
|
4896 "if the repository is being written to while the read is occurring. This has a "
|
|
dongsheng@627
|
4897 "big effect on scalability; you can have an arbitrary number of Mercurial "
|
|
dongsheng@627
|
4898 "processes safely reading data from a repository safely all at once, no matter "
|
|
dongsheng@627
|
4899 "whether it's being written to or not."
|
|
dongsheng@627
|
4900 msgstr ""
|
|
dongsheng@627
|
4901
|
|
dongsheng@627
|
4902 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4903 #: ../en/ch04-concepts.xml:640
|
|
dongsheng@627
|
4904 msgid ""
|
|
dongsheng@627
|
4905 "The lockless nature of reading means that if you're sharing a repository on a "
|
|
dongsheng@627
|
4906 "multi-user system, you don't need to grant other local users permission to "
|
|
dongsheng@627
|
4907 "<emphasis>write</emphasis> to your repository in order for them to be able to "
|
|
dongsheng@627
|
4908 "clone it or pull changes from it; they only need <emphasis>read</emphasis> "
|
|
dongsheng@627
|
4909 "permission. (This is <emphasis>not</emphasis> a common feature among "
|
|
dongsheng@627
|
4910 "revision control systems, so don't take it for granted! Most require readers "
|
|
dongsheng@627
|
4911 "to be able to lock a repository to access it safely, and this requires write "
|
|
dongsheng@627
|
4912 "permission on at least one directory, which of course makes for all kinds of "
|
|
dongsheng@627
|
4913 "nasty and annoying security and administrative problems.)"
|
|
dongsheng@627
|
4914 msgstr ""
|
|
dongsheng@627
|
4915
|
|
dongsheng@627
|
4916 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4917 #: ../en/ch04-concepts.xml:653
|
|
dongsheng@627
|
4918 msgid ""
|
|
dongsheng@627
|
4919 "Mercurial uses locks to ensure that only one process can write to a "
|
|
dongsheng@627
|
4920 "repository at a time (the locking mechanism is safe even over filesystems "
|
|
dongsheng@627
|
4921 "that are notoriously hostile to locking, such as NFS). If a repository is "
|
|
dongsheng@627
|
4922 "locked, a writer will wait for a while to retry if the repository becomes "
|
|
dongsheng@627
|
4923 "unlocked, but if the repository remains locked for too long, the process "
|
|
dongsheng@627
|
4924 "attempting to write will time out after a while. This means that your daily "
|
|
dongsheng@627
|
4925 "automated scripts won't get stuck forever and pile up if a system crashes "
|
|
dongsheng@627
|
4926 "unnoticed, for example. (Yes, the timeout is configurable, from zero to "
|
|
dongsheng@627
|
4927 "infinity.)"
|
|
dongsheng@627
|
4928 msgstr ""
|
|
dongsheng@627
|
4929
|
|
dongsheng@627
|
4930 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
4931 #: ../en/ch04-concepts.xml:665
|
|
dongsheng@627
|
4932 msgid "Safe dirstate access"
|
|
dongsheng@627
|
4933 msgstr "安全的目录状态访问"
|
|
dongsheng@627
|
4934
|
|
dongsheng@627
|
4935 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
4936 #: ../en/ch04-concepts.xml:667
|
|
dongsheng@627
|
4937 msgid ""
|
|
dongsheng@627
|
4938 "As with revision data, Mercurial doesn't take a lock to read the dirstate "
|
|
dongsheng@627
|
4939 "file; it does acquire a lock to write it. To avoid the possibility of "
|
|
dongsheng@627
|
4940 "reading a partially written copy of the dirstate file, Mercurial writes to a "
|
|
dongsheng@627
|
4941 "file with a unique name in the same directory as the dirstate file, then "
|
|
dongsheng@627
|
4942 "renames the temporary file atomically to <filename>dirstate</filename>. The "
|
|
dongsheng@627
|
4943 "file named <filename>dirstate</filename> is thus guaranteed to be complete, "
|
|
dongsheng@627
|
4944 "not partially written."
|
|
dongsheng@627
|
4945 msgstr ""
|
|
dongsheng@627
|
4946
|
|
dongsheng@627
|
4947 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4948 #: ../en/ch04-concepts.xml:680
|
|
dongsheng@627
|
4949 msgid "Avoiding seeks"
|
|
dongsheng@627
|
4950 msgstr "避免查找"
|
|
dongsheng@627
|
4951
|
|
dongsheng@627
|
4952 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4953 #: ../en/ch04-concepts.xml:682
|
|
dongsheng@627
|
4954 msgid ""
|
|
dongsheng@627
|
4955 "Critical to Mercurial's performance is the avoidance of seeks of the disk "
|
|
dongsheng@627
|
4956 "head, since any seek is far more expensive than even a comparatively large "
|
|
dongsheng@627
|
4957 "read operation."
|
|
dongsheng@627
|
4958 msgstr ""
|
|
dongsheng@627
|
4959
|
|
dongsheng@627
|
4960 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4961 #: ../en/ch04-concepts.xml:686
|
|
dongsheng@627
|
4962 msgid ""
|
|
dongsheng@627
|
4963 "This is why, for example, the dirstate is stored in a single file. If there "
|
|
dongsheng@627
|
4964 "were a dirstate file per directory that Mercurial tracked, the disk would "
|
|
dongsheng@627
|
4965 "seek once per directory. Instead, Mercurial reads the entire single dirstate "
|
|
dongsheng@627
|
4966 "file in one step."
|
|
dongsheng@627
|
4967 msgstr ""
|
|
dongsheng@627
|
4968
|
|
dongsheng@627
|
4969 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4970 #: ../en/ch04-concepts.xml:692
|
|
dongsheng@627
|
4971 msgid ""
|
|
dongsheng@627
|
4972 "Mercurial also uses a <quote>copy on write</quote> scheme when cloning a "
|
|
dongsheng@627
|
4973 "repository on local storage. Instead of copying every revlog file from the "
|
|
dongsheng@627
|
4974 "old repository into the new repository, it makes a <quote>hard link</quote>, "
|
|
dongsheng@627
|
4975 "which is a shorthand way to say <quote>these two names point to the same "
|
|
dongsheng@627
|
4976 "file</quote>. When Mercurial is about to write to one of a revlog's files, "
|
|
dongsheng@627
|
4977 "it checks to see if the number of names pointing at the file is greater than "
|
|
dongsheng@627
|
4978 "one. If it is, more than one repository is using the file, so Mercurial "
|
|
dongsheng@627
|
4979 "makes a new copy of the file that is private to this repository."
|
|
dongsheng@627
|
4980 msgstr ""
|
|
dongsheng@627
|
4981
|
|
dongsheng@627
|
4982 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
4983 #: ../en/ch04-concepts.xml:703
|
|
dongsheng@627
|
4984 msgid ""
|
|
dongsheng@627
|
4985 "A few revision control developers have pointed out that this idea of making a "
|
|
dongsheng@627
|
4986 "complete private copy of a file is not very efficient in its use of storage. "
|
|
dongsheng@627
|
4987 "While this is true, storage is cheap, and this method gives the highest "
|
|
dongsheng@627
|
4988 "performance while deferring most book-keeping to the operating system. An "
|
|
dongsheng@627
|
4989 "alternative scheme would most likely reduce performance and increase the "
|
|
dongsheng@627
|
4990 "complexity of the software, each of which is much more important to the "
|
|
dongsheng@627
|
4991 "<quote>feel</quote> of day-to-day use."
|
|
dongsheng@627
|
4992 msgstr ""
|
|
dongsheng@627
|
4993
|
|
dongsheng@627
|
4994 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
4995 #: ../en/ch04-concepts.xml:715
|
|
dongsheng@627
|
4996 msgid "Other contents of the dirstate"
|
|
dongsheng@627
|
4997 msgstr "目录状态的其它内容"
|
|
dongsheng@627
|
4998
|
|
dongsheng@627
|
4999 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
5000 #: ../en/ch04-concepts.xml:717
|
|
dongsheng@627
|
5001 msgid ""
|
|
dongsheng@627
|
5002 "Because Mercurial doesn't force you to tell it when you're modifying a file, "
|
|
dongsheng@627
|
5003 "it uses the dirstate to store some extra information so it can determine "
|
|
dongsheng@627
|
5004 "efficiently whether you have modified a file. For each file in the working "
|
|
dongsheng@627
|
5005 "directory, it stores the time that it last modified the file itself, and the "
|
|
dongsheng@627
|
5006 "size of the file at that time."
|
|
dongsheng@627
|
5007 msgstr ""
|
|
dongsheng@627
|
5008
|
|
dongsheng@627
|
5009 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
5010 #: ../en/ch04-concepts.xml:724
|
|
dongsheng@627
|
5011 msgid ""
|
|
dongsheng@627
|
5012 "When you explicitly <command role=\"hg-cmd\">hg add</command>, <command role="
|
|
dongsheng@627
|
5013 "\"hg-cmd\">hg remove</command>, <command role=\"hg-cmd\">hg rename</command> "
|
|
dongsheng@627
|
5014 "or <command role=\"hg-cmd\">hg copy</command> files, Mercurial updates the "
|
|
dongsheng@627
|
5015 "dirstate so that it knows what to do with those files when you commit."
|
|
dongsheng@627
|
5016 msgstr ""
|
|
dongsheng@627
|
5017
|
|
dongsheng@627
|
5018 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
5019 #: ../en/ch04-concepts.xml:731
|
|
dongsheng@627
|
5020 msgid ""
|
|
dongsheng@627
|
5021 "When Mercurial is checking the states of files in the working directory, it "
|
|
dongsheng@627
|
5022 "first checks a file's modification time. If that has not changed, the file "
|
|
dongsheng@627
|
5023 "must not have been modified. If the file's size has changed, the file must "
|
|
dongsheng@627
|
5024 "have been modified. If the modification time has changed, but the size has "
|
|
dongsheng@627
|
5025 "not, only then does Mercurial need to read the actual contents of the file to "
|
|
dongsheng@627
|
5026 "see if they've changed. Storing these few extra pieces of information "
|
|
dongsheng@627
|
5027 "dramatically reduces the amount of data that Mercurial needs to read, which "
|
|
dongsheng@627
|
5028 "yields large performance improvements compared to other revision control "
|
|
dongsheng@627
|
5029 "systems."
|
|
dongsheng@627
|
5030 msgstr ""
|
|
dongsheng@627
|
5031
|
|
dongsheng@627
|
5032 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
5033 #: ../en/ch05-daily.xml:5
|
|
dongsheng@627
|
5034 msgid "Mercurial in daily use"
|
|
dongsheng@627
|
5035 msgstr "Mercurial 的日常使用"
|
|
dongsheng@627
|
5036
|
|
dongsheng@627
|
5037 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
5038 #: ../en/ch05-daily.xml:8
|
|
dongsheng@627
|
5039 msgid "Telling Mercurial which files to track"
|
|
dongsheng@627
|
5040 msgstr "告诉 Mercurial 要跟踪哪些文件"
|
|
dongsheng@627
|
5041
|
|
dongsheng@627
|
5042 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5043 #: ../en/ch05-daily.xml:10
|
|
dongsheng@627
|
5044 msgid ""
|
|
dongsheng@627
|
5045 "Mercurial does not work with files in your repository unless you tell it to "
|
|
dongsheng@627
|
5046 "manage them. The <command role=\"hg-cmd\">hg status</command> command will "
|
|
dongsheng@627
|
5047 "tell you which files Mercurial doesn't know about; it uses a <quote><literal>?"
|
|
dongsheng@627
|
5048 "</literal></quote> to display such files."
|
|
dongsheng@627
|
5049 msgstr ""
|
|
dongsheng@627
|
5050
|
|
dongsheng@627
|
5051 #
|
|
dongsheng@627
|
5052 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5053 #: ../en/ch05-daily.xml:17
|
|
dongsheng@627
|
5054 msgid ""
|
|
dongsheng@627
|
5055 "To tell Mercurial to track a file, use the <command role=\"hg-cmd\">hg add</"
|
|
dongsheng@627
|
5056 "command> command. Once you have added a file, the entry in the output of "
|
|
dongsheng@627
|
5057 "<command role=\"hg-cmd\">hg status</command> for that file changes from "
|
|
dongsheng@627
|
5058 "<quote><literal>?</literal></quote> to <quote><literal>A</literal></quote>."
|
|
dongsheng@627
|
5059 msgstr ""
|
|
dongsheng@627
|
5060
|
|
dongsheng@627
|
5061 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5062 #: ../en/ch05-daily.xml:26
|
|
dongsheng@627
|
5063 msgid ""
|
|
dongsheng@627
|
5064 "After you run a <command role=\"hg-cmd\">hg commit</command>, the files that "
|
|
dongsheng@627
|
5065 "you added before the commit will no longer be listed in the output of "
|
|
dongsheng@627
|
5066 "<command role=\"hg-cmd\">hg status</command>. The reason for this is that "
|
|
dongsheng@627
|
5067 "<command role=\"hg-cmd\">hg status</command> only tells you about "
|
|
dongsheng@627
|
5068 "<quote>interesting</quote> files&emdash;those that you have modified or told "
|
|
dongsheng@627
|
5069 "Mercurial to do something with&emdash;by default. If you have a repository "
|
|
dongsheng@627
|
5070 "that contains thousands of files, you will rarely want to know about files "
|
|
dongsheng@627
|
5071 "that Mercurial is tracking, but that have not changed. (You can still get "
|
|
dongsheng@627
|
5072 "this information; we'll return to this later.)"
|
|
dongsheng@627
|
5073 msgstr ""
|
|
dongsheng@627
|
5074
|
|
dongsheng@627
|
5075 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5076 #: ../en/ch05-daily.xml:38
|
|
dongsheng@627
|
5077 msgid ""
|
|
dongsheng@627
|
5078 "Once you add a file, Mercurial doesn't do anything with it immediately. "
|
|
dongsheng@627
|
5079 "Instead, it will take a snapshot of the file's state the next time you "
|
|
dongsheng@627
|
5080 "perform a commit. It will then continue to track the changes you make to the "
|
|
dongsheng@627
|
5081 "file every time you commit, until you remove the file."
|
|
dongsheng@627
|
5082 msgstr ""
|
|
dongsheng@627
|
5083
|
|
dongsheng@627
|
5084 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5085 #: ../en/ch05-daily.xml:45
|
|
dongsheng@627
|
5086 msgid "Explicit versus implicit file naming"
|
|
dongsheng@627
|
5087 msgstr "明确与隐含文件命名"
|
|
dongsheng@627
|
5088
|
|
dongsheng@627
|
5089 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5090 #: ../en/ch05-daily.xml:47
|
|
dongsheng@627
|
5091 msgid ""
|
|
dongsheng@627
|
5092 "A useful behaviour that Mercurial has is that if you pass the name of a "
|
|
dongsheng@627
|
5093 "directory to a command, every Mercurial command will treat this as <quote>I "
|
|
dongsheng@627
|
5094 "want to operate on every file in this directory and its subdirectories</"
|
|
dongsheng@627
|
5095 "quote>."
|
|
dongsheng@627
|
5096 msgstr ""
|
|
dongsheng@627
|
5097
|
|
dongsheng@627
|
5098 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5099 #: ../en/ch05-daily.xml:54
|
|
dongsheng@627
|
5100 msgid ""
|
|
dongsheng@627
|
5101 "Notice in this example that Mercurial printed the names of the files it "
|
|
dongsheng@627
|
5102 "added, whereas it didn't do so when we added the file named <filename>a</"
|
|
dongsheng@627
|
5103 "filename> in the earlier example."
|
|
dongsheng@627
|
5104 msgstr ""
|
|
dongsheng@627
|
5105
|
|
dongsheng@627
|
5106 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5107 #: ../en/ch05-daily.xml:59
|
|
dongsheng@627
|
5108 msgid ""
|
|
dongsheng@627
|
5109 "What's going on is that in the former case, we explicitly named the file to "
|
|
dongsheng@627
|
5110 "add on the command line, so the assumption that Mercurial makes in such cases "
|
|
dongsheng@627
|
5111 "is that you know what you were doing, and it doesn't print any output."
|
|
dongsheng@627
|
5112 msgstr ""
|
|
dongsheng@627
|
5113
|
|
dongsheng@627
|
5114 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5115 #: ../en/ch05-daily.xml:64
|
|
dongsheng@627
|
5116 msgid ""
|
|
dongsheng@627
|
5117 "However, when we <emphasis>imply</emphasis> the names of files by giving the "
|
|
dongsheng@627
|
5118 "name of a directory, Mercurial takes the extra step of printing the name of "
|
|
dongsheng@627
|
5119 "each file that it does something with. This makes it more clear what is "
|
|
dongsheng@627
|
5120 "happening, and reduces the likelihood of a silent and nasty surprise. This "
|
|
dongsheng@627
|
5121 "behaviour is common to most Mercurial commands."
|
|
dongsheng@627
|
5122 msgstr ""
|
|
dongsheng@627
|
5123
|
|
dongsheng@627
|
5124 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5125 #: ../en/ch05-daily.xml:73
|
|
dongsheng@627
|
5126 msgid "Aside: Mercurial tracks files, not directories"
|
|
dongsheng@627
|
5127 msgstr "旁白: Mercurial 只跟踪文件，不跟踪目录"
|
|
dongsheng@627
|
5128
|
|
dongsheng@627
|
5129 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5130 #: ../en/ch05-daily.xml:75
|
|
dongsheng@627
|
5131 msgid ""
|
|
dongsheng@627
|
5132 "Mercurial does not track directory information. Instead, it tracks the path "
|
|
dongsheng@627
|
5133 "to a file. Before creating a file, it first creates any missing directory "
|
|
dongsheng@627
|
5134 "components of the path. After it deletes a file, it then deletes any empty "
|
|
dongsheng@627
|
5135 "directories that were in the deleted file's path. This sounds like a trivial "
|
|
dongsheng@627
|
5136 "distinction, but it has one minor practical consequence: it is not possible "
|
|
dongsheng@627
|
5137 "to represent a completely empty directory in Mercurial."
|
|
dongsheng@627
|
5138 msgstr ""
|
|
dongsheng@627
|
5139
|
|
dongsheng@627
|
5140 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5141 #: ../en/ch05-daily.xml:84
|
|
dongsheng@627
|
5142 msgid ""
|
|
dongsheng@627
|
5143 "Empty directories are rarely useful, and there are unintrusive workarounds "
|
|
dongsheng@627
|
5144 "that you can use to achieve an appropriate effect. The developers of "
|
|
dongsheng@627
|
5145 "Mercurial thus felt that the complexity that would be required to manage "
|
|
dongsheng@627
|
5146 "empty directories was not worth the limited benefit this feature would bring."
|
|
dongsheng@627
|
5147 msgstr ""
|
|
dongsheng@627
|
5148
|
|
dongsheng@627
|
5149 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5150 #: ../en/ch05-daily.xml:91
|
|
dongsheng@627
|
5151 msgid ""
|
|
dongsheng@627
|
5152 "If you need an empty directory in your repository, there are a few ways to "
|
|
dongsheng@627
|
5153 "achieve this. One is to create a directory, then <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
5154 "add</command> a <quote>hidden</quote> file to that directory. On Unix-like "
|
|
dongsheng@627
|
5155 "systems, any file name that begins with a period (<quote><literal>.</"
|
|
dongsheng@627
|
5156 "literal></quote>) is treated as hidden by most commands and GUI tools. This "
|
|
dongsheng@627
|
5157 "approach is illustrated below."
|
|
dongsheng@627
|
5158 msgstr ""
|
|
dongsheng@627
|
5159
|
|
dongsheng@627
|
5160 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5161 #: ../en/ch05-daily.xml:102
|
|
dongsheng@627
|
5162 msgid ""
|
|
dongsheng@627
|
5163 "Another way to tackle a need for an empty directory is to simply create one "
|
|
dongsheng@627
|
5164 "in your automated build scripts before they will need it."
|
|
dongsheng@627
|
5165 msgstr ""
|
|
dongsheng@627
|
5166
|
|
dongsheng@627
|
5167 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
5168 #: ../en/ch05-daily.xml:109
|
|
dongsheng@627
|
5169 msgid "How to stop tracking a file"
|
|
dongsheng@627
|
5170 msgstr "如何停止跟踪文件"
|
|
dongsheng@627
|
5171
|
|
dongsheng@627
|
5172 #
|
|
dongsheng@627
|
5173 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5174 #: ../en/ch05-daily.xml:111
|
|
dongsheng@627
|
5175 msgid ""
|
|
dongsheng@627
|
5176 "Once you decide that a file no longer belongs in your repository, use the "
|
|
dongsheng@627
|
5177 "<command role=\"hg-cmd\">hg remove</command> command; this deletes the file, "
|
|
dongsheng@627
|
5178 "and tells Mercurial to stop tracking it. A removed file is represented in "
|
|
dongsheng@627
|
5179 "the output of <command role=\"hg-cmd\">hg status</command> with a "
|
|
dongsheng@627
|
5180 "<quote><literal>R</literal></quote>."
|
|
dongsheng@627
|
5181 msgstr ""
|
|
dongsheng@627
|
5182
|
|
dongsheng@627
|
5183 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5184 #: ../en/ch05-daily.xml:120
|
|
dongsheng@627
|
5185 msgid ""
|
|
dongsheng@627
|
5186 "After you <command role=\"hg-cmd\">hg remove</command> a file, Mercurial will "
|
|
dongsheng@627
|
5187 "no longer track changes to that file, even if you recreate a file with the "
|
|
dongsheng@627
|
5188 "same name in your working directory. If you do recreate a file with the same "
|
|
dongsheng@627
|
5189 "name and want Mercurial to track the new file, simply <command role=\"hg-cmd"
|
|
dongsheng@627
|
5190 "\">hg add</command> it. Mercurial will know that the newly added file is not "
|
|
dongsheng@627
|
5191 "related to the old file of the same name."
|
|
dongsheng@627
|
5192 msgstr ""
|
|
dongsheng@627
|
5193
|
|
dongsheng@627
|
5194 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5195 #: ../en/ch05-daily.xml:129
|
|
dongsheng@627
|
5196 msgid "Removing a file does not affect its history"
|
|
dongsheng@627
|
5197 msgstr "删除文件不影响历史"
|
|
dongsheng@627
|
5198
|
|
dongsheng@627
|
5199 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5200 #: ../en/ch05-daily.xml:131
|
|
dongsheng@627
|
5201 msgid "It is important to understand that removing a file has only two effects."
|
|
dongsheng@627
|
5202 msgstr ""
|
|
dongsheng@627
|
5203
|
|
dongsheng@627
|
5204 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
5205 #: ../en/ch05-daily.xml:134
|
|
dongsheng@627
|
5206 msgid "It removes the current version of the file from the working directory."
|
|
dongsheng@627
|
5207 msgstr ""
|
|
dongsheng@627
|
5208
|
|
dongsheng@627
|
5209 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
5210 #: ../en/ch05-daily.xml:137
|
|
dongsheng@627
|
5211 msgid ""
|
|
dongsheng@627
|
5212 "It stops Mercurial from tracking changes to the file, from the time of the "
|
|
dongsheng@627
|
5213 "next commit."
|
|
dongsheng@627
|
5214 msgstr ""
|
|
dongsheng@627
|
5215
|
|
dongsheng@627
|
5216 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5217 #: ../en/ch05-daily.xml:140
|
|
dongsheng@627
|
5218 msgid ""
|
|
dongsheng@627
|
5219 "Removing a file <emphasis>does not</emphasis> in any way alter the "
|
|
dongsheng@627
|
5220 "<emphasis>history</emphasis> of the file."
|
|
dongsheng@627
|
5221 msgstr ""
|
|
dongsheng@627
|
5222
|
|
dongsheng@627
|
5223 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5224 #: ../en/ch05-daily.xml:143
|
|
dongsheng@627
|
5225 msgid ""
|
|
dongsheng@627
|
5226 "If you update the working directory to a changeset in which a file that you "
|
|
dongsheng@627
|
5227 "have removed was still tracked, it will reappear in the working directory, "
|
|
dongsheng@627
|
5228 "with the contents it had when you committed that changeset. If you then "
|
|
dongsheng@627
|
5229 "update the working directory to a later changeset, in which the file had been "
|
|
dongsheng@627
|
5230 "removed, Mercurial will once again remove the file from the working directory."
|
|
dongsheng@627
|
5231 msgstr ""
|
|
dongsheng@627
|
5232
|
|
dongsheng@627
|
5233 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5234 #: ../en/ch05-daily.xml:153
|
|
dongsheng@627
|
5235 msgid "Missing files"
|
|
dongsheng@627
|
5236 msgstr "丢失的文件"
|
|
dongsheng@627
|
5237
|
|
dongsheng@627
|
5238 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5239 #: ../en/ch05-daily.xml:155
|
|
dongsheng@627
|
5240 msgid ""
|
|
dongsheng@627
|
5241 "Mercurial considers a file that you have deleted, but not used <command role="
|
|
dongsheng@627
|
5242 "\"hg-cmd\">hg remove</command> to delete, to be <emphasis>missing</"
|
|
dongsheng@627
|
5243 "emphasis>. A missing file is represented with <quote><literal>!</literal></"
|
|
dongsheng@627
|
5244 "quote> in the output of <command role=\"hg-cmd\">hg status</command>. "
|
|
dongsheng@627
|
5245 "Mercurial commands will not generally do anything with missing files."
|
|
dongsheng@627
|
5246 msgstr ""
|
|
dongsheng@627
|
5247
|
|
dongsheng@627
|
5248 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5249 #: ../en/ch05-daily.xml:165
|
|
dongsheng@627
|
5250 msgid ""
|
|
dongsheng@627
|
5251 "If your repository contains a file that <command role=\"hg-cmd\">hg status</"
|
|
dongsheng@627
|
5252 "command> reports as missing, and you want the file to stay gone, you can run "
|
|
dongsheng@627
|
5253 "<command role=\"hg-cmd\">hg remove <option role=\"hg-opt-remove\">--after</"
|
|
dongsheng@627
|
5254 "option></command> at any time later on, to tell Mercurial that you really did "
|
|
dongsheng@627
|
5255 "mean to remove the file."
|
|
dongsheng@627
|
5256 msgstr ""
|
|
dongsheng@627
|
5257
|
|
dongsheng@627
|
5258 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5259 #: ../en/ch05-daily.xml:175
|
|
dongsheng@627
|
5260 msgid ""
|
|
dongsheng@627
|
5261 "On the other hand, if you deleted the missing file by accident, give <command "
|
|
dongsheng@627
|
5262 "role=\"hg-cmd\">hg revert</command> the name of the file to recover. It will "
|
|
dongsheng@627
|
5263 "reappear, in unmodified form."
|
|
dongsheng@627
|
5264 msgstr ""
|
|
dongsheng@627
|
5265
|
|
dongsheng@627
|
5266 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5267 #: ../en/ch05-daily.xml:184
|
|
dongsheng@627
|
5268 msgid "Aside: why tell Mercurial explicitly to remove a file?"
|
|
dongsheng@627
|
5269 msgstr "旁白: 为什么要明确告诉 Mercurial 删除文件?"
|
|
dongsheng@627
|
5270
|
|
dongsheng@627
|
5271 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5272 #: ../en/ch05-daily.xml:187
|
|
dongsheng@627
|
5273 msgid ""
|
|
dongsheng@627
|
5274 "You might wonder why Mercurial requires you to explicitly tell it that you "
|
|
dongsheng@627
|
5275 "are deleting a file. Early during the development of Mercurial, it let you "
|
|
dongsheng@627
|
5276 "delete a file however you pleased; Mercurial would notice the absence of the "
|
|
dongsheng@627
|
5277 "file automatically when you next ran a <command role=\"hg-cmd\">hg commit</"
|
|
dongsheng@627
|
5278 "command>, and stop tracking the file. In practice, this made it too easy to "
|
|
dongsheng@627
|
5279 "accidentally remove a file without noticing."
|
|
dongsheng@627
|
5280 msgstr ""
|
|
dongsheng@627
|
5281
|
|
dongsheng@627
|
5282 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5283 #: ../en/ch05-daily.xml:198
|
|
dongsheng@627
|
5284 msgid "Useful shorthand&emdash;adding and removing files in one step"
|
|
dongsheng@627
|
5285 msgstr "有用的速记&emdash;一个步骤添加和删除文件"
|
|
dongsheng@627
|
5286
|
|
dongsheng@627
|
5287 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5288 #: ../en/ch05-daily.xml:201
|
|
dongsheng@627
|
5289 msgid ""
|
|
dongsheng@627
|
5290 "Mercurial offers a combination command, <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
5291 "addremove</command>, that adds untracked files and marks missing files as "
|
|
dongsheng@627
|
5292 "removed."
|
|
dongsheng@627
|
5293 msgstr ""
|
|
dongsheng@627
|
5294
|
|
dongsheng@627
|
5295 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5296 #: ../en/ch05-daily.xml:207
|
|
dongsheng@627
|
5297 msgid ""
|
|
dongsheng@627
|
5298 "The <command role=\"hg-cmd\">hg commit</command> command also provides a "
|
|
dongsheng@627
|
5299 "<option role=\"hg-opt-commit\">-A</option> option that performs this same add-"
|
|
dongsheng@627
|
5300 "and-remove, immediately followed by a commit."
|
|
dongsheng@627
|
5301 msgstr ""
|
|
dongsheng@627
|
5302
|
|
dongsheng@627
|
5303 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
5304 #: ../en/ch05-daily.xml:217
|
|
dongsheng@627
|
5305 msgid "Copying files"
|
|
dongsheng@627
|
5306 msgstr "复制文件"
|
|
dongsheng@627
|
5307
|
|
dongsheng@627
|
5308 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5309 #: ../en/ch05-daily.xml:219
|
|
dongsheng@627
|
5310 msgid ""
|
|
dongsheng@627
|
5311 "Mercurial provides a <command role=\"hg-cmd\">hg copy</command> command that "
|
|
dongsheng@627
|
5312 "lets you make a new copy of a file. When you copy a file using this command, "
|
|
dongsheng@627
|
5313 "Mercurial makes a record of the fact that the new file is a copy of the "
|
|
dongsheng@627
|
5314 "original file. It treats these copied files specially when you merge your "
|
|
dongsheng@627
|
5315 "work with someone else's."
|
|
dongsheng@627
|
5316 msgstr ""
|
|
dongsheng@627
|
5317
|
|
dongsheng@627
|
5318 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5319 #: ../en/ch05-daily.xml:227
|
|
dongsheng@627
|
5320 msgid "The results of copying during a merge"
|
|
dongsheng@627
|
5321 msgstr "合并期间的复制结果"
|
|
dongsheng@627
|
5322
|
|
dongsheng@627
|
5323 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5324 #: ../en/ch05-daily.xml:229
|
|
dongsheng@627
|
5325 msgid ""
|
|
dongsheng@627
|
5326 "What happens during a merge is that changes <quote>follow</quote> a copy. To "
|
|
dongsheng@627
|
5327 "best illustrate what this means, let's create an example. We'll start with "
|
|
dongsheng@627
|
5328 "the usual tiny repository that contains a single file."
|
|
dongsheng@627
|
5329 msgstr ""
|
|
dongsheng@627
|
5330
|
|
dongsheng@627
|
5331 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5332 #: ../en/ch05-daily.xml:236
|
|
dongsheng@627
|
5333 msgid ""
|
|
dongsheng@627
|
5334 "We need to do some work in parallel, so that we'll have something to merge. "
|
|
dongsheng@627
|
5335 "So let's clone our repository."
|
|
dongsheng@627
|
5336 msgstr ""
|
|
dongsheng@627
|
5337
|
|
dongsheng@627
|
5338 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5339 #: ../en/ch05-daily.xml:242
|
|
dongsheng@627
|
5340 msgid ""
|
|
dongsheng@627
|
5341 "Back in our initial repository, let's use the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
5342 "copy</command> command to make a copy of the first file we created."
|
|
dongsheng@627
|
5343 msgstr ""
|
|
dongsheng@627
|
5344
|
|
dongsheng@627
|
5345 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5346 #: ../en/ch05-daily.xml:248
|
|
dongsheng@627
|
5347 msgid ""
|
|
dongsheng@627
|
5348 "If we look at the output of the <command role=\"hg-cmd\">hg status</command> "
|
|
dongsheng@627
|
5349 "command afterwards, the copied file looks just like a normal added file."
|
|
dongsheng@627
|
5350 msgstr ""
|
|
dongsheng@627
|
5351
|
|
dongsheng@627
|
5352 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5353 #: ../en/ch05-daily.xml:254
|
|
dongsheng@627
|
5354 msgid ""
|
|
dongsheng@627
|
5355 "But if we pass the <option role=\"hg-opt-status\">-C</option> option to "
|
|
dongsheng@627
|
5356 "<command role=\"hg-cmd\">hg status</command>, it prints another line of "
|
|
dongsheng@627
|
5357 "output: this is the file that our newly-added file was copied <emphasis>from</"
|
|
dongsheng@627
|
5358 "emphasis>."
|
|
dongsheng@627
|
5359 msgstr ""
|
|
dongsheng@627
|
5360
|
|
dongsheng@627
|
5361 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5362 #: ../en/ch05-daily.xml:262
|
|
dongsheng@627
|
5363 msgid ""
|
|
dongsheng@627
|
5364 "Now, back in the repository we cloned, let's make a change in parallel. "
|
|
dongsheng@627
|
5365 "We'll add a line of content to the original file that we created."
|
|
dongsheng@627
|
5366 msgstr ""
|
|
dongsheng@627
|
5367
|
|
dongsheng@627
|
5368 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5369 #: ../en/ch05-daily.xml:268
|
|
dongsheng@627
|
5370 msgid ""
|
|
dongsheng@627
|
5371 "Now we have a modified <filename>file</filename> in this repository. When we "
|
|
dongsheng@627
|
5372 "pull the changes from the first repository, and merge the two heads, "
|
|
dongsheng@627
|
5373 "Mercurial will propagate the changes that we made locally to <filename>file</"
|
|
dongsheng@627
|
5374 "filename> into its copy, <filename>new-file</filename>."
|
|
dongsheng@627
|
5375 msgstr ""
|
|
dongsheng@627
|
5376
|
|
dongsheng@627
|
5377 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5378 #: ../en/ch05-daily.xml:278
|
|
dongsheng@627
|
5379 msgid "Why should changes follow copies?"
|
|
dongsheng@627
|
5380 msgstr "为什么复制后需要后续修改?"
|
|
dongsheng@627
|
5381
|
|
dongsheng@627
|
5382 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5383 #: ../en/ch05-daily.xml:280
|
|
dongsheng@627
|
5384 msgid ""
|
|
dongsheng@627
|
5385 "This behaviour, of changes to a file propagating out to copies of the file, "
|
|
dongsheng@627
|
5386 "might seem esoteric, but in most cases it's highly desirable."
|
|
dongsheng@627
|
5387 msgstr ""
|
|
dongsheng@627
|
5388
|
|
dongsheng@627
|
5389 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5390 #: ../en/ch05-daily.xml:284
|
|
dongsheng@627
|
5391 msgid ""
|
|
dongsheng@627
|
5392 "First of all, remember that this propagation <emphasis>only</emphasis> "
|
|
dongsheng@627
|
5393 "happens when you merge. So if you <command role=\"hg-cmd\">hg copy</command> "
|
|
dongsheng@627
|
5394 "a file, and subsequently modify the original file during the normal course of "
|
|
dongsheng@627
|
5395 "your work, nothing will happen."
|
|
dongsheng@627
|
5396 msgstr ""
|
|
dongsheng@627
|
5397
|
|
dongsheng@627
|
5398 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5399 #: ../en/ch05-daily.xml:290
|
|
dongsheng@627
|
5400 msgid ""
|
|
dongsheng@627
|
5401 "The second thing to know is that modifications will only propagate across a "
|
|
dongsheng@627
|
5402 "copy as long as the repository that you're pulling changes from "
|
|
dongsheng@627
|
5403 "<emphasis>doesn't know</emphasis> about the copy."
|
|
dongsheng@627
|
5404 msgstr ""
|
|
dongsheng@627
|
5405
|
|
dongsheng@627
|
5406 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5407 #: ../en/ch05-daily.xml:295
|
|
dongsheng@627
|
5408 msgid ""
|
|
dongsheng@627
|
5409 "The reason that Mercurial does this is as follows. Let's say I make an "
|
|
dongsheng@627
|
5410 "important bug fix in a source file, and commit my changes. Meanwhile, you've "
|
|
dongsheng@627
|
5411 "decided to <command role=\"hg-cmd\">hg copy</command> the file in your "
|
|
dongsheng@627
|
5412 "repository, without knowing about the bug or having seen the fix, and you "
|
|
dongsheng@627
|
5413 "have started hacking on your copy of the file."
|
|
dongsheng@627
|
5414 msgstr ""
|
|
dongsheng@627
|
5415
|
|
dongsheng@627
|
5416 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5417 #: ../en/ch05-daily.xml:302
|
|
dongsheng@627
|
5418 msgid ""
|
|
dongsheng@627
|
5419 "If you pulled and merged my changes, and Mercurial <emphasis>didn't</"
|
|
dongsheng@627
|
5420 "emphasis> propagate changes across copies, your source file would now contain "
|
|
dongsheng@627
|
5421 "the bug, and unless you remembered to propagate the bug fix by hand, the bug "
|
|
dongsheng@627
|
5422 "would <emphasis>remain</emphasis> in your copy of the file."
|
|
dongsheng@627
|
5423 msgstr ""
|
|
dongsheng@627
|
5424
|
|
dongsheng@627
|
5425 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5426 #: ../en/ch05-daily.xml:308
|
|
dongsheng@627
|
5427 msgid ""
|
|
dongsheng@627
|
5428 "By automatically propagating the change that fixed the bug from the original "
|
|
dongsheng@627
|
5429 "file to the copy, Mercurial prevents this class of problem. To my knowledge, "
|
|
dongsheng@627
|
5430 "Mercurial is the <emphasis>only</emphasis> revision control system that "
|
|
dongsheng@627
|
5431 "propagates changes across copies like this."
|
|
dongsheng@627
|
5432 msgstr ""
|
|
dongsheng@627
|
5433
|
|
dongsheng@627
|
5434 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5435 #: ../en/ch05-daily.xml:314
|
|
dongsheng@627
|
5436 msgid ""
|
|
dongsheng@627
|
5437 "Once your change history has a record that the copy and subsequent merge "
|
|
dongsheng@627
|
5438 "occurred, there's usually no further need to propagate changes from the "
|
|
dongsheng@627
|
5439 "original file to the copied file, and that's why Mercurial only propagates "
|
|
dongsheng@627
|
5440 "changes across copies until this point, and no further."
|
|
dongsheng@627
|
5441 msgstr ""
|
|
dongsheng@627
|
5442
|
|
dongsheng@627
|
5443 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5444 #: ../en/ch05-daily.xml:322
|
|
dongsheng@627
|
5445 msgid "How to make changes <emphasis>not</emphasis> follow a copy"
|
|
dongsheng@627
|
5446 msgstr "如何让复制后<emphasis>不</emphasis>修改?"
|
|
dongsheng@627
|
5447
|
|
dongsheng@627
|
5448 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5449 #: ../en/ch05-daily.xml:325
|
|
dongsheng@627
|
5450 msgid ""
|
|
dongsheng@627
|
5451 "If, for some reason, you decide that this business of automatically "
|
|
dongsheng@627
|
5452 "propagating changes across copies is not for you, simply use your system's "
|
|
dongsheng@627
|
5453 "normal file copy command (on Unix-like systems, that's <command>cp</command>) "
|
|
dongsheng@627
|
5454 "to make a copy of a file, then <command role=\"hg-cmd\">hg add</command> the "
|
|
dongsheng@627
|
5455 "new copy by hand. Before you do so, though, please do reread section <xref "
|
|
dongsheng@627
|
5456 "linkend=\"sec.daily.why-copy\"/>, and make an informed decision that this "
|
|
dongsheng@627
|
5457 "behaviour is not appropriate to your specific case."
|
|
dongsheng@627
|
5458 msgstr ""
|
|
dongsheng@627
|
5459
|
|
dongsheng@627
|
5460 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5461 #: ../en/ch05-daily.xml:338
|
|
dongsheng@627
|
5462 msgid "Behaviour of the <command role=\"hg-cmd\">hg copy</command> command"
|
|
dongsheng@627
|
5463 msgstr "命令 <command role=\"hg-cmd\">hg copy</command> 的特性"
|
|
dongsheng@627
|
5464
|
|
dongsheng@627
|
5465 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5466 #: ../en/ch05-daily.xml:341
|
|
dongsheng@627
|
5467 msgid ""
|
|
dongsheng@627
|
5468 "When you use the <command role=\"hg-cmd\">hg copy</command> command, "
|
|
dongsheng@627
|
5469 "Mercurial makes a copy of each source file as it currently stands in the "
|
|
dongsheng@627
|
5470 "working directory. This means that if you make some modifications to a file, "
|
|
dongsheng@627
|
5471 "then <command role=\"hg-cmd\">hg copy</command> it without first having "
|
|
dongsheng@627
|
5472 "committed those changes, the new copy will also contain the modifications you "
|
|
dongsheng@627
|
5473 "have made up until that point. (I find this behaviour a little "
|
|
dongsheng@627
|
5474 "counterintuitive, which is why I mention it here.)"
|
|
dongsheng@627
|
5475 msgstr ""
|
|
dongsheng@627
|
5476
|
|
dongsheng@627
|
5477 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5478 #: ../en/ch05-daily.xml:351
|
|
dongsheng@627
|
5479 msgid ""
|
|
dongsheng@627
|
5480 "The <command role=\"hg-cmd\">hg copy</command> command acts similarly to the "
|
|
dongsheng@627
|
5481 "Unix <command>cp</command> command (you can use the <command role=\"hg-cmd"
|
|
dongsheng@627
|
5482 "\">hg cp</command> alias if you prefer). The last argument is the "
|
|
dongsheng@627
|
5483 "<emphasis>destination</emphasis>, and all prior arguments are "
|
|
dongsheng@627
|
5484 "<emphasis>sources</emphasis>. If you pass it a single file as the source, "
|
|
dongsheng@627
|
5485 "and the destination does not exist, it creates a new file with that name."
|
|
dongsheng@627
|
5486 msgstr ""
|
|
dongsheng@627
|
5487
|
|
dongsheng@627
|
5488 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5489 #: ../en/ch05-daily.xml:362
|
|
dongsheng@627
|
5490 msgid ""
|
|
dongsheng@627
|
5491 "If the destination is a directory, Mercurial copies its sources into that "
|
|
dongsheng@627
|
5492 "directory."
|
|
dongsheng@627
|
5493 msgstr ""
|
|
dongsheng@627
|
5494
|
|
dongsheng@627
|
5495 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5496 #: ../en/ch05-daily.xml:367
|
|
dongsheng@627
|
5497 msgid ""
|
|
dongsheng@627
|
5498 "Copying a directory is recursive, and preserves the directory structure of "
|
|
dongsheng@627
|
5499 "the source."
|
|
dongsheng@627
|
5500 msgstr ""
|
|
dongsheng@627
|
5501
|
|
dongsheng@627
|
5502 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5503 #: ../en/ch05-daily.xml:373
|
|
dongsheng@627
|
5504 msgid ""
|
|
dongsheng@627
|
5505 "If the source and destination are both directories, the source tree is "
|
|
dongsheng@627
|
5506 "recreated in the destination directory."
|
|
dongsheng@627
|
5507 msgstr ""
|
|
dongsheng@627
|
5508
|
|
dongsheng@627
|
5509 #
|
|
dongsheng@627
|
5510 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5511 #: ../en/ch05-daily.xml:378
|
|
dongsheng@627
|
5512 msgid ""
|
|
dongsheng@627
|
5513 "As with the <command role=\"hg-cmd\">hg rename</command> command, if you copy "
|
|
dongsheng@627
|
5514 "a file manually and then want Mercurial to know that you've copied the file, "
|
|
dongsheng@627
|
5515 "simply use the <option role=\"hg-opt-copy\">--after</option> option to "
|
|
dongsheng@627
|
5516 "<command role=\"hg-cmd\">hg copy</command>."
|
|
dongsheng@627
|
5517 msgstr ""
|
|
dongsheng@627
|
5518
|
|
dongsheng@627
|
5519 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
5520 #: ../en/ch05-daily.xml:389
|
|
dongsheng@627
|
5521 msgid "Renaming files"
|
|
dongsheng@627
|
5522 msgstr "改名文件"
|
|
dongsheng@627
|
5523
|
|
dongsheng@627
|
5524 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5525 #: ../en/ch05-daily.xml:391
|
|
dongsheng@627
|
5526 msgid ""
|
|
dongsheng@627
|
5527 "It's rather more common to need to rename a file than to make a copy of it. "
|
|
dongsheng@627
|
5528 "The reason I discussed the <command role=\"hg-cmd\">hg copy</command> command "
|
|
dongsheng@627
|
5529 "before talking about renaming files is that Mercurial treats a rename in "
|
|
dongsheng@627
|
5530 "essentially the same way as a copy. Therefore, knowing what Mercurial does "
|
|
dongsheng@627
|
5531 "when you copy a file tells you what to expect when you rename a file."
|
|
dongsheng@627
|
5532 msgstr ""
|
|
dongsheng@627
|
5533
|
|
dongsheng@627
|
5534 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5535 #: ../en/ch05-daily.xml:399
|
|
dongsheng@627
|
5536 msgid ""
|
|
dongsheng@627
|
5537 "When you use the <command role=\"hg-cmd\">hg rename</command> command, "
|
|
dongsheng@627
|
5538 "Mercurial makes a copy of each source file, then deletes it and marks the "
|
|
dongsheng@627
|
5539 "file as removed."
|
|
dongsheng@627
|
5540 msgstr ""
|
|
dongsheng@627
|
5541
|
|
dongsheng@627
|
5542 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5543 #: ../en/ch05-daily.xml:405
|
|
dongsheng@627
|
5544 msgid ""
|
|
dongsheng@627
|
5545 "The <command role=\"hg-cmd\">hg status</command> command shows the newly "
|
|
dongsheng@627
|
5546 "copied file as added, and the copied-from file as removed."
|
|
dongsheng@627
|
5547 msgstr ""
|
|
dongsheng@627
|
5548
|
|
dongsheng@627
|
5549 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5550 #: ../en/ch05-daily.xml:411
|
|
dongsheng@627
|
5551 msgid ""
|
|
dongsheng@627
|
5552 "As with the results of a <command role=\"hg-cmd\">hg copy</command>, we must "
|
|
dongsheng@627
|
5553 "use the <option role=\"hg-opt-status\">-C</option> option to <command role="
|
|
dongsheng@627
|
5554 "\"hg-cmd\">hg status</command> to see that the added file is really being "
|
|
dongsheng@627
|
5555 "tracked by Mercurial as a copy of the original, now removed, file."
|
|
dongsheng@627
|
5556 msgstr ""
|
|
dongsheng@627
|
5557
|
|
dongsheng@627
|
5558 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5559 #: ../en/ch05-daily.xml:420
|
|
dongsheng@627
|
5560 msgid ""
|
|
dongsheng@627
|
5561 "As with <command role=\"hg-cmd\">hg remove</command> and <command role=\"hg-"
|
|
dongsheng@627
|
5562 "cmd\">hg copy</command>, you can tell Mercurial about a rename after the fact "
|
|
dongsheng@627
|
5563 "using the <option role=\"hg-opt-rename\">--after</option> option. In most "
|
|
dongsheng@627
|
5564 "other respects, the behaviour of the <command role=\"hg-cmd\">hg rename</"
|
|
dongsheng@627
|
5565 "command> command, and the options it accepts, are similar to the <command "
|
|
dongsheng@627
|
5566 "role=\"hg-cmd\">hg copy</command> command."
|
|
dongsheng@627
|
5567 msgstr ""
|
|
dongsheng@627
|
5568
|
|
dongsheng@627
|
5569 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5570 #: ../en/ch05-daily.xml:430
|
|
dongsheng@627
|
5571 msgid "Renaming files and merging changes"
|
|
dongsheng@627
|
5572 msgstr "改名文件与合并修改"
|
|
dongsheng@627
|
5573
|
|
dongsheng@627
|
5574 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5575 #: ../en/ch05-daily.xml:432
|
|
dongsheng@627
|
5576 msgid ""
|
|
dongsheng@627
|
5577 "Since Mercurial's rename is implemented as copy-and-remove, the same "
|
|
dongsheng@627
|
5578 "propagation of changes happens when you merge after a rename as after a copy."
|
|
dongsheng@627
|
5579 msgstr ""
|
|
dongsheng@627
|
5580
|
|
dongsheng@627
|
5581 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5582 #: ../en/ch05-daily.xml:436
|
|
dongsheng@627
|
5583 msgid ""
|
|
dongsheng@627
|
5584 "If I modify a file, and you rename it to a new name, and then we merge our "
|
|
dongsheng@627
|
5585 "respective changes, my modifications to the file under its original name will "
|
|
dongsheng@627
|
5586 "be propagated into the file under its new name. (This is something you might "
|
|
dongsheng@627
|
5587 "expect to <quote>simply work,</quote> but not all revision control systems "
|
|
dongsheng@627
|
5588 "actually do this.)"
|
|
dongsheng@627
|
5589 msgstr ""
|
|
dongsheng@627
|
5590
|
|
dongsheng@627
|
5591 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5592 #: ../en/ch05-daily.xml:443
|
|
dongsheng@627
|
5593 msgid ""
|
|
dongsheng@627
|
5594 "Whereas having changes follow a copy is a feature where you can perhaps nod "
|
|
dongsheng@627
|
5595 "and say <quote>yes, that might be useful,</quote> it should be clear that "
|
|
dongsheng@627
|
5596 "having them follow a rename is definitely important. Without this facility, "
|
|
dongsheng@627
|
5597 "it would simply be too easy for changes to become orphaned when files are "
|
|
dongsheng@627
|
5598 "renamed."
|
|
dongsheng@627
|
5599 msgstr ""
|
|
dongsheng@627
|
5600
|
|
dongsheng@627
|
5601 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5602 #: ../en/ch05-daily.xml:452
|
|
dongsheng@627
|
5603 msgid "Divergent renames and merging"
|
|
dongsheng@627
|
5604 msgstr "改名与合并的分歧"
|
|
dongsheng@627
|
5605
|
|
dongsheng@627
|
5606 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5607 #: ../en/ch05-daily.xml:454
|
|
dongsheng@627
|
5608 msgid ""
|
|
dongsheng@627
|
5609 "The case of diverging names occurs when two developers start with a "
|
|
dongsheng@627
|
5610 "file&emdash;let's call it <filename>foo</filename>&emdash;in their respective "
|
|
dongsheng@627
|
5611 "repositories."
|
|
dongsheng@627
|
5612 msgstr ""
|
|
dongsheng@627
|
5613
|
|
dongsheng@627
|
5614 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5615 #: ../en/ch05-daily.xml:461
|
|
dongsheng@627
|
5616 msgid "Anne renames the file to <filename>bar</filename>."
|
|
dongsheng@627
|
5617 msgstr ""
|
|
dongsheng@627
|
5618
|
|
dongsheng@627
|
5619 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5620 #: ../en/ch05-daily.xml:465
|
|
dongsheng@627
|
5621 msgid "Meanwhile, Bob renames it to <filename>quux</filename>."
|
|
dongsheng@627
|
5622 msgstr ""
|
|
dongsheng@627
|
5623
|
|
dongsheng@627
|
5624 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5625 #: ../en/ch05-daily.xml:470
|
|
dongsheng@627
|
5626 msgid ""
|
|
dongsheng@627
|
5627 "I like to think of this as a conflict because each developer has expressed "
|
|
dongsheng@627
|
5628 "different intentions about what the file ought to be named."
|
|
dongsheng@627
|
5629 msgstr ""
|
|
dongsheng@627
|
5630
|
|
dongsheng@627
|
5631 #
|
|
dongsheng@627
|
5632 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5633 #: ../en/ch05-daily.xml:474
|
|
dongsheng@627
|
5634 msgid ""
|
|
dongsheng@627
|
5635 "What do you think should happen when they merge their work? Mercurial's "
|
|
dongsheng@627
|
5636 "actual behaviour is that it always preserves <emphasis>both</emphasis> names "
|
|
dongsheng@627
|
5637 "when it merges changesets that contain divergent renames."
|
|
dongsheng@627
|
5638 msgstr ""
|
|
dongsheng@627
|
5639
|
|
dongsheng@627
|
5640 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5641 #: ../en/ch05-daily.xml:481
|
|
dongsheng@627
|
5642 msgid ""
|
|
dongsheng@627
|
5643 "Notice that Mercurial does warn about the divergent renames, but it leaves it "
|
|
dongsheng@627
|
5644 "up to you to do something about the divergence after the merge."
|
|
dongsheng@627
|
5645 msgstr ""
|
|
dongsheng@627
|
5646
|
|
dongsheng@627
|
5647 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5648 #: ../en/ch05-daily.xml:487
|
|
dongsheng@627
|
5649 msgid "Convergent renames and merging"
|
|
dongsheng@627
|
5650 msgstr "收敛改名与合并"
|
|
dongsheng@627
|
5651
|
|
dongsheng@627
|
5652 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5653 #: ../en/ch05-daily.xml:489
|
|
dongsheng@627
|
5654 msgid ""
|
|
dongsheng@627
|
5655 "Another kind of rename conflict occurs when two people choose to rename "
|
|
dongsheng@627
|
5656 "different <emphasis>source</emphasis> files to the same "
|
|
dongsheng@627
|
5657 "<emphasis>destination</emphasis>. In this case, Mercurial runs its normal "
|
|
dongsheng@627
|
5658 "merge machinery, and lets you guide it to a suitable resolution."
|
|
dongsheng@627
|
5659 msgstr ""
|
|
dongsheng@627
|
5660
|
|
dongsheng@627
|
5661 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5662 #: ../en/ch05-daily.xml:497
|
|
dongsheng@627
|
5663 msgid "Other name-related corner cases"
|
|
dongsheng@627
|
5664 msgstr "其它名称相关的角落"
|
|
dongsheng@627
|
5665
|
|
dongsheng@627
|
5666 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5667 #: ../en/ch05-daily.xml:499
|
|
dongsheng@627
|
5668 msgid ""
|
|
dongsheng@627
|
5669 "Mercurial has a longstanding bug in which it fails to handle a merge where "
|
|
dongsheng@627
|
5670 "one side has a file with a given name, while another has a directory with the "
|
|
dongsheng@627
|
5671 "same name. This is documented as <ulink role=\"hg-bug\" url=\"http://www."
|
|
dongsheng@627
|
5672 "selenic.com/mercurial/bts/issue29\">issue 29</ulink>."
|
|
dongsheng@627
|
5673 msgstr ""
|
|
dongsheng@627
|
5674
|
|
dongsheng@627
|
5675 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
5676 #: ../en/ch05-daily.xml:511
|
|
dongsheng@627
|
5677 msgid "Recovering from mistakes"
|
|
dongsheng@627
|
5678 msgstr "从错误恢复"
|
|
dongsheng@627
|
5679
|
|
dongsheng@627
|
5680 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5681 #: ../en/ch05-daily.xml:513
|
|
dongsheng@627
|
5682 msgid ""
|
|
dongsheng@627
|
5683 "Mercurial has some useful commands that will help you to recover from some "
|
|
dongsheng@627
|
5684 "common mistakes."
|
|
dongsheng@627
|
5685 msgstr ""
|
|
dongsheng@627
|
5686
|
|
dongsheng@627
|
5687 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5688 #: ../en/ch05-daily.xml:516
|
|
dongsheng@627
|
5689 msgid ""
|
|
dongsheng@627
|
5690 "The <command role=\"hg-cmd\">hg revert</command> command lets you undo "
|
|
dongsheng@627
|
5691 "changes that you have made to your working directory. For example, if you "
|
|
dongsheng@627
|
5692 "<command role=\"hg-cmd\">hg add</command> a file by accident, just run "
|
|
dongsheng@627
|
5693 "<command role=\"hg-cmd\">hg revert</command> with the name of the file you "
|
|
dongsheng@627
|
5694 "added, and while the file won't be touched in any way, it won't be tracked "
|
|
dongsheng@627
|
5695 "for adding by Mercurial any longer, either. You can also use <command role="
|
|
dongsheng@627
|
5696 "\"hg-cmd\">hg revert</command> to get rid of erroneous changes to a file."
|
|
dongsheng@627
|
5697 msgstr ""
|
|
dongsheng@627
|
5698
|
|
dongsheng@627
|
5699 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5700 #: ../en/ch05-daily.xml:526
|
|
dongsheng@627
|
5701 msgid ""
|
|
dongsheng@627
|
5702 "It's useful to remember that the <command role=\"hg-cmd\">hg revert</command> "
|
|
dongsheng@627
|
5703 "command is useful for changes that you have not yet committed. Once you've "
|
|
dongsheng@627
|
5704 "committed a change, if you decide it was a mistake, you can still do "
|
|
dongsheng@627
|
5705 "something about it, though your options may be more limited."
|
|
dongsheng@627
|
5706 msgstr ""
|
|
dongsheng@627
|
5707
|
|
dongsheng@627
|
5708 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5709 #: ../en/ch05-daily.xml:532
|
|
dongsheng@627
|
5710 msgid ""
|
|
dongsheng@627
|
5711 "For more information about the <command role=\"hg-cmd\">hg revert</command> "
|
|
dongsheng@627
|
5712 "command, and details about how to deal with changes you have already "
|
|
dongsheng@627
|
5713 "committed, see chapter <xref linkend=\"chap.undo\"/>."
|
|
dongsheng@627
|
5714 msgstr ""
|
|
dongsheng@627
|
5715
|
|
dongsheng@627
|
5716 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
5717 #: ../en/ch06-collab.xml:5
|
|
dongsheng@627
|
5718 msgid "Collaborating with other people"
|
|
dongsheng@627
|
5719 msgstr "团体协作"
|
|
dongsheng@627
|
5720
|
|
dongsheng@627
|
5721 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
5722 #: ../en/ch06-collab.xml:7
|
|
dongsheng@627
|
5723 msgid ""
|
|
dongsheng@627
|
5724 "As a completely decentralised tool, Mercurial doesn't impose any policy on "
|
|
dongsheng@627
|
5725 "how people ought to work with each other. However, if you're new to "
|
|
dongsheng@627
|
5726 "distributed revision control, it helps to have some tools and examples in "
|
|
dongsheng@627
|
5727 "mind when you're thinking about possible workflow models."
|
|
dongsheng@627
|
5728 msgstr ""
|
|
dongsheng@627
|
5729
|
|
dongsheng@627
|
5730 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
5731 #: ../en/ch06-collab.xml:14
|
|
dongsheng@627
|
5732 msgid "Mercurial's web interface"
|
|
dongsheng@630
|
5733 msgstr "Mercurial 的 web 接口"
|
|
dongsheng@627
|
5734
|
|
dongsheng@627
|
5735 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5736 #: ../en/ch06-collab.xml:16
|
|
dongsheng@627
|
5737 msgid ""
|
|
dongsheng@627
|
5738 "Mercurial has a powerful web interface that provides several useful "
|
|
dongsheng@627
|
5739 "capabilities."
|
|
dongsheng@627
|
5740 msgstr ""
|
|
dongsheng@627
|
5741
|
|
dongsheng@627
|
5742 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5743 #: ../en/ch06-collab.xml:19
|
|
dongsheng@627
|
5744 msgid ""
|
|
dongsheng@627
|
5745 "For interactive use, the web interface lets you browse a single repository or "
|
|
dongsheng@627
|
5746 "a collection of repositories. You can view the history of a repository, "
|
|
dongsheng@627
|
5747 "examine each change (comments and diffs), and view the contents of each "
|
|
dongsheng@627
|
5748 "directory and file."
|
|
dongsheng@627
|
5749 msgstr ""
|
|
dongsheng@627
|
5750
|
|
dongsheng@627
|
5751 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5752 #: ../en/ch06-collab.xml:24
|
|
dongsheng@627
|
5753 msgid ""
|
|
dongsheng@627
|
5754 "Also for human consumption, the web interface provides an RSS feed of the "
|
|
dongsheng@627
|
5755 "changes in a repository. This lets you <quote>subscribe</quote> to a "
|
|
dongsheng@627
|
5756 "repository using your favourite feed reader, and be automatically notified of "
|
|
dongsheng@627
|
5757 "activity in that repository as soon as it happens. I find this capability "
|
|
dongsheng@627
|
5758 "much more convenient than the model of subscribing to a mailing list to which "
|
|
dongsheng@627
|
5759 "notifications are sent, as it requires no additional configuration on the "
|
|
dongsheng@627
|
5760 "part of whoever is serving the repository."
|
|
dongsheng@627
|
5761 msgstr ""
|
|
dongsheng@627
|
5762
|
|
dongsheng@627
|
5763 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5764 #: ../en/ch06-collab.xml:34
|
|
dongsheng@627
|
5765 msgid ""
|
|
dongsheng@627
|
5766 "The web interface also lets remote users clone a repository, pull changes "
|
|
dongsheng@627
|
5767 "from it, and (when the server is configured to permit it) push changes back "
|
|
dongsheng@627
|
5768 "to it. Mercurial's HTTP tunneling protocol aggressively compresses data, so "
|
|
dongsheng@627
|
5769 "that it works efficiently even over low-bandwidth network connections."
|
|
dongsheng@627
|
5770 msgstr ""
|
|
dongsheng@627
|
5771
|
|
dongsheng@627
|
5772 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5773 #: ../en/ch06-collab.xml:40
|
|
dongsheng@627
|
5774 msgid ""
|
|
dongsheng@627
|
5775 "The easiest way to get started with the web interface is to use your web "
|
|
dongsheng@627
|
5776 "browser to visit an existing repository, such as the master Mercurial "
|
|
dongsheng@627
|
5777 "repository at <ulink url=\"http://www.selenic.com/repo/hg?style=gitweb"
|
|
dongsheng@627
|
5778 "\">http://www.selenic.com/repo/hg?style=gitweb</ulink>."
|
|
dongsheng@627
|
5779 msgstr ""
|
|
dongsheng@627
|
5780
|
|
dongsheng@627
|
5781 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5782 #: ../en/ch06-collab.xml:45
|
|
dongsheng@627
|
5783 msgid ""
|
|
dongsheng@627
|
5784 "If you're interested in providing a web interface to your own repositories, "
|
|
dongsheng@627
|
5785 "Mercurial provides two ways to do this. The first is using the <command role="
|
|
dongsheng@627
|
5786 "\"hg-cmd\">hg serve</command> command, which is best suited to short-term "
|
|
dongsheng@627
|
5787 "<quote>lightweight</quote> serving. See section <xref linkend=\"sec.collab."
|
|
dongsheng@627
|
5788 "serve\"/> below for details of how to use this command. If you have a long-"
|
|
dongsheng@627
|
5789 "lived repository that you'd like to make permanently available, Mercurial has "
|
|
dongsheng@627
|
5790 "built-in support for the CGI (Common Gateway Interface) standard, which all "
|
|
dongsheng@627
|
5791 "common web servers support. See section <xref linkend=\"sec.collab.cgi\"/> "
|
|
dongsheng@627
|
5792 "for details of CGI configuration."
|
|
dongsheng@627
|
5793 msgstr ""
|
|
dongsheng@627
|
5794
|
|
dongsheng@627
|
5795 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
5796 #: ../en/ch06-collab.xml:60
|
|
dongsheng@627
|
5797 msgid "Collaboration models"
|
|
dongsheng@630
|
5798 msgstr "协作模型"
|
|
dongsheng@627
|
5799
|
|
dongsheng@627
|
5800 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
5801 #: ../en/ch06-collab.xml:62
|
|
dongsheng@627
|
5802 msgid ""
|
|
dongsheng@627
|
5803 "With a suitably flexible tool, making decisions about workflow is much more "
|
|
dongsheng@627
|
5804 "of a social engineering challenge than a technical one. Mercurial imposes few "
|
|
dongsheng@627
|
5805 "limitations on how you can structure the flow of work in a project, so it's "
|
|
dongsheng@627
|
5806 "up to you and your group to set up and live with a model that matches your "
|
|
dongsheng@627
|
5807 "own particular needs."
|
|
dongsheng@627
|
5808 msgstr ""
|
|
dongsheng@627
|
5809
|
|
dongsheng@627
|
5810 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5811 #: ../en/ch06-collab.xml:70
|
|
dongsheng@627
|
5812 msgid "Factors to keep in mind"
|
|
dongsheng@630
|
5813 msgstr "要牢记的因素"
|
|
dongsheng@627
|
5814
|
|
dongsheng@627
|
5815 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5816 #: ../en/ch06-collab.xml:72
|
|
dongsheng@627
|
5817 msgid ""
|
|
dongsheng@627
|
5818 "The most important aspect of any model that you must keep in mind is how well "
|
|
dongsheng@627
|
5819 "it matches the needs and capabilities of the people who will be using it. "
|
|
dongsheng@627
|
5820 "This might seem self-evident; even so, you still can't afford to forget it "
|
|
dongsheng@627
|
5821 "for a moment."
|
|
dongsheng@627
|
5822 msgstr ""
|
|
dongsheng@627
|
5823
|
|
dongsheng@627
|
5824 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5825 #: ../en/ch06-collab.xml:78
|
|
dongsheng@627
|
5826 msgid ""
|
|
dongsheng@627
|
5827 "I once put together a workflow model that seemed to make perfect sense to me, "
|
|
dongsheng@627
|
5828 "but that caused a considerable amount of consternation and strife within my "
|
|
dongsheng@627
|
5829 "development team. In spite of my attempts to explain why we needed a complex "
|
|
dongsheng@627
|
5830 "set of branches, and how changes ought to flow between them, a few team "
|
|
dongsheng@627
|
5831 "members revolted. Even though they were smart people, they didn't want to "
|
|
dongsheng@627
|
5832 "pay attention to the constraints we were operating under, or face the "
|
|
dongsheng@627
|
5833 "consequences of those constraints in the details of the model that I was "
|
|
dongsheng@627
|
5834 "advocating."
|
|
dongsheng@627
|
5835 msgstr ""
|
|
dongsheng@627
|
5836
|
|
dongsheng@627
|
5837 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5838 #: ../en/ch06-collab.xml:88
|
|
dongsheng@627
|
5839 msgid ""
|
|
dongsheng@627
|
5840 "Don't sweep foreseeable social or technical problems under the rug. Whatever "
|
|
dongsheng@627
|
5841 "scheme you put into effect, you should plan for mistakes and problem "
|
|
dongsheng@627
|
5842 "scenarios. Consider adding automated machinery to prevent, or quickly "
|
|
dongsheng@627
|
5843 "recover from, trouble that you can anticipate. As an example, if you intend "
|
|
dongsheng@627
|
5844 "to have a branch with not-for-release changes in it, you'd do well to think "
|
|
dongsheng@627
|
5845 "early about the possibility that someone might accidentally merge those "
|
|
dongsheng@627
|
5846 "changes into a release branch. You could avoid this particular problem by "
|
|
dongsheng@627
|
5847 "writing a hook that prevents changes from being merged from an inappropriate "
|
|
dongsheng@627
|
5848 "branch."
|
|
dongsheng@627
|
5849 msgstr ""
|
|
dongsheng@627
|
5850
|
|
dongsheng@627
|
5851 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5852 #: ../en/ch06-collab.xml:102
|
|
dongsheng@627
|
5853 msgid "Informal anarchy"
|
|
dongsheng@630
|
5854 msgstr "无政府状态"
|
|
dongsheng@627
|
5855
|
|
dongsheng@627
|
5856 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5857 #: ../en/ch06-collab.xml:104
|
|
dongsheng@627
|
5858 msgid ""
|
|
dongsheng@627
|
5859 "I wouldn't suggest an <quote>anything goes</quote> approach as something "
|
|
dongsheng@627
|
5860 "sustainable, but it's a model that's easy to grasp, and it works perfectly "
|
|
dongsheng@627
|
5861 "well in a few unusual situations."
|
|
dongsheng@627
|
5862 msgstr ""
|
|
dongsheng@627
|
5863
|
|
dongsheng@627
|
5864 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5865 #: ../en/ch06-collab.xml:109
|
|
dongsheng@627
|
5866 msgid ""
|
|
dongsheng@627
|
5867 "As one example, many projects have a loose-knit group of collaborators who "
|
|
dongsheng@627
|
5868 "rarely physically meet each other. Some groups like to overcome the "
|
|
dongsheng@627
|
5869 "isolation of working at a distance by organising occasional <quote>sprints</"
|
|
dongsheng@627
|
5870 "quote>. In a sprint, a number of people get together in a single location (a "
|
|
dongsheng@627
|
5871 "company's conference room, a hotel meeting room, that kind of place) and "
|
|
dongsheng@627
|
5872 "spend several days more or less locked in there, hacking intensely on a "
|
|
dongsheng@627
|
5873 "handful of projects."
|
|
dongsheng@627
|
5874 msgstr ""
|
|
dongsheng@627
|
5875
|
|
dongsheng@627
|
5876 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5877 #: ../en/ch06-collab.xml:118
|
|
dongsheng@627
|
5878 msgid ""
|
|
dongsheng@627
|
5879 "A sprint is the perfect place to use the <command role=\"hg-cmd\">hg serve</"
|
|
dongsheng@627
|
5880 "command> command, since <command role=\"hg-cmd\">hg serve</command> does not "
|
|
dongsheng@627
|
5881 "require any fancy server infrastructure. You can get started with <command "
|
|
dongsheng@627
|
5882 "role=\"hg-cmd\">hg serve</command> in moments, by reading section <xref "
|
|
dongsheng@627
|
5883 "linkend=\"sec.collab.serve\"/> below. Then simply tell the person next to "
|
|
dongsheng@627
|
5884 "you that you're running a server, send the URL to them in an instant message, "
|
|
dongsheng@627
|
5885 "and you immediately have a quick-turnaround way to work together. They can "
|
|
dongsheng@627
|
5886 "type your URL into their web browser and quickly review your changes; or they "
|
|
dongsheng@627
|
5887 "can pull a bugfix from you and verify it; or they can clone a branch "
|
|
dongsheng@627
|
5888 "containing a new feature and try it out."
|
|
dongsheng@627
|
5889 msgstr ""
|
|
dongsheng@627
|
5890
|
|
dongsheng@627
|
5891 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5892 #: ../en/ch06-collab.xml:132
|
|
dongsheng@627
|
5893 msgid ""
|
|
dongsheng@627
|
5894 "The charm, and the problem, with doing things in an ad hoc fashion like this "
|
|
dongsheng@627
|
5895 "is that only people who know about your changes, and where they are, can see "
|
|
dongsheng@627
|
5896 "them. Such an informal approach simply doesn't scale beyond a handful "
|
|
dongsheng@627
|
5897 "people, because each individual needs to know about $n$ different "
|
|
dongsheng@627
|
5898 "repositories to pull from."
|
|
dongsheng@627
|
5899 msgstr ""
|
|
dongsheng@627
|
5900
|
|
dongsheng@627
|
5901 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5902 #: ../en/ch06-collab.xml:141
|
|
dongsheng@627
|
5903 msgid "A single central repository"
|
|
dongsheng@630
|
5904 msgstr "单一中央版本库"
|
|
dongsheng@627
|
5905
|
|
dongsheng@627
|
5906 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5907 #: ../en/ch06-collab.xml:143
|
|
dongsheng@627
|
5908 msgid ""
|
|
dongsheng@627
|
5909 "For smaller projects migrating from a centralised revision control tool, "
|
|
dongsheng@627
|
5910 "perhaps the easiest way to get started is to have changes flow through a "
|
|
dongsheng@627
|
5911 "single shared central repository. This is also the most common "
|
|
dongsheng@627
|
5912 "<quote>building block</quote> for more ambitious workflow schemes."
|
|
dongsheng@627
|
5913 msgstr ""
|
|
dongsheng@627
|
5914
|
|
dongsheng@627
|
5915 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5916 #: ../en/ch06-collab.xml:149
|
|
dongsheng@627
|
5917 msgid ""
|
|
dongsheng@627
|
5918 "Contributors start by cloning a copy of this repository. They can pull "
|
|
dongsheng@627
|
5919 "changes from it whenever they need to, and some (perhaps all) developers have "
|
|
dongsheng@627
|
5920 "permission to push a change back when they're ready for other people to see "
|
|
dongsheng@627
|
5921 "it."
|
|
dongsheng@627
|
5922 msgstr ""
|
|
dongsheng@627
|
5923
|
|
dongsheng@627
|
5924 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5925 #: ../en/ch06-collab.xml:154
|
|
dongsheng@627
|
5926 msgid ""
|
|
dongsheng@627
|
5927 "Under this model, it can still often make sense for people to pull changes "
|
|
dongsheng@627
|
5928 "directly from each other, without going through the central repository. "
|
|
dongsheng@627
|
5929 "Consider a case in which I have a tentative bug fix, but I am worried that if "
|
|
dongsheng@627
|
5930 "I were to publish it to the central repository, it might subsequently break "
|
|
dongsheng@627
|
5931 "everyone else's trees as they pull it. To reduce the potential for damage, I "
|
|
dongsheng@627
|
5932 "can ask you to clone my repository into a temporary repository of your own "
|
|
dongsheng@627
|
5933 "and test it. This lets us put off publishing the potentially unsafe change "
|
|
dongsheng@627
|
5934 "until it has had a little testing."
|
|
dongsheng@627
|
5935 msgstr ""
|
|
dongsheng@627
|
5936
|
|
dongsheng@627
|
5937 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5938 #: ../en/ch06-collab.xml:165
|
|
dongsheng@627
|
5939 msgid ""
|
|
dongsheng@627
|
5940 "In this kind of scenario, people usually use the <command>ssh</command> "
|
|
dongsheng@627
|
5941 "protocol to securely push changes to the central repository, as documented in "
|
|
dongsheng@627
|
5942 "section <xref linkend=\"sec.collab.ssh\"/>. It's also usual to publish a "
|
|
dongsheng@627
|
5943 "read-only copy of the repository over HTTP using CGI, as in section <xref "
|
|
dongsheng@627
|
5944 "linkend=\"sec.collab.cgi\"/>. Publishing over HTTP satisfies the needs of "
|
|
dongsheng@627
|
5945 "people who don't have push access, and those who want to use web browsers to "
|
|
dongsheng@627
|
5946 "browse the repository's history."
|
|
dongsheng@627
|
5947 msgstr ""
|
|
dongsheng@627
|
5948
|
|
dongsheng@627
|
5949 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
5950 #: ../en/ch06-collab.xml:178
|
|
dongsheng@627
|
5951 msgid "Working with multiple branches"
|
|
dongsheng@630
|
5952 msgstr "使用多个分支工作"
|
|
dongsheng@627
|
5953
|
|
dongsheng@627
|
5954 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5955 #: ../en/ch06-collab.xml:180
|
|
dongsheng@627
|
5956 msgid ""
|
|
dongsheng@627
|
5957 "Projects of any significant size naturally tend to make progress on several "
|
|
dongsheng@627
|
5958 "fronts simultaneously. In the case of software, it's common for a project to "
|
|
dongsheng@627
|
5959 "go through periodic official releases. A release might then go into "
|
|
dongsheng@627
|
5960 "<quote>maintenance mode</quote> for a while after its first publication; "
|
|
dongsheng@627
|
5961 "maintenance releases tend to contain only bug fixes, not new features. In "
|
|
dongsheng@627
|
5962 "parallel with these maintenance releases, one or more future releases may be "
|
|
dongsheng@627
|
5963 "under development. People normally use the word <quote>branch</quote> to "
|
|
dongsheng@627
|
5964 "refer to one of these many slightly different directions in which development "
|
|
dongsheng@627
|
5965 "is proceeding."
|
|
dongsheng@627
|
5966 msgstr ""
|
|
dongsheng@627
|
5967
|
|
dongsheng@627
|
5968 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5969 #: ../en/ch06-collab.xml:193
|
|
dongsheng@627
|
5970 msgid ""
|
|
dongsheng@627
|
5971 "Mercurial is particularly well suited to managing a number of simultaneous, "
|
|
dongsheng@627
|
5972 "but not identical, branches. Each <quote>development direction</quote> can "
|
|
dongsheng@627
|
5973 "live in its own central repository, and you can merge changes from one to "
|
|
dongsheng@627
|
5974 "another as the need arises. Because repositories are independent of each "
|
|
dongsheng@627
|
5975 "other, unstable changes in a development branch will never affect a stable "
|
|
dongsheng@627
|
5976 "branch unless someone explicitly merges those changes in."
|
|
dongsheng@627
|
5977 msgstr ""
|
|
dongsheng@627
|
5978
|
|
dongsheng@627
|
5979 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5980 #: ../en/ch06-collab.xml:202
|
|
dongsheng@627
|
5981 msgid ""
|
|
dongsheng@627
|
5982 "Here's an example of how this can work in practice. Let's say you have one "
|
|
dongsheng@627
|
5983 "<quote>main branch</quote> on a central server."
|
|
dongsheng@627
|
5984 msgstr ""
|
|
dongsheng@627
|
5985
|
|
dongsheng@627
|
5986 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5987 #: ../en/ch06-collab.xml:208
|
|
dongsheng@627
|
5988 msgid "People clone it, make changes locally, test them, and push them back."
|
|
dongsheng@627
|
5989 msgstr ""
|
|
dongsheng@627
|
5990
|
|
dongsheng@627
|
5991 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
5992 #: ../en/ch06-collab.xml:211
|
|
dongsheng@627
|
5993 msgid ""
|
|
dongsheng@627
|
5994 "Once the main branch reaches a release milestone, you can use the <command "
|
|
dongsheng@627
|
5995 "role=\"hg-cmd\">hg tag</command> command to give a permanent name to the "
|
|
dongsheng@627
|
5996 "milestone revision."
|
|
dongsheng@627
|
5997 msgstr ""
|
|
dongsheng@627
|
5998
|
|
dongsheng@627
|
5999 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6000 #: ../en/ch06-collab.xml:217
|
|
dongsheng@627
|
6001 msgid "Let's say some ongoing development occurs on the main branch."
|
|
dongsheng@627
|
6002 msgstr ""
|
|
dongsheng@627
|
6003
|
|
dongsheng@627
|
6004 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6005 #: ../en/ch06-collab.xml:222
|
|
dongsheng@627
|
6006 msgid ""
|
|
dongsheng@627
|
6007 "Using the tag that was recorded at the milestone, people who clone that "
|
|
dongsheng@627
|
6008 "repository at any time in the future can use <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
6009 "update</command> to get a copy of the working directory exactly as it was "
|
|
dongsheng@627
|
6010 "when that tagged revision was committed."
|
|
dongsheng@627
|
6011 msgstr ""
|
|
dongsheng@627
|
6012
|
|
dongsheng@627
|
6013 #
|
|
dongsheng@627
|
6014 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6015 #: ../en/ch06-collab.xml:230
|
|
dongsheng@627
|
6016 msgid ""
|
|
dongsheng@627
|
6017 "In addition, immediately after the main branch is tagged, someone can then "
|
|
dongsheng@627
|
6018 "clone the main branch on the server to a new <quote>stable</quote> branch, "
|
|
dongsheng@627
|
6019 "also on the server."
|
|
dongsheng@627
|
6020 msgstr ""
|
|
dongsheng@627
|
6021
|
|
dongsheng@627
|
6022 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6023 #: ../en/ch06-collab.xml:236
|
|
dongsheng@627
|
6024 msgid ""
|
|
dongsheng@627
|
6025 "Someone who needs to make a change to the stable branch can then clone "
|
|
dongsheng@627
|
6026 "<emphasis>that</emphasis> repository, make their changes, commit, and push "
|
|
dongsheng@627
|
6027 "their changes back there."
|
|
dongsheng@627
|
6028 msgstr ""
|
|
dongsheng@627
|
6029
|
|
dongsheng@627
|
6030 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6031 #: ../en/ch06-collab.xml:242
|
|
dongsheng@627
|
6032 msgid ""
|
|
dongsheng@627
|
6033 "Because Mercurial repositories are independent, and Mercurial doesn't move "
|
|
dongsheng@627
|
6034 "changes around automatically, the stable and main branches are "
|
|
dongsheng@627
|
6035 "<emphasis>isolated</emphasis> from each other. The changes that you made on "
|
|
dongsheng@627
|
6036 "the main branch don't <quote>leak</quote> to the stable branch, and vice "
|
|
dongsheng@627
|
6037 "versa."
|
|
dongsheng@627
|
6038 msgstr ""
|
|
dongsheng@627
|
6039
|
|
dongsheng@627
|
6040 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6041 #: ../en/ch06-collab.xml:249
|
|
dongsheng@627
|
6042 msgid ""
|
|
dongsheng@627
|
6043 "You'll often want all of your bugfixes on the stable branch to show up on the "
|
|
dongsheng@627
|
6044 "main branch, too. Rather than rewrite a bugfix on the main branch, you can "
|
|
dongsheng@627
|
6045 "simply pull and merge changes from the stable to the main branch, and "
|
|
dongsheng@627
|
6046 "Mercurial will bring those bugfixes in for you."
|
|
dongsheng@627
|
6047 msgstr ""
|
|
dongsheng@627
|
6048
|
|
dongsheng@627
|
6049 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6050 #: ../en/ch06-collab.xml:257
|
|
dongsheng@627
|
6051 msgid ""
|
|
dongsheng@627
|
6052 "The main branch will still contain changes that are not on the stable branch, "
|
|
dongsheng@627
|
6053 "but it will also contain all of the bugfixes from the stable branch. The "
|
|
dongsheng@627
|
6054 "stable branch remains unaffected by these changes."
|
|
dongsheng@627
|
6055 msgstr ""
|
|
dongsheng@627
|
6056
|
|
dongsheng@627
|
6057 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
6058 #: ../en/ch06-collab.xml:264 ../en/ch06-collab.xml:278
|
|
dongsheng@627
|
6059 msgid "Feature branches"
|
|
dongsheng@630
|
6060 msgstr "特性分支"
|
|
dongsheng@627
|
6061
|
|
dongsheng@627
|
6062 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
6063 #: ../en/ch06-collab.xml:266
|
|
dongsheng@627
|
6064 msgid ""
|
|
dongsheng@627
|
6065 "For larger projects, an effective way to manage change is to break up a team "
|
|
dongsheng@627
|
6066 "into smaller groups. Each group has a shared branch of its own, cloned from "
|
|
dongsheng@627
|
6067 "a single <quote>master</quote> branch used by the entire project. People "
|
|
dongsheng@627
|
6068 "working on an individual branch are typically quite isolated from "
|
|
dongsheng@627
|
6069 "developments on other branches."
|
|
dongsheng@627
|
6070 msgstr ""
|
|
dongsheng@627
|
6071
|
|
dongsheng@627
|
6072 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
6073 #: ../en/ch06-collab.xml:275
|
|
dongsheng@641
|
6074 msgid ""
|
|
dongsheng@641
|
6075 "<imageobject><imagedata fileref=\"images/feature-branches.png\"/> </"
|
|
dongsheng@627
|
6076 "imageobject>"
|
|
dongsheng@627
|
6077 msgstr ""
|
|
dongsheng@627
|
6078
|
|
dongsheng@627
|
6079 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6080 #: ../en/ch06-collab.xml:283
|
|
dongsheng@627
|
6081 msgid ""
|
|
dongsheng@627
|
6082 "When a particular feature is deemed to be in suitable shape, someone on that "
|
|
dongsheng@627
|
6083 "feature team pulls and merges from the master branch into the feature branch, "
|
|
dongsheng@627
|
6084 "then pushes back up to the master branch."
|
|
dongsheng@627
|
6085 msgstr ""
|
|
dongsheng@627
|
6086
|
|
dongsheng@627
|
6087 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6088 #: ../en/ch06-collab.xml:290
|
|
dongsheng@627
|
6089 msgid "The release train"
|
|
dongsheng@630
|
6090 msgstr "发布列车"
|
|
dongsheng@627
|
6091
|
|
dongsheng@627
|
6092 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6093 #: ../en/ch06-collab.xml:292
|
|
dongsheng@627
|
6094 msgid ""
|
|
dongsheng@627
|
6095 "Some projects are organised on a <quote>train</quote> basis: a release is "
|
|
dongsheng@627
|
6096 "scheduled to happen every few months, and whatever features are ready when "
|
|
dongsheng@627
|
6097 "the <quote>train</quote> is ready to leave are allowed in."
|
|
dongsheng@627
|
6098 msgstr ""
|
|
dongsheng@627
|
6099
|
|
dongsheng@627
|
6100 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6101 #: ../en/ch06-collab.xml:297
|
|
dongsheng@627
|
6102 msgid ""
|
|
dongsheng@627
|
6103 "This model resembles working with feature branches. The difference is that "
|
|
dongsheng@627
|
6104 "when a feature branch misses a train, someone on the feature team pulls and "
|
|
dongsheng@627
|
6105 "merges the changes that went out on that train release into the feature "
|
|
dongsheng@627
|
6106 "branch, and the team continues its work on top of that release so that their "
|
|
dongsheng@627
|
6107 "feature can make the next release."
|
|
dongsheng@627
|
6108 msgstr ""
|
|
dongsheng@627
|
6109
|
|
dongsheng@627
|
6110 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6111 #: ../en/ch06-collab.xml:306
|
|
dongsheng@627
|
6112 msgid "The Linux kernel model"
|
|
dongsheng@630
|
6113 msgstr "Linux 内核模型"
|
|
dongsheng@627
|
6114
|
|
dongsheng@627
|
6115 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6116 #: ../en/ch06-collab.xml:308
|
|
dongsheng@627
|
6117 msgid ""
|
|
dongsheng@627
|
6118 "The development of the Linux kernel has a shallow hierarchical structure, "
|
|
dongsheng@627
|
6119 "surrounded by a cloud of apparent chaos. Because most Linux developers use "
|
|
dongsheng@627
|
6120 "<command>git</command>, a distributed revision control tool with capabilities "
|
|
dongsheng@627
|
6121 "similar to Mercurial, it's useful to describe the way work flows in that "
|
|
dongsheng@627
|
6122 "environment; if you like the ideas, the approach translates well across tools."
|
|
dongsheng@627
|
6123 msgstr ""
|
|
dongsheng@627
|
6124
|
|
dongsheng@627
|
6125 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6126 #: ../en/ch06-collab.xml:316
|
|
dongsheng@627
|
6127 msgid ""
|
|
dongsheng@627
|
6128 "At the center of the community sits Linus Torvalds, the creator of Linux. He "
|
|
dongsheng@627
|
6129 "publishes a single source repository that is considered the "
|
|
dongsheng@627
|
6130 "<quote>authoritative</quote> current tree by the entire developer community. "
|
|
dongsheng@627
|
6131 "Anyone can clone Linus's tree, but he is very choosy about whose trees he "
|
|
dongsheng@627
|
6132 "pulls from."
|
|
dongsheng@627
|
6133 msgstr ""
|
|
dongsheng@627
|
6134
|
|
dongsheng@627
|
6135 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6136 #: ../en/ch06-collab.xml:323
|
|
dongsheng@627
|
6137 msgid ""
|
|
dongsheng@627
|
6138 "Linus has a number of <quote>trusted lieutenants</quote>. As a general rule, "
|
|
dongsheng@627
|
6139 "he pulls whatever changes they publish, in most cases without even reviewing "
|
|
dongsheng@627
|
6140 "those changes. Some of those lieutenants are generally agreed to be "
|
|
dongsheng@627
|
6141 "<quote>maintainers</quote>, responsible for specific subsystems within the "
|
|
dongsheng@627
|
6142 "kernel. If a random kernel hacker wants to make a change to a subsystem that "
|
|
dongsheng@627
|
6143 "they want to end up in Linus's tree, they must find out who the subsystem's "
|
|
dongsheng@627
|
6144 "maintainer is, and ask that maintainer to take their change. If the "
|
|
dongsheng@627
|
6145 "maintainer reviews their changes and agrees to take them, they'll pass them "
|
|
dongsheng@627
|
6146 "along to Linus in due course."
|
|
dongsheng@627
|
6147 msgstr ""
|
|
dongsheng@627
|
6148
|
|
dongsheng@627
|
6149 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6150 #: ../en/ch06-collab.xml:335
|
|
dongsheng@627
|
6151 msgid ""
|
|
dongsheng@627
|
6152 "Individual lieutenants have their own approaches to reviewing, accepting, and "
|
|
dongsheng@627
|
6153 "publishing changes; and for deciding when to feed them to Linus. In "
|
|
dongsheng@627
|
6154 "addition, there are several well known branches that people use for different "
|
|
dongsheng@627
|
6155 "purposes. For example, a few people maintain <quote>stable</quote> "
|
|
dongsheng@627
|
6156 "repositories of older versions of the kernel, to which they apply critical "
|
|
dongsheng@627
|
6157 "fixes as needed. Some maintainers publish multiple trees: one for "
|
|
dongsheng@627
|
6158 "experimental changes; one for changes that they are about to feed upstream; "
|
|
dongsheng@627
|
6159 "and so on. Others just publish a single tree."
|
|
dongsheng@627
|
6160 msgstr ""
|
|
dongsheng@627
|
6161
|
|
dongsheng@627
|
6162 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6163 #: ../en/ch06-collab.xml:346
|
|
dongsheng@627
|
6164 msgid ""
|
|
dongsheng@627
|
6165 "This model has two notable features. The first is that it's <quote>pull "
|
|
dongsheng@627
|
6166 "only</quote>. You have to ask, convince, or beg another developer to take a "
|
|
dongsheng@627
|
6167 "change from you, because there are almost no trees to which more than one "
|
|
dongsheng@627
|
6168 "person can push, and there's no way to push changes into a tree that someone "
|
|
dongsheng@627
|
6169 "else controls."
|
|
dongsheng@627
|
6170 msgstr ""
|
|
dongsheng@627
|
6171
|
|
dongsheng@627
|
6172 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6173 #: ../en/ch06-collab.xml:353
|
|
dongsheng@627
|
6174 msgid ""
|
|
dongsheng@627
|
6175 "The second is that it's based on reputation and acclaim. If you're an "
|
|
dongsheng@627
|
6176 "unknown, Linus will probably ignore changes from you without even "
|
|
dongsheng@627
|
6177 "responding. But a subsystem maintainer will probably review them, and will "
|
|
dongsheng@627
|
6178 "likely take them if they pass their criteria for suitability. The more "
|
|
dongsheng@627
|
6179 "<quote>good</quote> changes you contribute to a maintainer, the more likely "
|
|
dongsheng@627
|
6180 "they are to trust your judgment and accept your changes. If you're well-"
|
|
dongsheng@627
|
6181 "known and maintain a long-lived branch for something Linus hasn't yet "
|
|
dongsheng@627
|
6182 "accepted, people with similar interests may pull your changes regularly to "
|
|
dongsheng@627
|
6183 "keep up with your work."
|
|
dongsheng@627
|
6184 msgstr ""
|
|
dongsheng@627
|
6185
|
|
dongsheng@627
|
6186 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6187 #: ../en/ch06-collab.xml:364
|
|
dongsheng@627
|
6188 msgid ""
|
|
dongsheng@627
|
6189 "Reputation and acclaim don't necessarily cross subsystem or <quote>people</"
|
|
dongsheng@627
|
6190 "quote> boundaries. If you're a respected but specialised storage hacker, and "
|
|
dongsheng@627
|
6191 "you try to fix a networking bug, that change will receive a level of scrutiny "
|
|
dongsheng@627
|
6192 "from a network maintainer comparable to a change from a complete stranger."
|
|
dongsheng@627
|
6193 msgstr ""
|
|
dongsheng@627
|
6194
|
|
dongsheng@627
|
6195 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6196 #: ../en/ch06-collab.xml:371
|
|
dongsheng@627
|
6197 msgid ""
|
|
dongsheng@627
|
6198 "To people who come from more orderly project backgrounds, the comparatively "
|
|
dongsheng@627
|
6199 "chaotic Linux kernel development process often seems completely insane. It's "
|
|
dongsheng@627
|
6200 "subject to the whims of individuals; people make sweeping changes whenever "
|
|
dongsheng@627
|
6201 "they deem it appropriate; and the pace of development is astounding. And yet "
|
|
dongsheng@627
|
6202 "Linux is a highly successful, well-regarded piece of software."
|
|
dongsheng@627
|
6203 msgstr ""
|
|
dongsheng@627
|
6204
|
|
dongsheng@627
|
6205 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6206 #: ../en/ch06-collab.xml:381
|
|
dongsheng@627
|
6207 msgid "Pull-only versus shared-push collaboration"
|
|
dongsheng@630
|
6208 msgstr "只读与共享写协作"
|
|
dongsheng@627
|
6209
|
|
dongsheng@627
|
6210 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6211 #: ../en/ch06-collab.xml:383
|
|
dongsheng@627
|
6212 msgid ""
|
|
dongsheng@627
|
6213 "A perpetual source of heat in the open source community is whether a "
|
|
dongsheng@627
|
6214 "development model in which people only ever pull changes from others is "
|
|
dongsheng@627
|
6215 "<quote>better than</quote> one in which multiple people can push changes to a "
|
|
dongsheng@627
|
6216 "shared repository."
|
|
dongsheng@627
|
6217 msgstr ""
|
|
dongsheng@627
|
6218
|
|
dongsheng@627
|
6219 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6220 #: ../en/ch06-collab.xml:389
|
|
dongsheng@627
|
6221 msgid ""
|
|
dongsheng@627
|
6222 "Typically, the backers of the shared-push model use tools that actively "
|
|
dongsheng@627
|
6223 "enforce this approach. If you're using a centralised revision control tool "
|
|
dongsheng@627
|
6224 "such as Subversion, there's no way to make a choice over which model you'll "
|
|
dongsheng@627
|
6225 "use: the tool gives you shared-push, and if you want to do anything else, "
|
|
dongsheng@627
|
6226 "you'll have to roll your own approach on top (such as applying a patch by "
|
|
dongsheng@627
|
6227 "hand)."
|
|
dongsheng@627
|
6228 msgstr ""
|
|
dongsheng@627
|
6229
|
|
dongsheng@627
|
6230 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6231 #: ../en/ch06-collab.xml:397
|
|
dongsheng@627
|
6232 msgid ""
|
|
dongsheng@627
|
6233 "A good distributed revision control tool, such as Mercurial, will support "
|
|
dongsheng@627
|
6234 "both models. You and your collaborators can then structure how you work "
|
|
dongsheng@627
|
6235 "together based on your own needs and preferences, not on what contortions "
|
|
dongsheng@627
|
6236 "your tools force you into."
|
|
dongsheng@627
|
6237 msgstr ""
|
|
dongsheng@627
|
6238
|
|
dongsheng@627
|
6239 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6240 #: ../en/ch06-collab.xml:405
|
|
dongsheng@627
|
6241 msgid "Where collaboration meets branch management"
|
|
dongsheng@630
|
6242 msgstr "协作与分支管理"
|
|
dongsheng@627
|
6243
|
|
dongsheng@627
|
6244 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6245 #: ../en/ch06-collab.xml:407
|
|
dongsheng@627
|
6246 msgid ""
|
|
dongsheng@627
|
6247 "Once you and your team set up some shared repositories and start propagating "
|
|
dongsheng@627
|
6248 "changes back and forth between local and shared repos, you begin to face a "
|
|
dongsheng@627
|
6249 "related, but slightly different challenge: that of managing the multiple "
|
|
dongsheng@627
|
6250 "directions in which your team may be moving at once. Even though this "
|
|
dongsheng@627
|
6251 "subject is intimately related to how your team collaborates, it's dense "
|
|
dongsheng@627
|
6252 "enough to merit treatment of its own, in chapter <xref linkend=\"chap.branch"
|
|
dongsheng@627
|
6253 "\"/>."
|
|
dongsheng@627
|
6254 msgstr ""
|
|
dongsheng@627
|
6255
|
|
dongsheng@627
|
6256 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
6257 #: ../en/ch06-collab.xml:419
|
|
dongsheng@627
|
6258 msgid "The technical side of sharing"
|
|
dongsheng@630
|
6259 msgstr "共享的技术因素"
|
|
dongsheng@627
|
6260
|
|
dongsheng@627
|
6261 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6262 #: ../en/ch06-collab.xml:421
|
|
dongsheng@627
|
6263 msgid ""
|
|
dongsheng@627
|
6264 "The remainder of this chapter is devoted to the question of serving data to "
|
|
dongsheng@627
|
6265 "your collaborators."
|
|
dongsheng@627
|
6266 msgstr ""
|
|
dongsheng@627
|
6267
|
|
dongsheng@627
|
6268 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
6269 #: ../en/ch06-collab.xml:426
|
|
dongsheng@627
|
6270 msgid "Informal sharing with <command role=\"hg-cmd\">hg serve</command>"
|
|
dongsheng@630
|
6271 msgstr "使用 <command role=\"hg-cmd\">hg serve</command> 进行非正式共享"
|
|
dongsheng@627
|
6272
|
|
dongsheng@627
|
6273 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6274 #: ../en/ch06-collab.xml:429
|
|
dongsheng@627
|
6275 msgid ""
|
|
dongsheng@627
|
6276 "Mercurial's <command role=\"hg-cmd\">hg serve</command> command is "
|
|
dongsheng@627
|
6277 "wonderfully suited to small, tight-knit, and fast-paced group environments. "
|
|
dongsheng@627
|
6278 "It also provides a great way to get a feel for using Mercurial commands over "
|
|
dongsheng@627
|
6279 "a network."
|
|
dongsheng@627
|
6280 msgstr ""
|
|
dongsheng@627
|
6281
|
|
dongsheng@627
|
6282 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6283 #: ../en/ch06-collab.xml:434
|
|
dongsheng@627
|
6284 msgid ""
|
|
dongsheng@627
|
6285 "Run <command role=\"hg-cmd\">hg serve</command> inside a repository, and in "
|
|
dongsheng@627
|
6286 "under a second it will bring up a specialised HTTP server; this will accept "
|
|
dongsheng@627
|
6287 "connections from any client, and serve up data for that repository until you "
|
|
dongsheng@627
|
6288 "terminate it. Anyone who knows the URL of the server you just started, and "
|
|
dongsheng@627
|
6289 "can talk to your computer over the network, can then use a web browser or "
|
|
dongsheng@627
|
6290 "Mercurial to read data from that repository. A URL for a <command role=\"hg-"
|
|
dongsheng@627
|
6291 "cmd\">hg serve</command> instance running on a laptop is likely to look "
|
|
dongsheng@627
|
6292 "something like <literal>http://my-laptop.local:8000/</literal>."
|
|
dongsheng@627
|
6293 msgstr ""
|
|
dongsheng@627
|
6294
|
|
dongsheng@627
|
6295 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6296 #: ../en/ch06-collab.xml:445
|
|
dongsheng@627
|
6297 msgid ""
|
|
dongsheng@627
|
6298 "The <command role=\"hg-cmd\">hg serve</command> command is <emphasis>not</"
|
|
dongsheng@627
|
6299 "emphasis> a general-purpose web server. It can do only two things:"
|
|
dongsheng@627
|
6300 msgstr ""
|
|
dongsheng@627
|
6301
|
|
dongsheng@627
|
6302 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6303 #: ../en/ch06-collab.xml:449
|
|
dongsheng@627
|
6304 msgid ""
|
|
dongsheng@627
|
6305 "Allow people to browse the history of the repository it's serving, from their "
|
|
dongsheng@627
|
6306 "normal web browsers."
|
|
dongsheng@627
|
6307 msgstr ""
|
|
dongsheng@627
|
6308
|
|
dongsheng@627
|
6309 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6310 #: ../en/ch06-collab.xml:453
|
|
dongsheng@627
|
6311 msgid ""
|
|
dongsheng@627
|
6312 "Speak Mercurial's wire protocol, so that people can <command role=\"hg-cmd"
|
|
dongsheng@627
|
6313 "\">hg clone</command> or <command role=\"hg-cmd\">hg pull</command> changes "
|
|
dongsheng@627
|
6314 "from that repository."
|
|
dongsheng@627
|
6315 msgstr ""
|
|
dongsheng@627
|
6316
|
|
dongsheng@627
|
6317 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6318 #: ../en/ch06-collab.xml:458
|
|
dongsheng@627
|
6319 msgid ""
|
|
dongsheng@627
|
6320 "In particular, <command role=\"hg-cmd\">hg serve</command> won't allow remote "
|
|
dongsheng@627
|
6321 "users to <emphasis>modify</emphasis> your repository. It's intended for read-"
|
|
dongsheng@627
|
6322 "only use."
|
|
dongsheng@627
|
6323 msgstr ""
|
|
dongsheng@627
|
6324
|
|
dongsheng@627
|
6325 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6326 #: ../en/ch06-collab.xml:462
|
|
dongsheng@627
|
6327 msgid ""
|
|
dongsheng@627
|
6328 "If you're getting started with Mercurial, there's nothing to prevent you from "
|
|
dongsheng@627
|
6329 "using <command role=\"hg-cmd\">hg serve</command> to serve up a repository on "
|
|
dongsheng@627
|
6330 "your own computer, then use commands like <command role=\"hg-cmd\">hg clone</"
|
|
dongsheng@627
|
6331 "command>, <command role=\"hg-cmd\">hg incoming</command>, and so on to talk "
|
|
dongsheng@627
|
6332 "to that server as if the repository was hosted remotely. This can help you to "
|
|
dongsheng@627
|
6333 "quickly get acquainted with using commands on network-hosted repositories."
|
|
dongsheng@627
|
6334 msgstr ""
|
|
dongsheng@627
|
6335
|
|
dongsheng@627
|
6336 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6337 #: ../en/ch06-collab.xml:472
|
|
dongsheng@627
|
6338 msgid "A few things to keep in mind"
|
|
dongsheng@630
|
6339 msgstr "要牢记的几件事"
|
|
dongsheng@627
|
6340
|
|
dongsheng@627
|
6341 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6342 #: ../en/ch06-collab.xml:474
|
|
dongsheng@627
|
6343 msgid ""
|
|
dongsheng@627
|
6344 "Because it provides unauthenticated read access to all clients, you should "
|
|
dongsheng@627
|
6345 "only use <command role=\"hg-cmd\">hg serve</command> in an environment where "
|
|
dongsheng@627
|
6346 "you either don't care, or have complete control over, who can access your "
|
|
dongsheng@627
|
6347 "network and pull data from your repository."
|
|
dongsheng@627
|
6348 msgstr ""
|
|
dongsheng@627
|
6349
|
|
dongsheng@627
|
6350 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6351 #: ../en/ch06-collab.xml:480
|
|
dongsheng@627
|
6352 msgid ""
|
|
dongsheng@627
|
6353 "The <command role=\"hg-cmd\">hg serve</command> command knows nothing about "
|
|
dongsheng@627
|
6354 "any firewall software you might have installed on your system or network. It "
|
|
dongsheng@627
|
6355 "cannot detect or control your firewall software. If other people are unable "
|
|
dongsheng@627
|
6356 "to talk to a running <command role=\"hg-cmd\">hg serve</command> instance, "
|
|
dongsheng@627
|
6357 "the second thing you should do (<emphasis>after</emphasis> you make sure that "
|
|
dongsheng@627
|
6358 "they're using the correct URL) is check your firewall configuration."
|
|
dongsheng@627
|
6359 msgstr ""
|
|
dongsheng@627
|
6360
|
|
dongsheng@627
|
6361 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6362 #: ../en/ch06-collab.xml:489
|
|
dongsheng@627
|
6363 msgid ""
|
|
dongsheng@627
|
6364 "By default, <command role=\"hg-cmd\">hg serve</command> listens for incoming "
|
|
dongsheng@627
|
6365 "connections on port 8000. If another process is already listening on the "
|
|
dongsheng@627
|
6366 "port you want to use, you can specify a different port to listen on using the "
|
|
dongsheng@627
|
6367 "<option role=\"hg-opt-serve\">-p</option> option."
|
|
dongsheng@627
|
6368 msgstr ""
|
|
dongsheng@627
|
6369
|
|
dongsheng@627
|
6370 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6371 #: ../en/ch06-collab.xml:495
|
|
dongsheng@627
|
6372 msgid ""
|
|
dongsheng@627
|
6373 "Normally, when <command role=\"hg-cmd\">hg serve</command> starts, it prints "
|
|
dongsheng@627
|
6374 "no output, which can be a bit unnerving. If you'd like to confirm that it is "
|
|
dongsheng@627
|
6375 "indeed running correctly, and find out what URL you should send to your "
|
|
dongsheng@627
|
6376 "collaborators, start it with the <option role=\"hg-opt-global\">-v</option> "
|
|
dongsheng@627
|
6377 "option."
|
|
dongsheng@627
|
6378 msgstr ""
|
|
dongsheng@627
|
6379
|
|
dongsheng@627
|
6380 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
6381 #: ../en/ch06-collab.xml:505
|
|
dongsheng@627
|
6382 msgid "Using the Secure Shell (ssh) protocol"
|
|
dongsheng@630
|
6383 msgstr "使用 ssh 协议"
|
|
dongsheng@627
|
6384
|
|
dongsheng@627
|
6385 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6386 #: ../en/ch06-collab.xml:507
|
|
dongsheng@627
|
6387 msgid ""
|
|
dongsheng@627
|
6388 "You can pull and push changes securely over a network connection using the "
|
|
dongsheng@627
|
6389 "Secure Shell (<literal>ssh</literal>) protocol. To use this successfully, "
|
|
dongsheng@627
|
6390 "you may have to do a little bit of configuration on the client or server "
|
|
dongsheng@627
|
6391 "sides."
|
|
dongsheng@627
|
6392 msgstr ""
|
|
dongsheng@627
|
6393
|
|
dongsheng@627
|
6394 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6395 #: ../en/ch06-collab.xml:512
|
|
dongsheng@627
|
6396 msgid ""
|
|
dongsheng@627
|
6397 "If you're not familiar with ssh, it's a network protocol that lets you "
|
|
dongsheng@627
|
6398 "securely communicate with another computer. To use it with Mercurial, you'll "
|
|
dongsheng@627
|
6399 "be setting up one or more user accounts on a server so that remote users can "
|
|
dongsheng@627
|
6400 "log in and execute commands."
|
|
dongsheng@627
|
6401 msgstr ""
|
|
dongsheng@627
|
6402
|
|
dongsheng@627
|
6403 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6404 #: ../en/ch06-collab.xml:518
|
|
dongsheng@627
|
6405 msgid ""
|
|
dongsheng@627
|
6406 "(If you <emphasis>are</emphasis> familiar with ssh, you'll probably find some "
|
|
dongsheng@627
|
6407 "of the material that follows to be elementary in nature.)"
|
|
dongsheng@627
|
6408 msgstr ""
|
|
dongsheng@627
|
6409
|
|
dongsheng@627
|
6410 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6411 #: ../en/ch06-collab.xml:523
|
|
dongsheng@627
|
6412 msgid "How to read and write ssh URLs"
|
|
dongsheng@630
|
6413 msgstr "如何读写 ssh 路径"
|
|
dongsheng@627
|
6414
|
|
dongsheng@627
|
6415 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6416 #: ../en/ch06-collab.xml:525
|
|
dongsheng@627
|
6417 msgid "An ssh URL tends to look like this:"
|
|
dongsheng@627
|
6418 msgstr ""
|
|
dongsheng@627
|
6419
|
|
dongsheng@627
|
6420 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6421 #: ../en/ch06-collab.xml:528
|
|
dongsheng@627
|
6422 msgid ""
|
|
dongsheng@627
|
6423 "The <quote><literal>ssh://</literal></quote> part tells Mercurial to use the "
|
|
dongsheng@627
|
6424 "ssh protocol."
|
|
dongsheng@627
|
6425 msgstr ""
|
|
dongsheng@627
|
6426
|
|
dongsheng@627
|
6427 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6428 #: ../en/ch06-collab.xml:531
|
|
dongsheng@627
|
6429 msgid ""
|
|
dongsheng@627
|
6430 "The <quote><literal>bos@</literal></quote> component indicates what username "
|
|
dongsheng@627
|
6431 "to log into the server as. You can leave this out if the remote username is "
|
|
dongsheng@627
|
6432 "the same as your local username."
|
|
dongsheng@627
|
6433 msgstr ""
|
|
dongsheng@627
|
6434
|
|
dongsheng@627
|
6435 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6436 #: ../en/ch06-collab.xml:536
|
|
dongsheng@627
|
6437 msgid ""
|
|
dongsheng@627
|
6438 "The <quote><literal>hg.serpentine.com</literal></quote> gives the hostname of "
|
|
dongsheng@627
|
6439 "the server to log into."
|
|
dongsheng@627
|
6440 msgstr ""
|
|
dongsheng@627
|
6441
|
|
dongsheng@627
|
6442 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6443 #: ../en/ch06-collab.xml:540
|
|
dongsheng@627
|
6444 msgid ""
|
|
dongsheng@627
|
6445 "The <quote>:22</quote> identifies the port number to connect to the server "
|
|
dongsheng@627
|
6446 "on. The default port is 22, so you only need to specify this part if you're "
|
|
dongsheng@627
|
6447 "<emphasis>not</emphasis> using port 22."
|
|
dongsheng@627
|
6448 msgstr ""
|
|
dongsheng@627
|
6449
|
|
dongsheng@627
|
6450 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6451 #: ../en/ch06-collab.xml:545
|
|
dongsheng@627
|
6452 msgid ""
|
|
dongsheng@627
|
6453 "The remainder of the URL is the local path to the repository on the server."
|
|
dongsheng@627
|
6454 msgstr ""
|
|
dongsheng@627
|
6455
|
|
dongsheng@627
|
6456 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6457 #: ../en/ch06-collab.xml:549
|
|
dongsheng@627
|
6458 msgid ""
|
|
dongsheng@627
|
6459 "There's plenty of scope for confusion with the path component of ssh URLs, as "
|
|
dongsheng@627
|
6460 "there is no standard way for tools to interpret it. Some programs behave "
|
|
dongsheng@627
|
6461 "differently than others when dealing with these paths. This isn't an ideal "
|
|
dongsheng@627
|
6462 "situation, but it's unlikely to change. Please read the following paragraphs "
|
|
dongsheng@627
|
6463 "carefully."
|
|
dongsheng@627
|
6464 msgstr ""
|
|
dongsheng@627
|
6465
|
|
dongsheng@627
|
6466 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6467 #: ../en/ch06-collab.xml:556
|
|
dongsheng@627
|
6468 msgid ""
|
|
dongsheng@627
|
6469 "Mercurial treats the path to a repository on the server as relative to the "
|
|
dongsheng@627
|
6470 "remote user's home directory. For example, if user <literal>foo</literal> on "
|
|
dongsheng@627
|
6471 "the server has a home directory of <filename class=\"directory\">/home/foo</"
|
|
dongsheng@627
|
6472 "filename>, then an ssh URL that contains a path component of <filename class="
|
|
dongsheng@627
|
6473 "\"directory\">bar</filename> <emphasis>really</emphasis> refers to the "
|
|
dongsheng@627
|
6474 "directory <filename class=\"directory\">/home/foo/bar</filename>."
|
|
dongsheng@627
|
6475 msgstr ""
|
|
dongsheng@627
|
6476
|
|
dongsheng@627
|
6477 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6478 #: ../en/ch06-collab.xml:565
|
|
dongsheng@627
|
6479 msgid ""
|
|
dongsheng@627
|
6480 "If you want to specify a path relative to another user's home directory, you "
|
|
dongsheng@627
|
6481 "can use a path that starts with a tilde character followed by the user's name "
|
|
dongsheng@627
|
6482 "(let's call them <literal>otheruser</literal>), like this."
|
|
dongsheng@627
|
6483 msgstr ""
|
|
dongsheng@627
|
6484
|
|
dongsheng@627
|
6485 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6486 #: ../en/ch06-collab.xml:571
|
|
dongsheng@627
|
6487 msgid ""
|
|
dongsheng@627
|
6488 "And if you really want to specify an <emphasis>absolute</emphasis> path on "
|
|
dongsheng@627
|
6489 "the server, begin the path component with two slashes, as in this example."
|
|
dongsheng@627
|
6490 msgstr ""
|
|
dongsheng@627
|
6491
|
|
dongsheng@627
|
6492 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6493 #: ../en/ch06-collab.xml:578
|
|
dongsheng@627
|
6494 msgid "Finding an ssh client for your system"
|
|
dongsheng@630
|
6495 msgstr "为你的系统寻找 ssh 客户端"
|
|
dongsheng@627
|
6496
|
|
dongsheng@627
|
6497 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6498 #: ../en/ch06-collab.xml:580
|
|
dongsheng@627
|
6499 msgid ""
|
|
dongsheng@627
|
6500 "Almost every Unix-like system comes with OpenSSH preinstalled. If you're "
|
|
dongsheng@627
|
6501 "using such a system, run <literal>which ssh</literal> to find out if the "
|
|
dongsheng@627
|
6502 "<command>ssh</command> command is installed (it's usually in <filename class="
|
|
dongsheng@627
|
6503 "\"directory\">/usr/bin</filename>). In the unlikely event that it isn't "
|
|
dongsheng@627
|
6504 "present, take a look at your system documentation to figure out how to "
|
|
dongsheng@627
|
6505 "install it."
|
|
dongsheng@627
|
6506 msgstr ""
|
|
dongsheng@627
|
6507
|
|
dongsheng@627
|
6508 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6509 #: ../en/ch06-collab.xml:588
|
|
dongsheng@627
|
6510 msgid ""
|
|
dongsheng@627
|
6511 "On Windows, you'll first need to download a suitable ssh client. There are "
|
|
dongsheng@627
|
6512 "two alternatives."
|
|
dongsheng@627
|
6513 msgstr ""
|
|
dongsheng@627
|
6514
|
|
dongsheng@627
|
6515 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6516 #: ../en/ch06-collab.xml:591
|
|
dongsheng@627
|
6517 msgid ""
|
|
dongsheng@627
|
6518 "Simon Tatham's excellent PuTTY package <citation>web:putty</citation> "
|
|
dongsheng@627
|
6519 "provides a complete suite of ssh client commands."
|
|
dongsheng@627
|
6520 msgstr ""
|
|
dongsheng@627
|
6521
|
|
dongsheng@627
|
6522 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6523 #: ../en/ch06-collab.xml:595
|
|
dongsheng@627
|
6524 msgid ""
|
|
dongsheng@627
|
6525 "If you have a high tolerance for pain, you can use the Cygwin port of OpenSSH."
|
|
dongsheng@627
|
6526 msgstr ""
|
|
dongsheng@627
|
6527
|
|
dongsheng@627
|
6528 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6529 #: ../en/ch06-collab.xml:598
|
|
dongsheng@627
|
6530 msgid ""
|
|
dongsheng@627
|
6531 "In either case, you'll need to edit your \\hgini\\ file to tell Mercurial "
|
|
dongsheng@627
|
6532 "where to find the actual client command. For example, if you're using PuTTY, "
|
|
dongsheng@627
|
6533 "you'll need to use the <command>plink</command> command as a command-line ssh "
|
|
dongsheng@627
|
6534 "client."
|
|
dongsheng@627
|
6535 msgstr ""
|
|
dongsheng@627
|
6536
|
|
dongsheng@627
|
6537 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@641
|
6538 #: ../en/ch06-collab.xml:607
|
|
dongsheng@627
|
6539 msgid ""
|
|
dongsheng@627
|
6540 "The path to <command>plink</command> shouldn't contain any whitespace "
|
|
dongsheng@627
|
6541 "characters, or Mercurial may not be able to run it correctly (so putting it "
|
|
dongsheng@627
|
6542 "in <filename class=\"directory\">C:\\\\Program Files</filename> is probably "
|
|
dongsheng@627
|
6543 "not a good idea)."
|
|
dongsheng@627
|
6544 msgstr ""
|
|
dongsheng@627
|
6545
|
|
dongsheng@627
|
6546 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6547 #: ../en/ch06-collab.xml:616
|
|
dongsheng@627
|
6548 msgid "Generating a key pair"
|
|
dongsheng@630
|
6549 msgstr "产生密钥对"
|
|
dongsheng@627
|
6550
|
|
dongsheng@627
|
6551 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6552 #: ../en/ch06-collab.xml:618
|
|
dongsheng@627
|
6553 msgid ""
|
|
dongsheng@627
|
6554 "To avoid the need to repetitively type a password every time you need to use "
|
|
dongsheng@627
|
6555 "your ssh client, I recommend generating a key pair. On a Unix-like system, "
|
|
dongsheng@627
|
6556 "the <command>ssh-keygen</command> command will do the trick. On Windows, if "
|
|
dongsheng@627
|
6557 "you're using PuTTY, the <command>puttygen</command> command is what you'll "
|
|
dongsheng@627
|
6558 "need."
|
|
dongsheng@627
|
6559 msgstr ""
|
|
dongsheng@627
|
6560
|
|
dongsheng@627
|
6561 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6562 #: ../en/ch06-collab.xml:626
|
|
dongsheng@627
|
6563 msgid ""
|
|
dongsheng@627
|
6564 "When you generate a key pair, it's usually <emphasis>highly</emphasis> "
|
|
dongsheng@627
|
6565 "advisable to protect it with a passphrase. (The only time that you might not "
|
|
dongsheng@627
|
6566 "want to do this is when you're using the ssh protocol for automated tasks on "
|
|
dongsheng@627
|
6567 "a secure network.)"
|
|
dongsheng@627
|
6568 msgstr ""
|
|
dongsheng@627
|
6569
|
|
dongsheng@627
|
6570 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6571 #: ../en/ch06-collab.xml:632
|
|
dongsheng@627
|
6572 msgid ""
|
|
dongsheng@627
|
6573 "Simply generating a key pair isn't enough, however. You'll need to add the "
|
|
dongsheng@627
|
6574 "public key to the set of authorised keys for whatever user you're logging in "
|
|
dongsheng@627
|
6575 "remotely as. For servers using OpenSSH (the vast majority), this will mean "
|
|
dongsheng@627
|
6576 "adding the public key to a list in a file called <filename role=\"special"
|
|
dongsheng@627
|
6577 "\">authorized_keys</filename> in their <filename role=\"special\" class="
|
|
dongsheng@627
|
6578 "\"directory\">.ssh</filename> directory."
|
|
dongsheng@627
|
6579 msgstr ""
|
|
dongsheng@627
|
6580
|
|
dongsheng@627
|
6581 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6582 #: ../en/ch06-collab.xml:641
|
|
dongsheng@627
|
6583 msgid ""
|
|
dongsheng@627
|
6584 "On a Unix-like system, your public key will have a <filename>.pub</filename> "
|
|
dongsheng@627
|
6585 "extension. If you're using <command>puttygen</command> on Windows, you can "
|
|
dongsheng@627
|
6586 "save the public key to a file of your choosing, or paste it from the window "
|
|
dongsheng@627
|
6587 "it's displayed in straight into the <filename role=\"special"
|
|
dongsheng@627
|
6588 "\">authorized_keys</filename> file."
|
|
dongsheng@627
|
6589 msgstr ""
|
|
dongsheng@627
|
6590
|
|
dongsheng@627
|
6591 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6592 #: ../en/ch06-collab.xml:650
|
|
dongsheng@627
|
6593 msgid "Using an authentication agent"
|
|
dongsheng@630
|
6594 msgstr "使用认证代理"
|
|
dongsheng@627
|
6595
|
|
dongsheng@627
|
6596 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6597 #: ../en/ch06-collab.xml:652
|
|
dongsheng@627
|
6598 msgid ""
|
|
dongsheng@627
|
6599 "An authentication agent is a daemon that stores passphrases in memory (so it "
|
|
dongsheng@627
|
6600 "will forget passphrases if you log out and log back in again). An ssh client "
|
|
dongsheng@627
|
6601 "will notice if it's running, and query it for a passphrase. If there's no "
|
|
dongsheng@627
|
6602 "authentication agent running, or the agent doesn't store the necessary "
|
|
dongsheng@627
|
6603 "passphrase, you'll have to type your passphrase every time Mercurial tries to "
|
|
dongsheng@627
|
6604 "communicate with a server on your behalf (e.g. whenever you pull or push "
|
|
dongsheng@627
|
6605 "changes)."
|
|
dongsheng@627
|
6606 msgstr ""
|
|
dongsheng@627
|
6607
|
|
dongsheng@627
|
6608 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6609 #: ../en/ch06-collab.xml:661
|
|
dongsheng@627
|
6610 msgid ""
|
|
dongsheng@627
|
6611 "The downside of storing passphrases in an agent is that it's possible for a "
|
|
dongsheng@627
|
6612 "well-prepared attacker to recover the plain text of your passphrases, in some "
|
|
dongsheng@627
|
6613 "cases even if your system has been power-cycled. You should make your own "
|
|
dongsheng@627
|
6614 "judgment as to whether this is an acceptable risk. It certainly saves a lot "
|
|
dongsheng@627
|
6615 "of repeated typing."
|
|
dongsheng@627
|
6616 msgstr ""
|
|
dongsheng@627
|
6617
|
|
dongsheng@627
|
6618 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6619 #: ../en/ch06-collab.xml:668
|
|
dongsheng@627
|
6620 msgid ""
|
|
dongsheng@627
|
6621 "On Unix-like systems, the agent is called <command>ssh-agent</command>, and "
|
|
dongsheng@627
|
6622 "it's often run automatically for you when you log in. You'll need to use the "
|
|
dongsheng@627
|
6623 "<command>ssh-add</command> command to add passphrases to the agent's store. "
|
|
dongsheng@627
|
6624 "On Windows, if you're using PuTTY, the <command>pageant</command> command "
|
|
dongsheng@627
|
6625 "acts as the agent. It adds an icon to your system tray that will let you "
|
|
dongsheng@627
|
6626 "manage stored passphrases."
|
|
dongsheng@627
|
6627 msgstr ""
|
|
dongsheng@627
|
6628
|
|
dongsheng@627
|
6629 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6630 #: ../en/ch06-collab.xml:679
|
|
dongsheng@627
|
6631 msgid "Configuring the server side properly"
|
|
dongsheng@630
|
6632 msgstr "正确配置服务器端"
|
|
dongsheng@627
|
6633
|
|
dongsheng@627
|
6634 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6635 #: ../en/ch06-collab.xml:681
|
|
dongsheng@627
|
6636 msgid ""
|
|
dongsheng@627
|
6637 "Because ssh can be fiddly to set up if you're new to it, there's a variety of "
|
|
dongsheng@627
|
6638 "things that can go wrong. Add Mercurial on top, and there's plenty more "
|
|
dongsheng@627
|
6639 "scope for head-scratching. Most of these potential problems occur on the "
|
|
dongsheng@627
|
6640 "server side, not the client side. The good news is that once you've gotten a "
|
|
dongsheng@627
|
6641 "configuration working, it will usually continue to work indefinitely."
|
|
dongsheng@627
|
6642 msgstr ""
|
|
dongsheng@627
|
6643
|
|
dongsheng@627
|
6644 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6645 #: ../en/ch06-collab.xml:689
|
|
dongsheng@627
|
6646 msgid ""
|
|
dongsheng@627
|
6647 "Before you try using Mercurial to talk to an ssh server, it's best to make "
|
|
dongsheng@627
|
6648 "sure that you can use the normal <command>ssh</command> or <command>putty</"
|
|
dongsheng@627
|
6649 "command> command to talk to the server first. If you run into problems with "
|
|
dongsheng@627
|
6650 "using these commands directly, Mercurial surely won't work. Worse, it will "
|
|
dongsheng@627
|
6651 "obscure the underlying problem. Any time you want to debug ssh-related "
|
|
dongsheng@627
|
6652 "Mercurial problems, you should drop back to making sure that plain ssh client "
|
|
dongsheng@627
|
6653 "commands work first, <emphasis>before</emphasis> you worry about whether "
|
|
dongsheng@627
|
6654 "there's a problem with Mercurial."
|
|
dongsheng@627
|
6655 msgstr ""
|
|
dongsheng@627
|
6656
|
|
dongsheng@627
|
6657 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6658 #: ../en/ch06-collab.xml:700
|
|
dongsheng@627
|
6659 msgid ""
|
|
dongsheng@627
|
6660 "The first thing to be sure of on the server side is that you can actually log "
|
|
dongsheng@627
|
6661 "in from another machine at all. If you can't use <command>ssh</command> or "
|
|
dongsheng@627
|
6662 "<command>putty</command> to log in, the error message you get may give you a "
|
|
dongsheng@627
|
6663 "few hints as to what's wrong. The most common problems are as follows."
|
|
dongsheng@627
|
6664 msgstr ""
|
|
dongsheng@627
|
6665
|
|
dongsheng@627
|
6666 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6667 #: ../en/ch06-collab.xml:707
|
|
dongsheng@627
|
6668 msgid ""
|
|
dongsheng@627
|
6669 "If you get a <quote>connection refused</quote> error, either there isn't an "
|
|
dongsheng@627
|
6670 "SSH daemon running on the server at all, or it's inaccessible due to firewall "
|
|
dongsheng@627
|
6671 "configuration."
|
|
dongsheng@627
|
6672 msgstr ""
|
|
dongsheng@627
|
6673
|
|
dongsheng@627
|
6674 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6675 #: ../en/ch06-collab.xml:712
|
|
dongsheng@627
|
6676 msgid ""
|
|
dongsheng@627
|
6677 "If you get a <quote>no route to host</quote> error, you either have an "
|
|
dongsheng@627
|
6678 "incorrect address for the server or a seriously locked down firewall that "
|
|
dongsheng@627
|
6679 "won't admit its existence at all."
|
|
dongsheng@627
|
6680 msgstr ""
|
|
dongsheng@627
|
6681
|
|
dongsheng@627
|
6682 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6683 #: ../en/ch06-collab.xml:717
|
|
dongsheng@627
|
6684 msgid ""
|
|
dongsheng@627
|
6685 "If you get a <quote>permission denied</quote> error, you may have mistyped "
|
|
dongsheng@627
|
6686 "the username on the server, or you could have mistyped your key's passphrase "
|
|
dongsheng@627
|
6687 "or the remote user's password."
|
|
dongsheng@627
|
6688 msgstr ""
|
|
dongsheng@627
|
6689
|
|
dongsheng@627
|
6690 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6691 #: ../en/ch06-collab.xml:722
|
|
dongsheng@627
|
6692 msgid ""
|
|
dongsheng@627
|
6693 "In summary, if you're having trouble talking to the server's ssh daemon, "
|
|
dongsheng@627
|
6694 "first make sure that one is running at all. On many systems it will be "
|
|
dongsheng@627
|
6695 "installed, but disabled, by default. Once you're done with this step, you "
|
|
dongsheng@627
|
6696 "should then check that the server's firewall is configured to allow incoming "
|
|
dongsheng@627
|
6697 "connections on the port the ssh daemon is listening on (usually 22). Don't "
|
|
dongsheng@627
|
6698 "worry about more exotic possibilities for misconfiguration until you've "
|
|
dongsheng@627
|
6699 "checked these two first."
|
|
dongsheng@627
|
6700 msgstr ""
|
|
dongsheng@627
|
6701
|
|
dongsheng@627
|
6702 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6703 #: ../en/ch06-collab.xml:732
|
|
dongsheng@627
|
6704 msgid ""
|
|
dongsheng@627
|
6705 "If you're using an authentication agent on the client side to store "
|
|
dongsheng@627
|
6706 "passphrases for your keys, you ought to be able to log into the server "
|
|
dongsheng@627
|
6707 "without being prompted for a passphrase or a password. If you're prompted "
|
|
dongsheng@627
|
6708 "for a passphrase, there are a few possible culprits."
|
|
dongsheng@627
|
6709 msgstr ""
|
|
dongsheng@627
|
6710
|
|
dongsheng@627
|
6711 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6712 #: ../en/ch06-collab.xml:738
|
|
dongsheng@627
|
6713 msgid ""
|
|
dongsheng@627
|
6714 "You might have forgotten to use <command>ssh-add</command> or "
|
|
dongsheng@627
|
6715 "<command>pageant</command> to store the passphrase."
|
|
dongsheng@627
|
6716 msgstr ""
|
|
dongsheng@627
|
6717
|
|
dongsheng@627
|
6718 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6719 #: ../en/ch06-collab.xml:742
|
|
dongsheng@627
|
6720 msgid "You might have stored the passphrase for the wrong key."
|
|
dongsheng@627
|
6721 msgstr ""
|
|
dongsheng@627
|
6722
|
|
dongsheng@627
|
6723 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6724 #: ../en/ch06-collab.xml:745
|
|
dongsheng@627
|
6725 msgid ""
|
|
dongsheng@627
|
6726 "If you're being prompted for the remote user's password, there are another "
|
|
dongsheng@627
|
6727 "few possible problems to check."
|
|
dongsheng@627
|
6728 msgstr ""
|
|
dongsheng@627
|
6729
|
|
dongsheng@627
|
6730 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6731 #: ../en/ch06-collab.xml:748
|
|
dongsheng@627
|
6732 msgid ""
|
|
dongsheng@627
|
6733 "Either the user's home directory or their <filename role=\"special\" class="
|
|
dongsheng@627
|
6734 "\"directory\">.ssh</filename> directory might have excessively liberal "
|
|
dongsheng@627
|
6735 "permissions. As a result, the ssh daemon will not trust or read their "
|
|
dongsheng@627
|
6736 "<filename role=\"special\">authorized_keys</filename> file. For example, a "
|
|
dongsheng@627
|
6737 "group-writable home or <filename role=\"special\" class=\"directory\">.ssh</"
|
|
dongsheng@627
|
6738 "filename> directory will often cause this symptom."
|
|
dongsheng@627
|
6739 msgstr ""
|
|
dongsheng@627
|
6740
|
|
dongsheng@627
|
6741 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6742 #: ../en/ch06-collab.xml:757
|
|
dongsheng@627
|
6743 msgid ""
|
|
dongsheng@627
|
6744 "The user's <filename role=\"special\">authorized_keys</filename> file may "
|
|
dongsheng@627
|
6745 "have a problem. If anyone other than the user owns or can write to that file, "
|
|
dongsheng@627
|
6746 "the ssh daemon will not trust or read it."
|
|
dongsheng@627
|
6747 msgstr ""
|
|
dongsheng@627
|
6748
|
|
dongsheng@627
|
6749 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6750 #: ../en/ch06-collab.xml:764
|
|
dongsheng@627
|
6751 msgid ""
|
|
dongsheng@627
|
6752 "In the ideal world, you should be able to run the following command "
|
|
dongsheng@627
|
6753 "successfully, and it should print exactly one line of output, the current "
|
|
dongsheng@627
|
6754 "date and time."
|
|
dongsheng@627
|
6755 msgstr ""
|
|
dongsheng@627
|
6756
|
|
dongsheng@627
|
6757 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6758 #: ../en/ch06-collab.xml:769
|
|
dongsheng@627
|
6759 msgid ""
|
|
dongsheng@627
|
6760 "If, on your server, you have login scripts that print banners or other junk "
|
|
dongsheng@627
|
6761 "even when running non-interactive commands like this, you should fix them "
|
|
dongsheng@627
|
6762 "before you continue, so that they only print output if they're run "
|
|
dongsheng@627
|
6763 "interactively. Otherwise these banners will at least clutter up Mercurial's "
|
|
dongsheng@627
|
6764 "output. Worse, they could potentially cause problems with running Mercurial "
|
|
dongsheng@627
|
6765 "commands remotely. Mercurial makes tries to detect and ignore banners in non-"
|
|
dongsheng@627
|
6766 "interactive <command>ssh</command> sessions, but it is not foolproof. (If "
|
|
dongsheng@627
|
6767 "you're editing your login scripts on your server, the usual way to see if a "
|
|
dongsheng@627
|
6768 "login script is running in an interactive shell is to check the return code "
|
|
dongsheng@627
|
6769 "from the command <literal>tty -s</literal>.)"
|
|
dongsheng@627
|
6770 msgstr ""
|
|
dongsheng@627
|
6771
|
|
dongsheng@627
|
6772 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6773 #: ../en/ch06-collab.xml:783
|
|
dongsheng@627
|
6774 msgid ""
|
|
dongsheng@627
|
6775 "Once you've verified that plain old ssh is working with your server, the next "
|
|
dongsheng@627
|
6776 "step is to ensure that Mercurial runs on the server. The following command "
|
|
dongsheng@627
|
6777 "should run successfully:"
|
|
dongsheng@627
|
6778 msgstr ""
|
|
dongsheng@627
|
6779
|
|
dongsheng@627
|
6780 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6781 #: ../en/ch06-collab.xml:788
|
|
dongsheng@627
|
6782 msgid ""
|
|
dongsheng@627
|
6783 "If you see an error message instead of normal <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
6784 "version</command> output, this is usually because you haven't installed "
|
|
dongsheng@627
|
6785 "Mercurial to <filename class=\"directory\">/usr/bin</filename>. Don't worry "
|
|
dongsheng@627
|
6786 "if this is the case; you don't need to do that. But you should check for a "
|
|
dongsheng@627
|
6787 "few possible problems."
|
|
dongsheng@627
|
6788 msgstr ""
|
|
dongsheng@627
|
6789
|
|
dongsheng@627
|
6790 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6791 #: ../en/ch06-collab.xml:795
|
|
dongsheng@627
|
6792 msgid ""
|
|
dongsheng@627
|
6793 "Is Mercurial really installed on the server at all? I know this sounds "
|
|
dongsheng@627
|
6794 "trivial, but it's worth checking!"
|
|
dongsheng@627
|
6795 msgstr ""
|
|
dongsheng@627
|
6796
|
|
dongsheng@627
|
6797 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6798 #: ../en/ch06-collab.xml:799
|
|
dongsheng@627
|
6799 msgid ""
|
|
dongsheng@627
|
6800 "Maybe your shell's search path (usually set via the <envar>PATH</envar> "
|
|
dongsheng@627
|
6801 "environment variable) is simply misconfigured."
|
|
dongsheng@627
|
6802 msgstr ""
|
|
dongsheng@627
|
6803
|
|
dongsheng@627
|
6804 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6805 #: ../en/ch06-collab.xml:803
|
|
dongsheng@627
|
6806 msgid ""
|
|
dongsheng@627
|
6807 "Perhaps your <envar>PATH</envar> environment variable is only being set to "
|
|
dongsheng@627
|
6808 "point to the location of the <command>hg</command> executable if the login "
|
|
dongsheng@627
|
6809 "session is interactive. This can happen if you're setting the path in the "
|
|
dongsheng@627
|
6810 "wrong shell login script. See your shell's documentation for details."
|
|
dongsheng@627
|
6811 msgstr ""
|
|
dongsheng@627
|
6812
|
|
dongsheng@627
|
6813 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
6814 #: ../en/ch06-collab.xml:810
|
|
dongsheng@627
|
6815 msgid ""
|
|
dongsheng@627
|
6816 "The <envar>PYTHONPATH</envar> environment variable may need to contain the "
|
|
dongsheng@627
|
6817 "path to the Mercurial Python modules. It might not be set at all; it could "
|
|
dongsheng@627
|
6818 "be incorrect; or it may be set only if the login is interactive."
|
|
dongsheng@627
|
6819 msgstr ""
|
|
dongsheng@627
|
6820
|
|
dongsheng@627
|
6821 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6822 #: ../en/ch06-collab.xml:817
|
|
dongsheng@627
|
6823 msgid ""
|
|
dongsheng@627
|
6824 "If you can run <command role=\"hg-cmd\">hg version</command> over an ssh "
|
|
dongsheng@627
|
6825 "connection, well done! You've got the server and client sorted out. You "
|
|
dongsheng@627
|
6826 "should now be able to use Mercurial to access repositories hosted by that "
|
|
dongsheng@627
|
6827 "username on that server. If you run into problems with Mercurial and ssh at "
|
|
dongsheng@627
|
6828 "this point, try using the <option role=\"hg-opt-global\">--debug</option> "
|
|
dongsheng@627
|
6829 "option to get a clearer picture of what's going on."
|
|
dongsheng@627
|
6830 msgstr ""
|
|
dongsheng@627
|
6831
|
|
dongsheng@627
|
6832 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6833 #: ../en/ch06-collab.xml:827
|
|
dongsheng@627
|
6834 msgid "Using compression with ssh"
|
|
dongsheng@630
|
6835 msgstr "通过 ssh 使用压缩"
|
|
dongsheng@627
|
6836
|
|
dongsheng@627
|
6837 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6838 #: ../en/ch06-collab.xml:829
|
|
dongsheng@627
|
6839 msgid ""
|
|
dongsheng@627
|
6840 "Mercurial does not compress data when it uses the ssh protocol, because the "
|
|
dongsheng@627
|
6841 "ssh protocol can transparently compress data. However, the default behaviour "
|
|
dongsheng@627
|
6842 "of ssh clients is <emphasis>not</emphasis> to request compression."
|
|
dongsheng@627
|
6843 msgstr ""
|
|
dongsheng@627
|
6844
|
|
dongsheng@627
|
6845 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6846 #: ../en/ch06-collab.xml:834
|
|
dongsheng@627
|
6847 msgid ""
|
|
dongsheng@627
|
6848 "Over any network other than a fast LAN (even a wireless network), using "
|
|
dongsheng@627
|
6849 "compression is likely to significantly speed up Mercurial's network "
|
|
dongsheng@627
|
6850 "operations. For example, over a WAN, someone measured compression as "
|
|
dongsheng@627
|
6851 "reducing the amount of time required to clone a particularly large repository "
|
|
dongsheng@627
|
6852 "from 51 minutes to 17 minutes."
|
|
dongsheng@627
|
6853 msgstr ""
|
|
dongsheng@627
|
6854
|
|
dongsheng@627
|
6855 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6856 #: ../en/ch06-collab.xml:841
|
|
dongsheng@627
|
6857 msgid ""
|
|
dongsheng@627
|
6858 "Both <command>ssh</command> and <command>plink</command> accept a <option "
|
|
dongsheng@627
|
6859 "role=\"cmd-opt-ssh\">-C</option> option which turns on compression. You can "
|
|
dongsheng@627
|
6860 "easily edit your <filename role=\"special\"> /.hgrc</filename>\\ to enable "
|
|
dongsheng@627
|
6861 "compression for all of Mercurial's uses of the ssh protocol."
|
|
dongsheng@627
|
6862 msgstr ""
|
|
dongsheng@627
|
6863
|
|
dongsheng@627
|
6864 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6865 #: ../en/ch06-collab.xml:848
|
|
dongsheng@627
|
6866 msgid ""
|
|
dongsheng@627
|
6867 "If you use <command>ssh</command>, you can configure it to always use "
|
|
dongsheng@627
|
6868 "compression when talking to your server. To do this, edit your <filename "
|
|
dongsheng@627
|
6869 "role=\"special\">.ssh/config</filename> file (which may not yet exist), as "
|
|
dongsheng@627
|
6870 "follows."
|
|
dongsheng@627
|
6871 msgstr ""
|
|
dongsheng@627
|
6872
|
|
dongsheng@627
|
6873 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6874 #: ../en/ch06-collab.xml:855
|
|
dongsheng@627
|
6875 msgid ""
|
|
dongsheng@627
|
6876 "This defines an alias, <literal>hg</literal>. When you use it on the "
|
|
dongsheng@627
|
6877 "<command>ssh</command> command line or in a Mercurial <literal>ssh</literal>-"
|
|
dongsheng@627
|
6878 "protocol URL, it will cause <command>ssh</command> to connect to <literal>hg."
|
|
dongsheng@627
|
6879 "example.com</literal> and use compression. This gives you both a shorter "
|
|
dongsheng@627
|
6880 "name to type and compression, each of which is a good thing in its own right."
|
|
dongsheng@627
|
6881 msgstr ""
|
|
dongsheng@627
|
6882
|
|
dongsheng@627
|
6883 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
6884 #: ../en/ch06-collab.xml:866
|
|
dongsheng@627
|
6885 msgid "Serving over HTTP using CGI"
|
|
dongsheng@630
|
6886 msgstr "使用 CGI 通过 HTTP 提供服务"
|
|
dongsheng@627
|
6887
|
|
dongsheng@627
|
6888 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6889 #: ../en/ch06-collab.xml:868
|
|
dongsheng@627
|
6890 msgid ""
|
|
dongsheng@627
|
6891 "Depending on how ambitious you are, configuring Mercurial's CGI interface can "
|
|
dongsheng@627
|
6892 "take anything from a few moments to several hours."
|
|
dongsheng@627
|
6893 msgstr ""
|
|
dongsheng@627
|
6894
|
|
dongsheng@627
|
6895 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
6896 #: ../en/ch06-collab.xml:872
|
|
dongsheng@627
|
6897 msgid ""
|
|
dongsheng@627
|
6898 "We'll begin with the simplest of examples, and work our way towards a more "
|
|
dongsheng@627
|
6899 "complex configuration. Even for the most basic case, you're almost certainly "
|
|
dongsheng@627
|
6900 "going to need to read and modify your web server's configuration."
|
|
dongsheng@627
|
6901 msgstr ""
|
|
dongsheng@627
|
6902
|
|
dongsheng@627
|
6903 #. type: Content of: <book><chapter><sect1><note><para>
|
|
dongsheng@641
|
6904 #: ../en/ch06-collab.xml:878
|
|
dongsheng@627
|
6905 msgid ""
|
|
dongsheng@627
|
6906 "Configuring a web server is a complex, fiddly, and highly system-dependent "
|
|
dongsheng@627
|
6907 "activity. I can't possibly give you instructions that will cover anything "
|
|
dongsheng@627
|
6908 "like all of the cases you will encounter. Please use your discretion and "
|
|
dongsheng@627
|
6909 "judgment in following the sections below. Be prepared to make plenty of "
|
|
dongsheng@627
|
6910 "mistakes, and to spend a lot of time reading your server's error logs."
|
|
dongsheng@627
|
6911 msgstr ""
|
|
dongsheng@627
|
6912
|
|
dongsheng@627
|
6913 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6914 #: ../en/ch06-collab.xml:888
|
|
dongsheng@627
|
6915 msgid "Web server configuration checklist"
|
|
dongsheng@630
|
6916 msgstr "Web 服务器配置检查表"
|
|
dongsheng@627
|
6917
|
|
dongsheng@627
|
6918 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6919 #: ../en/ch06-collab.xml:890
|
|
dongsheng@627
|
6920 msgid ""
|
|
dongsheng@627
|
6921 "Before you continue, do take a few moments to check a few aspects of your "
|
|
dongsheng@627
|
6922 "system's setup."
|
|
dongsheng@627
|
6923 msgstr ""
|
|
dongsheng@627
|
6924
|
|
dongsheng@627
|
6925 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6926 #: ../en/ch06-collab.xml:894
|
|
dongsheng@627
|
6927 msgid ""
|
|
dongsheng@627
|
6928 "Do you have a web server installed at all? Mac OS X ships with Apache, but "
|
|
dongsheng@627
|
6929 "many other systems may not have a web server installed."
|
|
dongsheng@627
|
6930 msgstr ""
|
|
dongsheng@627
|
6931
|
|
dongsheng@627
|
6932 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6933 #: ../en/ch06-collab.xml:898
|
|
dongsheng@627
|
6934 msgid ""
|
|
dongsheng@627
|
6935 "If you have a web server installed, is it actually running? On most systems, "
|
|
dongsheng@627
|
6936 "even if one is present, it will be disabled by default."
|
|
dongsheng@627
|
6937 msgstr ""
|
|
dongsheng@627
|
6938
|
|
dongsheng@627
|
6939 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
6940 #: ../en/ch06-collab.xml:902
|
|
dongsheng@627
|
6941 msgid ""
|
|
dongsheng@627
|
6942 "Is your server configured to allow you to run CGI programs in the directory "
|
|
dongsheng@627
|
6943 "where you plan to do so? Most servers default to explicitly disabling the "
|
|
dongsheng@627
|
6944 "ability to run CGI programs."
|
|
dongsheng@627
|
6945 msgstr ""
|
|
dongsheng@627
|
6946
|
|
dongsheng@627
|
6947 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6948 #: ../en/ch06-collab.xml:908
|
|
dongsheng@627
|
6949 msgid ""
|
|
dongsheng@627
|
6950 "If you don't have a web server installed, and don't have substantial "
|
|
dongsheng@627
|
6951 "experience configuring Apache, you should consider using the "
|
|
dongsheng@627
|
6952 "<literal>lighttpd</literal> web server instead of Apache. Apache has a well-"
|
|
dongsheng@627
|
6953 "deserved reputation for baroque and confusing configuration. While "
|
|
dongsheng@627
|
6954 "<literal>lighttpd</literal> is less capable in some ways than Apache, most of "
|
|
dongsheng@627
|
6955 "these capabilities are not relevant to serving Mercurial repositories. And "
|
|
dongsheng@627
|
6956 "<literal>lighttpd</literal> is undeniably <emphasis>much</emphasis> easier to "
|
|
dongsheng@627
|
6957 "get started with than Apache."
|
|
dongsheng@627
|
6958 msgstr ""
|
|
dongsheng@627
|
6959
|
|
dongsheng@627
|
6960 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
6961 #: ../en/ch06-collab.xml:921
|
|
dongsheng@627
|
6962 msgid "Basic CGI configuration"
|
|
dongsheng@630
|
6963 msgstr "基本 CGI 配置"
|
|
dongsheng@627
|
6964
|
|
dongsheng@627
|
6965 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6966 #: ../en/ch06-collab.xml:923
|
|
dongsheng@627
|
6967 msgid ""
|
|
dongsheng@627
|
6968 "On Unix-like systems, it's common for users to have a subdirectory named "
|
|
dongsheng@627
|
6969 "something like <filename class=\"directory\">public_html</filename> in their "
|
|
dongsheng@627
|
6970 "home directory, from which they can serve up web pages. A file named "
|
|
dongsheng@627
|
6971 "<filename>foo</filename> in this directory will be accessible at a URL of the "
|
|
dongsheng@627
|
6972 "form <literal>http://www.example.com/\\ {</literal>username/foo}."
|
|
dongsheng@627
|
6973 msgstr ""
|
|
dongsheng@627
|
6974
|
|
dongsheng@627
|
6975 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6976 #: ../en/ch06-collab.xml:932
|
|
dongsheng@627
|
6977 msgid ""
|
|
dongsheng@627
|
6978 "To get started, find the <filename role=\"special\">hgweb.cgi</filename> "
|
|
dongsheng@627
|
6979 "script that should be present in your Mercurial installation. If you can't "
|
|
dongsheng@627
|
6980 "quickly find a local copy on your system, simply download one from the master "
|
|
dongsheng@627
|
6981 "Mercurial repository at <ulink url=\"http://www.selenic.com/repo/hg/raw-file/"
|
|
dongsheng@627
|
6982 "tip/hgweb.cgi\">http://www.selenic.com/repo/hg/raw-file/tip/hgweb.cgi</ulink>."
|
|
dongsheng@627
|
6983 msgstr ""
|
|
dongsheng@627
|
6984
|
|
dongsheng@627
|
6985 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6986 #: ../en/ch06-collab.xml:939 ../en/ch06-collab.xml:1112
|
|
dongsheng@627
|
6987 msgid ""
|
|
dongsheng@627
|
6988 "You'll need to copy this script into your <filename class=\"directory"
|
|
dongsheng@627
|
6989 "\">public_html</filename> directory, and ensure that it's executable."
|
|
dongsheng@627
|
6990 msgstr ""
|
|
dongsheng@627
|
6991
|
|
dongsheng@627
|
6992 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
6993 #: ../en/ch06-collab.xml:944
|
|
dongsheng@627
|
6994 msgid ""
|
|
dongsheng@627
|
6995 "The <literal>755</literal> argument to <command>chmod</command> is a little "
|
|
dongsheng@627
|
6996 "more general than just making the script executable: it ensures that the "
|
|
dongsheng@627
|
6997 "script is executable by anyone, and that <quote>group</quote> and "
|
|
dongsheng@627
|
6998 "<quote>other</quote> write permissions are <emphasis>not</emphasis> set. If "
|
|
dongsheng@627
|
6999 "you were to leave those write permissions enabled, Apache's <literal>suexec</"
|
|
dongsheng@627
|
7000 "literal> subsystem would likely refuse to execute the script. In fact, "
|
|
dongsheng@627
|
7001 "<literal>suexec</literal> also insists that the <emphasis>directory</"
|
|
dongsheng@627
|
7002 "emphasis> in which the script resides must not be writable by others."
|
|
dongsheng@627
|
7003 msgstr ""
|
|
dongsheng@627
|
7004
|
|
dongsheng@627
|
7005 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
7006 #: ../en/ch06-collab.xml:958
|
|
dongsheng@627
|
7007 msgid "What could <emphasis>possibly</emphasis> go wrong?"
|
|
dongsheng@630
|
7008 msgstr "什么<emphasis>可能</emphasis>会出错?"
|
|
dongsheng@627
|
7009
|
|
dongsheng@627
|
7010 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7011 #: ../en/ch06-collab.xml:961
|
|
dongsheng@627
|
7012 msgid ""
|
|
dongsheng@627
|
7013 "Once you've copied the CGI script into place, go into a web browser, and try "
|
|
dongsheng@627
|
7014 "to open the URL <ulink url=\"http://myhostname/ myuser/hgweb.cgi\">http://"
|
|
dongsheng@627
|
7015 "myhostname/ myuser/hgweb.cgi</ulink>, <emphasis>but</emphasis> brace yourself "
|
|
dongsheng@627
|
7016 "for instant failure. There's a high probability that trying to visit this "
|
|
dongsheng@627
|
7017 "URL will fail, and there are many possible reasons for this. In fact, you're "
|
|
dongsheng@627
|
7018 "likely to stumble over almost every one of the possible errors below, so "
|
|
dongsheng@627
|
7019 "please read carefully. The following are all of the problems I ran into on a "
|
|
dongsheng@627
|
7020 "system running Fedora 7, with a fresh installation of Apache, and a user "
|
|
dongsheng@627
|
7021 "account that I created specially to perform this exercise."
|
|
dongsheng@627
|
7022 msgstr ""
|
|
dongsheng@627
|
7023
|
|
dongsheng@627
|
7024 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7025 #: ../en/ch06-collab.xml:975
|
|
dongsheng@627
|
7026 msgid ""
|
|
dongsheng@627
|
7027 "Your web server may have per-user directories disabled. If you're using "
|
|
dongsheng@627
|
7028 "Apache, search your config file for a <literal>UserDir</literal> directive. "
|
|
dongsheng@627
|
7029 "If there's none present, per-user directories will be disabled. If one "
|
|
dongsheng@627
|
7030 "exists, but its value is <literal>disabled</literal>, then per-user "
|
|
dongsheng@627
|
7031 "directories will be disabled. Otherwise, the string after <literal>UserDir</"
|
|
dongsheng@627
|
7032 "literal> gives the name of the subdirectory that Apache will look in under "
|
|
dongsheng@627
|
7033 "your home directory, for example <filename class=\"directory\">public_html</"
|
|
dongsheng@627
|
7034 "filename>."
|
|
dongsheng@627
|
7035 msgstr ""
|
|
dongsheng@627
|
7036
|
|
dongsheng@627
|
7037 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7038 #: ../en/ch06-collab.xml:986
|
|
dongsheng@627
|
7039 msgid ""
|
|
dongsheng@627
|
7040 "Your file access permissions may be too restrictive. The web server must be "
|
|
dongsheng@627
|
7041 "able to traverse your home directory and directories under your <filename "
|
|
dongsheng@627
|
7042 "class=\"directory\">public_html</filename> directory, and read files under "
|
|
dongsheng@627
|
7043 "the latter too. Here's a quick recipe to help you to make your permissions "
|
|
dongsheng@627
|
7044 "more appropriate."
|
|
dongsheng@627
|
7045 msgstr ""
|
|
dongsheng@627
|
7046
|
|
dongsheng@627
|
7047 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7048 #: ../en/ch06-collab.xml:996
|
|
dongsheng@627
|
7049 msgid ""
|
|
dongsheng@627
|
7050 "The other possibility with permissions is that you might get a completely "
|
|
dongsheng@627
|
7051 "empty window when you try to load the script. In this case, it's likely that "
|
|
dongsheng@627
|
7052 "your access permissions are <emphasis>too permissive</emphasis>. Apache's "
|
|
dongsheng@627
|
7053 "<literal>suexec</literal> subsystem won't execute a script that's group- or "
|
|
dongsheng@627
|
7054 "world-writable, for example."
|
|
dongsheng@627
|
7055 msgstr ""
|
|
dongsheng@627
|
7056
|
|
dongsheng@627
|
7057 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7058 #: ../en/ch06-collab.xml:1003
|
|
dongsheng@627
|
7059 msgid ""
|
|
dongsheng@627
|
7060 "Your web server may be configured to disallow execution of CGI programs in "
|
|
dongsheng@627
|
7061 "your per-user web directory. Here's Apache's default per-user configuration "
|
|
dongsheng@627
|
7062 "from my Fedora system."
|
|
dongsheng@627
|
7063 msgstr ""
|
|
dongsheng@627
|
7064
|
|
dongsheng@627
|
7065 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7066 #: ../en/ch06-collab.xml:1014
|
|
dongsheng@627
|
7067 msgid ""
|
|
dongsheng@627
|
7068 "If you find a similar-looking <literal>Directory</literal> group in your "
|
|
dongsheng@627
|
7069 "Apache configuration, the directive to look at inside it is <literal>Options</"
|
|
dongsheng@627
|
7070 "literal>. Add <literal>ExecCGI</literal> to the end of this list if it's "
|
|
dongsheng@627
|
7071 "missing, and restart the web server."
|
|
dongsheng@627
|
7072 msgstr ""
|
|
dongsheng@627
|
7073
|
|
dongsheng@627
|
7074 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7075 #: ../en/ch06-collab.xml:1021
|
|
dongsheng@627
|
7076 msgid ""
|
|
dongsheng@627
|
7077 "If you find that Apache serves you the text of the CGI script instead of "
|
|
dongsheng@627
|
7078 "executing it, you may need to either uncomment (if already present) or add a "
|
|
dongsheng@627
|
7079 "directive like this."
|
|
dongsheng@627
|
7080 msgstr ""
|
|
dongsheng@627
|
7081
|
|
dongsheng@627
|
7082 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7083 #: ../en/ch06-collab.xml:1027
|
|
dongsheng@627
|
7084 msgid ""
|
|
dongsheng@627
|
7085 "The next possibility is that you might be served with a colourful Python "
|
|
dongsheng@627
|
7086 "backtrace claiming that it can't import a <literal>mercurial</literal>-"
|
|
dongsheng@627
|
7087 "related module. This is actually progress! The server is now capable of "
|
|
dongsheng@627
|
7088 "executing your CGI script. This error is only likely to occur if you're "
|
|
dongsheng@627
|
7089 "running a private installation of Mercurial, instead of a system-wide "
|
|
dongsheng@627
|
7090 "version. Remember that the web server runs the CGI program without any of "
|
|
dongsheng@627
|
7091 "the environment variables that you take for granted in an interactive "
|
|
dongsheng@627
|
7092 "session. If this error happens to you, edit your copy of <filename role="
|
|
dongsheng@627
|
7093 "\"special\">hgweb.cgi</filename> and follow the directions inside it to "
|
|
dongsheng@627
|
7094 "correctly set your <envar>PYTHONPATH</envar> environment variable."
|
|
dongsheng@627
|
7095 msgstr ""
|
|
dongsheng@627
|
7096
|
|
dongsheng@627
|
7097 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7098 #: ../en/ch06-collab.xml:1041
|
|
dongsheng@627
|
7099 msgid ""
|
|
dongsheng@627
|
7100 "Finally, you are <emphasis>certain</emphasis> to by served with another "
|
|
dongsheng@627
|
7101 "colourful Python backtrace: this one will complain that it can't find "
|
|
dongsheng@627
|
7102 "<filename class=\"directory\">/path/to/repository</filename>. Edit your "
|
|
dongsheng@627
|
7103 "<filename role=\"special\">hgweb.cgi</filename> script and replace the "
|
|
dongsheng@627
|
7104 "<filename class=\"directory\">/path/to/repository</filename> string with the "
|
|
dongsheng@627
|
7105 "complete path to the repository you want to serve up."
|
|
dongsheng@627
|
7106 msgstr ""
|
|
dongsheng@627
|
7107
|
|
dongsheng@627
|
7108 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7109 #: ../en/ch06-collab.xml:1051
|
|
dongsheng@627
|
7110 msgid ""
|
|
dongsheng@627
|
7111 "At this point, when you try to reload the page, you should be presented with "
|
|
dongsheng@627
|
7112 "a nice HTML view of your repository's history. Whew!"
|
|
dongsheng@627
|
7113 msgstr ""
|
|
dongsheng@627
|
7114
|
|
dongsheng@627
|
7115 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
7116 #: ../en/ch06-collab.xml:1057
|
|
dongsheng@627
|
7117 msgid "Configuring lighttpd"
|
|
dongsheng@630
|
7118 msgstr "配置 lighttpd"
|
|
dongsheng@627
|
7119
|
|
dongsheng@627
|
7120 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7121 #: ../en/ch06-collab.xml:1059
|
|
dongsheng@627
|
7122 msgid ""
|
|
dongsheng@627
|
7123 "To be exhaustive in my experiments, I tried configuring the increasingly "
|
|
dongsheng@627
|
7124 "popular <literal>lighttpd</literal> web server to serve the same repository "
|
|
dongsheng@627
|
7125 "as I described with Apache above. I had already overcome all of the problems "
|
|
dongsheng@627
|
7126 "I outlined with Apache, many of which are not server-specific. As a result, "
|
|
dongsheng@627
|
7127 "I was fairly sure that my file and directory permissions were good, and that "
|
|
dongsheng@627
|
7128 "my <filename role=\"special\">hgweb.cgi</filename> script was properly edited."
|
|
dongsheng@627
|
7129 msgstr ""
|
|
dongsheng@627
|
7130
|
|
dongsheng@627
|
7131 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7132 #: ../en/ch06-collab.xml:1069
|
|
dongsheng@627
|
7133 msgid ""
|
|
dongsheng@627
|
7134 "Once I had Apache running, getting <literal>lighttpd</literal> to serve the "
|
|
dongsheng@627
|
7135 "repository was a snap (in other words, even if you're trying to use "
|
|
dongsheng@627
|
7136 "<literal>lighttpd</literal>, you should read the Apache section). I first "
|
|
dongsheng@627
|
7137 "had to edit the <literal>mod_access</literal> section of its config file to "
|
|
dongsheng@627
|
7138 "enable <literal>mod_cgi</literal> and <literal>mod_userdir</literal>, both of "
|
|
dongsheng@627
|
7139 "which were disabled by default on my system. I then added a few lines to the "
|
|
dongsheng@627
|
7140 "end of the config file, to configure these modules."
|
|
dongsheng@627
|
7141 msgstr ""
|
|
dongsheng@627
|
7142
|
|
dongsheng@627
|
7143 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7144 #: ../en/ch06-collab.xml:1081
|
|
dongsheng@627
|
7145 msgid ""
|
|
dongsheng@627
|
7146 "With this done, <literal>lighttpd</literal> ran immediately for me. If I had "
|
|
dongsheng@627
|
7147 "configured <literal>lighttpd</literal> before Apache, I'd almost certainly "
|
|
dongsheng@627
|
7148 "have run into many of the same system-level configuration problems as I did "
|
|
dongsheng@627
|
7149 "with Apache. However, I found <literal>lighttpd</literal> to be noticeably "
|
|
dongsheng@627
|
7150 "easier to configure than Apache, even though I've used Apache for over a "
|
|
dongsheng@627
|
7151 "decade, and this was my first exposure to <literal>lighttpd</literal>."
|
|
dongsheng@627
|
7152 msgstr ""
|
|
dongsheng@627
|
7153
|
|
dongsheng@627
|
7154 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
7155 #: ../en/ch06-collab.xml:1094
|
|
dongsheng@627
|
7156 msgid "Sharing multiple repositories with one CGI script"
|
|
dongsheng@630
|
7157 msgstr "使用一个 CGI 脚本共享多个版本库"
|
|
dongsheng@627
|
7158
|
|
dongsheng@627
|
7159 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7160 #: ../en/ch06-collab.xml:1096
|
|
dongsheng@627
|
7161 msgid ""
|
|
dongsheng@627
|
7162 "The <filename role=\"special\">hgweb.cgi</filename> script only lets you "
|
|
dongsheng@627
|
7163 "publish a single repository, which is an annoying restriction. If you want "
|
|
dongsheng@627
|
7164 "to publish more than one without wracking yourself with multiple copies of "
|
|
dongsheng@627
|
7165 "the same script, each with different names, a better choice is to use the "
|
|
dongsheng@627
|
7166 "<filename role=\"special\">hgwebdir.cgi</filename> script."
|
|
dongsheng@627
|
7167 msgstr ""
|
|
dongsheng@627
|
7168
|
|
dongsheng@627
|
7169 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7170 #: ../en/ch06-collab.xml:1104
|
|
dongsheng@627
|
7171 msgid ""
|
|
dongsheng@627
|
7172 "The procedure to configure <filename role=\"special\">hgwebdir.cgi</filename> "
|
|
dongsheng@627
|
7173 "is only a little more involved than for <filename role=\"special\">hgweb.cgi</"
|
|
dongsheng@627
|
7174 "filename>. First, you must obtain a copy of the script. If you don't have "
|
|
dongsheng@627
|
7175 "one handy, you can download a copy from the master Mercurial repository at "
|
|
dongsheng@627
|
7176 "<ulink url=\"http://www.selenic.com/repo/hg/raw-file/tip/hgwebdir.cgi"
|
|
dongsheng@627
|
7177 "\">http://www.selenic.com/repo/hg/raw-file/tip/hgwebdir.cgi</ulink>."
|
|
dongsheng@627
|
7178 msgstr ""
|
|
dongsheng@627
|
7179
|
|
dongsheng@627
|
7180 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7181 #: ../en/ch06-collab.xml:1117
|
|
dongsheng@627
|
7182 msgid ""
|
|
dongsheng@627
|
7183 "With basic configuration out of the way, try to visit <ulink url=\"http://"
|
|
dongsheng@627
|
7184 "myhostname/ myuser/hgwebdir.cgi\">http://myhostname/ myuser/hgwebdir.cgi</"
|
|
dongsheng@627
|
7185 "ulink> in your browser. It should display an empty list of repositories. If "
|
|
dongsheng@627
|
7186 "you get a blank window or error message, try walking through the list of "
|
|
dongsheng@627
|
7187 "potential problems in section <xref linkend=\"sec.collab.wtf\"/>."
|
|
dongsheng@627
|
7188 msgstr ""
|
|
dongsheng@627
|
7189
|
|
dongsheng@627
|
7190 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7191 #: ../en/ch06-collab.xml:1126
|
|
dongsheng@627
|
7192 msgid ""
|
|
dongsheng@627
|
7193 "The <filename role=\"special\">hgwebdir.cgi</filename> script relies on an "
|
|
dongsheng@627
|
7194 "external configuration file. By default, it searches for a file named "
|
|
dongsheng@627
|
7195 "<filename role=\"special\">hgweb.config</filename> in the same directory as "
|
|
dongsheng@627
|
7196 "itself. You'll need to create this file, and make it world-readable. The "
|
|
dongsheng@627
|
7197 "format of the file is similar to a Windows <quote>ini</quote> file, as "
|
|
dongsheng@627
|
7198 "understood by Python's <literal>ConfigParser</literal> <citation>web:"
|
|
dongsheng@627
|
7199 "configparser</citation> module."
|
|
dongsheng@627
|
7200 msgstr ""
|
|
dongsheng@627
|
7201
|
|
dongsheng@627
|
7202 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7203 #: ../en/ch06-collab.xml:1136
|
|
dongsheng@627
|
7204 msgid ""
|
|
dongsheng@627
|
7205 "The easiest way to configure <filename role=\"special\">hgwebdir.cgi</"
|
|
dongsheng@627
|
7206 "filename> is with a section named <literal>collections</literal>. This will "
|
|
dongsheng@627
|
7207 "automatically publish <emphasis>every</emphasis> repository under the "
|
|
dongsheng@627
|
7208 "directories you name. The section should look like this:"
|
|
dongsheng@627
|
7209 msgstr ""
|
|
dongsheng@627
|
7210
|
|
dongsheng@627
|
7211 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7212 #: ../en/ch06-collab.xml:1144
|
|
dongsheng@627
|
7213 msgid ""
|
|
dongsheng@627
|
7214 "Mercurial interprets this by looking at the directory name on the "
|
|
dongsheng@627
|
7215 "<emphasis>right</emphasis> hand side of the <quote><literal>=</literal></"
|
|
dongsheng@627
|
7216 "quote> sign; finding repositories in that directory hierarchy; and using the "
|
|
dongsheng@627
|
7217 "text on the <emphasis>left</emphasis> to strip off matching text from the "
|
|
dongsheng@627
|
7218 "names it will actually list in the web interface. The remaining component of "
|
|
dongsheng@627
|
7219 "a path after this stripping has occurred is called a <quote>virtual path</"
|
|
dongsheng@627
|
7220 "quote>."
|
|
dongsheng@627
|
7221 msgstr ""
|
|
dongsheng@627
|
7222
|
|
dongsheng@627
|
7223 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7224 #: ../en/ch06-collab.xml:1153
|
|
dongsheng@627
|
7225 msgid ""
|
|
dongsheng@627
|
7226 "Given the example above, if we have a repository whose local path is "
|
|
dongsheng@627
|
7227 "<filename class=\"directory\">/my/root/this/repo</filename>, the CGI script "
|
|
dongsheng@627
|
7228 "will strip the leading <filename class=\"directory\">/my/root</filename> from "
|
|
dongsheng@627
|
7229 "the name, and publish the repository with a virtual path of <filename class="
|
|
dongsheng@627
|
7230 "\"directory\">this/repo</filename>. If the base URL for our CGI script is "
|
|
dongsheng@627
|
7231 "<ulink url=\"http://myhostname/ myuser/hgwebdir.cgi\">http://myhostname/ "
|
|
dongsheng@627
|
7232 "myuser/hgwebdir.cgi</ulink>, the complete URL for that repository will be "
|
|
dongsheng@627
|
7233 "<ulink url=\"http://myhostname/ myuser/hgwebdir.cgi/this/repo\">http://"
|
|
dongsheng@627
|
7234 "myhostname/ myuser/hgwebdir.cgi/this/repo</ulink>."
|
|
dongsheng@627
|
7235 msgstr ""
|
|
dongsheng@627
|
7236
|
|
dongsheng@627
|
7237 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7238 #: ../en/ch06-collab.xml:1167
|
|
dongsheng@627
|
7239 msgid ""
|
|
dongsheng@627
|
7240 "If we replace <filename class=\"directory\">/my/root</filename> on the left "
|
|
dongsheng@627
|
7241 "hand side of this example with <filename class=\"directory\">/my</filename>, "
|
|
dongsheng@627
|
7242 "then <filename role=\"special\">hgwebdir.cgi</filename> will only strip off "
|
|
dongsheng@627
|
7243 "<filename class=\"directory\">/my</filename> from the repository name, and "
|
|
dongsheng@627
|
7244 "will give us a virtual path of <filename class=\"directory\">root/this/repo</"
|
|
dongsheng@627
|
7245 "filename> instead of <filename class=\"directory\">this/repo</filename>."
|
|
dongsheng@627
|
7246 msgstr ""
|
|
dongsheng@627
|
7247
|
|
dongsheng@627
|
7248 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7249 #: ../en/ch06-collab.xml:1177
|
|
dongsheng@627
|
7250 msgid ""
|
|
dongsheng@627
|
7251 "The <filename role=\"special\">hgwebdir.cgi</filename> script will "
|
|
dongsheng@627
|
7252 "recursively search each directory listed in the <literal>collections</"
|
|
dongsheng@627
|
7253 "literal> section of its configuration file, but it will <literal>not</"
|
|
dongsheng@627
|
7254 "literal> recurse into the repositories it finds."
|
|
dongsheng@627
|
7255 msgstr ""
|
|
dongsheng@627
|
7256
|
|
dongsheng@627
|
7257 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7258 #: ../en/ch06-collab.xml:1183
|
|
dongsheng@627
|
7259 msgid ""
|
|
dongsheng@627
|
7260 "The <literal>collections</literal> mechanism makes it easy to publish many "
|
|
dongsheng@627
|
7261 "repositories in a <quote>fire and forget</quote> manner. You only need to "
|
|
dongsheng@627
|
7262 "set up the CGI script and configuration file one time. Afterwards, you can "
|
|
dongsheng@627
|
7263 "publish or unpublish a repository at any time by simply moving it into, or "
|
|
dongsheng@627
|
7264 "out of, the directory hierarchy in which you've configured <filename role="
|
|
dongsheng@627
|
7265 "\"special\">hgwebdir.cgi</filename> to look."
|
|
dongsheng@627
|
7266 msgstr ""
|
|
dongsheng@627
|
7267
|
|
dongsheng@627
|
7268 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
7269 #: ../en/ch06-collab.xml:1193
|
|
dongsheng@627
|
7270 msgid "Explicitly specifying which repositories to publish"
|
|
dongsheng@630
|
7271 msgstr "明确指出要发布的版本库"
|
|
dongsheng@627
|
7272
|
|
dongsheng@627
|
7273 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7274 #: ../en/ch06-collab.xml:1196
|
|
dongsheng@627
|
7275 msgid ""
|
|
dongsheng@627
|
7276 "In addition to the <literal>collections</literal> mechanism, the <filename "
|
|
dongsheng@627
|
7277 "role=\"special\">hgwebdir.cgi</filename> script allows you to publish a "
|
|
dongsheng@627
|
7278 "specific list of repositories. To do so, create a <literal>paths</literal> "
|
|
dongsheng@627
|
7279 "section, with contents of the following form."
|
|
dongsheng@627
|
7280 msgstr ""
|
|
dongsheng@627
|
7281
|
|
dongsheng@627
|
7282 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7283 #: ../en/ch06-collab.xml:1204
|
|
dongsheng@627
|
7284 msgid ""
|
|
dongsheng@627
|
7285 "In this case, the virtual path (the component that will appear in a URL) is "
|
|
dongsheng@627
|
7286 "on the left hand side of each definition, while the path to the repository is "
|
|
dongsheng@627
|
7287 "on the right. Notice that there does not need to be any relationship between "
|
|
dongsheng@627
|
7288 "the virtual path you choose and the location of a repository in your "
|
|
dongsheng@627
|
7289 "filesystem."
|
|
dongsheng@627
|
7290 msgstr ""
|
|
dongsheng@627
|
7291
|
|
dongsheng@627
|
7292 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7293 #: ../en/ch06-collab.xml:1211
|
|
dongsheng@627
|
7294 msgid ""
|
|
dongsheng@627
|
7295 "If you wish, you can use both the <literal>collections</literal> and "
|
|
dongsheng@627
|
7296 "<literal>paths</literal> mechanisms simultaneously in a single configuration "
|
|
dongsheng@627
|
7297 "file."
|
|
dongsheng@627
|
7298 msgstr ""
|
|
dongsheng@627
|
7299
|
|
dongsheng@627
|
7300 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
|
|
dongsheng@641
|
7301 #: ../en/ch06-collab.xml:1217
|
|
dongsheng@627
|
7302 msgid ""
|
|
dongsheng@627
|
7303 "If multiple repositories have the same virtual path, <filename role=\"special"
|
|
dongsheng@627
|
7304 "\">hgwebdir.cgi</filename> will not report an error. Instead, it will behave "
|
|
dongsheng@627
|
7305 "unpredictably."
|
|
dongsheng@627
|
7306 msgstr ""
|
|
dongsheng@627
|
7307
|
|
dongsheng@627
|
7308 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
7309 #: ../en/ch06-collab.xml:1226
|
|
dongsheng@627
|
7310 msgid "Downloading source archives"
|
|
dongsheng@630
|
7311 msgstr "下载源代码档案包"
|
|
dongsheng@627
|
7312
|
|
dongsheng@627
|
7313 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7314 #: ../en/ch06-collab.xml:1228
|
|
dongsheng@627
|
7315 msgid ""
|
|
dongsheng@627
|
7316 "Mercurial's web interface lets users download an archive of any revision. "
|
|
dongsheng@627
|
7317 "This archive will contain a snapshot of the working directory as of that "
|
|
dongsheng@627
|
7318 "revision, but it will not contain a copy of the repository data."
|
|
dongsheng@627
|
7319 msgstr ""
|
|
dongsheng@627
|
7320
|
|
dongsheng@627
|
7321 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7322 #: ../en/ch06-collab.xml:1233
|
|
dongsheng@627
|
7323 msgid ""
|
|
dongsheng@627
|
7324 "By default, this feature is not enabled. To enable it, you'll need to add an "
|
|
dongsheng@627
|
7325 "<envar role=\"rc-item-web\">allow_archive</envar> item to the <literal role="
|
|
dongsheng@627
|
7326 "\"rc-web\">web</literal> section of your <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
7327 "filename>."
|
|
dongsheng@627
|
7328 msgstr ""
|
|
dongsheng@627
|
7329
|
|
dongsheng@627
|
7330 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
7331 #: ../en/ch06-collab.xml:1241
|
|
dongsheng@627
|
7332 msgid "Web configuration options"
|
|
dongsheng@630
|
7333 msgstr "Web 配置选项"
|
|
dongsheng@627
|
7334
|
|
dongsheng@627
|
7335 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7336 #: ../en/ch06-collab.xml:1243
|
|
dongsheng@627
|
7337 msgid ""
|
|
dongsheng@627
|
7338 "Mercurial's web interfaces (the <command role=\"hg-cmd\">hg serve</command> "
|
|
dongsheng@627
|
7339 "command, and the <filename role=\"special\">hgweb.cgi</filename> and "
|
|
dongsheng@627
|
7340 "<filename role=\"special\">hgwebdir.cgi</filename> scripts) have a number of "
|
|
dongsheng@627
|
7341 "configuration options that you can set. These belong in a section named "
|
|
dongsheng@627
|
7342 "<literal role=\"rc-web\">web</literal>."
|
|
dongsheng@627
|
7343 msgstr ""
|
|
dongsheng@627
|
7344
|
|
dongsheng@627
|
7345 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7346 #: ../en/ch06-collab.xml:1251
|
|
dongsheng@627
|
7347 msgid ""
|
|
dongsheng@627
|
7348 "<envar role=\"rc-item-web\">allow_archive</envar>: Determines which (if any) "
|
|
dongsheng@627
|
7349 "archive download mechanisms Mercurial supports. If you enable this feature, "
|
|
dongsheng@627
|
7350 "users of the web interface will be able to download an archive of whatever "
|
|
dongsheng@627
|
7351 "revision of a repository they are viewing. To enable the archive feature, "
|
|
dongsheng@627
|
7352 "this item must take the form of a sequence of words drawn from the list below."
|
|
dongsheng@627
|
7353 msgstr ""
|
|
dongsheng@627
|
7354
|
|
dongsheng@627
|
7355 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7356 #: ../en/ch06-collab.xml:1260
|
|
dongsheng@627
|
7357 msgid ""
|
|
dongsheng@627
|
7358 "<literal>bz2</literal>: A <command>tar</command> archive, compressed using "
|
|
dongsheng@627
|
7359 "<literal>bzip2</literal> compression. This has the best compression ratio, "
|
|
dongsheng@627
|
7360 "but uses the most CPU time on the server."
|
|
dongsheng@627
|
7361 msgstr ""
|
|
dongsheng@627
|
7362
|
|
dongsheng@627
|
7363 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7364 #: ../en/ch06-collab.xml:1266
|
|
dongsheng@627
|
7365 msgid ""
|
|
dongsheng@627
|
7366 "<literal>gz</literal>: A <command>tar</command> archive, compressed using "
|
|
dongsheng@627
|
7367 "<literal>gzip</literal> compression."
|
|
dongsheng@627
|
7368 msgstr ""
|
|
dongsheng@627
|
7369
|
|
dongsheng@627
|
7370 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7371 #: ../en/ch06-collab.xml:1270
|
|
dongsheng@627
|
7372 msgid ""
|
|
dongsheng@627
|
7373 "<literal>zip</literal>: A <command>zip</command> archive, compressed using "
|
|
dongsheng@627
|
7374 "LZW compression. This format has the worst compression ratio, but is widely "
|
|
dongsheng@627
|
7375 "used in the Windows world."
|
|
dongsheng@627
|
7376 msgstr ""
|
|
dongsheng@627
|
7377
|
|
dongsheng@627
|
7378 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7379 #: ../en/ch06-collab.xml:1276
|
|
dongsheng@627
|
7380 msgid ""
|
|
dongsheng@627
|
7381 "If you provide an empty list, or don't have an <envar role=\"rc-item-web"
|
|
dongsheng@627
|
7382 "\">allow_archive</envar> entry at all, this feature will be disabled. Here "
|
|
dongsheng@627
|
7383 "is an example of how to enable all three supported formats."
|
|
dongsheng@627
|
7384 msgstr ""
|
|
dongsheng@627
|
7385
|
|
dongsheng@627
|
7386 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7387 #: ../en/ch06-collab.xml:1283
|
|
dongsheng@627
|
7388 msgid ""
|
|
dongsheng@627
|
7389 "<envar role=\"rc-item-web\">allowpull</envar>: Boolean. Determines whether "
|
|
dongsheng@627
|
7390 "the web interface allows remote users to <command role=\"hg-cmd\">hg pull</"
|
|
dongsheng@627
|
7391 "command> and <command role=\"hg-cmd\">hg clone</command> this repository over "
|
|
dongsheng@627
|
7392 "HTTP. If set to <literal>no</literal> or <literal>false</literal>, only the "
|
|
dongsheng@627
|
7393 "<quote>human-oriented</quote> portion of the web interface is available."
|
|
dongsheng@627
|
7394 msgstr ""
|
|
dongsheng@627
|
7395
|
|
dongsheng@627
|
7396 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7397 #: ../en/ch06-collab.xml:1292
|
|
dongsheng@627
|
7398 msgid ""
|
|
dongsheng@627
|
7399 "<envar role=\"rc-item-web\">contact</envar>: String. A free-form (but "
|
|
dongsheng@627
|
7400 "preferably brief) string identifying the person or group in charge of the "
|
|
dongsheng@627
|
7401 "repository. This often contains the name and email address of a person or "
|
|
dongsheng@627
|
7402 "mailing list. It often makes sense to place this entry in a repository's own "
|
|
dongsheng@627
|
7403 "<filename role=\"special\">.hg/hgrc</filename> file, but it can make sense to "
|
|
dongsheng@627
|
7404 "use in a global <filename role=\"special\"> /.hgrc</filename>\\ if every "
|
|
dongsheng@627
|
7405 "repository has a single maintainer."
|
|
dongsheng@627
|
7406 msgstr ""
|
|
dongsheng@627
|
7407
|
|
dongsheng@627
|
7408 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7409 #: ../en/ch06-collab.xml:1303
|
|
dongsheng@627
|
7410 msgid ""
|
|
dongsheng@627
|
7411 "<envar role=\"rc-item-web\">maxchanges</envar>: Integer. The default maximum "
|
|
dongsheng@627
|
7412 "number of changesets to display in a single page of output."
|
|
dongsheng@627
|
7413 msgstr ""
|
|
dongsheng@627
|
7414
|
|
dongsheng@627
|
7415 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7416 #: ../en/ch06-collab.xml:1307
|
|
dongsheng@627
|
7417 msgid ""
|
|
dongsheng@627
|
7418 "<envar role=\"rc-item-web\">maxfiles</envar>: Integer. The default maximum "
|
|
dongsheng@627
|
7419 "number of modified files to display in a single page of output."
|
|
dongsheng@627
|
7420 msgstr ""
|
|
dongsheng@627
|
7421
|
|
dongsheng@627
|
7422 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7423 #: ../en/ch06-collab.xml:1311
|
|
dongsheng@627
|
7424 msgid ""
|
|
dongsheng@627
|
7425 "<envar role=\"rc-item-web\">stripes</envar>: Integer. If the web interface "
|
|
dongsheng@627
|
7426 "displays alternating <quote>stripes</quote> to make it easier to visually "
|
|
dongsheng@627
|
7427 "align rows when you are looking at a table, this number controls the number "
|
|
dongsheng@627
|
7428 "of rows in each stripe."
|
|
dongsheng@627
|
7429 msgstr ""
|
|
dongsheng@627
|
7430
|
|
dongsheng@627
|
7431 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7432 #: ../en/ch06-collab.xml:1317
|
|
dongsheng@627
|
7433 msgid ""
|
|
dongsheng@627
|
7434 "<envar role=\"rc-item-web\">style</envar>: Controls the template Mercurial "
|
|
dongsheng@627
|
7435 "uses to display the web interface. Mercurial ships with two web templates, "
|
|
dongsheng@627
|
7436 "named <literal>default</literal> and <literal>gitweb</literal> (the latter is "
|
|
dongsheng@627
|
7437 "much more visually attractive). You can also specify a custom template of "
|
|
dongsheng@627
|
7438 "your own; see chapter <xref linkend=\"chap.template\"/> for details. Here, "
|
|
dongsheng@627
|
7439 "you can see how to enable the <literal>gitweb</literal> style."
|
|
dongsheng@627
|
7440 msgstr ""
|
|
dongsheng@627
|
7441
|
|
dongsheng@627
|
7442 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7443 #: ../en/ch06-collab.xml:1328
|
|
dongsheng@627
|
7444 msgid ""
|
|
dongsheng@627
|
7445 "<envar role=\"rc-item-web\">templates</envar>: Path. The directory in which "
|
|
dongsheng@627
|
7446 "to search for template files. By default, Mercurial searches in the "
|
|
dongsheng@627
|
7447 "directory in which it was installed."
|
|
dongsheng@627
|
7448 msgstr ""
|
|
dongsheng@627
|
7449
|
|
dongsheng@627
|
7450 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
7451 #: ../en/ch06-collab.xml:1333
|
|
dongsheng@627
|
7452 msgid ""
|
|
dongsheng@627
|
7453 "If you are using <filename role=\"special\">hgwebdir.cgi</filename>, you can "
|
|
dongsheng@627
|
7454 "place a few configuration items in a <literal role=\"rc-web\">web</literal> "
|
|
dongsheng@627
|
7455 "section of the <filename role=\"special\">hgweb.config</filename> file "
|
|
dongsheng@627
|
7456 "instead of a <filename role=\"special\"> /.hgrc</filename>\\ file, for "
|
|
dongsheng@627
|
7457 "convenience. These items are <envar role=\"rc-item-web\">motd</envar> and "
|
|
dongsheng@627
|
7458 "<envar role=\"rc-item-web\">style</envar>."
|
|
dongsheng@627
|
7459 msgstr ""
|
|
dongsheng@627
|
7460
|
|
dongsheng@627
|
7461 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
7462 #: ../en/ch06-collab.xml:1344
|
|
dongsheng@627
|
7463 msgid "Options specific to an individual repository"
|
|
dongsheng@630
|
7464 msgstr "针对单个版本库的选项"
|
|
dongsheng@627
|
7465
|
|
dongsheng@627
|
7466 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7467 #: ../en/ch06-collab.xml:1346
|
|
dongsheng@627
|
7468 msgid ""
|
|
dongsheng@627
|
7469 "A few <literal role=\"rc-web\">web</literal> configuration items ought to be "
|
|
dongsheng@627
|
7470 "placed in a repository's local <filename role=\"special\">.hg/hgrc</"
|
|
dongsheng@627
|
7471 "filename>, rather than a user's or global <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
7472 "filename>."
|
|
dongsheng@627
|
7473 msgstr ""
|
|
dongsheng@627
|
7474
|
|
dongsheng@627
|
7475 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7476 #: ../en/ch06-collab.xml:1352
|
|
dongsheng@627
|
7477 msgid ""
|
|
dongsheng@627
|
7478 "<envar role=\"rc-item-web\">description</envar>: String. A free-form (but "
|
|
dongsheng@627
|
7479 "preferably brief) string that describes the contents or purpose of the "
|
|
dongsheng@627
|
7480 "repository."
|
|
dongsheng@627
|
7481 msgstr ""
|
|
dongsheng@627
|
7482
|
|
dongsheng@627
|
7483 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7484 #: ../en/ch06-collab.xml:1357
|
|
dongsheng@627
|
7485 msgid ""
|
|
dongsheng@627
|
7486 "<envar role=\"rc-item-web\">name</envar>: String. The name to use for the "
|
|
dongsheng@627
|
7487 "repository in the web interface. This overrides the default name, which is "
|
|
dongsheng@627
|
7488 "the last component of the repository's path."
|
|
dongsheng@627
|
7489 msgstr ""
|
|
dongsheng@627
|
7490
|
|
dongsheng@627
|
7491 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
7492 #: ../en/ch06-collab.xml:1365
|
|
dongsheng@627
|
7493 msgid ""
|
|
dongsheng@627
|
7494 "Options specific to the <command role=\"hg-cmd\">hg serve</command> command"
|
|
dongsheng@630
|
7495 msgstr "命令 <command role=\"hg-cmd\">hg serve</command> 的选项"
|
|
dongsheng@627
|
7496
|
|
dongsheng@627
|
7497 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7498 #: ../en/ch06-collab.xml:1368
|
|
dongsheng@627
|
7499 msgid ""
|
|
dongsheng@627
|
7500 "Some of the items in the <literal role=\"rc-web\">web</literal> section of a "
|
|
dongsheng@627
|
7501 "<filename role=\"special\"> /.hgrc</filename>\\ file are only for use with "
|
|
dongsheng@627
|
7502 "the <command role=\"hg-cmd\">hg serve</command> command."
|
|
dongsheng@627
|
7503 msgstr ""
|
|
dongsheng@627
|
7504
|
|
dongsheng@627
|
7505 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7506 #: ../en/ch06-collab.xml:1374
|
|
dongsheng@627
|
7507 msgid ""
|
|
dongsheng@627
|
7508 "<envar role=\"rc-item-web\">accesslog</envar>: Path. The name of a file into "
|
|
dongsheng@627
|
7509 "which to write an access log. By default, the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
7510 "serve</command> command writes this information to standard output, not to a "
|
|
dongsheng@627
|
7511 "file. Log entries are written in the standard <quote>combined</quote> file "
|
|
dongsheng@627
|
7512 "format used by almost all web servers."
|
|
dongsheng@627
|
7513 msgstr ""
|
|
dongsheng@627
|
7514
|
|
dongsheng@627
|
7515 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7516 #: ../en/ch06-collab.xml:1382
|
|
dongsheng@627
|
7517 msgid ""
|
|
dongsheng@627
|
7518 "<envar role=\"rc-item-web\">address</envar>: String. The local address on "
|
|
dongsheng@627
|
7519 "which the server should listen for incoming connections. By default, the "
|
|
dongsheng@627
|
7520 "server listens on all addresses."
|
|
dongsheng@627
|
7521 msgstr ""
|
|
dongsheng@627
|
7522
|
|
dongsheng@627
|
7523 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7524 #: ../en/ch06-collab.xml:1387
|
|
dongsheng@627
|
7525 msgid ""
|
|
dongsheng@627
|
7526 "<envar role=\"rc-item-web\">errorlog</envar>: Path. The name of a file into "
|
|
dongsheng@627
|
7527 "which to write an error log. By default, the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
7528 "serve</command> command writes this information to standard error, not to a "
|
|
dongsheng@627
|
7529 "file."
|
|
dongsheng@627
|
7530 msgstr ""
|
|
dongsheng@627
|
7531
|
|
dongsheng@627
|
7532 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7533 #: ../en/ch06-collab.xml:1393
|
|
dongsheng@627
|
7534 msgid ""
|
|
dongsheng@627
|
7535 "<envar role=\"rc-item-web\">ipv6</envar>: Boolean. Whether to use the IPv6 "
|
|
dongsheng@627
|
7536 "protocol. By default, IPv6 is not used."
|
|
dongsheng@627
|
7537 msgstr ""
|
|
dongsheng@627
|
7538
|
|
dongsheng@627
|
7539 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@641
|
7540 #: ../en/ch06-collab.xml:1397
|
|
dongsheng@627
|
7541 msgid ""
|
|
dongsheng@627
|
7542 "<envar role=\"rc-item-web\">port</envar>: Integer. The TCP port number on "
|
|
dongsheng@627
|
7543 "which the server should listen. The default port number used is 8000."
|
|
dongsheng@627
|
7544 msgstr ""
|
|
dongsheng@627
|
7545
|
|
dongsheng@627
|
7546 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
7547 #: ../en/ch06-collab.xml:1404
|
|
dongsheng@627
|
7548 msgid ""
|
|
dongsheng@627
|
7549 "Choosing the right <filename role=\"special\"> /.hgrc</filename>\\ file to "
|
|
dongsheng@627
|
7550 "add <literal role=\"rc-web\">web</literal> items to"
|
|
dongsheng@627
|
7551 msgstr ""
|
|
dongsheng@630
|
7552 "选择正确的 <filename role=\"special\"> /.hgrc</filename> 文件增加到 <literal "
|
|
dongsheng@630
|
7553 "role=\"rc-web\">web</literal> 条目"
|
|
dongsheng@627
|
7554
|
|
dongsheng@627
|
7555 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7556 #: ../en/ch06-collab.xml:1408
|
|
dongsheng@627
|
7557 msgid ""
|
|
dongsheng@627
|
7558 "It is important to remember that a web server like Apache or "
|
|
dongsheng@627
|
7559 "<literal>lighttpd</literal> will run under a user ID that is different to "
|
|
dongsheng@627
|
7560 "yours. CGI scripts run by your server, such as <filename role=\"special"
|
|
dongsheng@627
|
7561 "\">hgweb.cgi</filename>, will usually also run under that user ID."
|
|
dongsheng@627
|
7562 msgstr ""
|
|
dongsheng@627
|
7563
|
|
dongsheng@627
|
7564 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
7565 #: ../en/ch06-collab.xml:1415
|
|
dongsheng@627
|
7566 msgid ""
|
|
dongsheng@627
|
7567 "If you add <literal role=\"rc-web\">web</literal> items to your own personal "
|
|
dongsheng@627
|
7568 "<filename role=\"special\"> /.hgrc</filename>\\ file, CGI scripts won't read "
|
|
dongsheng@627
|
7569 "that <filename role=\"special\"> /.hgrc</filename>\\ file. Those settings "
|
|
dongsheng@627
|
7570 "will thus only affect the behaviour of the <command role=\"hg-cmd\">hg serve</"
|
|
dongsheng@627
|
7571 "command> command when you run it. To cause CGI scripts to see your settings, "
|
|
dongsheng@627
|
7572 "either create a <filename role=\"special\"> /.hgrc</filename>\\ file in the "
|
|
dongsheng@627
|
7573 "home directory of the user ID that runs your web server, or add those "
|
|
dongsheng@627
|
7574 "settings to a system-wide <filename role=\"special\"> /.hgrc</filename>\\ "
|
|
dongsheng@627
|
7575 "file."
|
|
dongsheng@627
|
7576 msgstr ""
|
|
dongsheng@627
|
7577
|
|
dongsheng@627
|
7578 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
7579 #: ../en/ch07-filenames.xml:5
|
|
dongsheng@627
|
7580 msgid "File names and pattern matching"
|
|
dongsheng@627
|
7581 msgstr "文件名称与模式匹配"
|
|
dongsheng@627
|
7582
|
|
dongsheng@627
|
7583 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
7584 #: ../en/ch07-filenames.xml:7
|
|
dongsheng@627
|
7585 msgid ""
|
|
dongsheng@627
|
7586 "Mercurial provides mechanisms that let you work with file names in a "
|
|
dongsheng@627
|
7587 "consistent and expressive way."
|
|
dongsheng@627
|
7588 msgstr ""
|
|
dongsheng@627
|
7589
|
|
dongsheng@627
|
7590 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
7591 #: ../en/ch07-filenames.xml:11
|
|
dongsheng@627
|
7592 msgid "Simple file naming"
|
|
dongsheng@630
|
7593 msgstr "简单文件名称"
|
|
dongsheng@627
|
7594
|
|
dongsheng@627
|
7595 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7596 #: ../en/ch07-filenames.xml:13
|
|
dongsheng@627
|
7597 msgid ""
|
|
dongsheng@627
|
7598 "Mercurial uses a unified piece of machinery <quote>under the hood</quote> to "
|
|
dongsheng@627
|
7599 "handle file names. Every command behaves uniformly with respect to file "
|
|
dongsheng@627
|
7600 "names. The way in which commands work with file names is as follows."
|
|
dongsheng@627
|
7601 msgstr ""
|
|
dongsheng@627
|
7602
|
|
dongsheng@627
|
7603 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7604 #: ../en/ch07-filenames.xml:18
|
|
dongsheng@627
|
7605 msgid ""
|
|
dongsheng@627
|
7606 "If you explicitly name real files on the command line, Mercurial works with "
|
|
dongsheng@627
|
7607 "exactly those files, as you would expect. &interaction.filenames.files;"
|
|
dongsheng@627
|
7608 msgstr ""
|
|
dongsheng@627
|
7609
|
|
dongsheng@627
|
7610 #
|
|
dongsheng@627
|
7611 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7612 #: ../en/ch07-filenames.xml:22
|
|
dongsheng@627
|
7613 msgid ""
|
|
dongsheng@627
|
7614 "When you provide a directory name, Mercurial will interpret this as "
|
|
dongsheng@627
|
7615 "<quote>operate on every file in this directory and its subdirectories</"
|
|
dongsheng@627
|
7616 "quote>. Mercurial traverses the files and subdirectories in a directory in "
|
|
dongsheng@627
|
7617 "alphabetical order. When it encounters a subdirectory, it will traverse that "
|
|
dongsheng@627
|
7618 "subdirectory before continuing with the current directory."
|
|
dongsheng@627
|
7619 msgstr ""
|
|
dongsheng@627
|
7620
|
|
dongsheng@627
|
7621 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
7622 #: ../en/ch07-filenames.xml:33
|
|
dongsheng@627
|
7623 msgid "Running commands without any file names"
|
|
dongsheng@630
|
7624 msgstr "不提供文件名称的执行命令"
|
|
dongsheng@627
|
7625
|
|
dongsheng@627
|
7626 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7627 #: ../en/ch07-filenames.xml:35
|
|
dongsheng@627
|
7628 msgid ""
|
|
dongsheng@627
|
7629 "Mercurial's commands that work with file names have useful default behaviours "
|
|
dongsheng@627
|
7630 "when you invoke them without providing any file names or patterns. What kind "
|
|
dongsheng@627
|
7631 "of behaviour you should expect depends on what the command does. Here are a "
|
|
dongsheng@627
|
7632 "few rules of thumb you can use to predict what a command is likely to do if "
|
|
dongsheng@627
|
7633 "you don't give it any names to work with."
|
|
dongsheng@627
|
7634 msgstr ""
|
|
dongsheng@627
|
7635
|
|
dongsheng@627
|
7636 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
7637 #: ../en/ch07-filenames.xml:42
|
|
dongsheng@627
|
7638 msgid ""
|
|
dongsheng@627
|
7639 "Most commands will operate on the entire working directory. This is what the "
|
|
dongsheng@627
|
7640 "<command role=\"hg-cmd\">hg add</command> command does, for example."
|
|
dongsheng@627
|
7641 msgstr ""
|
|
dongsheng@627
|
7642
|
|
dongsheng@627
|
7643 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
7644 #: ../en/ch07-filenames.xml:46
|
|
dongsheng@627
|
7645 msgid ""
|
|
dongsheng@627
|
7646 "If the command has effects that are difficult or impossible to reverse, it "
|
|
dongsheng@627
|
7647 "will force you to explicitly provide at least one name or pattern (see "
|
|
dongsheng@627
|
7648 "below). This protects you from accidentally deleting files by running "
|
|
dongsheng@627
|
7649 "<command role=\"hg-cmd\">hg remove</command> with no arguments, for example."
|
|
dongsheng@627
|
7650 msgstr ""
|
|
dongsheng@627
|
7651
|
|
dongsheng@627
|
7652 #
|
|
dongsheng@627
|
7653 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7654 #: ../en/ch07-filenames.xml:54
|
|
dongsheng@627
|
7655 msgid ""
|
|
dongsheng@627
|
7656 "It's easy to work around these default behaviours if they don't suit you. If "
|
|
dongsheng@627
|
7657 "a command normally operates on the whole working directory, you can invoke it "
|
|
dongsheng@627
|
7658 "on just the current directory and its subdirectories by giving it the name "
|
|
dongsheng@627
|
7659 "<quote><filename class=\"directory\">.</filename></quote>."
|
|
dongsheng@627
|
7660 msgstr ""
|
|
dongsheng@627
|
7661
|
|
dongsheng@627
|
7662 #
|
|
dongsheng@627
|
7663 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7664 #: ../en/ch07-filenames.xml:62
|
|
dongsheng@627
|
7665 msgid ""
|
|
dongsheng@627
|
7666 "Along the same lines, some commands normally print file names relative to the "
|
|
dongsheng@627
|
7667 "root of the repository, even if you're invoking them from a subdirectory. "
|
|
dongsheng@627
|
7668 "Such a command will print file names relative to your subdirectory if you "
|
|
dongsheng@627
|
7669 "give it explicit names. Here, we're going to run <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
7670 "status</command> from a subdirectory, and get it to operate on the entire "
|
|
dongsheng@627
|
7671 "working directory while printing file names relative to our subdirectory, by "
|
|
dongsheng@627
|
7672 "passing it the output of the <command role=\"hg-cmd\">hg root</command> "
|
|
dongsheng@627
|
7673 "command."
|
|
dongsheng@627
|
7674 msgstr ""
|
|
dongsheng@627
|
7675
|
|
dongsheng@627
|
7676 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
7677 #: ../en/ch07-filenames.xml:76
|
|
dongsheng@627
|
7678 msgid "Telling you what's going on"
|
|
dongsheng@630
|
7679 msgstr "告诉你正在做什么"
|
|
dongsheng@627
|
7680
|
|
dongsheng@627
|
7681 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7682 #: ../en/ch07-filenames.xml:78
|
|
dongsheng@627
|
7683 msgid ""
|
|
dongsheng@627
|
7684 "The <command role=\"hg-cmd\">hg add</command> example in the preceding "
|
|
dongsheng@627
|
7685 "section illustrates something else that's helpful about Mercurial commands. "
|
|
dongsheng@627
|
7686 "If a command operates on a file that you didn't name explicitly on the "
|
|
dongsheng@627
|
7687 "command line, it will usually print the name of the file, so that you will "
|
|
dongsheng@627
|
7688 "not be surprised what's going on."
|
|
dongsheng@627
|
7689 msgstr ""
|
|
dongsheng@627
|
7690
|
|
dongsheng@627
|
7691 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7692 #: ../en/ch07-filenames.xml:85
|
|
dongsheng@627
|
7693 msgid ""
|
|
dongsheng@627
|
7694 "The principle here is of <emphasis>least surprise</emphasis>. If you've "
|
|
dongsheng@627
|
7695 "exactly named a file on the command line, there's no point in repeating it "
|
|
dongsheng@627
|
7696 "back at you. If Mercurial is acting on a file <emphasis>implicitly</"
|
|
dongsheng@627
|
7697 "emphasis>, because you provided no names, or a directory, or a pattern (see "
|
|
dongsheng@627
|
7698 "below), it's safest to tell you what it's doing."
|
|
dongsheng@627
|
7699 msgstr ""
|
|
dongsheng@627
|
7700
|
|
dongsheng@627
|
7701 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7702 #: ../en/ch07-filenames.xml:92
|
|
dongsheng@627
|
7703 msgid ""
|
|
dongsheng@627
|
7704 "For commands that behave this way, you can silence them using the <option "
|
|
dongsheng@627
|
7705 "role=\"hg-opt-global\">-q</option> option. You can also get them to print "
|
|
dongsheng@627
|
7706 "the name of every file, even those you've named explicitly, using the <option "
|
|
dongsheng@627
|
7707 "role=\"hg-opt-global\">-v</option> option."
|
|
dongsheng@627
|
7708 msgstr ""
|
|
dongsheng@627
|
7709
|
|
dongsheng@627
|
7710 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
7711 #: ../en/ch07-filenames.xml:100
|
|
dongsheng@627
|
7712 msgid "Using patterns to identify files"
|
|
dongsheng@630
|
7713 msgstr "使用模式标识文件"
|
|
dongsheng@627
|
7714
|
|
dongsheng@627
|
7715 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7716 #: ../en/ch07-filenames.xml:102
|
|
dongsheng@627
|
7717 msgid ""
|
|
dongsheng@627
|
7718 "In addition to working with file and directory names, Mercurial lets you use "
|
|
dongsheng@627
|
7719 "<emphasis>patterns</emphasis> to identify files. Mercurial's pattern "
|
|
dongsheng@627
|
7720 "handling is expressive."
|
|
dongsheng@627
|
7721 msgstr ""
|
|
dongsheng@627
|
7722
|
|
dongsheng@627
|
7723 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7724 #: ../en/ch07-filenames.xml:106
|
|
dongsheng@627
|
7725 msgid ""
|
|
dongsheng@627
|
7726 "On Unix-like systems (Linux, MacOS, etc.), the job of matching file names to "
|
|
dongsheng@627
|
7727 "patterns normally falls to the shell. On these systems, you must explicitly "
|
|
dongsheng@627
|
7728 "tell Mercurial that a name is a pattern. On Windows, the shell does not "
|
|
dongsheng@627
|
7729 "expand patterns, so Mercurial will automatically identify names that are "
|
|
dongsheng@627
|
7730 "patterns, and expand them for you."
|
|
dongsheng@627
|
7731 msgstr ""
|
|
dongsheng@627
|
7732
|
|
dongsheng@627
|
7733 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7734 #: ../en/ch07-filenames.xml:113
|
|
dongsheng@627
|
7735 msgid ""
|
|
dongsheng@627
|
7736 "To provide a pattern in place of a regular name on the command line, the "
|
|
dongsheng@627
|
7737 "mechanism is simple:"
|
|
dongsheng@627
|
7738 msgstr ""
|
|
dongsheng@627
|
7739
|
|
dongsheng@627
|
7740 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7741 #: ../en/ch07-filenames.xml:116
|
|
dongsheng@627
|
7742 msgid ""
|
|
dongsheng@627
|
7743 "That is, a pattern is identified by a short text string that says what kind "
|
|
dongsheng@627
|
7744 "of pattern this is, followed by a colon, followed by the actual pattern."
|
|
dongsheng@627
|
7745 msgstr ""
|
|
dongsheng@627
|
7746
|
|
dongsheng@627
|
7747 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7748 #: ../en/ch07-filenames.xml:120
|
|
dongsheng@627
|
7749 msgid ""
|
|
dongsheng@627
|
7750 "Mercurial supports two kinds of pattern syntax. The most frequently used is "
|
|
dongsheng@627
|
7751 "called <literal>glob</literal>; this is the same kind of pattern matching "
|
|
dongsheng@627
|
7752 "used by the Unix shell, and should be familiar to Windows command prompt "
|
|
dongsheng@627
|
7753 "users, too."
|
|
dongsheng@627
|
7754 msgstr ""
|
|
dongsheng@627
|
7755
|
|
dongsheng@627
|
7756 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7757 #: ../en/ch07-filenames.xml:125
|
|
dongsheng@627
|
7758 msgid ""
|
|
dongsheng@627
|
7759 "When Mercurial does automatic pattern matching on Windows, it uses "
|
|
dongsheng@627
|
7760 "<literal>glob</literal> syntax. You can thus omit the <quote><literal>glob:</"
|
|
dongsheng@627
|
7761 "literal></quote> prefix on Windows, but it's safe to use it, too."
|
|
dongsheng@627
|
7762 msgstr ""
|
|
dongsheng@627
|
7763
|
|
dongsheng@627
|
7764 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7765 #: ../en/ch07-filenames.xml:130
|
|
dongsheng@627
|
7766 msgid ""
|
|
dongsheng@627
|
7767 "The <literal>re</literal> syntax is more powerful; it lets you specify "
|
|
dongsheng@627
|
7768 "patterns using regular expressions, also known as regexps."
|
|
dongsheng@627
|
7769 msgstr ""
|
|
dongsheng@627
|
7770
|
|
dongsheng@627
|
7771 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7772 #: ../en/ch07-filenames.xml:134
|
|
dongsheng@627
|
7773 msgid ""
|
|
dongsheng@627
|
7774 "By the way, in the examples that follow, notice that I'm careful to wrap all "
|
|
dongsheng@627
|
7775 "of my patterns in quote characters, so that they won't get expanded by the "
|
|
dongsheng@627
|
7776 "shell before Mercurial sees them."
|
|
dongsheng@627
|
7777 msgstr ""
|
|
dongsheng@627
|
7778
|
|
dongsheng@627
|
7779 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
7780 #: ../en/ch07-filenames.xml:140
|
|
dongsheng@627
|
7781 msgid "Shell-style <literal>glob</literal> patterns"
|
|
dongsheng@630
|
7782 msgstr "外壳风格的 <literal>glob</literal> 模式"
|
|
dongsheng@627
|
7783
|
|
dongsheng@627
|
7784 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7785 #: ../en/ch07-filenames.xml:142
|
|
dongsheng@627
|
7786 msgid ""
|
|
dongsheng@627
|
7787 "This is an overview of the kinds of patterns you can use when you're matching "
|
|
dongsheng@627
|
7788 "on glob patterns."
|
|
dongsheng@627
|
7789 msgstr ""
|
|
dongsheng@627
|
7790
|
|
dongsheng@627
|
7791 #
|
|
dongsheng@627
|
7792 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7793 #: ../en/ch07-filenames.xml:145
|
|
dongsheng@627
|
7794 msgid ""
|
|
dongsheng@627
|
7795 "The <quote><literal>*</literal></quote> character matches any string, within "
|
|
dongsheng@627
|
7796 "a single directory."
|
|
dongsheng@627
|
7797 msgstr ""
|
|
dongsheng@627
|
7798
|
|
dongsheng@627
|
7799 #
|
|
dongsheng@627
|
7800 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7801 #: ../en/ch07-filenames.xml:150
|
|
dongsheng@627
|
7802 msgid ""
|
|
dongsheng@627
|
7803 "The <quote><literal>**</literal></quote> pattern matches any string, and "
|
|
dongsheng@627
|
7804 "crosses directory boundaries. It's not a standard Unix glob token, but it's "
|
|
dongsheng@627
|
7805 "accepted by several popular Unix shells, and is very useful."
|
|
dongsheng@627
|
7806 msgstr ""
|
|
dongsheng@627
|
7807
|
|
dongsheng@627
|
7808 #
|
|
dongsheng@627
|
7809 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7810 #: ../en/ch07-filenames.xml:157
|
|
dongsheng@627
|
7811 msgid ""
|
|
dongsheng@627
|
7812 "The <quote><literal>?</literal></quote> pattern matches any single character."
|
|
dongsheng@627
|
7813 msgstr ""
|
|
dongsheng@627
|
7814
|
|
dongsheng@627
|
7815 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7816 #: ../en/ch07-filenames.xml:162
|
|
dongsheng@627
|
7817 msgid ""
|
|
dongsheng@627
|
7818 "The <quote><literal>[</literal></quote> character begins a "
|
|
dongsheng@627
|
7819 "<emphasis>character class</emphasis>. This matches any single character "
|
|
dongsheng@627
|
7820 "within the class. The class ends with a <quote><literal>]</literal></quote> "
|
|
dongsheng@627
|
7821 "character. A class may contain multiple <emphasis>range</emphasis>s of the "
|
|
dongsheng@627
|
7822 "form <quote><literal>a-f</literal></quote>, which is shorthand for "
|
|
dongsheng@627
|
7823 "<quote><literal>abcdef</literal></quote>."
|
|
dongsheng@627
|
7824 msgstr ""
|
|
dongsheng@627
|
7825
|
|
dongsheng@627
|
7826 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7827 #: ../en/ch07-filenames.xml:172
|
|
dongsheng@627
|
7828 msgid ""
|
|
dongsheng@627
|
7829 "If the first character after the <quote><literal>[</literal></quote> in a "
|
|
dongsheng@627
|
7830 "character class is a <quote><literal>!</literal></quote>, it "
|
|
dongsheng@627
|
7831 "<emphasis>negates</emphasis> the class, making it match any single character "
|
|
dongsheng@627
|
7832 "not in the class."
|
|
dongsheng@627
|
7833 msgstr ""
|
|
dongsheng@627
|
7834
|
|
dongsheng@627
|
7835 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7836 #: ../en/ch07-filenames.xml:178
|
|
dongsheng@627
|
7837 msgid ""
|
|
dongsheng@627
|
7838 "A <quote><literal>{</literal></quote> begins a group of subpatterns, where "
|
|
dongsheng@627
|
7839 "the whole group matches if any subpattern in the group matches. The "
|
|
dongsheng@627
|
7840 "<quote><literal>,</literal></quote> character separates subpatterns, and "
|
|
dongsheng@627
|
7841 "<quote><literal>}</literal></quote> ends the group."
|
|
dongsheng@627
|
7842 msgstr ""
|
|
dongsheng@627
|
7843
|
|
dongsheng@627
|
7844 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
7845 #: ../en/ch07-filenames.xml:187
|
|
dongsheng@627
|
7846 msgid "Watch out!"
|
|
dongsheng@630
|
7847 msgstr "千万小心！"
|
|
dongsheng@627
|
7848
|
|
dongsheng@627
|
7849 #
|
|
dongsheng@627
|
7850 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
7851 #: ../en/ch07-filenames.xml:189
|
|
dongsheng@627
|
7852 msgid ""
|
|
dongsheng@627
|
7853 "Don't forget that if you want to match a pattern in any directory, you should "
|
|
dongsheng@627
|
7854 "not be using the <quote><literal>*</literal></quote> match-any token, as this "
|
|
dongsheng@627
|
7855 "will only match within one directory. Instead, use the <quote><literal>**</"
|
|
dongsheng@627
|
7856 "literal></quote> token. This small example illustrates the difference "
|
|
dongsheng@627
|
7857 "between the two."
|
|
dongsheng@627
|
7858 msgstr ""
|
|
dongsheng@627
|
7859
|
|
dongsheng@627
|
7860 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
7861 #: ../en/ch07-filenames.xml:201
|
|
dongsheng@627
|
7862 msgid "Regular expression matching with <literal>re</literal> patterns"
|
|
dongsheng@630
|
7863 msgstr "使用 <literal>re</literal> 模式的正则表达式匹配"
|
|
dongsheng@627
|
7864
|
|
dongsheng@627
|
7865 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7866 #: ../en/ch07-filenames.xml:204
|
|
dongsheng@627
|
7867 msgid ""
|
|
dongsheng@627
|
7868 "Mercurial accepts the same regular expression syntax as the Python "
|
|
dongsheng@627
|
7869 "programming language (it uses Python's regexp engine internally). This is "
|
|
dongsheng@627
|
7870 "based on the Perl language's regexp syntax, which is the most popular dialect "
|
|
dongsheng@627
|
7871 "in use (it's also used in Java, for example)."
|
|
dongsheng@627
|
7872 msgstr ""
|
|
dongsheng@627
|
7873
|
|
dongsheng@627
|
7874 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7875 #: ../en/ch07-filenames.xml:210
|
|
dongsheng@627
|
7876 msgid ""
|
|
dongsheng@627
|
7877 "I won't discuss Mercurial's regexp dialect in any detail here, as regexps are "
|
|
dongsheng@627
|
7878 "not often used. Perl-style regexps are in any case already exhaustively "
|
|
dongsheng@627
|
7879 "documented on a multitude of web sites, and in many books. Instead, I will "
|
|
dongsheng@627
|
7880 "focus here on a few things you should know if you find yourself needing to "
|
|
dongsheng@627
|
7881 "use regexps with Mercurial."
|
|
dongsheng@627
|
7882 msgstr ""
|
|
dongsheng@627
|
7883
|
|
dongsheng@627
|
7884 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7885 #: ../en/ch07-filenames.xml:217
|
|
dongsheng@627
|
7886 msgid ""
|
|
dongsheng@627
|
7887 "A regexp is matched against an entire file name, relative to the root of the "
|
|
dongsheng@627
|
7888 "repository. In other words, even if you're already in subbdirectory "
|
|
dongsheng@627
|
7889 "<filename class=\"directory\">foo</filename>, if you want to match files "
|
|
dongsheng@627
|
7890 "under this directory, your pattern must start with <quote><literal>foo/</"
|
|
dongsheng@627
|
7891 "literal></quote>."
|
|
dongsheng@627
|
7892 msgstr ""
|
|
dongsheng@627
|
7893
|
|
dongsheng@627
|
7894 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
7895 #: ../en/ch07-filenames.xml:224
|
|
dongsheng@627
|
7896 msgid ""
|
|
dongsheng@627
|
7897 "One thing to note, if you're familiar with Perl-style regexps, is that "
|
|
dongsheng@627
|
7898 "Mercurial's are <emphasis>rooted</emphasis>. That is, a regexp starts "
|
|
dongsheng@627
|
7899 "matching against the beginning of a string; it doesn't look for a match "
|
|
dongsheng@627
|
7900 "anywhere within the string. To match anywhere in a string, start your "
|
|
dongsheng@627
|
7901 "pattern with <quote><literal>.*</literal></quote>."
|
|
dongsheng@627
|
7902 msgstr ""
|
|
dongsheng@627
|
7903
|
|
dongsheng@627
|
7904 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
7905 #: ../en/ch07-filenames.xml:234
|
|
dongsheng@627
|
7906 msgid "Filtering files"
|
|
dongsheng@630
|
7907 msgstr "过滤文件"
|
|
dongsheng@627
|
7908
|
|
dongsheng@627
|
7909 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7910 #: ../en/ch07-filenames.xml:236
|
|
dongsheng@627
|
7911 msgid ""
|
|
dongsheng@627
|
7912 "Not only does Mercurial give you a variety of ways to specify files; it lets "
|
|
dongsheng@627
|
7913 "you further winnow those files using <emphasis>filters</emphasis>. Commands "
|
|
dongsheng@627
|
7914 "that work with file names accept two filtering options."
|
|
dongsheng@627
|
7915 msgstr ""
|
|
dongsheng@627
|
7916
|
|
dongsheng@627
|
7917 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
7918 #: ../en/ch07-filenames.xml:241
|
|
dongsheng@627
|
7919 msgid ""
|
|
dongsheng@627
|
7920 "<option role=\"hg-opt-global\">-I</option>, or <option role=\"hg-opt-global"
|
|
dongsheng@627
|
7921 "\">--include</option>, lets you specify a pattern that file names must match "
|
|
dongsheng@627
|
7922 "in order to be processed."
|
|
dongsheng@627
|
7923 msgstr ""
|
|
dongsheng@627
|
7924
|
|
dongsheng@627
|
7925 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
7926 #: ../en/ch07-filenames.xml:246
|
|
dongsheng@627
|
7927 msgid ""
|
|
dongsheng@627
|
7928 "<option role=\"hg-opt-global\">-X</option>, or <option role=\"hg-opt-global"
|
|
dongsheng@627
|
7929 "\">--exclude</option>, gives you a way to <emphasis>avoid</emphasis> "
|
|
dongsheng@627
|
7930 "processing files, if they match this pattern."
|
|
dongsheng@627
|
7931 msgstr ""
|
|
dongsheng@627
|
7932
|
|
dongsheng@627
|
7933 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7934 #: ../en/ch07-filenames.xml:251
|
|
dongsheng@627
|
7935 msgid ""
|
|
dongsheng@627
|
7936 "You can provide multiple <option role=\"hg-opt-global\">-I</option> and "
|
|
dongsheng@627
|
7937 "<option role=\"hg-opt-global\">-X</option> options on the command line, and "
|
|
dongsheng@627
|
7938 "intermix them as you please. Mercurial interprets the patterns you provide "
|
|
dongsheng@627
|
7939 "using glob syntax by default (but you can use regexps if you need to)."
|
|
dongsheng@627
|
7940 msgstr ""
|
|
dongsheng@627
|
7941
|
|
dongsheng@627
|
7942 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7943 #: ../en/ch07-filenames.xml:258
|
|
dongsheng@627
|
7944 msgid ""
|
|
dongsheng@627
|
7945 "You can read a <option role=\"hg-opt-global\">-I</option> filter as "
|
|
dongsheng@627
|
7946 "<quote>process only the files that match this filter</quote>."
|
|
dongsheng@627
|
7947 msgstr ""
|
|
dongsheng@627
|
7948
|
|
dongsheng@627
|
7949 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7950 #: ../en/ch07-filenames.xml:264
|
|
dongsheng@627
|
7951 msgid ""
|
|
dongsheng@627
|
7952 "The <option role=\"hg-opt-global\">-X</option> filter is best read as "
|
|
dongsheng@627
|
7953 "<quote>process only the files that don't match this pattern</quote>."
|
|
dongsheng@627
|
7954 msgstr ""
|
|
dongsheng@627
|
7955
|
|
dongsheng@627
|
7956 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
7957 #: ../en/ch07-filenames.xml:272
|
|
dongsheng@627
|
7958 msgid "Ignoring unwanted files and directories"
|
|
dongsheng@630
|
7959 msgstr "忽略不需要的文件和目录"
|
|
dongsheng@627
|
7960
|
|
dongsheng@627
|
7961 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7962 #: ../en/ch07-filenames.xml:274
|
|
dongsheng@627
|
7963 msgid "XXX."
|
|
dongsheng@627
|
7964 msgstr ""
|
|
dongsheng@627
|
7965
|
|
dongsheng@627
|
7966 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
7967 #: ../en/ch07-filenames.xml:278
|
|
dongsheng@627
|
7968 msgid "Case sensitivity"
|
|
dongsheng@630
|
7969 msgstr "大小写敏感性"
|
|
dongsheng@627
|
7970
|
|
dongsheng@627
|
7971 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7972 #: ../en/ch07-filenames.xml:280
|
|
dongsheng@627
|
7973 msgid ""
|
|
dongsheng@627
|
7974 "If you're working in a mixed development environment that contains both Linux "
|
|
dongsheng@627
|
7975 "(or other Unix) systems and Macs or Windows systems, you should keep in the "
|
|
dongsheng@627
|
7976 "back of your mind the knowledge that they treat the case (<quote>N</quote> "
|
|
dongsheng@627
|
7977 "versus <quote>n</quote>) of file names in incompatible ways. This is not "
|
|
dongsheng@627
|
7978 "very likely to affect you, and it's easy to deal with if it does, but it "
|
|
dongsheng@627
|
7979 "could surprise you if you don't know about it."
|
|
dongsheng@627
|
7980 msgstr ""
|
|
dongsheng@627
|
7981
|
|
dongsheng@627
|
7982 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
7983 #: ../en/ch07-filenames.xml:289
|
|
dongsheng@627
|
7984 msgid ""
|
|
dongsheng@627
|
7985 "Operating systems and filesystems differ in the way they handle the "
|
|
dongsheng@627
|
7986 "<emphasis>case</emphasis> of characters in file and directory names. There "
|
|
dongsheng@627
|
7987 "are three common ways to handle case in names."
|
|
dongsheng@627
|
7988 msgstr ""
|
|
dongsheng@627
|
7989
|
|
dongsheng@627
|
7990 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
7991 #: ../en/ch07-filenames.xml:294
|
|
dongsheng@627
|
7992 msgid ""
|
|
dongsheng@627
|
7993 "Completely case insensitive. Uppercase and lowercase versions of a letter "
|
|
dongsheng@627
|
7994 "are treated as identical, both when creating a file and during subsequent "
|
|
dongsheng@627
|
7995 "accesses. This is common on older DOS-based systems."
|
|
dongsheng@627
|
7996 msgstr ""
|
|
dongsheng@627
|
7997
|
|
dongsheng@627
|
7998 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
7999 #: ../en/ch07-filenames.xml:299
|
|
dongsheng@627
|
8000 msgid ""
|
|
dongsheng@627
|
8001 "Case preserving, but insensitive. When a file or directory is created, the "
|
|
dongsheng@627
|
8002 "case of its name is stored, and can be retrieved and displayed by the "
|
|
dongsheng@627
|
8003 "operating system. When an existing file is being looked up, its case is "
|
|
dongsheng@627
|
8004 "ignored. This is the standard arrangement on Windows and MacOS. The names "
|
|
dongsheng@627
|
8005 "<filename>foo</filename> and <filename>FoO</filename> identify the same "
|
|
dongsheng@627
|
8006 "file. This treatment of uppercase and lowercase letters as interchangeable "
|
|
dongsheng@627
|
8007 "is also referred to as <emphasis>case folding</emphasis>."
|
|
dongsheng@627
|
8008 msgstr ""
|
|
dongsheng@627
|
8009
|
|
dongsheng@627
|
8010 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
8011 #: ../en/ch07-filenames.xml:310
|
|
dongsheng@627
|
8012 msgid ""
|
|
dongsheng@627
|
8013 "Case sensitive. The case of a name is significant at all times. The names "
|
|
dongsheng@627
|
8014 "<filename>foo</filename> and {FoO} identify different files. This is the way "
|
|
dongsheng@627
|
8015 "Linux and Unix systems normally work."
|
|
dongsheng@627
|
8016 msgstr ""
|
|
dongsheng@627
|
8017
|
|
dongsheng@627
|
8018 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8019 #: ../en/ch07-filenames.xml:316
|
|
dongsheng@627
|
8020 msgid ""
|
|
dongsheng@627
|
8021 "On Unix-like systems, it is possible to have any or all of the above ways of "
|
|
dongsheng@627
|
8022 "handling case in action at once. For example, if you use a USB thumb drive "
|
|
dongsheng@627
|
8023 "formatted with a FAT32 filesystem on a Linux system, Linux will handle names "
|
|
dongsheng@627
|
8024 "on that filesystem in a case preserving, but insensitive, way."
|
|
dongsheng@627
|
8025 msgstr ""
|
|
dongsheng@627
|
8026
|
|
dongsheng@627
|
8027 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8028 #: ../en/ch07-filenames.xml:323
|
|
dongsheng@627
|
8029 msgid "Safe, portable repository storage"
|
|
dongsheng@630
|
8030 msgstr "安全，可移植的版本库存储"
|
|
dongsheng@627
|
8031
|
|
dongsheng@627
|
8032 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8033 #: ../en/ch07-filenames.xml:325
|
|
dongsheng@627
|
8034 msgid ""
|
|
dongsheng@627
|
8035 "Mercurial's repository storage mechanism is <emphasis>case safe</emphasis>. "
|
|
dongsheng@627
|
8036 "It translates file names so that they can be safely stored on both case "
|
|
dongsheng@627
|
8037 "sensitive and case insensitive filesystems. This means that you can use "
|
|
dongsheng@627
|
8038 "normal file copying tools to transfer a Mercurial repository onto, for "
|
|
dongsheng@627
|
8039 "example, a USB thumb drive, and safely move that drive and repository back "
|
|
dongsheng@627
|
8040 "and forth between a Mac, a PC running Windows, and a Linux box."
|
|
dongsheng@627
|
8041 msgstr ""
|
|
dongsheng@627
|
8042
|
|
dongsheng@627
|
8043 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8044 #: ../en/ch07-filenames.xml:336
|
|
dongsheng@627
|
8045 msgid "Detecting case conflicts"
|
|
dongsheng@630
|
8046 msgstr "检测大小写冲突"
|
|
dongsheng@627
|
8047
|
|
dongsheng@627
|
8048 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8049 #: ../en/ch07-filenames.xml:338
|
|
dongsheng@627
|
8050 msgid ""
|
|
dongsheng@627
|
8051 "When operating in the working directory, Mercurial honours the naming policy "
|
|
dongsheng@627
|
8052 "of the filesystem where the working directory is located. If the filesystem "
|
|
dongsheng@627
|
8053 "is case preserving, but insensitive, Mercurial will treat names that differ "
|
|
dongsheng@627
|
8054 "only in case as the same."
|
|
dongsheng@627
|
8055 msgstr ""
|
|
dongsheng@627
|
8056
|
|
dongsheng@627
|
8057 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8058 #: ../en/ch07-filenames.xml:344
|
|
dongsheng@627
|
8059 msgid ""
|
|
dongsheng@627
|
8060 "An important aspect of this approach is that it is possible to commit a "
|
|
dongsheng@627
|
8061 "changeset on a case sensitive (typically Linux or Unix) filesystem that will "
|
|
dongsheng@627
|
8062 "cause trouble for users on case insensitive (usually Windows and MacOS) "
|
|
dongsheng@627
|
8063 "users. If a Linux user commits changes to two files, one named "
|
|
dongsheng@627
|
8064 "<filename>myfile.c</filename> and the other named <filename>MyFile.C</"
|
|
dongsheng@627
|
8065 "filename>, they will be stored correctly in the repository. And in the "
|
|
dongsheng@627
|
8066 "working directories of other Linux users, they will be correctly represented "
|
|
dongsheng@627
|
8067 "as separate files."
|
|
dongsheng@627
|
8068 msgstr ""
|
|
dongsheng@627
|
8069
|
|
dongsheng@627
|
8070 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8071 #: ../en/ch07-filenames.xml:355
|
|
dongsheng@627
|
8072 msgid ""
|
|
dongsheng@627
|
8073 "If a Windows or Mac user pulls this change, they will not initially have a "
|
|
dongsheng@627
|
8074 "problem, because Mercurial's repository storage mechanism is case safe. "
|
|
dongsheng@627
|
8075 "However, once they try to <command role=\"hg-cmd\">hg update</command> the "
|
|
dongsheng@627
|
8076 "working directory to that changeset, or <command role=\"hg-cmd\">hg merge</"
|
|
dongsheng@627
|
8077 "command> with that changeset, Mercurial will spot the conflict between the "
|
|
dongsheng@627
|
8078 "two file names that the filesystem would treat as the same, and forbid the "
|
|
dongsheng@627
|
8079 "update or merge from occurring."
|
|
dongsheng@627
|
8080 msgstr ""
|
|
dongsheng@627
|
8081
|
|
dongsheng@627
|
8082 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8083 #: ../en/ch07-filenames.xml:367
|
|
dongsheng@627
|
8084 msgid "Fixing a case conflict"
|
|
dongsheng@630
|
8085 msgstr "修正大小写冲突"
|
|
dongsheng@627
|
8086
|
|
dongsheng@627
|
8087 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8088 #: ../en/ch07-filenames.xml:369
|
|
dongsheng@627
|
8089 msgid ""
|
|
dongsheng@627
|
8090 "If you are using Windows or a Mac in a mixed environment where some of your "
|
|
dongsheng@627
|
8091 "collaborators are using Linux or Unix, and Mercurial reports a case folding "
|
|
dongsheng@627
|
8092 "conflict when you try to <command role=\"hg-cmd\">hg update</command> or "
|
|
dongsheng@627
|
8093 "<command role=\"hg-cmd\">hg merge</command>, the procedure to fix the problem "
|
|
dongsheng@627
|
8094 "is simple."
|
|
dongsheng@627
|
8095 msgstr ""
|
|
dongsheng@627
|
8096
|
|
dongsheng@627
|
8097 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8098 #: ../en/ch07-filenames.xml:376
|
|
dongsheng@627
|
8099 msgid ""
|
|
dongsheng@627
|
8100 "Just find a nearby Linux or Unix box, clone the problem repository onto it, "
|
|
dongsheng@627
|
8101 "and use Mercurial's <command role=\"hg-cmd\">hg rename</command> command to "
|
|
dongsheng@627
|
8102 "change the names of any offending files or directories so that they will no "
|
|
dongsheng@627
|
8103 "longer cause case folding conflicts. Commit this change, <command role=\"hg-"
|
|
dongsheng@627
|
8104 "cmd\">hg pull</command> or <command role=\"hg-cmd\">hg push</command> it "
|
|
dongsheng@627
|
8105 "across to your Windows or MacOS system, and <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
8106 "update</command> to the revision with the non-conflicting names."
|
|
dongsheng@627
|
8107 msgstr ""
|
|
dongsheng@627
|
8108
|
|
dongsheng@627
|
8109 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8110 #: ../en/ch07-filenames.xml:386
|
|
dongsheng@627
|
8111 msgid ""
|
|
dongsheng@627
|
8112 "The changeset with case-conflicting names will remain in your project's "
|
|
dongsheng@627
|
8113 "history, and you still won't be able to <command role=\"hg-cmd\">hg update</"
|
|
dongsheng@627
|
8114 "command> your working directory to that changeset on a Windows or MacOS "
|
|
dongsheng@627
|
8115 "system, but you can continue development unimpeded."
|
|
dongsheng@627
|
8116 msgstr ""
|
|
dongsheng@627
|
8117
|
|
dongsheng@627
|
8118 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@627
|
8119 #: ../en/ch07-filenames.xml:393
|
|
dongsheng@627
|
8120 msgid ""
|
|
dongsheng@627
|
8121 "Prior to version 0.9.3, Mercurial did not use a case safe repository storage "
|
|
dongsheng@627
|
8122 "mechanism, and did not detect case folding conflicts. If you are using an "
|
|
dongsheng@627
|
8123 "older version of Mercurial on Windows or MacOS, I strongly recommend that you "
|
|
dongsheng@627
|
8124 "upgrade."
|
|
dongsheng@627
|
8125 msgstr ""
|
|
dongsheng@627
|
8126
|
|
dongsheng@627
|
8127 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
8128 #: ../en/ch08-branch.xml:5
|
|
dongsheng@627
|
8129 msgid "Managing releases and branchy development"
|
|
dongsheng@627
|
8130 msgstr "发布管理与分支开发"
|
|
dongsheng@627
|
8131
|
|
dongsheng@627
|
8132 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
8133 #: ../en/ch08-branch.xml:7
|
|
dongsheng@627
|
8134 msgid ""
|
|
dongsheng@627
|
8135 "Mercurial provides several mechanisms for you to manage a project that is "
|
|
dongsheng@627
|
8136 "making progress on multiple fronts at once. To understand these mechanisms, "
|
|
dongsheng@627
|
8137 "let's first take a brief look at a fairly normal software project structure."
|
|
dongsheng@627
|
8138 msgstr ""
|
|
dongsheng@627
|
8139
|
|
dongsheng@627
|
8140 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
8141 #: ../en/ch08-branch.xml:12
|
|
dongsheng@627
|
8142 msgid ""
|
|
dongsheng@627
|
8143 "Many software projects issue periodic <quote>major</quote> releases that "
|
|
dongsheng@627
|
8144 "contain substantial new features. In parallel, they may issue <quote>minor</"
|
|
dongsheng@627
|
8145 "quote> releases. These are usually identical to the major releases off which "
|
|
dongsheng@627
|
8146 "they're based, but with a few bugs fixed."
|
|
dongsheng@627
|
8147 msgstr ""
|
|
dongsheng@627
|
8148
|
|
dongsheng@627
|
8149 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
8150 #: ../en/ch08-branch.xml:18
|
|
dongsheng@627
|
8151 msgid ""
|
|
dongsheng@627
|
8152 "In this chapter, we'll start by talking about how to keep records of project "
|
|
dongsheng@627
|
8153 "milestones such as releases. We'll then continue on to talk about the flow "
|
|
dongsheng@627
|
8154 "of work between different phases of a project, and how Mercurial can help you "
|
|
dongsheng@627
|
8155 "to isolate and manage this work."
|
|
dongsheng@627
|
8156 msgstr ""
|
|
dongsheng@627
|
8157
|
|
dongsheng@627
|
8158 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8159 #: ../en/ch08-branch.xml:25
|
|
dongsheng@627
|
8160 msgid "Giving a persistent name to a revision"
|
|
dongsheng@635
|
8161 msgstr "给版本指定一个永久的名称"
|
|
dongsheng@627
|
8162
|
|
dongsheng@627
|
8163 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8164 #: ../en/ch08-branch.xml:27
|
|
dongsheng@627
|
8165 msgid ""
|
|
dongsheng@627
|
8166 "Once you decide that you'd like to call a particular revision a "
|
|
dongsheng@627
|
8167 "<quote>release</quote>, it's a good idea to record the identity of that "
|
|
dongsheng@627
|
8168 "revision. This will let you reproduce that release at a later date, for "
|
|
dongsheng@627
|
8169 "whatever purpose you might need at the time (reproducing a bug, porting to a "
|
|
dongsheng@627
|
8170 "new platform, etc). &interaction.tag.init;"
|
|
dongsheng@627
|
8171 msgstr ""
|
|
dongsheng@627
|
8172
|
|
dongsheng@627
|
8173 #
|
|
dongsheng@627
|
8174 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8175 #: ../en/ch08-branch.xml:34
|
|
dongsheng@627
|
8176 msgid ""
|
|
dongsheng@627
|
8177 "Mercurial lets you give a permanent name to any revision using the <command "
|
|
dongsheng@627
|
8178 "role=\"hg-cmd\">hg tag</command> command. Not surprisingly, these names are "
|
|
dongsheng@627
|
8179 "called <quote>tags</quote>."
|
|
dongsheng@627
|
8180 msgstr ""
|
|
dongsheng@627
|
8181
|
|
dongsheng@627
|
8182 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8183 #: ../en/ch08-branch.xml:40
|
|
dongsheng@627
|
8184 msgid ""
|
|
dongsheng@627
|
8185 "A tag is nothing more than a <quote>symbolic name</quote> for a revision. "
|
|
dongsheng@627
|
8186 "Tags exist purely for your convenience, so that you have a handy permanent "
|
|
dongsheng@627
|
8187 "way to refer to a revision; Mercurial doesn't interpret the tag names you use "
|
|
dongsheng@627
|
8188 "in any way. Neither does Mercurial place any restrictions on the name of a "
|
|
dongsheng@627
|
8189 "tag, beyond a few that are necessary to ensure that a tag can be parsed "
|
|
dongsheng@627
|
8190 "unambiguously. A tag name cannot contain any of the following characters:"
|
|
dongsheng@627
|
8191 msgstr ""
|
|
dongsheng@627
|
8192
|
|
dongsheng@627
|
8193 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
8194 #: ../en/ch08-branch.xml:49
|
|
dongsheng@627
|
8195 msgid "Colon (ASCII 58, <quote><literal>:</literal></quote>)"
|
|
dongsheng@627
|
8196 msgstr ""
|
|
dongsheng@627
|
8197
|
|
dongsheng@627
|
8198 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
8199 #: ../en/ch08-branch.xml:52
|
|
dongsheng@627
|
8200 msgid "Carriage return (ASCII 13, <quote><literal>\\r</literal></quote>)"
|
|
dongsheng@627
|
8201 msgstr ""
|
|
dongsheng@627
|
8202
|
|
dongsheng@627
|
8203 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
8204 #: ../en/ch08-branch.xml:55
|
|
dongsheng@627
|
8205 msgid "Newline (ASCII 10, <quote><literal>\\n</literal></quote>)"
|
|
dongsheng@627
|
8206 msgstr ""
|
|
dongsheng@627
|
8207
|
|
dongsheng@627
|
8208 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8209 #: ../en/ch08-branch.xml:59
|
|
dongsheng@627
|
8210 msgid ""
|
|
dongsheng@627
|
8211 "You can use the <command role=\"hg-cmd\">hg tags</command> command to display "
|
|
dongsheng@627
|
8212 "the tags present in your repository. In the output, each tagged revision is "
|
|
dongsheng@627
|
8213 "identified first by its name, then by revision number, and finally by the "
|
|
dongsheng@627
|
8214 "unique hash of the revision."
|
|
dongsheng@627
|
8215 msgstr ""
|
|
dongsheng@627
|
8216
|
|
dongsheng@627
|
8217 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8218 #: ../en/ch08-branch.xml:67
|
|
dongsheng@627
|
8219 msgid ""
|
|
dongsheng@627
|
8220 "Notice that <literal>tip</literal> is listed in the output of <command role="
|
|
dongsheng@627
|
8221 "\"hg-cmd\">hg tags</command>. The <literal>tip</literal> tag is a special "
|
|
dongsheng@627
|
8222 "<quote>floating</quote> tag, which always identifies the newest revision in "
|
|
dongsheng@627
|
8223 "the repository."
|
|
dongsheng@627
|
8224 msgstr ""
|
|
dongsheng@627
|
8225
|
|
dongsheng@627
|
8226 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8227 #: ../en/ch08-branch.xml:73
|
|
dongsheng@627
|
8228 msgid ""
|
|
dongsheng@627
|
8229 "In the output of the <command role=\"hg-cmd\">hg tags</command> command, tags "
|
|
dongsheng@627
|
8230 "are listed in reverse order, by revision number. This usually means that "
|
|
dongsheng@627
|
8231 "recent tags are listed before older tags. It also means that <literal>tip</"
|
|
dongsheng@627
|
8232 "literal> is always going to be the first tag listed in the output of <command "
|
|
dongsheng@627
|
8233 "role=\"hg-cmd\">hg tags</command>."
|
|
dongsheng@627
|
8234 msgstr ""
|
|
dongsheng@627
|
8235
|
|
dongsheng@627
|
8236 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8237 #: ../en/ch08-branch.xml:80
|
|
dongsheng@627
|
8238 msgid ""
|
|
dongsheng@627
|
8239 "When you run <command role=\"hg-cmd\">hg log</command>, if it displays a "
|
|
dongsheng@627
|
8240 "revision that has tags associated with it, it will print those tags."
|
|
dongsheng@627
|
8241 msgstr ""
|
|
dongsheng@627
|
8242
|
|
dongsheng@627
|
8243 #
|
|
dongsheng@627
|
8244 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8245 #: ../en/ch08-branch.xml:86
|
|
dongsheng@627
|
8246 msgid ""
|
|
dongsheng@627
|
8247 "Any time you need to provide a revision ID to a Mercurial command, the "
|
|
dongsheng@627
|
8248 "command will accept a tag name in its place. Internally, Mercurial will "
|
|
dongsheng@627
|
8249 "translate your tag name into the corresponding revision ID, then use that."
|
|
dongsheng@627
|
8250 msgstr ""
|
|
dongsheng@627
|
8251
|
|
dongsheng@627
|
8252 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8253 #: ../en/ch08-branch.xml:93
|
|
dongsheng@627
|
8254 msgid ""
|
|
dongsheng@627
|
8255 "There's no limit on the number of tags you can have in a repository, or on "
|
|
dongsheng@627
|
8256 "the number of tags that a single revision can have. As a practical matter, "
|
|
dongsheng@627
|
8257 "it's not a great idea to have <quote>too many</quote> (a number which will "
|
|
dongsheng@627
|
8258 "vary from project to project), simply because tags are supposed to help you "
|
|
dongsheng@627
|
8259 "to find revisions. If you have lots of tags, the ease of using them to "
|
|
dongsheng@627
|
8260 "identify revisions diminishes rapidly."
|
|
dongsheng@627
|
8261 msgstr ""
|
|
dongsheng@627
|
8262
|
|
dongsheng@627
|
8263 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8264 #: ../en/ch08-branch.xml:101
|
|
dongsheng@627
|
8265 msgid ""
|
|
dongsheng@627
|
8266 "For example, if your project has milestones as frequent as every few days, "
|
|
dongsheng@627
|
8267 "it's perfectly reasonable to tag each one of those. But if you have a "
|
|
dongsheng@627
|
8268 "continuous build system that makes sure every revision can be built cleanly, "
|
|
dongsheng@627
|
8269 "you'd be introducing a lot of noise if you were to tag every clean build. "
|
|
dongsheng@627
|
8270 "Instead, you could tag failed builds (on the assumption that they're rare!), "
|
|
dongsheng@627
|
8271 "or simply not use tags to track buildability."
|
|
dongsheng@627
|
8272 msgstr ""
|
|
dongsheng@627
|
8273
|
|
dongsheng@627
|
8274 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8275 #: ../en/ch08-branch.xml:109
|
|
dongsheng@627
|
8276 msgid ""
|
|
dongsheng@627
|
8277 "If you want to remove a tag that you no longer want, use <command role=\"hg-"
|
|
dongsheng@627
|
8278 "cmd\">hg tag --remove</command>."
|
|
dongsheng@627
|
8279 msgstr ""
|
|
dongsheng@627
|
8280
|
|
dongsheng@627
|
8281 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8282 #: ../en/ch08-branch.xml:114
|
|
dongsheng@627
|
8283 msgid ""
|
|
dongsheng@627
|
8284 "You can also modify a tag at any time, so that it identifies a different "
|
|
dongsheng@627
|
8285 "revision, by simply issuing a new <command role=\"hg-cmd\">hg tag</command> "
|
|
dongsheng@627
|
8286 "command. You'll have to use the <option role=\"hg-opt-tag\">-f</option> "
|
|
dongsheng@627
|
8287 "option to tell Mercurial that you <emphasis>really</emphasis> want to update "
|
|
dongsheng@627
|
8288 "the tag."
|
|
dongsheng@627
|
8289 msgstr ""
|
|
dongsheng@627
|
8290
|
|
dongsheng@627
|
8291 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8292 #: ../en/ch08-branch.xml:123
|
|
dongsheng@627
|
8293 msgid ""
|
|
dongsheng@627
|
8294 "There will still be a permanent record of the previous identity of the tag, "
|
|
dongsheng@627
|
8295 "but Mercurial will no longer use it. There's thus no penalty to tagging the "
|
|
dongsheng@627
|
8296 "wrong revision; all you have to do is turn around and tag the correct "
|
|
dongsheng@627
|
8297 "revision once you discover your error."
|
|
dongsheng@627
|
8298 msgstr ""
|
|
dongsheng@627
|
8299
|
|
dongsheng@627
|
8300 #
|
|
dongsheng@627
|
8301 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8302 #: ../en/ch08-branch.xml:129
|
|
dongsheng@627
|
8303 msgid ""
|
|
dongsheng@627
|
8304 "Mercurial stores tags in a normal revision-controlled file in your "
|
|
dongsheng@627
|
8305 "repository. If you've created any tags, you'll find them in a file named "
|
|
dongsheng@627
|
8306 "<filename role=\"special\">.hgtags</filename>. When you run the <command "
|
|
dongsheng@627
|
8307 "role=\"hg-cmd\">hg tag</command> command, Mercurial modifies this file, then "
|
|
dongsheng@627
|
8308 "automatically commits the change to it. This means that every time you run "
|
|
dongsheng@627
|
8309 "<command role=\"hg-cmd\">hg tag</command>, you'll see a corresponding "
|
|
dongsheng@627
|
8310 "changeset in the output of <command role=\"hg-cmd\">hg log</command>."
|
|
dongsheng@627
|
8311 msgstr ""
|
|
dongsheng@627
|
8312
|
|
dongsheng@627
|
8313 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8314 #: ../en/ch08-branch.xml:142
|
|
dongsheng@627
|
8315 msgid "Handling tag conflicts during a merge"
|
|
dongsheng@635
|
8316 msgstr "在合并期间处理标签冲突"
|
|
dongsheng@627
|
8317
|
|
dongsheng@627
|
8318 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8319 #: ../en/ch08-branch.xml:144
|
|
dongsheng@627
|
8320 msgid ""
|
|
dongsheng@627
|
8321 "You won't often need to care about the <filename role=\"special\">.hgtags</"
|
|
dongsheng@627
|
8322 "filename> file, but it sometimes makes its presence known during a merge. "
|
|
dongsheng@627
|
8323 "The format of the file is simple: it consists of a series of lines. Each "
|
|
dongsheng@627
|
8324 "line starts with a changeset hash, followed by a space, followed by the name "
|
|
dongsheng@627
|
8325 "of a tag."
|
|
dongsheng@627
|
8326 msgstr ""
|
|
dongsheng@627
|
8327
|
|
dongsheng@627
|
8328 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8329 #: ../en/ch08-branch.xml:151
|
|
dongsheng@627
|
8330 msgid ""
|
|
dongsheng@627
|
8331 "If you're resolving a conflict in the <filename role=\"special\">.hgtags</"
|
|
dongsheng@627
|
8332 "filename> file during a merge, there's one twist to modifying the <filename "
|
|
dongsheng@627
|
8333 "role=\"special\">.hgtags</filename> file: when Mercurial is parsing the tags "
|
|
dongsheng@627
|
8334 "in a repository, it <emphasis>never</emphasis> reads the working copy of the "
|
|
dongsheng@627
|
8335 "<filename role=\"special\">.hgtags</filename> file. Instead, it reads the "
|
|
dongsheng@627
|
8336 "<emphasis>most recently committed</emphasis> revision of the file."
|
|
dongsheng@627
|
8337 msgstr ""
|
|
dongsheng@627
|
8338
|
|
dongsheng@627
|
8339 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8340 #: ../en/ch08-branch.xml:161
|
|
dongsheng@627
|
8341 msgid ""
|
|
dongsheng@627
|
8342 "An unfortunate consequence of this design is that you can't actually verify "
|
|
dongsheng@627
|
8343 "that your merged <filename role=\"special\">.hgtags</filename> file is "
|
|
dongsheng@627
|
8344 "correct until <emphasis>after</emphasis> you've committed a change. So if "
|
|
dongsheng@627
|
8345 "you find yourself resolving a conflict on <filename role=\"special\">.hgtags</"
|
|
dongsheng@627
|
8346 "filename> during a merge, be sure to run <command role=\"hg-cmd\">hg tags</"
|
|
dongsheng@627
|
8347 "command> after you commit. If it finds an error in the <filename role="
|
|
dongsheng@627
|
8348 "\"special\">.hgtags</filename> file, it will report the location of the "
|
|
dongsheng@627
|
8349 "error, which you can then fix and commit. You should then run <command role="
|
|
dongsheng@627
|
8350 "\"hg-cmd\">hg tags</command> again, just to be sure that your fix is correct."
|
|
dongsheng@627
|
8351 msgstr ""
|
|
dongsheng@627
|
8352
|
|
dongsheng@627
|
8353 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8354 #: ../en/ch08-branch.xml:176
|
|
dongsheng@627
|
8355 msgid "Tags and cloning"
|
|
dongsheng@635
|
8356 msgstr "标签与克隆"
|
|
dongsheng@627
|
8357
|
|
dongsheng@627
|
8358 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8359 #: ../en/ch08-branch.xml:178
|
|
dongsheng@627
|
8360 msgid ""
|
|
dongsheng@627
|
8361 "You may have noticed that the <command role=\"hg-cmd\">hg clone</command> "
|
|
dongsheng@627
|
8362 "command has a <option role=\"hg-opt-clone\">-r</option> option that lets you "
|
|
dongsheng@627
|
8363 "clone an exact copy of the repository as of a particular changeset. The new "
|
|
dongsheng@627
|
8364 "clone will not contain any project history that comes after the revision you "
|
|
dongsheng@627
|
8365 "specified. This has an interaction with tags that can surprise the unwary."
|
|
dongsheng@627
|
8366 msgstr ""
|
|
dongsheng@627
|
8367
|
|
dongsheng@627
|
8368 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8369 #: ../en/ch08-branch.xml:186
|
|
dongsheng@627
|
8370 msgid ""
|
|
dongsheng@627
|
8371 "Recall that a tag is stored as a revision to the <filename role=\"special\">."
|
|
dongsheng@627
|
8372 "hgtags</filename> file, so that when you create a tag, the changeset in which "
|
|
dongsheng@627
|
8373 "it's recorded necessarily refers to an older changeset. When you run "
|
|
dongsheng@627
|
8374 "<command role=\"hg-cmd\">hg clone -r foo</command> to clone a repository as "
|
|
dongsheng@627
|
8375 "of tag <literal>foo</literal>, the new clone <emphasis>will not contain the "
|
|
dongsheng@627
|
8376 "history that created the tag</emphasis> that you used to clone the "
|
|
dongsheng@627
|
8377 "repository. The result is that you'll get exactly the right subset of the "
|
|
dongsheng@627
|
8378 "project's history in the new repository, but <emphasis>not</emphasis> the tag "
|
|
dongsheng@627
|
8379 "you might have expected."
|
|
dongsheng@627
|
8380 msgstr ""
|
|
dongsheng@627
|
8381
|
|
dongsheng@627
|
8382 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8383 #: ../en/ch08-branch.xml:201
|
|
dongsheng@627
|
8384 msgid "When permanent tags are too much"
|
|
dongsheng@635
|
8385 msgstr "当永久标签太多的时候"
|
|
dongsheng@627
|
8386
|
|
dongsheng@627
|
8387 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8388 #: ../en/ch08-branch.xml:203
|
|
dongsheng@627
|
8389 msgid ""
|
|
dongsheng@627
|
8390 "Since Mercurial's tags are revision controlled and carried around with a "
|
|
dongsheng@627
|
8391 "project's history, everyone you work with will see the tags you create. But "
|
|
dongsheng@627
|
8392 "giving names to revisions has uses beyond simply noting that revision "
|
|
dongsheng@627
|
8393 "<literal>4237e45506ee</literal> is really <literal>v2.0.2</literal>. If "
|
|
dongsheng@627
|
8394 "you're trying to track down a subtle bug, you might want a tag to remind you "
|
|
dongsheng@627
|
8395 "of something like <quote>Anne saw the symptoms with this revision</quote>."
|
|
dongsheng@627
|
8396 msgstr ""
|
|
dongsheng@627
|
8397
|
|
dongsheng@627
|
8398 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8399 #: ../en/ch08-branch.xml:213
|
|
dongsheng@627
|
8400 msgid ""
|
|
dongsheng@627
|
8401 "For cases like this, what you might want to use are <emphasis>local</"
|
|
dongsheng@627
|
8402 "emphasis> tags. You can create a local tag with the <option role=\"hg-opt-tag"
|
|
dongsheng@627
|
8403 "\">-l</option> option to the <command role=\"hg-cmd\">hg tag</command> "
|
|
dongsheng@627
|
8404 "command. This will store the tag in a file called <filename role=\"special"
|
|
dongsheng@627
|
8405 "\">.hg/localtags</filename>. Unlike <filename role=\"special\">.hgtags</"
|
|
dongsheng@627
|
8406 "filename>, <filename role=\"special\">.hg/localtags</filename> is not "
|
|
dongsheng@627
|
8407 "revision controlled. Any tags you create using <option role=\"hg-opt-tag\">-"
|
|
dongsheng@627
|
8408 "l</option> remain strictly local to the repository you're currently working "
|
|
dongsheng@627
|
8409 "in."
|
|
dongsheng@627
|
8410 msgstr ""
|
|
dongsheng@627
|
8411
|
|
dongsheng@627
|
8412 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8413 #: ../en/ch08-branch.xml:228
|
|
dongsheng@627
|
8414 msgid "The flow of changes&emdash;big picture vs. little"
|
|
dongsheng@635
|
8415 msgstr "修改流程&emdash;宏观与微观"
|
|
dongsheng@627
|
8416
|
|
dongsheng@627
|
8417 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8418 #: ../en/ch08-branch.xml:230
|
|
dongsheng@627
|
8419 msgid ""
|
|
dongsheng@627
|
8420 "To return to the outline I sketched at the beginning of a chapter, let's "
|
|
dongsheng@627
|
8421 "think about a project that has multiple concurrent pieces of work under "
|
|
dongsheng@627
|
8422 "development at once."
|
|
dongsheng@627
|
8423 msgstr ""
|
|
dongsheng@627
|
8424
|
|
dongsheng@627
|
8425 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8426 #: ../en/ch08-branch.xml:234
|
|
dongsheng@627
|
8427 msgid ""
|
|
dongsheng@627
|
8428 "There might be a push for a new <quote>main</quote> release; a new minor "
|
|
dongsheng@627
|
8429 "bugfix release to the last main release; and an unexpected <quote>hot fix</"
|
|
dongsheng@627
|
8430 "quote> to an old release that is now in maintenance mode."
|
|
dongsheng@627
|
8431 msgstr ""
|
|
dongsheng@627
|
8432
|
|
dongsheng@627
|
8433 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8434 #: ../en/ch08-branch.xml:239
|
|
dongsheng@627
|
8435 msgid ""
|
|
dongsheng@627
|
8436 "The usual way people refer to these different concurrent directions of "
|
|
dongsheng@627
|
8437 "development is as <quote>branches</quote>. However, we've already seen "
|
|
dongsheng@627
|
8438 "numerous times that Mercurial treats <emphasis>all of history</emphasis> as a "
|
|
dongsheng@627
|
8439 "series of branches and merges. Really, what we have here is two ideas that "
|
|
dongsheng@627
|
8440 "are peripherally related, but which happen to share a name."
|
|
dongsheng@627
|
8441 msgstr ""
|
|
dongsheng@627
|
8442
|
|
dongsheng@627
|
8443 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
8444 #: ../en/ch08-branch.xml:246
|
|
dongsheng@627
|
8445 msgid ""
|
|
dongsheng@627
|
8446 "<quote>Big picture</quote> branches represent the sweep of a project's "
|
|
dongsheng@627
|
8447 "evolution; people give them names, and talk about them in conversation."
|
|
dongsheng@627
|
8448 msgstr ""
|
|
dongsheng@627
|
8449
|
|
dongsheng@627
|
8450 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
8451 #: ../en/ch08-branch.xml:250
|
|
dongsheng@627
|
8452 msgid ""
|
|
dongsheng@627
|
8453 "<quote>Little picture</quote> branches are artefacts of the day-to-day "
|
|
dongsheng@627
|
8454 "activity of developing and merging changes. They expose the narrative of how "
|
|
dongsheng@627
|
8455 "the code was developed."
|
|
dongsheng@627
|
8456 msgstr ""
|
|
dongsheng@627
|
8457
|
|
dongsheng@627
|
8458 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8459 #: ../en/ch08-branch.xml:258
|
|
dongsheng@627
|
8460 msgid "Managing big-picture branches in repositories"
|
|
dongsheng@635
|
8461 msgstr "在版本库中管理分支"
|
|
dongsheng@627
|
8462
|
|
dongsheng@627
|
8463 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8464 #: ../en/ch08-branch.xml:260
|
|
dongsheng@627
|
8465 msgid ""
|
|
dongsheng@627
|
8466 "The easiest way to isolate a <quote>big picture</quote> branch in Mercurial "
|
|
dongsheng@627
|
8467 "is in a dedicated repository. If you have an existing shared "
|
|
dongsheng@627
|
8468 "repository&emdash;let's call it <literal>myproject</literal>&emdash;that "
|
|
dongsheng@627
|
8469 "reaches a <quote>1.0</quote> milestone, you can start to prepare for future "
|
|
dongsheng@627
|
8470 "maintenance releases on top of version 1.0 by tagging the revision from which "
|
|
dongsheng@627
|
8471 "you prepared the 1.0 release."
|
|
dongsheng@627
|
8472 msgstr ""
|
|
dongsheng@627
|
8473
|
|
dongsheng@627
|
8474 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8475 #: ../en/ch08-branch.xml:270
|
|
dongsheng@627
|
8476 msgid ""
|
|
dongsheng@627
|
8477 "You can then clone a new shared <literal>myproject-1.0.1</literal> repository "
|
|
dongsheng@627
|
8478 "as of that tag."
|
|
dongsheng@627
|
8479 msgstr ""
|
|
dongsheng@627
|
8480
|
|
dongsheng@627
|
8481 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8482 #: ../en/ch08-branch.xml:276
|
|
dongsheng@627
|
8483 msgid ""
|
|
dongsheng@627
|
8484 "Afterwards, if someone needs to work on a bug fix that ought to go into an "
|
|
dongsheng@627
|
8485 "upcoming 1.0.1 minor release, they clone the <literal>myproject-1.0.1</"
|
|
dongsheng@627
|
8486 "literal> repository, make their changes, and push them back."
|
|
dongsheng@627
|
8487 msgstr ""
|
|
dongsheng@627
|
8488
|
|
dongsheng@627
|
8489 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8490 #: ../en/ch08-branch.xml:283
|
|
dongsheng@627
|
8491 msgid ""
|
|
dongsheng@627
|
8492 "Meanwhile, development for the next major release can continue, isolated and "
|
|
dongsheng@627
|
8493 "unabated, in the <literal>myproject</literal> repository."
|
|
dongsheng@627
|
8494 msgstr ""
|
|
dongsheng@627
|
8495
|
|
dongsheng@627
|
8496 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8497 #: ../en/ch08-branch.xml:291
|
|
dongsheng@627
|
8498 msgid "Don't repeat yourself: merging across branches"
|
|
dongsheng@635
|
8499 msgstr "不要重复劳动：在分支间合并"
|
|
dongsheng@627
|
8500
|
|
dongsheng@627
|
8501 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8502 #: ../en/ch08-branch.xml:293
|
|
dongsheng@627
|
8503 msgid ""
|
|
dongsheng@627
|
8504 "In many cases, if you have a bug to fix on a maintenance branch, the chances "
|
|
dongsheng@627
|
8505 "are good that the bug exists on your project's main branch (and possibly "
|
|
dongsheng@627
|
8506 "other maintenance branches, too). It's a rare developer who wants to fix the "
|
|
dongsheng@627
|
8507 "same bug multiple times, so let's look at a few ways that Mercurial can help "
|
|
dongsheng@627
|
8508 "you to manage these bugfixes without duplicating your work."
|
|
dongsheng@627
|
8509 msgstr ""
|
|
dongsheng@627
|
8510
|
|
dongsheng@627
|
8511 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8512 #: ../en/ch08-branch.xml:301
|
|
dongsheng@627
|
8513 msgid ""
|
|
dongsheng@627
|
8514 "In the simplest instance, all you need to do is pull changes from your "
|
|
dongsheng@627
|
8515 "maintenance branch into your local clone of the target branch."
|
|
dongsheng@627
|
8516 msgstr ""
|
|
dongsheng@627
|
8517
|
|
dongsheng@627
|
8518 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8519 #: ../en/ch08-branch.xml:307
|
|
dongsheng@627
|
8520 msgid ""
|
|
dongsheng@627
|
8521 "You'll then need to merge the heads of the two branches, and push back to the "
|
|
dongsheng@627
|
8522 "main branch."
|
|
dongsheng@627
|
8523 msgstr ""
|
|
dongsheng@627
|
8524
|
|
dongsheng@627
|
8525 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8526 #: ../en/ch08-branch.xml:314
|
|
dongsheng@627
|
8527 msgid "Naming branches within one repository"
|
|
dongsheng@635
|
8528 msgstr "版本库中的命名分支"
|
|
dongsheng@627
|
8529
|
|
dongsheng@627
|
8530 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8531 #: ../en/ch08-branch.xml:316
|
|
dongsheng@627
|
8532 msgid ""
|
|
dongsheng@627
|
8533 "In most instances, isolating branches in repositories is the right approach. "
|
|
dongsheng@627
|
8534 "Its simplicity makes it easy to understand; and so it's hard to make "
|
|
dongsheng@627
|
8535 "mistakes. There's a one-to-one relationship between branches you're working "
|
|
dongsheng@627
|
8536 "in and directories on your system. This lets you use normal (non-Mercurial-"
|
|
dongsheng@627
|
8537 "aware) tools to work on files within a branch/repository."
|
|
dongsheng@627
|
8538 msgstr ""
|
|
dongsheng@627
|
8539
|
|
dongsheng@627
|
8540 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8541 #: ../en/ch08-branch.xml:323
|
|
dongsheng@627
|
8542 msgid ""
|
|
dongsheng@627
|
8543 "If you're more in the <quote>power user</quote> category (<emphasis>and</"
|
|
dongsheng@627
|
8544 "emphasis> your collaborators are too), there is an alternative way of "
|
|
dongsheng@627
|
8545 "handling branches that you can consider. I've already mentioned the human-"
|
|
dongsheng@627
|
8546 "level distinction between <quote>small picture</quote> and <quote>big "
|
|
dongsheng@627
|
8547 "picture</quote> branches. While Mercurial works with multiple <quote>small "
|
|
dongsheng@627
|
8548 "picture</quote> branches in a repository all the time (for example after you "
|
|
dongsheng@627
|
8549 "pull changes in, but before you merge them), it can <emphasis>also</emphasis> "
|
|
dongsheng@627
|
8550 "work with multiple <quote>big picture</quote> branches."
|
|
dongsheng@627
|
8551 msgstr ""
|
|
dongsheng@627
|
8552
|
|
dongsheng@627
|
8553 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8554 #: ../en/ch08-branch.xml:334
|
|
dongsheng@627
|
8555 msgid ""
|
|
dongsheng@627
|
8556 "The key to working this way is that Mercurial lets you assign a persistent "
|
|
dongsheng@627
|
8557 "<emphasis>name</emphasis> to a branch. There always exists a branch named "
|
|
dongsheng@627
|
8558 "<literal>default</literal>. Even before you start naming branches yourself, "
|
|
dongsheng@627
|
8559 "you can find traces of the <literal>default</literal> branch if you look for "
|
|
dongsheng@627
|
8560 "them."
|
|
dongsheng@627
|
8561 msgstr ""
|
|
dongsheng@627
|
8562
|
|
dongsheng@627
|
8563 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8564 #: ../en/ch08-branch.xml:341
|
|
dongsheng@627
|
8565 msgid ""
|
|
dongsheng@627
|
8566 "As an example, when you run the <command role=\"hg-cmd\">hg commit</command> "
|
|
dongsheng@627
|
8567 "command, and it pops up your editor so that you can enter a commit message, "
|
|
dongsheng@627
|
8568 "look for a line that contains the text <quote><literal>HG: branch default</"
|
|
dongsheng@627
|
8569 "literal></quote> at the bottom. This is telling you that your commit will "
|
|
dongsheng@627
|
8570 "occur on the branch named <literal>default</literal>."
|
|
dongsheng@627
|
8571 msgstr ""
|
|
dongsheng@627
|
8572
|
|
dongsheng@627
|
8573 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8574 #: ../en/ch08-branch.xml:348
|
|
dongsheng@627
|
8575 msgid ""
|
|
dongsheng@627
|
8576 "To start working with named branches, use the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
8577 "branches</command> command. This command lists the named branches already "
|
|
dongsheng@627
|
8578 "present in your repository, telling you which changeset is the tip of each."
|
|
dongsheng@627
|
8579 msgstr ""
|
|
dongsheng@627
|
8580
|
|
dongsheng@627
|
8581 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8582 #: ../en/ch08-branch.xml:355
|
|
dongsheng@627
|
8583 msgid ""
|
|
dongsheng@627
|
8584 "Since you haven't created any named branches yet, the only one that exists is "
|
|
dongsheng@627
|
8585 "<literal>default</literal>."
|
|
dongsheng@627
|
8586 msgstr ""
|
|
dongsheng@627
|
8587
|
|
dongsheng@627
|
8588 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8589 #: ../en/ch08-branch.xml:358
|
|
dongsheng@627
|
8590 msgid ""
|
|
dongsheng@627
|
8591 "To find out what the <quote>current</quote> branch is, run the <command role="
|
|
dongsheng@627
|
8592 "\"hg-cmd\">hg branch</command> command, giving it no arguments. This tells "
|
|
dongsheng@627
|
8593 "you what branch the parent of the current changeset is on."
|
|
dongsheng@627
|
8594 msgstr ""
|
|
dongsheng@627
|
8595
|
|
dongsheng@627
|
8596 #
|
|
dongsheng@627
|
8597 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8598 #: ../en/ch08-branch.xml:365
|
|
dongsheng@627
|
8599 msgid ""
|
|
dongsheng@627
|
8600 "To create a new branch, run the <command role=\"hg-cmd\">hg branch</command> "
|
|
dongsheng@627
|
8601 "command again. This time, give it one argument: the name of the branch you "
|
|
dongsheng@627
|
8602 "want to create."
|
|
dongsheng@627
|
8603 msgstr ""
|
|
dongsheng@627
|
8604
|
|
dongsheng@627
|
8605 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8606 #: ../en/ch08-branch.xml:371
|
|
dongsheng@627
|
8607 msgid ""
|
|
dongsheng@627
|
8608 "After you've created a branch, you might wonder what effect the <command role="
|
|
dongsheng@627
|
8609 "\"hg-cmd\">hg branch</command> command has had. What do the <command role="
|
|
dongsheng@627
|
8610 "\"hg-cmd\">hg status</command> and <command role=\"hg-cmd\">hg tip</command> "
|
|
dongsheng@627
|
8611 "commands report?"
|
|
dongsheng@627
|
8612 msgstr ""
|
|
dongsheng@627
|
8613
|
|
dongsheng@627
|
8614 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8615 #: ../en/ch08-branch.xml:378
|
|
dongsheng@627
|
8616 msgid ""
|
|
dongsheng@627
|
8617 "Nothing has changed in the working directory, and there's been no new history "
|
|
dongsheng@627
|
8618 "created. As this suggests, running the <command role=\"hg-cmd\">hg branch</"
|
|
dongsheng@627
|
8619 "command> command has no permanent effect; it only tells Mercurial what branch "
|
|
dongsheng@627
|
8620 "name to use the <emphasis>next</emphasis> time you commit a changeset."
|
|
dongsheng@627
|
8621 msgstr ""
|
|
dongsheng@627
|
8622
|
|
dongsheng@627
|
8623 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8624 #: ../en/ch08-branch.xml:385
|
|
dongsheng@627
|
8625 msgid ""
|
|
dongsheng@627
|
8626 "When you commit a change, Mercurial records the name of the branch on which "
|
|
dongsheng@627
|
8627 "you committed. Once you've switched from the <literal>default</literal> "
|
|
dongsheng@627
|
8628 "branch to another and committed, you'll see the name of the new branch show "
|
|
dongsheng@627
|
8629 "up in the output of <command role=\"hg-cmd\">hg log</command>, <command role="
|
|
dongsheng@627
|
8630 "\"hg-cmd\">hg tip</command>, and other commands that display the same kind of "
|
|
dongsheng@627
|
8631 "output."
|
|
dongsheng@627
|
8632 msgstr ""
|
|
dongsheng@627
|
8633
|
|
dongsheng@627
|
8634 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8635 #: ../en/ch08-branch.xml:395
|
|
dongsheng@627
|
8636 msgid ""
|
|
dongsheng@627
|
8637 "The <command role=\"hg-cmd\">hg log</command>-like commands will print the "
|
|
dongsheng@627
|
8638 "branch name of every changeset that's not on the <literal>default</literal> "
|
|
dongsheng@627
|
8639 "branch. As a result, if you never use named branches, you'll never see this "
|
|
dongsheng@627
|
8640 "information."
|
|
dongsheng@627
|
8641 msgstr ""
|
|
dongsheng@627
|
8642
|
|
dongsheng@627
|
8643 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8644 #: ../en/ch08-branch.xml:400
|
|
dongsheng@627
|
8645 msgid ""
|
|
dongsheng@627
|
8646 "Once you've named a branch and committed a change with that name, every "
|
|
dongsheng@627
|
8647 "subsequent commit that descends from that change will inherit the same branch "
|
|
dongsheng@627
|
8648 "name. You can change the name of a branch at any time, using the <command "
|
|
dongsheng@627
|
8649 "role=\"hg-cmd\">hg branch</command> command."
|
|
dongsheng@627
|
8650 msgstr ""
|
|
dongsheng@627
|
8651
|
|
dongsheng@627
|
8652 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8653 #: ../en/ch08-branch.xml:408
|
|
dongsheng@627
|
8654 msgid ""
|
|
dongsheng@627
|
8655 "In practice, this is something you won't do very often, as branch names tend "
|
|
dongsheng@627
|
8656 "to have fairly long lifetimes. (This isn't a rule, just an observation.)"
|
|
dongsheng@627
|
8657 msgstr ""
|
|
dongsheng@627
|
8658
|
|
dongsheng@627
|
8659 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8660 #: ../en/ch08-branch.xml:414
|
|
dongsheng@627
|
8661 msgid "Dealing with multiple named branches in a repository"
|
|
dongsheng@635
|
8662 msgstr "在版本库中处理多个命名分支"
|
|
dongsheng@627
|
8663
|
|
dongsheng@627
|
8664 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8665 #: ../en/ch08-branch.xml:417
|
|
dongsheng@627
|
8666 msgid ""
|
|
dongsheng@627
|
8667 "If you have more than one named branch in a repository, Mercurial will "
|
|
dongsheng@627
|
8668 "remember the branch that your working directory on when you start a command "
|
|
dongsheng@627
|
8669 "like <command role=\"hg-cmd\">hg update</command> or <command role=\"hg-cmd"
|
|
dongsheng@627
|
8670 "\">hg pull -u</command>. It will update the working directory to the tip of "
|
|
dongsheng@627
|
8671 "this branch, no matter what the <quote>repo-wide</quote> tip is. To update "
|
|
dongsheng@627
|
8672 "to a revision that's on a different named branch, you may need to use the "
|
|
dongsheng@627
|
8673 "<option role=\"hg-opt-update\">-C</option> option to <command role=\"hg-cmd"
|
|
dongsheng@627
|
8674 "\">hg update</command>."
|
|
dongsheng@627
|
8675 msgstr ""
|
|
dongsheng@627
|
8676
|
|
dongsheng@627
|
8677 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8678 #: ../en/ch08-branch.xml:427
|
|
dongsheng@627
|
8679 msgid ""
|
|
dongsheng@627
|
8680 "This behaviour is a little subtle, so let's see it in action. First, let's "
|
|
dongsheng@627
|
8681 "remind ourselves what branch we're currently on, and what branches are in our "
|
|
dongsheng@627
|
8682 "repository."
|
|
dongsheng@627
|
8683 msgstr ""
|
|
dongsheng@627
|
8684
|
|
dongsheng@627
|
8685 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8686 #: ../en/ch08-branch.xml:433
|
|
dongsheng@627
|
8687 msgid ""
|
|
dongsheng@627
|
8688 "We're on the <literal>bar</literal> branch, but there also exists an older "
|
|
dongsheng@627
|
8689 "<command role=\"hg-cmd\">hg foo</command> branch."
|
|
dongsheng@627
|
8690 msgstr ""
|
|
dongsheng@627
|
8691
|
|
dongsheng@627
|
8692 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8693 #: ../en/ch08-branch.xml:437
|
|
dongsheng@627
|
8694 msgid ""
|
|
dongsheng@627
|
8695 "We can <command role=\"hg-cmd\">hg update</command> back and forth between "
|
|
dongsheng@627
|
8696 "the tips of the <literal>foo</literal> and <literal>bar</literal> branches "
|
|
dongsheng@627
|
8697 "without needing to use the <option role=\"hg-opt-update\">-C</option> option, "
|
|
dongsheng@627
|
8698 "because this only involves going backwards and forwards linearly through our "
|
|
dongsheng@627
|
8699 "change history."
|
|
dongsheng@627
|
8700 msgstr ""
|
|
dongsheng@627
|
8701
|
|
dongsheng@627
|
8702 #
|
|
dongsheng@627
|
8703 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8704 #: ../en/ch08-branch.xml:446
|
|
dongsheng@627
|
8705 msgid ""
|
|
dongsheng@627
|
8706 "If we go back to the <literal>foo</literal> branch and then run <command role="
|
|
dongsheng@627
|
8707 "\"hg-cmd\">hg update</command>, it will keep us on <literal>foo</literal>, "
|
|
dongsheng@627
|
8708 "not move us to the tip of <literal>bar</literal>."
|
|
dongsheng@627
|
8709 msgstr ""
|
|
dongsheng@627
|
8710
|
|
dongsheng@627
|
8711 #
|
|
dongsheng@627
|
8712 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8713 #: ../en/ch08-branch.xml:453
|
|
dongsheng@627
|
8714 msgid ""
|
|
dongsheng@627
|
8715 "Committing a new change on the <literal>foo</literal> branch introduces a new "
|
|
dongsheng@627
|
8716 "head."
|
|
dongsheng@627
|
8717 msgstr ""
|
|
dongsheng@627
|
8718
|
|
dongsheng@627
|
8719 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8720 #: ../en/ch08-branch.xml:460
|
|
dongsheng@627
|
8721 msgid "Branch names and merging"
|
|
dongsheng@635
|
8722 msgstr "分支名称与合并"
|
|
dongsheng@627
|
8723
|
|
dongsheng@627
|
8724 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8725 #: ../en/ch08-branch.xml:462
|
|
dongsheng@627
|
8726 msgid ""
|
|
dongsheng@627
|
8727 "As you've probably noticed, merges in Mercurial are not symmetrical. Let's "
|
|
dongsheng@627
|
8728 "say our repository has two heads, 17 and 23. If I <command role=\"hg-cmd"
|
|
dongsheng@627
|
8729 "\">hg update</command> to 17 and then <command role=\"hg-cmd\">hg merge</"
|
|
dongsheng@627
|
8730 "command> with 23, Mercurial records 17 as the first parent of the merge, and "
|
|
dongsheng@627
|
8731 "23 as the second. Whereas if I <command role=\"hg-cmd\">hg update</command> "
|
|
dongsheng@627
|
8732 "to 23 and then <command role=\"hg-cmd\">hg merge</command> with 17, it "
|
|
dongsheng@627
|
8733 "records 23 as the first parent, and 17 as the second."
|
|
dongsheng@627
|
8734 msgstr ""
|
|
dongsheng@627
|
8735
|
|
dongsheng@627
|
8736 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8737 #: ../en/ch08-branch.xml:472
|
|
dongsheng@627
|
8738 msgid ""
|
|
dongsheng@627
|
8739 "This affects Mercurial's choice of branch name when you merge. After a "
|
|
dongsheng@627
|
8740 "merge, Mercurial will retain the branch name of the first parent when you "
|
|
dongsheng@627
|
8741 "commit the result of the merge. If your first parent's branch name is "
|
|
dongsheng@627
|
8742 "<literal>foo</literal>, and you merge with <literal>bar</literal>, the branch "
|
|
dongsheng@627
|
8743 "name will still be <literal>foo</literal> after you merge."
|
|
dongsheng@627
|
8744 msgstr ""
|
|
dongsheng@627
|
8745
|
|
dongsheng@627
|
8746 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8747 #: ../en/ch08-branch.xml:479
|
|
dongsheng@627
|
8748 msgid ""
|
|
dongsheng@627
|
8749 "It's not unusual for a repository to contain multiple heads, each with the "
|
|
dongsheng@627
|
8750 "same branch name. Let's say I'm working on the <literal>foo</literal> "
|
|
dongsheng@627
|
8751 "branch, and so are you. We commit different changes; I pull your changes; I "
|
|
dongsheng@627
|
8752 "now have two heads, each claiming to be on the <literal>foo</literal> "
|
|
dongsheng@627
|
8753 "branch. The result of a merge will be a single head on the <literal>foo</"
|
|
dongsheng@627
|
8754 "literal> branch, as you might hope."
|
|
dongsheng@627
|
8755 msgstr ""
|
|
dongsheng@627
|
8756
|
|
dongsheng@627
|
8757 #
|
|
dongsheng@627
|
8758 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8759 #: ../en/ch08-branch.xml:487
|
|
dongsheng@627
|
8760 msgid ""
|
|
dongsheng@627
|
8761 "But if I'm working on the <literal>bar</literal> branch, and I merge work "
|
|
dongsheng@627
|
8762 "from the <literal>foo</literal> branch, the result will remain on the "
|
|
dongsheng@627
|
8763 "<literal>bar</literal> branch."
|
|
dongsheng@627
|
8764 msgstr ""
|
|
dongsheng@627
|
8765
|
|
dongsheng@627
|
8766 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8767 #: ../en/ch08-branch.xml:493
|
|
dongsheng@627
|
8768 msgid ""
|
|
dongsheng@627
|
8769 "To give a more concrete example, if I'm working on the <literal>bleeding-"
|
|
dongsheng@627
|
8770 "edge</literal> branch, and I want to bring in the latest fixes from the "
|
|
dongsheng@627
|
8771 "<literal>stable</literal> branch, Mercurial will choose the <quote>right</"
|
|
dongsheng@627
|
8772 "quote> (<literal>bleeding-edge</literal>) branch name when I pull and merge "
|
|
dongsheng@627
|
8773 "from <literal>stable</literal>."
|
|
dongsheng@627
|
8774 msgstr ""
|
|
dongsheng@627
|
8775
|
|
dongsheng@627
|
8776 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8777 #: ../en/ch08-branch.xml:502
|
|
dongsheng@627
|
8778 msgid "Branch naming is generally useful"
|
|
dongsheng@635
|
8779 msgstr "分支名称通常都很有用"
|
|
dongsheng@627
|
8780
|
|
dongsheng@627
|
8781 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8782 #: ../en/ch08-branch.xml:504
|
|
dongsheng@627
|
8783 msgid ""
|
|
dongsheng@627
|
8784 "You shouldn't think of named branches as applicable only to situations where "
|
|
dongsheng@627
|
8785 "you have multiple long-lived branches cohabiting in a single repository. "
|
|
dongsheng@627
|
8786 "They're very useful even in the one-branch-per-repository case."
|
|
dongsheng@627
|
8787 msgstr ""
|
|
dongsheng@627
|
8788
|
|
dongsheng@627
|
8789 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8790 #: ../en/ch08-branch.xml:509
|
|
dongsheng@627
|
8791 msgid ""
|
|
dongsheng@627
|
8792 "In the simplest case, giving a name to each branch gives you a permanent "
|
|
dongsheng@627
|
8793 "record of which branch a changeset originated on. This gives you more "
|
|
dongsheng@627
|
8794 "context when you're trying to follow the history of a long-lived branchy "
|
|
dongsheng@627
|
8795 "project."
|
|
dongsheng@627
|
8796 msgstr ""
|
|
dongsheng@627
|
8797
|
|
dongsheng@627
|
8798 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
8799 #: ../en/ch08-branch.xml:514
|
|
dongsheng@627
|
8800 msgid ""
|
|
dongsheng@627
|
8801 "If you're working with shared repositories, you can set up a <literal role="
|
|
dongsheng@627
|
8802 "\"hook\">pretxnchangegroup</literal> hook on each that will block incoming "
|
|
dongsheng@627
|
8803 "changes that have the <quote>wrong</quote> branch name. This provides a "
|
|
dongsheng@627
|
8804 "simple, but effective, defence against people accidentally pushing changes "
|
|
dongsheng@627
|
8805 "from a <quote>bleeding edge</quote> branch to a <quote>stable</quote> "
|
|
dongsheng@627
|
8806 "branch. Such a hook might look like this inside the shared repo's <filename "
|
|
dongsheng@627
|
8807 "role=\"special\"> /.hgrc</filename>."
|
|
dongsheng@627
|
8808 msgstr ""
|
|
dongsheng@627
|
8809
|
|
dongsheng@627
|
8810 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
8811 #: ../en/ch09-undo.xml:5
|
|
dongsheng@627
|
8812 msgid "Finding and fixing mistakes"
|
|
dongsheng@627
|
8813 msgstr "查找和修改错误"
|
|
dongsheng@627
|
8814
|
|
dongsheng@627
|
8815 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
8816 #: ../en/ch09-undo.xml:7
|
|
dongsheng@627
|
8817 msgid ""
|
|
dongsheng@627
|
8818 "To err might be human, but to really handle the consequences well takes a top-"
|
|
dongsheng@627
|
8819 "notch revision control system. In this chapter, we'll discuss some of the "
|
|
dongsheng@627
|
8820 "techniques you can use when you find that a problem has crept into your "
|
|
dongsheng@627
|
8821 "project. Mercurial has some highly capable features that will help you to "
|
|
dongsheng@627
|
8822 "isolate the sources of problems, and to handle them appropriately."
|
|
dongsheng@627
|
8823 msgstr ""
|
|
dongsheng@627
|
8824
|
|
dongsheng@627
|
8825 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
8826 #: ../en/ch09-undo.xml:15
|
|
dongsheng@627
|
8827 msgid "Erasing local history"
|
|
dongsheng@635
|
8828 msgstr "销毁本地历史"
|
|
dongsheng@627
|
8829
|
|
dongsheng@627
|
8830 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8831 #: ../en/ch09-undo.xml:18
|
|
dongsheng@627
|
8832 msgid "The accidental commit"
|
|
dongsheng@635
|
8833 msgstr "意外的提交"
|
|
dongsheng@627
|
8834
|
|
dongsheng@627
|
8835 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8836 #: ../en/ch09-undo.xml:20
|
|
dongsheng@627
|
8837 msgid ""
|
|
dongsheng@627
|
8838 "I have the occasional but persistent problem of typing rather more quickly "
|
|
dongsheng@627
|
8839 "than I can think, which sometimes results in me committing a changeset that "
|
|
dongsheng@627
|
8840 "is either incomplete or plain wrong. In my case, the usual kind of "
|
|
dongsheng@627
|
8841 "incomplete changeset is one in which I've created a new source file, but "
|
|
dongsheng@627
|
8842 "forgotten to <command role=\"hg-cmd\">hg add</command> it. A <quote>plain "
|
|
dongsheng@627
|
8843 "wrong</quote> changeset is not as common, but no less annoying."
|
|
dongsheng@627
|
8844 msgstr ""
|
|
dongsheng@627
|
8845
|
|
dongsheng@627
|
8846 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8847 #: ../en/ch09-undo.xml:31
|
|
dongsheng@627
|
8848 msgid "Rolling back a transaction"
|
|
dongsheng@635
|
8849 msgstr "回滚一个事务"
|
|
dongsheng@627
|
8850
|
|
dongsheng@627
|
8851 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8852 #: ../en/ch09-undo.xml:33
|
|
dongsheng@627
|
8853 msgid ""
|
|
dongsheng@627
|
8854 "In section <xref linkend=\"sec.concepts.txn\"/>, I mentioned that Mercurial "
|
|
dongsheng@627
|
8855 "treats each modification of a repository as a <emphasis>transaction</"
|
|
dongsheng@627
|
8856 "emphasis>. Every time you commit a changeset or pull changes from another "
|
|
dongsheng@627
|
8857 "repository, Mercurial remembers what you did. You can undo, or "
|
|
dongsheng@627
|
8858 "<emphasis>roll back</emphasis>, exactly one of these actions using the "
|
|
dongsheng@627
|
8859 "<command role=\"hg-cmd\">hg rollback</command> command. (See section <xref "
|
|
dongsheng@627
|
8860 "linkend=\"sec.undo.rollback-after-push\"/> for an important caveat about the "
|
|
dongsheng@627
|
8861 "use of this command.)"
|
|
dongsheng@627
|
8862 msgstr ""
|
|
dongsheng@627
|
8863
|
|
dongsheng@627
|
8864 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8865 #: ../en/ch09-undo.xml:43
|
|
dongsheng@627
|
8866 msgid ""
|
|
dongsheng@627
|
8867 "Here's a mistake that I often find myself making: committing a change in "
|
|
dongsheng@627
|
8868 "which I've created a new file, but forgotten to <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
8869 "add</command> it."
|
|
dongsheng@627
|
8870 msgstr ""
|
|
dongsheng@627
|
8871
|
|
dongsheng@627
|
8872 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8873 #: ../en/ch09-undo.xml:50
|
|
dongsheng@627
|
8874 msgid ""
|
|
dongsheng@627
|
8875 "Looking at the output of <command role=\"hg-cmd\">hg status</command> after "
|
|
dongsheng@627
|
8876 "the commit immediately confirms the error."
|
|
dongsheng@627
|
8877 msgstr ""
|
|
dongsheng@627
|
8878
|
|
dongsheng@627
|
8879 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8880 #: ../en/ch09-undo.xml:56
|
|
dongsheng@627
|
8881 msgid ""
|
|
dongsheng@627
|
8882 "The commit captured the changes to the file <filename>a</filename>, but not "
|
|
dongsheng@627
|
8883 "the new file <filename>b</filename>. If I were to push this changeset to a "
|
|
dongsheng@627
|
8884 "repository that I shared with a colleague, the chances are high that "
|
|
dongsheng@627
|
8885 "something in <filename>a</filename> would refer to <filename>b</filename>, "
|
|
dongsheng@627
|
8886 "which would not be present in their repository when they pulled my changes. "
|
|
dongsheng@627
|
8887 "I would thus become the object of some indignation."
|
|
dongsheng@627
|
8888 msgstr ""
|
|
dongsheng@627
|
8889
|
|
dongsheng@627
|
8890 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8891 #: ../en/ch09-undo.xml:65
|
|
dongsheng@627
|
8892 msgid ""
|
|
dongsheng@627
|
8893 "However, luck is with me&emdash;I've caught my error before I pushed the "
|
|
dongsheng@627
|
8894 "changeset. I use the <command role=\"hg-cmd\">hg rollback</command> command, "
|
|
dongsheng@627
|
8895 "and Mercurial makes that last changeset vanish."
|
|
dongsheng@627
|
8896 msgstr ""
|
|
dongsheng@627
|
8897
|
|
dongsheng@627
|
8898 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8899 #: ../en/ch09-undo.xml:72
|
|
dongsheng@627
|
8900 msgid ""
|
|
dongsheng@627
|
8901 "Notice that the changeset is no longer present in the repository's history, "
|
|
dongsheng@627
|
8902 "and the working directory once again thinks that the file <filename>a</"
|
|
dongsheng@627
|
8903 "filename> is modified. The commit and rollback have left the working "
|
|
dongsheng@627
|
8904 "directory exactly as it was prior to the commit; the changeset has been "
|
|
dongsheng@627
|
8905 "completely erased. I can now safely <command role=\"hg-cmd\">hg add</"
|
|
dongsheng@627
|
8906 "command> the file <filename>b</filename>, and rerun my commit."
|
|
dongsheng@627
|
8907 msgstr ""
|
|
dongsheng@627
|
8908
|
|
dongsheng@627
|
8909 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8910 #: ../en/ch09-undo.xml:85
|
|
dongsheng@627
|
8911 msgid "The erroneous pull"
|
|
dongsheng@635
|
8912 msgstr "错误的抓取"
|
|
dongsheng@627
|
8913
|
|
dongsheng@627
|
8914 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8915 #: ../en/ch09-undo.xml:87
|
|
dongsheng@627
|
8916 msgid ""
|
|
dongsheng@627
|
8917 "It's common practice with Mercurial to maintain separate development branches "
|
|
dongsheng@627
|
8918 "of a project in different repositories. Your development team might have one "
|
|
dongsheng@627
|
8919 "shared repository for your project's <quote>0.9</quote> release, and another, "
|
|
dongsheng@627
|
8920 "containing different changes, for the <quote>1.0</quote> release."
|
|
dongsheng@627
|
8921 msgstr ""
|
|
dongsheng@627
|
8922
|
|
dongsheng@627
|
8923 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8924 #: ../en/ch09-undo.xml:94
|
|
dongsheng@627
|
8925 msgid ""
|
|
dongsheng@627
|
8926 "Given this, you can imagine that the consequences could be messy if you had a "
|
|
dongsheng@627
|
8927 "local <quote>0.9</quote> repository, and accidentally pulled changes from the "
|
|
dongsheng@627
|
8928 "shared <quote>1.0</quote> repository into it. At worst, you could be paying "
|
|
dongsheng@627
|
8929 "insufficient attention, and push those changes into the shared <quote>0.9</"
|
|
dongsheng@627
|
8930 "quote> tree, confusing your entire team (but don't worry, we'll return to "
|
|
dongsheng@627
|
8931 "this horror scenario later). However, it's more likely that you'll notice "
|
|
dongsheng@627
|
8932 "immediately, because Mercurial will display the URL it's pulling from, or you "
|
|
dongsheng@627
|
8933 "will see it pull a suspiciously large number of changes into the repository."
|
|
dongsheng@627
|
8934 msgstr ""
|
|
dongsheng@627
|
8935
|
|
dongsheng@627
|
8936 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8937 #: ../en/ch09-undo.xml:106
|
|
dongsheng@627
|
8938 msgid ""
|
|
dongsheng@627
|
8939 "The <command role=\"hg-cmd\">hg rollback</command> command will work nicely "
|
|
dongsheng@627
|
8940 "to expunge all of the changesets that you just pulled. Mercurial groups all "
|
|
dongsheng@627
|
8941 "changes from one <command role=\"hg-cmd\">hg pull</command> into a single "
|
|
dongsheng@627
|
8942 "transaction, so one <command role=\"hg-cmd\">hg rollback</command> is all you "
|
|
dongsheng@627
|
8943 "need to undo this mistake."
|
|
dongsheng@627
|
8944 msgstr ""
|
|
dongsheng@627
|
8945
|
|
dongsheng@627
|
8946 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8947 #: ../en/ch09-undo.xml:115
|
|
dongsheng@627
|
8948 msgid "Rolling back is useless once you've pushed"
|
|
dongsheng@635
|
8949 msgstr "当完成推送后，回滚是无效的"
|
|
dongsheng@627
|
8950
|
|
dongsheng@627
|
8951 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8952 #: ../en/ch09-undo.xml:117
|
|
dongsheng@627
|
8953 msgid ""
|
|
dongsheng@627
|
8954 "The value of the <command role=\"hg-cmd\">hg rollback</command> command drops "
|
|
dongsheng@627
|
8955 "to zero once you've pushed your changes to another repository. Rolling back "
|
|
dongsheng@627
|
8956 "a change makes it disappear entirely, but <emphasis>only</emphasis> in the "
|
|
dongsheng@627
|
8957 "repository in which you perform the <command role=\"hg-cmd\">hg rollback</"
|
|
dongsheng@627
|
8958 "command>. Because a rollback eliminates history, there's no way for the "
|
|
dongsheng@627
|
8959 "disappearance of a change to propagate between repositories."
|
|
dongsheng@627
|
8960 msgstr ""
|
|
dongsheng@627
|
8961
|
|
dongsheng@627
|
8962 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8963 #: ../en/ch09-undo.xml:126
|
|
dongsheng@627
|
8964 msgid ""
|
|
dongsheng@627
|
8965 "If you've pushed a change to another repository&emdash;particularly if it's a "
|
|
dongsheng@627
|
8966 "shared repository&emdash;it has essentially <quote>escaped into the wild,</"
|
|
dongsheng@627
|
8967 "quote> and you'll have to recover from your mistake in a different way. What "
|
|
dongsheng@627
|
8968 "will happen if you push a changeset somewhere, then roll it back, then pull "
|
|
dongsheng@627
|
8969 "from the repository you pushed to, is that the changeset will reappear in "
|
|
dongsheng@627
|
8970 "your repository."
|
|
dongsheng@627
|
8971 msgstr ""
|
|
dongsheng@627
|
8972
|
|
dongsheng@627
|
8973 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8974 #: ../en/ch09-undo.xml:135
|
|
dongsheng@627
|
8975 msgid ""
|
|
dongsheng@627
|
8976 "(If you absolutely know for sure that the change you want to roll back is the "
|
|
dongsheng@627
|
8977 "most recent change in the repository that you pushed to, <emphasis>and</"
|
|
dongsheng@627
|
8978 "emphasis> you know that nobody else could have pulled it from that "
|
|
dongsheng@627
|
8979 "repository, you can roll back the changeset there, too, but you really should "
|
|
dongsheng@627
|
8980 "really not rely on this working reliably. If you do this, sooner or later a "
|
|
dongsheng@627
|
8981 "change really will make it into a repository that you don't directly control "
|
|
dongsheng@627
|
8982 "(or have forgotten about), and come back to bite you.)"
|
|
dongsheng@627
|
8983 msgstr ""
|
|
dongsheng@627
|
8984
|
|
dongsheng@627
|
8985 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
8986 #: ../en/ch09-undo.xml:147
|
|
dongsheng@627
|
8987 msgid "You can only roll back once"
|
|
dongsheng@635
|
8988 msgstr "你只能回滚一次"
|
|
dongsheng@627
|
8989
|
|
dongsheng@627
|
8990 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
8991 #: ../en/ch09-undo.xml:149
|
|
dongsheng@627
|
8992 msgid ""
|
|
dongsheng@627
|
8993 "Mercurial stores exactly one transaction in its transaction log; that "
|
|
dongsheng@627
|
8994 "transaction is the most recent one that occurred in the repository. This "
|
|
dongsheng@627
|
8995 "means that you can only roll back one transaction. If you expect to be able "
|
|
dongsheng@627
|
8996 "to roll back one transaction, then its predecessor, this is not the behaviour "
|
|
dongsheng@627
|
8997 "you will get."
|
|
dongsheng@627
|
8998 msgstr ""
|
|
dongsheng@627
|
8999
|
|
dongsheng@627
|
9000 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9001 #: ../en/ch09-undo.xml:158
|
|
dongsheng@627
|
9002 msgid ""
|
|
dongsheng@627
|
9003 "Once you've rolled back one transaction in a repository, you can't roll back "
|
|
dongsheng@627
|
9004 "again in that repository until you perform another commit or pull."
|
|
dongsheng@627
|
9005 msgstr ""
|
|
dongsheng@627
|
9006
|
|
dongsheng@627
|
9007 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
9008 #: ../en/ch09-undo.xml:165
|
|
dongsheng@627
|
9009 msgid "Reverting the mistaken change"
|
|
dongsheng@635
|
9010 msgstr "撤销错误的修改"
|
|
dongsheng@627
|
9011
|
|
dongsheng@627
|
9012 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
9013 #: ../en/ch09-undo.xml:167
|
|
dongsheng@627
|
9014 msgid ""
|
|
dongsheng@627
|
9015 "If you make a modification to a file, and decide that you really didn't want "
|
|
dongsheng@627
|
9016 "to change the file at all, and you haven't yet committed your changes, the "
|
|
dongsheng@627
|
9017 "<command role=\"hg-cmd\">hg revert</command> command is the one you'll need. "
|
|
dongsheng@627
|
9018 "It looks at the changeset that's the parent of the working directory, and "
|
|
dongsheng@627
|
9019 "restores the contents of the file to their state as of that changeset. "
|
|
dongsheng@627
|
9020 "(That's a long-winded way of saying that, in the normal case, it undoes your "
|
|
dongsheng@627
|
9021 "modifications.)"
|
|
dongsheng@627
|
9022 msgstr ""
|
|
dongsheng@627
|
9023
|
|
dongsheng@627
|
9024 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
9025 #: ../en/ch09-undo.xml:176
|
|
dongsheng@627
|
9026 msgid ""
|
|
dongsheng@627
|
9027 "Let's illustrate how the <command role=\"hg-cmd\">hg revert</command> command "
|
|
dongsheng@627
|
9028 "works with yet another small example. We'll begin by modifying a file that "
|
|
dongsheng@627
|
9029 "Mercurial is already tracking."
|
|
dongsheng@627
|
9030 msgstr ""
|
|
dongsheng@627
|
9031
|
|
dongsheng@627
|
9032 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
9033 #: ../en/ch09-undo.xml:183
|
|
dongsheng@627
|
9034 msgid ""
|
|
dongsheng@627
|
9035 "If we don't want that change, we can simply <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9036 "revert</command> the file."
|
|
dongsheng@627
|
9037 msgstr ""
|
|
dongsheng@627
|
9038
|
|
dongsheng@627
|
9039 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
9040 #: ../en/ch09-undo.xml:189
|
|
dongsheng@627
|
9041 msgid ""
|
|
dongsheng@627
|
9042 "The <command role=\"hg-cmd\">hg revert</command> command provides us with an "
|
|
dongsheng@627
|
9043 "extra degree of safety by saving our modified file with a <filename>.orig</"
|
|
dongsheng@627
|
9044 "filename> extension."
|
|
dongsheng@627
|
9045 msgstr ""
|
|
dongsheng@627
|
9046
|
|
dongsheng@627
|
9047 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
9048 #: ../en/ch09-undo.xml:196
|
|
dongsheng@627
|
9049 msgid ""
|
|
dongsheng@627
|
9050 "Here is a summary of the cases that the <command role=\"hg-cmd\">hg revert</"
|
|
dongsheng@627
|
9051 "command> command can deal with. We will describe each of these in more "
|
|
dongsheng@627
|
9052 "detail in the section that follows."
|
|
dongsheng@627
|
9053 msgstr ""
|
|
dongsheng@627
|
9054
|
|
dongsheng@627
|
9055 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
9056 #: ../en/ch09-undo.xml:201
|
|
dongsheng@627
|
9057 msgid "If you modify a file, it will restore the file to its unmodified state."
|
|
dongsheng@627
|
9058 msgstr ""
|
|
dongsheng@627
|
9059
|
|
dongsheng@627
|
9060 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
9061 #: ../en/ch09-undo.xml:204
|
|
dongsheng@627
|
9062 msgid ""
|
|
dongsheng@627
|
9063 "If you <command role=\"hg-cmd\">hg add</command> a file, it will undo the "
|
|
dongsheng@627
|
9064 "<quote>added</quote> state of the file, but leave the file itself untouched."
|
|
dongsheng@627
|
9065 msgstr ""
|
|
dongsheng@627
|
9066
|
|
dongsheng@627
|
9067 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
9068 #: ../en/ch09-undo.xml:208
|
|
dongsheng@627
|
9069 msgid ""
|
|
dongsheng@627
|
9070 "If you delete a file without telling Mercurial, it will restore the file to "
|
|
dongsheng@627
|
9071 "its unmodified contents."
|
|
dongsheng@627
|
9072 msgstr ""
|
|
dongsheng@627
|
9073
|
|
dongsheng@627
|
9074 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
9075 #: ../en/ch09-undo.xml:211
|
|
dongsheng@627
|
9076 msgid ""
|
|
dongsheng@627
|
9077 "If you use the <command role=\"hg-cmd\">hg remove</command> command to remove "
|
|
dongsheng@627
|
9078 "a file, it will undo the <quote>removed</quote> state of the file, and "
|
|
dongsheng@627
|
9079 "restore the file to its unmodified contents."
|
|
dongsheng@627
|
9080 msgstr ""
|
|
dongsheng@627
|
9081
|
|
dongsheng@627
|
9082 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
9083 #: ../en/ch09-undo.xml:218
|
|
dongsheng@627
|
9084 msgid "File management errors"
|
|
dongsheng@635
|
9085 msgstr "文件管理错误"
|
|
dongsheng@627
|
9086
|
|
dongsheng@627
|
9087 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9088 #: ../en/ch09-undo.xml:220
|
|
dongsheng@627
|
9089 msgid ""
|
|
dongsheng@627
|
9090 "The <command role=\"hg-cmd\">hg revert</command> command is useful for more "
|
|
dongsheng@627
|
9091 "than just modified files. It lets you reverse the results of all of "
|
|
dongsheng@627
|
9092 "Mercurial's file management commands&emdash;<command role=\"hg-cmd\">hg add</"
|
|
dongsheng@627
|
9093 "command>, <command role=\"hg-cmd\">hg remove</command>, and so on."
|
|
dongsheng@627
|
9094 msgstr ""
|
|
dongsheng@627
|
9095
|
|
dongsheng@627
|
9096 #
|
|
dongsheng@627
|
9097 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9098 #: ../en/ch09-undo.xml:226
|
|
dongsheng@627
|
9099 msgid ""
|
|
dongsheng@627
|
9100 "If you <command role=\"hg-cmd\">hg add</command> a file, then decide that in "
|
|
dongsheng@627
|
9101 "fact you don't want Mercurial to track it, use <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9102 "revert</command> to undo the add. Don't worry; Mercurial will not modify the "
|
|
dongsheng@627
|
9103 "file in any way. It will just <quote>unmark</quote> the file."
|
|
dongsheng@627
|
9104 msgstr ""
|
|
dongsheng@627
|
9105
|
|
dongsheng@627
|
9106 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9107 #: ../en/ch09-undo.xml:234
|
|
dongsheng@627
|
9108 msgid ""
|
|
dongsheng@627
|
9109 "Similarly, if you ask Mercurial to <command role=\"hg-cmd\">hg remove</"
|
|
dongsheng@627
|
9110 "command> a file, you can use <command role=\"hg-cmd\">hg revert</command> to "
|
|
dongsheng@627
|
9111 "restore it to the contents it had as of the parent of the working directory. "
|
|
dongsheng@627
|
9112 "&interaction.daily.revert.remove; This works just as well for a file that you "
|
|
dongsheng@627
|
9113 "deleted by hand, without telling Mercurial (recall that in Mercurial "
|
|
dongsheng@627
|
9114 "terminology, this kind of file is called <quote>missing</quote>)."
|
|
dongsheng@627
|
9115 msgstr ""
|
|
dongsheng@627
|
9116
|
|
dongsheng@627
|
9117 #
|
|
dongsheng@627
|
9118 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9119 #: ../en/ch09-undo.xml:245
|
|
dongsheng@627
|
9120 msgid ""
|
|
dongsheng@627
|
9121 "If you revert a <command role=\"hg-cmd\">hg copy</command>, the copied-to "
|
|
dongsheng@627
|
9122 "file remains in your working directory afterwards, untracked. Since a copy "
|
|
dongsheng@627
|
9123 "doesn't affect the copied-from file in any way, Mercurial doesn't do anything "
|
|
dongsheng@627
|
9124 "with the copied-from file."
|
|
dongsheng@627
|
9125 msgstr ""
|
|
dongsheng@627
|
9126
|
|
dongsheng@627
|
9127 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
9128 #: ../en/ch09-undo.xml:254
|
|
dongsheng@627
|
9129 msgid "A slightly special case: reverting a rename"
|
|
dongsheng@635
|
9130 msgstr "一个稍微特别的案例：撤销改名"
|
|
dongsheng@627
|
9131
|
|
dongsheng@627
|
9132 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
9133 #: ../en/ch09-undo.xml:256
|
|
dongsheng@627
|
9134 msgid ""
|
|
dongsheng@627
|
9135 "If you <command role=\"hg-cmd\">hg rename</command> a file, there is one "
|
|
dongsheng@627
|
9136 "small detail that you should remember. When you <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9137 "revert</command> a rename, it's not enough to provide the name of the renamed-"
|
|
dongsheng@627
|
9138 "to file, as you can see here."
|
|
dongsheng@627
|
9139 msgstr ""
|
|
dongsheng@627
|
9140
|
|
dongsheng@627
|
9141 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
9142 #: ../en/ch09-undo.xml:264
|
|
dongsheng@627
|
9143 msgid ""
|
|
dongsheng@627
|
9144 "As you can see from the output of <command role=\"hg-cmd\">hg status</"
|
|
dongsheng@627
|
9145 "command>, the renamed-to file is no longer identified as added, but the "
|
|
dongsheng@627
|
9146 "renamed-<emphasis>from</emphasis> file is still removed! This is counter-"
|
|
dongsheng@627
|
9147 "intuitive (at least to me), but at least it's easy to deal with."
|
|
dongsheng@627
|
9148 msgstr ""
|
|
dongsheng@627
|
9149
|
|
dongsheng@627
|
9150 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
9151 #: ../en/ch09-undo.xml:273
|
|
dongsheng@627
|
9152 msgid ""
|
|
dongsheng@627
|
9153 "So remember, to revert a <command role=\"hg-cmd\">hg rename</command>, you "
|
|
dongsheng@627
|
9154 "must provide <emphasis>both</emphasis> the source and destination names."
|
|
dongsheng@627
|
9155 msgstr ""
|
|
dongsheng@627
|
9156
|
|
dongsheng@627
|
9157 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
9158 #: ../en/ch09-undo.xml:278
|
|
dongsheng@627
|
9159 msgid "% TODO: the output doesn't look like it will be removed!"
|
|
dongsheng@627
|
9160 msgstr ""
|
|
dongsheng@627
|
9161
|
|
dongsheng@627
|
9162 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
9163 #: ../en/ch09-undo.xml:281
|
|
dongsheng@627
|
9164 msgid ""
|
|
dongsheng@627
|
9165 "(By the way, if you rename a file, then modify the renamed-to file, then "
|
|
dongsheng@627
|
9166 "revert both components of the rename, when Mercurial restores the file that "
|
|
dongsheng@627
|
9167 "was removed as part of the rename, it will be unmodified. If you need the "
|
|
dongsheng@627
|
9168 "modifications in the renamed-to file to show up in the renamed-from file, "
|
|
dongsheng@627
|
9169 "don't forget to copy them over.)"
|
|
dongsheng@627
|
9170 msgstr ""
|
|
dongsheng@627
|
9171
|
|
dongsheng@627
|
9172 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
9173 #: ../en/ch09-undo.xml:288
|
|
dongsheng@627
|
9174 msgid ""
|
|
dongsheng@627
|
9175 "These fiddly aspects of reverting a rename arguably constitute a small bug in "
|
|
dongsheng@627
|
9176 "Mercurial."
|
|
dongsheng@627
|
9177 msgstr ""
|
|
dongsheng@627
|
9178
|
|
dongsheng@627
|
9179 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
9180 #: ../en/ch09-undo.xml:295
|
|
dongsheng@627
|
9181 msgid "Dealing with committed changes"
|
|
dongsheng@635
|
9182 msgstr "处理已经提交的修改"
|
|
dongsheng@627
|
9183
|
|
dongsheng@627
|
9184 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
9185 #: ../en/ch09-undo.xml:297
|
|
dongsheng@627
|
9186 msgid ""
|
|
dongsheng@627
|
9187 "Consider a case where you have committed a change $a$, and another change $b$ "
|
|
dongsheng@627
|
9188 "on top of it; you then realise that change $a$ was incorrect. Mercurial lets "
|
|
dongsheng@627
|
9189 "you <quote>back out</quote> an entire changeset automatically, and building "
|
|
dongsheng@627
|
9190 "blocks that let you reverse part of a changeset by hand."
|
|
dongsheng@627
|
9191 msgstr ""
|
|
dongsheng@627
|
9192
|
|
dongsheng@627
|
9193 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
9194 #: ../en/ch09-undo.xml:303
|
|
dongsheng@627
|
9195 msgid ""
|
|
dongsheng@627
|
9196 "Before you read this section, here's something to keep in mind: the <command "
|
|
dongsheng@627
|
9197 "role=\"hg-cmd\">hg backout</command> command undoes changes by "
|
|
dongsheng@627
|
9198 "<emphasis>adding</emphasis> history, not by modifying or erasing it. It's "
|
|
dongsheng@627
|
9199 "the right tool to use if you're fixing bugs, but not if you're trying to undo "
|
|
dongsheng@627
|
9200 "some change that has catastrophic consequences. To deal with those, see "
|
|
dongsheng@627
|
9201 "section <xref linkend=\"sec.undo.aaaiiieee\"/>."
|
|
dongsheng@627
|
9202 msgstr ""
|
|
dongsheng@627
|
9203
|
|
dongsheng@627
|
9204 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
9205 #: ../en/ch09-undo.xml:312
|
|
dongsheng@627
|
9206 msgid "Backing out a changeset"
|
|
dongsheng@635
|
9207 msgstr "恢复一个修改集"
|
|
dongsheng@627
|
9208
|
|
dongsheng@627
|
9209 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9210 #: ../en/ch09-undo.xml:314
|
|
dongsheng@627
|
9211 msgid ""
|
|
dongsheng@627
|
9212 "The <command role=\"hg-cmd\">hg backout</command> command lets you "
|
|
dongsheng@627
|
9213 "<quote>undo</quote> the effects of an entire changeset in an automated "
|
|
dongsheng@627
|
9214 "fashion. Because Mercurial's history is immutable, this command "
|
|
dongsheng@627
|
9215 "<emphasis>does not</emphasis> get rid of the changeset you want to undo. "
|
|
dongsheng@627
|
9216 "Instead, it creates a new changeset that <emphasis>reverses</emphasis> the "
|
|
dongsheng@627
|
9217 "effect of the to-be-undone changeset."
|
|
dongsheng@627
|
9218 msgstr ""
|
|
dongsheng@627
|
9219
|
|
dongsheng@627
|
9220 #
|
|
dongsheng@627
|
9221 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9222 #: ../en/ch09-undo.xml:323
|
|
dongsheng@627
|
9223 msgid ""
|
|
dongsheng@627
|
9224 "The operation of the <command role=\"hg-cmd\">hg backout</command> command is "
|
|
dongsheng@627
|
9225 "a little intricate, so let's illustrate it with some examples. First, we'll "
|
|
dongsheng@627
|
9226 "create a repository with some simple changes."
|
|
dongsheng@627
|
9227 msgstr ""
|
|
dongsheng@627
|
9228
|
|
dongsheng@627
|
9229 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9230 #: ../en/ch09-undo.xml:330
|
|
dongsheng@627
|
9231 msgid ""
|
|
dongsheng@627
|
9232 "The <command role=\"hg-cmd\">hg backout</command> command takes a single "
|
|
dongsheng@627
|
9233 "changeset ID as its argument; this is the changeset to back out. Normally, "
|
|
dongsheng@627
|
9234 "<command role=\"hg-cmd\">hg backout</command> will drop you into a text "
|
|
dongsheng@627
|
9235 "editor to write a commit message, so you can record why you're backing the "
|
|
dongsheng@627
|
9236 "change out. In this example, we provide a commit message on the command line "
|
|
dongsheng@627
|
9237 "using the <option role=\"hg-opt-backout\">-m</option> option."
|
|
dongsheng@627
|
9238 msgstr ""
|
|
dongsheng@627
|
9239
|
|
dongsheng@627
|
9240 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
9241 #: ../en/ch09-undo.xml:341
|
|
dongsheng@627
|
9242 msgid "Backing out the tip changeset"
|
|
dongsheng@635
|
9243 msgstr "恢复顶点修改集"
|
|
dongsheng@627
|
9244
|
|
dongsheng@627
|
9245 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9246 #: ../en/ch09-undo.xml:343
|
|
dongsheng@627
|
9247 msgid "We're going to start by backing out the last changeset we committed."
|
|
dongsheng@627
|
9248 msgstr ""
|
|
dongsheng@627
|
9249
|
|
dongsheng@627
|
9250 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
9251 #: ../en/ch09-undo.xml:348
|
|
dongsheng@627
|
9252 msgid ""
|
|
dongsheng@627
|
9253 "You can see that the second line from <filename>myfile</filename> is no "
|
|
dongsheng@627
|
9254 "longer present. Taking a look at the output of <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9255 "log</command> gives us an idea of what the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9256 "backout</command> command has done. &interaction.backout.simple.log; Notice "
|
|
dongsheng@627
|
9257 "that the new changeset that <command role=\"hg-cmd\">hg backout</command> has "
|
|
dongsheng@627
|
9258 "created is a child of the changeset we backed out. It's easier to see this "
|
|
dongsheng@641
|
9259 "in figure <xref endterm=\"fig.undo.backout.caption\" linkend=\"fig.undo."
|
|
dongsheng@641
|
9260 "backout\"/>, which presents a graphical view of the change history. As you "
|
|
dongsheng@641
|
9261 "can see, the history is nice and linear."
|
|
dongsheng@627
|
9262 msgstr ""
|
|
dongsheng@627
|
9263
|
|
dongsheng@627
|
9264 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
9265 #: ../en/ch09-undo.xml:364
|
|
dongsheng@641
|
9266 msgid ""
|
|
dongsheng@641
|
9267 "<imageobject><imagedata fileref=\"images/undo-simple.png\"/> </imageobject>"
|
|
dongsheng@627
|
9268 msgstr ""
|
|
dongsheng@627
|
9269
|
|
dongsheng@627
|
9270 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
9271 #: ../en/ch09-undo.xml:367 ../en/ch09-undo.xml:486
|
|
dongsheng@627
|
9272 msgid ""
|
|
dongsheng@627
|
9273 "Backing out a change using the <command role=\"hg-cmd\">hg backout</command> "
|
|
dongsheng@627
|
9274 "command"
|
|
dongsheng@627
|
9275 msgstr ""
|
|
dongsheng@627
|
9276
|
|
dongsheng@627
|
9277 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
9278 #: ../en/ch09-undo.xml:376
|
|
dongsheng@627
|
9279 msgid "Backing out a non-tip change"
|
|
dongsheng@635
|
9280 msgstr "恢复非顶点的修改"
|
|
dongsheng@627
|
9281
|
|
dongsheng@627
|
9282 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9283 #: ../en/ch09-undo.xml:378
|
|
dongsheng@627
|
9284 msgid ""
|
|
dongsheng@627
|
9285 "If you want to back out a change other than the last one you committed, pass "
|
|
dongsheng@627
|
9286 "the <option role=\"hg-opt-backout\">--merge</option> option to the <command "
|
|
dongsheng@627
|
9287 "role=\"hg-cmd\">hg backout</command> command."
|
|
dongsheng@627
|
9288 msgstr ""
|
|
dongsheng@627
|
9289
|
|
dongsheng@627
|
9290 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9291 #: ../en/ch09-undo.xml:385
|
|
dongsheng@627
|
9292 msgid ""
|
|
dongsheng@627
|
9293 "This makes backing out any changeset a <quote>one-shot</quote> operation "
|
|
dongsheng@627
|
9294 "that's usually simple and fast."
|
|
dongsheng@627
|
9295 msgstr ""
|
|
dongsheng@627
|
9296
|
|
dongsheng@627
|
9297 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9298 #: ../en/ch09-undo.xml:391
|
|
dongsheng@627
|
9299 msgid ""
|
|
dongsheng@627
|
9300 "If you take a look at the contents of <filename>myfile</filename> after the "
|
|
dongsheng@627
|
9301 "backout finishes, you'll see that the first and third changes are present, "
|
|
dongsheng@627
|
9302 "but not the second."
|
|
dongsheng@627
|
9303 msgstr ""
|
|
dongsheng@627
|
9304
|
|
dongsheng@627
|
9305 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9306 #: ../en/ch09-undo.xml:398
|
|
dongsheng@641
|
9307 msgid ""
|
|
dongsheng@641
|
9308 "As the graphical history in figure <xref endterm=\"fig.undo.backout-non-tip."
|
|
dongsheng@641
|
9309 "caption\" linkend=\"fig.undo.backout-non-tip\"/> illustrates, Mercurial "
|
|
dongsheng@641
|
9310 "actually commits <emphasis>two</emphasis> changes in this kind of situation "
|
|
dongsheng@641
|
9311 "(the box-shaped nodes are the ones that Mercurial commits automatically). "
|
|
dongsheng@641
|
9312 "Before Mercurial begins the backout process, it first remembers what the "
|
|
dongsheng@641
|
9313 "current parent of the working directory is. It then backs out the target "
|
|
dongsheng@641
|
9314 "changeset, and commits that as a changeset. Finally, it merges back to the "
|
|
dongsheng@641
|
9315 "previous parent of the working directory, and commits the result of the merge."
|
|
dongsheng@641
|
9316 msgstr ""
|
|
dongsheng@641
|
9317
|
|
dongsheng@641
|
9318 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9319 #: ../en/ch09-undo.xml:410
|
|
dongsheng@627
|
9320 msgid ""
|
|
dongsheng@627
|
9321 "% TODO: to me it looks like mercurial doesn't commit the second merge "
|
|
dongsheng@627
|
9322 "automatically!"
|
|
dongsheng@627
|
9323 msgstr ""
|
|
dongsheng@627
|
9324
|
|
dongsheng@627
|
9325 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
9326 #: ../en/ch09-undo.xml:415
|
|
dongsheng@641
|
9327 msgid ""
|
|
dongsheng@641
|
9328 "<imageobject><imagedata fileref=\"images/undo-non-tip.png\"/> </imageobject>"
|
|
dongsheng@627
|
9329 msgstr ""
|
|
dongsheng@627
|
9330
|
|
dongsheng@627
|
9331 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
9332 #: ../en/ch09-undo.xml:418
|
|
dongsheng@627
|
9333 msgid ""
|
|
dongsheng@627
|
9334 "Automated backout of a non-tip change using the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9335 "backout</command> command"
|
|
dongsheng@627
|
9336 msgstr ""
|
|
dongsheng@627
|
9337
|
|
dongsheng@627
|
9338 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9339 #: ../en/ch09-undo.xml:424
|
|
dongsheng@627
|
9340 msgid ""
|
|
dongsheng@627
|
9341 "The result is that you end up <quote>back where you were</quote>, only with "
|
|
dongsheng@627
|
9342 "some extra history that undoes the effect of the changeset you wanted to back "
|
|
dongsheng@627
|
9343 "out."
|
|
dongsheng@627
|
9344 msgstr ""
|
|
dongsheng@627
|
9345
|
|
dongsheng@627
|
9346 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@641
|
9347 #: ../en/ch09-undo.xml:429
|
|
dongsheng@627
|
9348 msgid "Always use the <option role=\"hg-opt-backout\">--merge</option> option"
|
|
dongsheng@635
|
9349 msgstr "始终使用选项 <option role=\"hg-opt-backout\">--merge</option>"
|
|
dongsheng@627
|
9350
|
|
dongsheng@627
|
9351 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@641
|
9352 #: ../en/ch09-undo.xml:432
|
|
dongsheng@627
|
9353 msgid ""
|
|
dongsheng@627
|
9354 "In fact, since the <option role=\"hg-opt-backout\">--merge</option> option "
|
|
dongsheng@627
|
9355 "will do the <quote>right thing</quote> whether or not the changeset you're "
|
|
dongsheng@627
|
9356 "backing out is the tip (i.e. it won't try to merge if it's backing out the "
|
|
dongsheng@627
|
9357 "tip, since there's no need), you should <emphasis>always</emphasis> use this "
|
|
dongsheng@627
|
9358 "option when you run the <command role=\"hg-cmd\">hg backout</command> command."
|
|
dongsheng@627
|
9359 msgstr ""
|
|
dongsheng@627
|
9360
|
|
dongsheng@627
|
9361 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
9362 #: ../en/ch09-undo.xml:443
|
|
dongsheng@627
|
9363 msgid "Gaining more control of the backout process"
|
|
dongsheng@635
|
9364 msgstr "在恢复处理中获得更多控制"
|
|
dongsheng@627
|
9365
|
|
dongsheng@627
|
9366 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9367 #: ../en/ch09-undo.xml:445
|
|
dongsheng@627
|
9368 msgid ""
|
|
dongsheng@627
|
9369 "While I've recommended that you always use the <option role=\"hg-opt-backout"
|
|
dongsheng@627
|
9370 "\">--merge</option> option when backing out a change, the <command role=\"hg-"
|
|
dongsheng@627
|
9371 "cmd\">hg backout</command> command lets you decide how to merge a backout "
|
|
dongsheng@627
|
9372 "changeset. Taking control of the backout process by hand is something you "
|
|
dongsheng@627
|
9373 "will rarely need to do, but it can be useful to understand what the <command "
|
|
dongsheng@627
|
9374 "role=\"hg-cmd\">hg backout</command> command is doing for you automatically. "
|
|
dongsheng@627
|
9375 "To illustrate this, let's clone our first repository, but omit the backout "
|
|
dongsheng@627
|
9376 "change that it contains."
|
|
dongsheng@627
|
9377 msgstr ""
|
|
dongsheng@627
|
9378
|
|
dongsheng@627
|
9379 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9380 #: ../en/ch09-undo.xml:458
|
|
dongsheng@627
|
9381 msgid ""
|
|
dongsheng@627
|
9382 "As with our earlier example, We'll commit a third changeset, then back out "
|
|
dongsheng@627
|
9383 "its parent, and see what happens."
|
|
dongsheng@627
|
9384 msgstr ""
|
|
dongsheng@627
|
9385
|
|
dongsheng@627
|
9386 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9387 #: ../en/ch09-undo.xml:464
|
|
dongsheng@627
|
9388 msgid ""
|
|
dongsheng@627
|
9389 "Our new changeset is again a descendant of the changeset we backout out; it's "
|
|
dongsheng@627
|
9390 "thus a new head, <emphasis>not</emphasis> a descendant of the changeset that "
|
|
dongsheng@627
|
9391 "was the tip. The <command role=\"hg-cmd\">hg backout</command> command was "
|
|
dongsheng@627
|
9392 "quite explicit in telling us this."
|
|
dongsheng@627
|
9393 msgstr ""
|
|
dongsheng@627
|
9394
|
|
dongsheng@627
|
9395 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9396 #: ../en/ch09-undo.xml:472
|
|
dongsheng@627
|
9397 msgid ""
|
|
dongsheng@627
|
9398 "Again, it's easier to see what has happened by looking at a graph of the "
|
|
dongsheng@641
|
9399 "revision history, in figure <xref endterm=\"fig.undo.backout-manual.caption\" "
|
|
dongsheng@641
|
9400 "linkend=\"fig.undo.backout-manual\"/>. This makes it clear that when we use "
|
|
dongsheng@641
|
9401 "<command role=\"hg-cmd\">hg backout</command> to back out a change other than "
|
|
dongsheng@641
|
9402 "the tip, Mercurial adds a new head to the repository (the change it committed "
|
|
dongsheng@641
|
9403 "is box-shaped)."
|
|
dongsheng@627
|
9404 msgstr ""
|
|
dongsheng@627
|
9405
|
|
dongsheng@627
|
9406 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
9407 #: ../en/ch09-undo.xml:483
|
|
dongsheng@641
|
9408 msgid ""
|
|
dongsheng@641
|
9409 "<imageobject><imagedata fileref=\"images/undo-manual.png\"/> </imageobject>"
|
|
dongsheng@641
|
9410 msgstr ""
|
|
dongsheng@641
|
9411
|
|
dongsheng@641
|
9412 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9413 #: ../en/ch09-undo.xml:492
|
|
dongsheng@627
|
9414 msgid ""
|
|
dongsheng@627
|
9415 "After the <command role=\"hg-cmd\">hg backout</command> command has "
|
|
dongsheng@627
|
9416 "completed, it leaves the new <quote>backout</quote> changeset as the parent "
|
|
dongsheng@627
|
9417 "of the working directory."
|
|
dongsheng@627
|
9418 msgstr ""
|
|
dongsheng@627
|
9419
|
|
dongsheng@627
|
9420 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9421 #: ../en/ch09-undo.xml:499
|
|
dongsheng@627
|
9422 msgid "Now we have two isolated sets of changes."
|
|
dongsheng@627
|
9423 msgstr ""
|
|
dongsheng@627
|
9424
|
|
dongsheng@627
|
9425 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9426 #: ../en/ch09-undo.xml:503
|
|
dongsheng@627
|
9427 msgid ""
|
|
dongsheng@627
|
9428 "Let's think about what we expect to see as the contents of <filename>myfile</"
|
|
dongsheng@627
|
9429 "filename> now. The first change should be present, because we've never "
|
|
dongsheng@627
|
9430 "backed it out. The second change should be missing, as that's the change we "
|
|
dongsheng@627
|
9431 "backed out. Since the history graph shows the third change as a separate "
|
|
dongsheng@627
|
9432 "head, we <emphasis>don't</emphasis> expect to see the third change present in "
|
|
dongsheng@627
|
9433 "<filename>myfile</filename>."
|
|
dongsheng@627
|
9434 msgstr ""
|
|
dongsheng@627
|
9435
|
|
dongsheng@627
|
9436 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9437 #: ../en/ch09-undo.xml:513
|
|
dongsheng@627
|
9438 msgid ""
|
|
dongsheng@627
|
9439 "To get the third change back into the file, we just do a normal merge of our "
|
|
dongsheng@627
|
9440 "two heads."
|
|
dongsheng@627
|
9441 msgstr ""
|
|
dongsheng@627
|
9442
|
|
dongsheng@627
|
9443 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9444 #: ../en/ch09-undo.xml:518
|
|
dongsheng@627
|
9445 msgid ""
|
|
dongsheng@627
|
9446 "Afterwards, the graphical history of our repository looks like figure <xref "
|
|
dongsheng@641
|
9447 "endterm=\"fig.undo.backout-manual-merge.caption\" linkend=\"fig.undo.backout-"
|
|
dongsheng@641
|
9448 "manual-merge\"/>."
|
|
dongsheng@627
|
9449 msgstr ""
|
|
dongsheng@627
|
9450
|
|
dongsheng@627
|
9451 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
9452 #: ../en/ch09-undo.xml:525
|
|
dongsheng@641
|
9453 msgid ""
|
|
dongsheng@641
|
9454 "<imageobject><imagedata fileref=\"images/undo-manual-merge.png\"/> </"
|
|
dongsheng@627
|
9455 "imageobject>"
|
|
dongsheng@627
|
9456 msgstr ""
|
|
dongsheng@627
|
9457
|
|
dongsheng@627
|
9458 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
9459 #: ../en/ch09-undo.xml:528
|
|
dongsheng@627
|
9460 msgid "Manually merging a backout change"
|
|
dongsheng@627
|
9461 msgstr ""
|
|
dongsheng@627
|
9462
|
|
dongsheng@627
|
9463 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
9464 #: ../en/ch09-undo.xml:535
|
|
dongsheng@627
|
9465 msgid "Why <command role=\"hg-cmd\">hg backout</command> works as it does"
|
|
dongsheng@635
|
9466 msgstr "<command role=\"hg-cmd\">hg backout</command> 的内幕"
|
|
dongsheng@627
|
9467
|
|
dongsheng@627
|
9468 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9469 #: ../en/ch09-undo.xml:538
|
|
dongsheng@627
|
9470 msgid ""
|
|
dongsheng@627
|
9471 "Here's a brief description of how the <command role=\"hg-cmd\">hg backout</"
|
|
dongsheng@627
|
9472 "command> command works."
|
|
dongsheng@627
|
9473 msgstr ""
|
|
dongsheng@627
|
9474
|
|
dongsheng@627
|
9475 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9476 #: ../en/ch09-undo.xml:541
|
|
dongsheng@627
|
9477 msgid ""
|
|
dongsheng@627
|
9478 "It ensures that the working directory is <quote>clean</quote>, i.e. that the "
|
|
dongsheng@627
|
9479 "output of <command role=\"hg-cmd\">hg status</command> would be empty."
|
|
dongsheng@627
|
9480 msgstr ""
|
|
dongsheng@627
|
9481
|
|
dongsheng@627
|
9482 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9483 #: ../en/ch09-undo.xml:545
|
|
dongsheng@627
|
9484 msgid ""
|
|
dongsheng@627
|
9485 "It remembers the current parent of the working directory. Let's call this "
|
|
dongsheng@627
|
9486 "changeset <literal>orig</literal>"
|
|
dongsheng@627
|
9487 msgstr ""
|
|
dongsheng@627
|
9488
|
|
dongsheng@627
|
9489 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9490 #: ../en/ch09-undo.xml:549
|
|
dongsheng@627
|
9491 msgid ""
|
|
dongsheng@627
|
9492 "It does the equivalent of a <command role=\"hg-cmd\">hg update</command> to "
|
|
dongsheng@627
|
9493 "sync the working directory to the changeset you want to back out. Let's call "
|
|
dongsheng@627
|
9494 "this changeset <literal>backout</literal>"
|
|
dongsheng@627
|
9495 msgstr ""
|
|
dongsheng@627
|
9496
|
|
dongsheng@627
|
9497 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9498 #: ../en/ch09-undo.xml:554
|
|
dongsheng@627
|
9499 msgid ""
|
|
dongsheng@627
|
9500 "It finds the parent of that changeset. Let's call that changeset "
|
|
dongsheng@627
|
9501 "<literal>parent</literal>."
|
|
dongsheng@627
|
9502 msgstr ""
|
|
dongsheng@627
|
9503
|
|
dongsheng@627
|
9504 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9505 #: ../en/ch09-undo.xml:557
|
|
dongsheng@627
|
9506 msgid ""
|
|
dongsheng@627
|
9507 "For each file that the <literal>backout</literal> changeset affected, it does "
|
|
dongsheng@627
|
9508 "the equivalent of a <command role=\"hg-cmd\">hg revert -r parent</command> on "
|
|
dongsheng@627
|
9509 "that file, to restore it to the contents it had before that changeset was "
|
|
dongsheng@627
|
9510 "committed."
|
|
dongsheng@627
|
9511 msgstr ""
|
|
dongsheng@627
|
9512
|
|
dongsheng@627
|
9513 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9514 #: ../en/ch09-undo.xml:564
|
|
dongsheng@627
|
9515 msgid ""
|
|
dongsheng@627
|
9516 "It commits the result as a new changeset. This changeset has "
|
|
dongsheng@627
|
9517 "<literal>backout</literal> as its parent."
|
|
dongsheng@627
|
9518 msgstr ""
|
|
dongsheng@627
|
9519
|
|
dongsheng@627
|
9520 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9521 #: ../en/ch09-undo.xml:568
|
|
dongsheng@627
|
9522 msgid ""
|
|
dongsheng@627
|
9523 "If you specify <option role=\"hg-opt-backout\">--merge</option> on the "
|
|
dongsheng@627
|
9524 "command line, it merges with <literal>orig</literal>, and commits the result "
|
|
dongsheng@627
|
9525 "of the merge."
|
|
dongsheng@627
|
9526 msgstr ""
|
|
dongsheng@627
|
9527
|
|
dongsheng@627
|
9528 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9529 #: ../en/ch09-undo.xml:574
|
|
dongsheng@627
|
9530 msgid ""
|
|
dongsheng@627
|
9531 "An alternative way to implement the <command role=\"hg-cmd\">hg backout</"
|
|
dongsheng@627
|
9532 "command> command would be to <command role=\"hg-cmd\">hg export</command> the "
|
|
dongsheng@627
|
9533 "to-be-backed-out changeset as a diff, then use the <option role=\"cmd-opt-"
|
|
dongsheng@627
|
9534 "patch\">--reverse</option> option to the <command>patch</command> command to "
|
|
dongsheng@627
|
9535 "reverse the effect of the change without fiddling with the working "
|
|
dongsheng@627
|
9536 "directory. This sounds much simpler, but it would not work nearly as well."
|
|
dongsheng@627
|
9537 msgstr ""
|
|
dongsheng@627
|
9538
|
|
dongsheng@627
|
9539 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9540 #: ../en/ch09-undo.xml:584
|
|
dongsheng@627
|
9541 msgid ""
|
|
dongsheng@627
|
9542 "The reason that <command role=\"hg-cmd\">hg backout</command> does an update, "
|
|
dongsheng@627
|
9543 "a commit, a merge, and another commit is to give the merge machinery the best "
|
|
dongsheng@627
|
9544 "chance to do a good job when dealing with all the changes <emphasis>between</"
|
|
dongsheng@627
|
9545 "emphasis> the change you're backing out and the current tip."
|
|
dongsheng@627
|
9546 msgstr ""
|
|
dongsheng@627
|
9547
|
|
dongsheng@627
|
9548 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9549 #: ../en/ch09-undo.xml:591
|
|
dongsheng@627
|
9550 msgid ""
|
|
dongsheng@627
|
9551 "If you're backing out a changeset that's 100 revisions back in your project's "
|
|
dongsheng@627
|
9552 "history, the chances that the <command>patch</command> command will be able "
|
|
dongsheng@627
|
9553 "to apply a reverse diff cleanly are not good, because intervening changes are "
|
|
dongsheng@627
|
9554 "likely to have <quote>broken the context</quote> that <command>patch</"
|
|
dongsheng@627
|
9555 "command> uses to determine whether it can apply a patch (if this sounds like "
|
|
dongsheng@627
|
9556 "gibberish, see <xref linkend=\"sec.mq.patch\"/> for a discussion of the "
|
|
dongsheng@627
|
9557 "<command>patch</command> command). Also, Mercurial's merge machinery will "
|
|
dongsheng@627
|
9558 "handle files and directories being renamed, permission changes, and "
|
|
dongsheng@627
|
9559 "modifications to binary files, none of which <command>patch</command> can "
|
|
dongsheng@627
|
9560 "deal with."
|
|
dongsheng@627
|
9561 msgstr ""
|
|
dongsheng@627
|
9562
|
|
dongsheng@627
|
9563 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
9564 #: ../en/ch09-undo.xml:608
|
|
dongsheng@627
|
9565 msgid "Changes that should never have been"
|
|
dongsheng@635
|
9566 msgstr "不该发生的修改"
|
|
dongsheng@627
|
9567
|
|
dongsheng@627
|
9568 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9569 #: ../en/ch09-undo.xml:610
|
|
dongsheng@627
|
9570 msgid ""
|
|
dongsheng@627
|
9571 "Most of the time, the <command role=\"hg-cmd\">hg backout</command> command "
|
|
dongsheng@627
|
9572 "is exactly what you need if you want to undo the effects of a change. It "
|
|
dongsheng@627
|
9573 "leaves a permanent record of exactly what you did, both when committing the "
|
|
dongsheng@627
|
9574 "original changeset and when you cleaned up after it."
|
|
dongsheng@627
|
9575 msgstr ""
|
|
dongsheng@627
|
9576
|
|
dongsheng@627
|
9577 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9578 #: ../en/ch09-undo.xml:616
|
|
dongsheng@627
|
9579 msgid ""
|
|
dongsheng@627
|
9580 "On rare occasions, though, you may find that you've committed a change that "
|
|
dongsheng@627
|
9581 "really should not be present in the repository at all. For example, it would "
|
|
dongsheng@627
|
9582 "be very unusual, and usually considered a mistake, to commit a software "
|
|
dongsheng@627
|
9583 "project's object files as well as its source files. Object files have almost "
|
|
dongsheng@627
|
9584 "no intrinsic value, and they're <emphasis>big</emphasis>, so they increase "
|
|
dongsheng@627
|
9585 "the size of the repository and the amount of time it takes to clone or pull "
|
|
dongsheng@627
|
9586 "changes."
|
|
dongsheng@627
|
9587 msgstr ""
|
|
dongsheng@627
|
9588
|
|
dongsheng@627
|
9589 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9590 #: ../en/ch09-undo.xml:625
|
|
dongsheng@627
|
9591 msgid ""
|
|
dongsheng@627
|
9592 "Before I discuss the options that you have if you commit a <quote>brown paper "
|
|
dongsheng@627
|
9593 "bag</quote> change (the kind that's so bad that you want to pull a brown "
|
|
dongsheng@627
|
9594 "paper bag over your head), let me first discuss some approaches that probably "
|
|
dongsheng@627
|
9595 "won't work."
|
|
dongsheng@627
|
9596 msgstr ""
|
|
dongsheng@627
|
9597
|
|
dongsheng@627
|
9598 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9599 #: ../en/ch09-undo.xml:630
|
|
dongsheng@627
|
9600 msgid ""
|
|
dongsheng@627
|
9601 "Since Mercurial treats history as accumulative&emdash;every change builds on "
|
|
dongsheng@627
|
9602 "top of all changes that preceded it&emdash;you generally can't just make "
|
|
dongsheng@627
|
9603 "disastrous changes disappear. The one exception is when you've just "
|
|
dongsheng@627
|
9604 "committed a change, and it hasn't been pushed or pulled into another "
|
|
dongsheng@627
|
9605 "repository. That's when you can safely use the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9606 "rollback</command> command, as I detailed in section <xref linkend=\"sec.undo."
|
|
dongsheng@627
|
9607 "rollback\"/>."
|
|
dongsheng@627
|
9608 msgstr ""
|
|
dongsheng@627
|
9609
|
|
dongsheng@627
|
9610 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9611 #: ../en/ch09-undo.xml:639
|
|
dongsheng@627
|
9612 msgid ""
|
|
dongsheng@627
|
9613 "After you've pushed a bad change to another repository, you <emphasis>could</"
|
|
dongsheng@627
|
9614 "emphasis> still use <command role=\"hg-cmd\">hg rollback</command> to make "
|
|
dongsheng@627
|
9615 "your local copy of the change disappear, but it won't have the consequences "
|
|
dongsheng@627
|
9616 "you want. The change will still be present in the remote repository, so it "
|
|
dongsheng@627
|
9617 "will reappear in your local repository the next time you pull."
|
|
dongsheng@627
|
9618 msgstr ""
|
|
dongsheng@627
|
9619
|
|
dongsheng@627
|
9620 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9621 #: ../en/ch09-undo.xml:647
|
|
dongsheng@627
|
9622 msgid ""
|
|
dongsheng@627
|
9623 "If a situation like this arises, and you know which repositories your bad "
|
|
dongsheng@627
|
9624 "change has propagated into, you can <emphasis>try</emphasis> to get rid of "
|
|
dongsheng@627
|
9625 "the changeefrom <emphasis>every</emphasis> one of those repositories. This "
|
|
dongsheng@627
|
9626 "is, of course, not a satisfactory solution: if you miss even a single "
|
|
dongsheng@627
|
9627 "repository while you're expunging, the change is still <quote>in the wild</"
|
|
dongsheng@627
|
9628 "quote>, and could propagate further."
|
|
dongsheng@627
|
9629 msgstr ""
|
|
dongsheng@627
|
9630
|
|
dongsheng@627
|
9631 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9632 #: ../en/ch09-undo.xml:655
|
|
dongsheng@627
|
9633 msgid ""
|
|
dongsheng@627
|
9634 "If you've committed one or more changes <emphasis>after</emphasis> the change "
|
|
dongsheng@627
|
9635 "that you'd like to see disappear, your options are further reduced. Mercurial "
|
|
dongsheng@627
|
9636 "doesn't provide a way to <quote>punch a hole</quote> in history, leaving "
|
|
dongsheng@627
|
9637 "changesets intact."
|
|
dongsheng@627
|
9638 msgstr ""
|
|
dongsheng@627
|
9639
|
|
dongsheng@627
|
9640 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9641 #: ../en/ch09-undo.xml:661
|
|
dongsheng@627
|
9642 msgid ""
|
|
dongsheng@627
|
9643 "XXX This needs filling out. The <literal>hg-replay</literal> script in the "
|
|
dongsheng@627
|
9644 "<literal>examples</literal> directory works, but doesn't handle merge "
|
|
dongsheng@627
|
9645 "changesets. Kind of an important omission."
|
|
dongsheng@627
|
9646 msgstr ""
|
|
dongsheng@627
|
9647
|
|
dongsheng@627
|
9648 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
9649 #: ../en/ch09-undo.xml:667
|
|
dongsheng@627
|
9650 msgid "Protect yourself from <quote>escaped</quote> changes"
|
|
dongsheng@635
|
9651 msgstr "使用<quote>校验</quote>修改来保护你自己"
|
|
dongsheng@627
|
9652
|
|
dongsheng@627
|
9653 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9654 #: ../en/ch09-undo.xml:670
|
|
dongsheng@627
|
9655 msgid ""
|
|
dongsheng@627
|
9656 "If you've committed some changes to your local repository and they've been "
|
|
dongsheng@627
|
9657 "pushed or pulled somewhere else, this isn't necessarily a disaster. You can "
|
|
dongsheng@627
|
9658 "protect yourself ahead of time against some classes of bad changeset. This "
|
|
dongsheng@627
|
9659 "is particularly easy if your team usually pulls changes from a central "
|
|
dongsheng@627
|
9660 "repository."
|
|
dongsheng@627
|
9661 msgstr ""
|
|
dongsheng@627
|
9662
|
|
dongsheng@627
|
9663 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9664 #: ../en/ch09-undo.xml:677
|
|
dongsheng@627
|
9665 msgid ""
|
|
dongsheng@627
|
9666 "By configuring some hooks on that repository to validate incoming changesets "
|
|
dongsheng@627
|
9667 "(see chapter <xref linkend=\"chap.hook\"/>), you can automatically prevent "
|
|
dongsheng@627
|
9668 "some kinds of bad changeset from being pushed to the central repository at "
|
|
dongsheng@627
|
9669 "all. With such a configuration in place, some kinds of bad changeset will "
|
|
dongsheng@627
|
9670 "naturally tend to <quote>die out</quote> because they can't propagate into "
|
|
dongsheng@627
|
9671 "the central repository. Better yet, this happens without any need for "
|
|
dongsheng@627
|
9672 "explicit intervention."
|
|
dongsheng@627
|
9673 msgstr ""
|
|
dongsheng@627
|
9674
|
|
dongsheng@627
|
9675 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9676 #: ../en/ch09-undo.xml:687
|
|
dongsheng@627
|
9677 msgid ""
|
|
dongsheng@627
|
9678 "For instance, an incoming change hook that verifies that a changeset will "
|
|
dongsheng@627
|
9679 "actually compile can prevent people from inadvertantly <quote>breaking the "
|
|
dongsheng@627
|
9680 "build</quote>."
|
|
dongsheng@627
|
9681 msgstr ""
|
|
dongsheng@627
|
9682
|
|
dongsheng@627
|
9683 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
9684 #: ../en/ch09-undo.xml:694
|
|
dongsheng@627
|
9685 msgid "Finding the source of a bug"
|
|
dongsheng@635
|
9686 msgstr "查找问题的根源"
|
|
dongsheng@627
|
9687
|
|
dongsheng@627
|
9688 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9689 #: ../en/ch09-undo.xml:696
|
|
dongsheng@627
|
9690 msgid ""
|
|
dongsheng@627
|
9691 "While it's all very well to be able to back out a changeset that introduced a "
|
|
dongsheng@627
|
9692 "bug, this requires that you know which changeset to back out. Mercurial "
|
|
dongsheng@627
|
9693 "provides an invaluable command, called <command role=\"hg-cmd\">hg bisect</"
|
|
dongsheng@627
|
9694 "command>, that helps you to automate this process and accomplish it very "
|
|
dongsheng@627
|
9695 "efficiently."
|
|
dongsheng@627
|
9696 msgstr ""
|
|
dongsheng@627
|
9697
|
|
dongsheng@627
|
9698 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9699 #: ../en/ch09-undo.xml:703
|
|
dongsheng@627
|
9700 msgid ""
|
|
dongsheng@627
|
9701 "The idea behind the <command role=\"hg-cmd\">hg bisect</command> command is "
|
|
dongsheng@627
|
9702 "that a changeset has introduced some change of behaviour that you can "
|
|
dongsheng@627
|
9703 "identify with a simple binary test. You don't know which piece of code "
|
|
dongsheng@627
|
9704 "introduced the change, but you know how to test for the presence of the bug. "
|
|
dongsheng@627
|
9705 "The <command role=\"hg-cmd\">hg bisect</command> command uses your test to "
|
|
dongsheng@627
|
9706 "direct its search for the changeset that introduced the code that caused the "
|
|
dongsheng@627
|
9707 "bug."
|
|
dongsheng@627
|
9708 msgstr ""
|
|
dongsheng@627
|
9709
|
|
dongsheng@627
|
9710 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9711 #: ../en/ch09-undo.xml:712
|
|
dongsheng@627
|
9712 msgid ""
|
|
dongsheng@627
|
9713 "Here are a few scenarios to help you understand how you might apply this "
|
|
dongsheng@627
|
9714 "command."
|
|
dongsheng@627
|
9715 msgstr ""
|
|
dongsheng@627
|
9716
|
|
dongsheng@627
|
9717 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9718 #: ../en/ch09-undo.xml:715
|
|
dongsheng@627
|
9719 msgid ""
|
|
dongsheng@627
|
9720 "The most recent version of your software has a bug that you remember wasn't "
|
|
dongsheng@627
|
9721 "present a few weeks ago, but you don't know when it was introduced. Here, "
|
|
dongsheng@627
|
9722 "your binary test checks for the presence of that bug."
|
|
dongsheng@627
|
9723 msgstr ""
|
|
dongsheng@627
|
9724
|
|
dongsheng@627
|
9725 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9726 #: ../en/ch09-undo.xml:720
|
|
dongsheng@627
|
9727 msgid ""
|
|
dongsheng@627
|
9728 "You fixed a bug in a rush, and now it's time to close the entry in your "
|
|
dongsheng@627
|
9729 "team's bug database. The bug database requires a changeset ID when you close "
|
|
dongsheng@627
|
9730 "an entry, but you don't remember which changeset you fixed the bug in. Once "
|
|
dongsheng@627
|
9731 "again, your binary test checks for the presence of the bug."
|
|
dongsheng@627
|
9732 msgstr ""
|
|
dongsheng@627
|
9733
|
|
dongsheng@627
|
9734 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9735 #: ../en/ch09-undo.xml:727
|
|
dongsheng@627
|
9736 msgid ""
|
|
dongsheng@627
|
9737 "Your software works correctly, but runs 15% slower than the last time you "
|
|
dongsheng@627
|
9738 "measured it. You want to know which changeset introduced the performance "
|
|
dongsheng@627
|
9739 "regression. In this case, your binary test measures the performance of your "
|
|
dongsheng@627
|
9740 "software, to see whether it's <quote>fast</quote> or <quote>slow</quote>."
|
|
dongsheng@627
|
9741 msgstr ""
|
|
dongsheng@627
|
9742
|
|
dongsheng@627
|
9743 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9744 #: ../en/ch09-undo.xml:734
|
|
dongsheng@627
|
9745 msgid ""
|
|
dongsheng@627
|
9746 "The sizes of the components of your project that you ship exploded recently, "
|
|
dongsheng@627
|
9747 "and you suspect that something changed in the way you build your project."
|
|
dongsheng@627
|
9748 msgstr ""
|
|
dongsheng@627
|
9749
|
|
dongsheng@627
|
9750 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9751 #: ../en/ch09-undo.xml:739
|
|
dongsheng@627
|
9752 msgid ""
|
|
dongsheng@627
|
9753 "From these examples, it should be clear that the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9754 "bisect</command> command is not useful only for finding the sources of bugs. "
|
|
dongsheng@627
|
9755 "You can use it to find any <quote>emergent property</quote> of a repository "
|
|
dongsheng@627
|
9756 "(anything that you can't find from a simple text search of the files in the "
|
|
dongsheng@627
|
9757 "tree) for which you can write a binary test."
|
|
dongsheng@627
|
9758 msgstr ""
|
|
dongsheng@627
|
9759
|
|
dongsheng@627
|
9760 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9761 #: ../en/ch09-undo.xml:746
|
|
dongsheng@627
|
9762 msgid ""
|
|
dongsheng@627
|
9763 "We'll introduce a little bit of terminology here, just to make it clear which "
|
|
dongsheng@627
|
9764 "parts of the search process are your responsibility, and which are "
|
|
dongsheng@627
|
9765 "Mercurial's. A <emphasis>test</emphasis> is something that <emphasis>you</"
|
|
dongsheng@627
|
9766 "emphasis> run when <command role=\"hg-cmd\">hg bisect</command> chooses a "
|
|
dongsheng@627
|
9767 "changeset. A <emphasis>probe</emphasis> is what <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9768 "bisect</command> runs to tell whether a revision is good. Finally, we'll use "
|
|
dongsheng@627
|
9769 "the word <quote>bisect</quote>, as both a noun and a verb, to stand in for "
|
|
dongsheng@627
|
9770 "the phrase <quote>search using the <command role=\"hg-cmd\">hg bisect</"
|
|
dongsheng@627
|
9771 "command> command</quote>."
|
|
dongsheng@627
|
9772 msgstr ""
|
|
dongsheng@627
|
9773
|
|
dongsheng@627
|
9774 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9775 #: ../en/ch09-undo.xml:759
|
|
dongsheng@627
|
9776 msgid ""
|
|
dongsheng@627
|
9777 "One simple way to automate the searching process would be simply to probe "
|
|
dongsheng@627
|
9778 "every changeset. However, this scales poorly. If it took ten minutes to "
|
|
dongsheng@627
|
9779 "test a single changeset, and you had 10,000 changesets in your repository, "
|
|
dongsheng@627
|
9780 "the exhaustive approach would take on average 35 <emphasis>days</emphasis> to "
|
|
dongsheng@627
|
9781 "find the changeset that introduced a bug. Even if you knew that the bug was "
|
|
dongsheng@627
|
9782 "introduced by one of the last 500 changesets, and limited your search to "
|
|
dongsheng@627
|
9783 "those, you'd still be looking at over 40 hours to find the changeset that "
|
|
dongsheng@627
|
9784 "introduced your bug."
|
|
dongsheng@627
|
9785 msgstr ""
|
|
dongsheng@627
|
9786
|
|
dongsheng@627
|
9787 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9788 #: ../en/ch09-undo.xml:769
|
|
dongsheng@627
|
9789 msgid ""
|
|
dongsheng@627
|
9790 "What the <command role=\"hg-cmd\">hg bisect</command> command does is use its "
|
|
dongsheng@627
|
9791 "knowledge of the <quote>shape</quote> of your project's revision history to "
|
|
dongsheng@627
|
9792 "perform a search in time proportional to the <emphasis>logarithm</emphasis> "
|
|
dongsheng@627
|
9793 "of the number of changesets to check (the kind of search it performs is "
|
|
dongsheng@627
|
9794 "called a dichotomic search). With this approach, searching through 10,000 "
|
|
dongsheng@627
|
9795 "changesets will take less than three hours, even at ten minutes per test (the "
|
|
dongsheng@627
|
9796 "search will require about 14 tests). Limit your search to the last hundred "
|
|
dongsheng@627
|
9797 "changesets, and it will take only about an hour (roughly seven tests)."
|
|
dongsheng@627
|
9798 msgstr ""
|
|
dongsheng@627
|
9799
|
|
dongsheng@627
|
9800 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
9801 #: ../en/ch09-undo.xml:780
|
|
dongsheng@627
|
9802 msgid ""
|
|
dongsheng@627
|
9803 "The <command role=\"hg-cmd\">hg bisect</command> command is aware of the "
|
|
dongsheng@627
|
9804 "<quote>branchy</quote> nature of a Mercurial project's revision history, so "
|
|
dongsheng@627
|
9805 "it has no problems dealing with branches, merges, or multiple heads in a "
|
|
dongsheng@627
|
9806 "repository. It can prune entire branches of history with a single probe, "
|
|
dongsheng@627
|
9807 "which is how it operates so efficiently."
|
|
dongsheng@627
|
9808 msgstr ""
|
|
dongsheng@627
|
9809
|
|
dongsheng@627
|
9810 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
9811 #: ../en/ch09-undo.xml:788
|
|
dongsheng@627
|
9812 msgid "Using the <command role=\"hg-cmd\">hg bisect</command> command"
|
|
dongsheng@635
|
9813 msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>"
|
|
dongsheng@627
|
9814
|
|
dongsheng@627
|
9815 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9816 #: ../en/ch09-undo.xml:791
|
|
dongsheng@627
|
9817 msgid ""
|
|
dongsheng@627
|
9818 "Here's an example of <command role=\"hg-cmd\">hg bisect</command> in action."
|
|
dongsheng@627
|
9819 msgstr ""
|
|
dongsheng@627
|
9820
|
|
dongsheng@627
|
9821 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@641
|
9822 #: ../en/ch09-undo.xml:795
|
|
dongsheng@627
|
9823 msgid ""
|
|
dongsheng@627
|
9824 "In versions 0.9.5 and earlier of Mercurial, <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
9825 "bisect</command> was not a core command: it was distributed with Mercurial as "
|
|
dongsheng@627
|
9826 "an extension. This section describes the built-in command, not the old "
|
|
dongsheng@627
|
9827 "extension."
|
|
dongsheng@627
|
9828 msgstr ""
|
|
dongsheng@627
|
9829
|
|
dongsheng@627
|
9830 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9831 #: ../en/ch09-undo.xml:802
|
|
dongsheng@627
|
9832 msgid ""
|
|
dongsheng@627
|
9833 "Now let's create a repository, so that we can try out the <command role=\"hg-"
|
|
dongsheng@627
|
9834 "cmd\">hg bisect</command> command in isolation."
|
|
dongsheng@627
|
9835 msgstr ""
|
|
dongsheng@627
|
9836
|
|
dongsheng@627
|
9837 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9838 #: ../en/ch09-undo.xml:808
|
|
dongsheng@627
|
9839 msgid ""
|
|
dongsheng@627
|
9840 "We'll simulate a project that has a bug in it in a simple-minded way: create "
|
|
dongsheng@627
|
9841 "trivial changes in a loop, and nominate one specific change that will have "
|
|
dongsheng@627
|
9842 "the <quote>bug</quote>. This loop creates 35 changesets, each adding a "
|
|
dongsheng@627
|
9843 "single file to the repository. We'll represent our <quote>bug</quote> with a "
|
|
dongsheng@627
|
9844 "file that contains the text <quote>i have a gub</quote>."
|
|
dongsheng@627
|
9845 msgstr ""
|
|
dongsheng@627
|
9846
|
|
dongsheng@627
|
9847 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9848 #: ../en/ch09-undo.xml:818
|
|
dongsheng@627
|
9849 msgid ""
|
|
dongsheng@627
|
9850 "The next thing that we'd like to do is figure out how to use the <command "
|
|
dongsheng@627
|
9851 "role=\"hg-cmd\">hg bisect</command> command. We can use Mercurial's normal "
|
|
dongsheng@627
|
9852 "built-in help mechanism for this."
|
|
dongsheng@627
|
9853 msgstr ""
|
|
dongsheng@627
|
9854
|
|
dongsheng@627
|
9855 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9856 #: ../en/ch09-undo.xml:825
|
|
dongsheng@627
|
9857 msgid ""
|
|
dongsheng@627
|
9858 "The <command role=\"hg-cmd\">hg bisect</command> command works in steps. "
|
|
dongsheng@627
|
9859 "Each step proceeds as follows."
|
|
dongsheng@627
|
9860 msgstr ""
|
|
dongsheng@627
|
9861
|
|
dongsheng@627
|
9862 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9863 #: ../en/ch09-undo.xml:828
|
|
dongsheng@627
|
9864 msgid "You run your binary test."
|
|
dongsheng@627
|
9865 msgstr ""
|
|
dongsheng@627
|
9866
|
|
dongsheng@627
|
9867 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9868 #: ../en/ch09-undo.xml:830
|
|
dongsheng@627
|
9869 msgid ""
|
|
dongsheng@627
|
9870 "If the test succeeded, you tell <command role=\"hg-cmd\">hg bisect</command> "
|
|
dongsheng@627
|
9871 "by running the <command role=\"hg-cmd\">hg bisect good</command> command."
|
|
dongsheng@627
|
9872 msgstr ""
|
|
dongsheng@627
|
9873
|
|
dongsheng@627
|
9874 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9875 #: ../en/ch09-undo.xml:835
|
|
dongsheng@627
|
9876 msgid ""
|
|
dongsheng@627
|
9877 "If it failed, run the <command role=\"hg-cmd\">hg bisect bad</command> "
|
|
dongsheng@627
|
9878 "command."
|
|
dongsheng@627
|
9879 msgstr ""
|
|
dongsheng@627
|
9880
|
|
dongsheng@627
|
9881 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9882 #: ../en/ch09-undo.xml:839
|
|
dongsheng@627
|
9883 msgid ""
|
|
dongsheng@627
|
9884 "The command uses your information to decide which changeset to test next."
|
|
dongsheng@627
|
9885 msgstr ""
|
|
dongsheng@627
|
9886
|
|
dongsheng@627
|
9887 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
|
|
dongsheng@641
|
9888 #: ../en/ch09-undo.xml:842
|
|
dongsheng@627
|
9889 msgid ""
|
|
dongsheng@627
|
9890 "It updates the working directory to that changeset, and the process begins "
|
|
dongsheng@627
|
9891 "again."
|
|
dongsheng@627
|
9892 msgstr ""
|
|
dongsheng@627
|
9893
|
|
dongsheng@627
|
9894 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9895 #: ../en/ch09-undo.xml:845
|
|
dongsheng@627
|
9896 msgid ""
|
|
dongsheng@627
|
9897 "The process ends when <command role=\"hg-cmd\">hg bisect</command> identifies "
|
|
dongsheng@627
|
9898 "a unique changeset that marks the point where your test transitioned from "
|
|
dongsheng@627
|
9899 "<quote>succeeding</quote> to <quote>failing</quote>."
|
|
dongsheng@627
|
9900 msgstr ""
|
|
dongsheng@627
|
9901
|
|
dongsheng@627
|
9902 #
|
|
dongsheng@627
|
9903 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9904 #: ../en/ch09-undo.xml:850
|
|
dongsheng@627
|
9905 msgid ""
|
|
dongsheng@627
|
9906 "To start the search, we must run the <command role=\"hg-cmd\">hg bisect --"
|
|
dongsheng@627
|
9907 "reset</command> command."
|
|
dongsheng@627
|
9908 msgstr ""
|
|
dongsheng@627
|
9909
|
|
dongsheng@627
|
9910 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9911 #: ../en/ch09-undo.xml:855
|
|
dongsheng@627
|
9912 msgid ""
|
|
dongsheng@627
|
9913 "In our case, the binary test we use is simple: we check to see if any file in "
|
|
dongsheng@627
|
9914 "the repository contains the string <quote>i have a gub</quote>. If it does, "
|
|
dongsheng@627
|
9915 "this changeset contains the change that <quote>caused the bug</quote>. By "
|
|
dongsheng@627
|
9916 "convention, a changeset that has the property we're searching for is "
|
|
dongsheng@627
|
9917 "<quote>bad</quote>, while one that doesn't is <quote>good</quote>."
|
|
dongsheng@627
|
9918 msgstr ""
|
|
dongsheng@627
|
9919
|
|
dongsheng@627
|
9920 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9921 #: ../en/ch09-undo.xml:863
|
|
dongsheng@627
|
9922 msgid ""
|
|
dongsheng@627
|
9923 "Most of the time, the revision to which the working directory is synced "
|
|
dongsheng@627
|
9924 "(usually the tip) already exhibits the problem introduced by the buggy "
|
|
dongsheng@627
|
9925 "change, so we'll mark it as <quote>bad</quote>."
|
|
dongsheng@627
|
9926 msgstr ""
|
|
dongsheng@627
|
9927
|
|
dongsheng@627
|
9928 #
|
|
dongsheng@627
|
9929 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9930 #: ../en/ch09-undo.xml:870
|
|
dongsheng@627
|
9931 msgid ""
|
|
dongsheng@627
|
9932 "Our next task is to nominate a changeset that we know <emphasis>doesn't</"
|
|
dongsheng@627
|
9933 "emphasis> have the bug; the <command role=\"hg-cmd\">hg bisect</command> "
|
|
dongsheng@627
|
9934 "command will <quote>bracket</quote> its search between the first pair of good "
|
|
dongsheng@627
|
9935 "and bad changesets. In our case, we know that revision 10 didn't have the "
|
|
dongsheng@627
|
9936 "bug. (I'll have more words about choosing the first <quote>good</quote> "
|
|
dongsheng@627
|
9937 "changeset later.)"
|
|
dongsheng@627
|
9938 msgstr ""
|
|
dongsheng@627
|
9939
|
|
dongsheng@627
|
9940 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9941 #: ../en/ch09-undo.xml:880
|
|
dongsheng@627
|
9942 msgid "Notice that this command printed some output."
|
|
dongsheng@627
|
9943 msgstr ""
|
|
dongsheng@627
|
9944
|
|
dongsheng@627
|
9945 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9946 #: ../en/ch09-undo.xml:882
|
|
dongsheng@627
|
9947 msgid ""
|
|
dongsheng@627
|
9948 "It told us how many changesets it must consider before it can identify the "
|
|
dongsheng@627
|
9949 "one that introduced the bug, and how many tests that will require."
|
|
dongsheng@627
|
9950 msgstr ""
|
|
dongsheng@627
|
9951
|
|
dongsheng@627
|
9952 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
9953 #: ../en/ch09-undo.xml:886
|
|
dongsheng@627
|
9954 msgid ""
|
|
dongsheng@627
|
9955 "It updated the working directory to the next changeset to test, and told us "
|
|
dongsheng@627
|
9956 "which changeset it's testing."
|
|
dongsheng@627
|
9957 msgstr ""
|
|
dongsheng@627
|
9958
|
|
dongsheng@627
|
9959 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9960 #: ../en/ch09-undo.xml:891
|
|
dongsheng@627
|
9961 msgid ""
|
|
dongsheng@627
|
9962 "We now run our test in the working directory. We use the <command>grep</"
|
|
dongsheng@627
|
9963 "command> command to see if our <quote>bad</quote> file is present in the "
|
|
dongsheng@627
|
9964 "working directory. If it is, this revision is bad; if not, this revision is "
|
|
dongsheng@627
|
9965 "good. &interaction.bisect.search.step1;"
|
|
dongsheng@627
|
9966 msgstr ""
|
|
dongsheng@627
|
9967
|
|
dongsheng@627
|
9968 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9969 #: ../en/ch09-undo.xml:897
|
|
dongsheng@627
|
9970 msgid ""
|
|
dongsheng@627
|
9971 "This test looks like a perfect candidate for automation, so let's turn it "
|
|
dongsheng@627
|
9972 "into a shell function."
|
|
dongsheng@627
|
9973 msgstr ""
|
|
dongsheng@627
|
9974
|
|
dongsheng@627
|
9975 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9976 #: ../en/ch09-undo.xml:901
|
|
dongsheng@627
|
9977 msgid ""
|
|
dongsheng@627
|
9978 "We can now run an entire test step with a single command, <literal>mytest</"
|
|
dongsheng@627
|
9979 "literal>."
|
|
dongsheng@627
|
9980 msgstr ""
|
|
dongsheng@627
|
9981
|
|
dongsheng@627
|
9982 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9983 #: ../en/ch09-undo.xml:906
|
|
dongsheng@627
|
9984 msgid "A few more invocations of our canned test step command, and we're done."
|
|
dongsheng@627
|
9985 msgstr ""
|
|
dongsheng@627
|
9986
|
|
dongsheng@627
|
9987 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
9988 #: ../en/ch09-undo.xml:911
|
|
dongsheng@627
|
9989 msgid ""
|
|
dongsheng@627
|
9990 "Even though we had 40 changesets to search through, the <command role=\"hg-cmd"
|
|
dongsheng@627
|
9991 "\">hg bisect</command> command let us find the changeset that introduced our "
|
|
dongsheng@627
|
9992 "<quote>bug</quote> with only five tests. Because the number of tests that "
|
|
dongsheng@627
|
9993 "the <command role=\"hg-cmd\">hg bisect</command> command performs grows "
|
|
dongsheng@627
|
9994 "logarithmically with the number of changesets to search, the advantage that "
|
|
dongsheng@627
|
9995 "it has over the <quote>brute force</quote> search approach increases with "
|
|
dongsheng@627
|
9996 "every changeset you add."
|
|
dongsheng@627
|
9997 msgstr ""
|
|
dongsheng@627
|
9998
|
|
dongsheng@627
|
9999 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
10000 #: ../en/ch09-undo.xml:922
|
|
dongsheng@627
|
10001 msgid "Cleaning up after your search"
|
|
dongsheng@635
|
10002 msgstr "搜索后的清理"
|
|
dongsheng@627
|
10003
|
|
dongsheng@627
|
10004 #
|
|
dongsheng@627
|
10005 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10006 #: ../en/ch09-undo.xml:924
|
|
dongsheng@627
|
10007 msgid ""
|
|
dongsheng@627
|
10008 "When you're finished using the <command role=\"hg-cmd\">hg bisect</command> "
|
|
dongsheng@627
|
10009 "command in a repository, you can use the <command role=\"hg-cmd\">hg bisect "
|
|
dongsheng@627
|
10010 "reset</command> command to drop the information it was using to drive your "
|
|
dongsheng@627
|
10011 "search. The command doesn't use much space, so it doesn't matter if you "
|
|
dongsheng@627
|
10012 "forget to run this command. However, <command role=\"hg-cmd\">hg bisect</"
|
|
dongsheng@627
|
10013 "command> won't let you start a new search in that repository until you do a "
|
|
dongsheng@627
|
10014 "<command role=\"hg-cmd\">hg bisect reset</command>."
|
|
dongsheng@627
|
10015 msgstr ""
|
|
dongsheng@627
|
10016
|
|
dongsheng@627
|
10017 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
10018 #: ../en/ch09-undo.xml:939
|
|
dongsheng@627
|
10019 msgid "Tips for finding bugs effectively"
|
|
dongsheng@635
|
10020 msgstr "有效查找问题的技巧"
|
|
dongsheng@627
|
10021
|
|
dongsheng@627
|
10022 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
10023 #: ../en/ch09-undo.xml:942
|
|
dongsheng@627
|
10024 msgid "Give consistent input"
|
|
dongsheng@635
|
10025 msgstr "给出一致的输入"
|
|
dongsheng@627
|
10026
|
|
dongsheng@627
|
10027 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10028 #: ../en/ch09-undo.xml:944
|
|
dongsheng@627
|
10029 msgid ""
|
|
dongsheng@627
|
10030 "The <command role=\"hg-cmd\">hg bisect</command> command requires that you "
|
|
dongsheng@627
|
10031 "correctly report the result of every test you perform. If you tell it that a "
|
|
dongsheng@627
|
10032 "test failed when it really succeeded, it <emphasis>might</emphasis> be able "
|
|
dongsheng@627
|
10033 "to detect the inconsistency. If it can identify an inconsistency in your "
|
|
dongsheng@627
|
10034 "reports, it will tell you that a particular changeset is both good and bad. "
|
|
dongsheng@627
|
10035 "However, it can't do this perfectly; it's about as likely to report the wrong "
|
|
dongsheng@627
|
10036 "changeset as the source of the bug."
|
|
dongsheng@627
|
10037 msgstr ""
|
|
dongsheng@627
|
10038
|
|
dongsheng@627
|
10039 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
10040 #: ../en/ch09-undo.xml:956
|
|
dongsheng@627
|
10041 msgid "Automate as much as possible"
|
|
dongsheng@635
|
10042 msgstr "尽量自动"
|
|
dongsheng@627
|
10043
|
|
dongsheng@627
|
10044 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10045 #: ../en/ch09-undo.xml:958
|
|
dongsheng@627
|
10046 msgid ""
|
|
dongsheng@627
|
10047 "When I started using the <command role=\"hg-cmd\">hg bisect</command> "
|
|
dongsheng@627
|
10048 "command, I tried a few times to run my tests by hand, on the command line. "
|
|
dongsheng@627
|
10049 "This is an approach that I, at least, am not suited to. After a few tries, I "
|
|
dongsheng@627
|
10050 "found that I was making enough mistakes that I was having to restart my "
|
|
dongsheng@627
|
10051 "searches several times before finally getting correct results."
|
|
dongsheng@627
|
10052 msgstr ""
|
|
dongsheng@627
|
10053
|
|
dongsheng@627
|
10054 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10055 #: ../en/ch09-undo.xml:966
|
|
dongsheng@627
|
10056 msgid ""
|
|
dongsheng@627
|
10057 "My initial problems with driving the <command role=\"hg-cmd\">hg bisect</"
|
|
dongsheng@627
|
10058 "command> command by hand occurred even with simple searches on small "
|
|
dongsheng@627
|
10059 "repositories; if the problem you're looking for is more subtle, or the number "
|
|
dongsheng@627
|
10060 "of tests that <command role=\"hg-cmd\">hg bisect</command> must perform "
|
|
dongsheng@627
|
10061 "increases, the likelihood of operator error ruining the search is much "
|
|
dongsheng@627
|
10062 "higher. Once I started automating my tests, I had much better results."
|
|
dongsheng@627
|
10063 msgstr ""
|
|
dongsheng@627
|
10064
|
|
dongsheng@627
|
10065 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10066 #: ../en/ch09-undo.xml:975
|
|
dongsheng@627
|
10067 msgid "The key to automated testing is twofold:"
|
|
dongsheng@627
|
10068 msgstr ""
|
|
dongsheng@627
|
10069
|
|
dongsheng@627
|
10070 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
10071 #: ../en/ch09-undo.xml:977
|
|
dongsheng@627
|
10072 msgid "always test for the same symptom, and"
|
|
dongsheng@627
|
10073 msgstr ""
|
|
dongsheng@627
|
10074
|
|
dongsheng@627
|
10075 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
10076 #: ../en/ch09-undo.xml:979
|
|
dongsheng@627
|
10077 msgid ""
|
|
dongsheng@627
|
10078 "always feed consistent input to the <command role=\"hg-cmd\">hg bisect</"
|
|
dongsheng@627
|
10079 "command> command."
|
|
dongsheng@627
|
10080 msgstr ""
|
|
dongsheng@627
|
10081
|
|
dongsheng@627
|
10082 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10083 #: ../en/ch09-undo.xml:982
|
|
dongsheng@627
|
10084 msgid ""
|
|
dongsheng@627
|
10085 "In my tutorial example above, the <command>grep</command> command tests for "
|
|
dongsheng@627
|
10086 "the symptom, and the <literal>if</literal> statement takes the result of this "
|
|
dongsheng@627
|
10087 "check and ensures that we always feed the same input to the <command role="
|
|
dongsheng@627
|
10088 "\"hg-cmd\">hg bisect</command> command. The <literal>mytest</literal> "
|
|
dongsheng@627
|
10089 "function marries these together in a reproducible way, so that every test is "
|
|
dongsheng@627
|
10090 "uniform and consistent."
|
|
dongsheng@627
|
10091 msgstr ""
|
|
dongsheng@627
|
10092
|
|
dongsheng@627
|
10093 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
10094 #: ../en/ch09-undo.xml:992
|
|
dongsheng@627
|
10095 msgid "Check your results"
|
|
dongsheng@635
|
10096 msgstr "检查你的结果"
|
|
dongsheng@627
|
10097
|
|
dongsheng@627
|
10098 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10099 #: ../en/ch09-undo.xml:994
|
|
dongsheng@627
|
10100 msgid ""
|
|
dongsheng@627
|
10101 "Because the output of a <command role=\"hg-cmd\">hg bisect</command> search "
|
|
dongsheng@627
|
10102 "is only as good as the input you give it, don't take the changeset it reports "
|
|
dongsheng@627
|
10103 "as the absolute truth. A simple way to cross-check its report is to manually "
|
|
dongsheng@627
|
10104 "run your test at each of the following changesets:"
|
|
dongsheng@627
|
10105 msgstr ""
|
|
dongsheng@627
|
10106
|
|
dongsheng@627
|
10107 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
10108 #: ../en/ch09-undo.xml:1000
|
|
dongsheng@627
|
10109 msgid ""
|
|
dongsheng@627
|
10110 "The changeset that it reports as the first bad revision. Your test should "
|
|
dongsheng@627
|
10111 "still report this as bad."
|
|
dongsheng@627
|
10112 msgstr ""
|
|
dongsheng@627
|
10113
|
|
dongsheng@627
|
10114 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
10115 #: ../en/ch09-undo.xml:1004
|
|
dongsheng@627
|
10116 msgid ""
|
|
dongsheng@627
|
10117 "The parent of that changeset (either parent, if it's a merge). Your test "
|
|
dongsheng@627
|
10118 "should report this changeset as good."
|
|
dongsheng@627
|
10119 msgstr ""
|
|
dongsheng@627
|
10120
|
|
dongsheng@627
|
10121 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
10122 #: ../en/ch09-undo.xml:1008
|
|
dongsheng@627
|
10123 msgid ""
|
|
dongsheng@627
|
10124 "A child of that changeset. Your test should report this changeset as bad."
|
|
dongsheng@627
|
10125 msgstr ""
|
|
dongsheng@627
|
10126
|
|
dongsheng@627
|
10127 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
10128 #: ../en/ch09-undo.xml:1014
|
|
dongsheng@627
|
10129 msgid "Beware interference between bugs"
|
|
dongsheng@635
|
10130 msgstr "谨防问题之间的冲突"
|
|
dongsheng@627
|
10131
|
|
dongsheng@627
|
10132 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10133 #: ../en/ch09-undo.xml:1016
|
|
dongsheng@627
|
10134 msgid ""
|
|
dongsheng@627
|
10135 "It's possible that your search for one bug could be disrupted by the presence "
|
|
dongsheng@627
|
10136 "of another. For example, let's say your software crashes at revision 100, "
|
|
dongsheng@627
|
10137 "and worked correctly at revision 50. Unknown to you, someone else introduced "
|
|
dongsheng@627
|
10138 "a different crashing bug at revision 60, and fixed it at revision 80. This "
|
|
dongsheng@627
|
10139 "could distort your results in one of several ways."
|
|
dongsheng@627
|
10140 msgstr ""
|
|
dongsheng@627
|
10141
|
|
dongsheng@627
|
10142 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10143 #: ../en/ch09-undo.xml:1024
|
|
dongsheng@627
|
10144 msgid ""
|
|
dongsheng@627
|
10145 "It is possible that this other bug completely <quote>masks</quote> yours, "
|
|
dongsheng@627
|
10146 "which is to say that it occurs before your bug has a chance to manifest "
|
|
dongsheng@627
|
10147 "itself. If you can't avoid that other bug (for example, it prevents your "
|
|
dongsheng@627
|
10148 "project from building), and so can't tell whether your bug is present in a "
|
|
dongsheng@627
|
10149 "particular changeset, the <command role=\"hg-cmd\">hg bisect</command> "
|
|
dongsheng@627
|
10150 "command cannot help you directly. Instead, you can mark a changeset as "
|
|
dongsheng@627
|
10151 "untested by running <command role=\"hg-cmd\">hg bisect --skip</command>."
|
|
dongsheng@627
|
10152 msgstr ""
|
|
dongsheng@627
|
10153
|
|
dongsheng@627
|
10154 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10155 #: ../en/ch09-undo.xml:1034
|
|
dongsheng@627
|
10156 msgid ""
|
|
dongsheng@627
|
10157 "A different problem could arise if your test for a bug's presence is not "
|
|
dongsheng@627
|
10158 "specific enough. If you check for <quote>my program crashes</quote>, then "
|
|
dongsheng@627
|
10159 "both your crashing bug and an unrelated crashing bug that masks it will look "
|
|
dongsheng@627
|
10160 "like the same thing, and mislead <command role=\"hg-cmd\">hg bisect</command>."
|
|
dongsheng@627
|
10161 msgstr ""
|
|
dongsheng@627
|
10162
|
|
dongsheng@627
|
10163 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10164 #: ../en/ch09-undo.xml:1041
|
|
dongsheng@627
|
10165 msgid ""
|
|
dongsheng@627
|
10166 "Another useful situation in which to use <command role=\"hg-cmd\">hg bisect --"
|
|
dongsheng@627
|
10167 "skip</command> is if you can't test a revision because your project was in a "
|
|
dongsheng@627
|
10168 "broken and hence untestable state at that revision, perhaps because someone "
|
|
dongsheng@627
|
10169 "checked in a change that prevented the project from building."
|
|
dongsheng@627
|
10170 msgstr ""
|
|
dongsheng@627
|
10171
|
|
dongsheng@627
|
10172 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
10173 #: ../en/ch09-undo.xml:1050
|
|
dongsheng@627
|
10174 msgid "Bracket your search lazily"
|
|
dongsheng@635
|
10175 msgstr "减少你的查找工作"
|
|
dongsheng@627
|
10176
|
|
dongsheng@627
|
10177 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10178 #: ../en/ch09-undo.xml:1052
|
|
dongsheng@627
|
10179 msgid ""
|
|
dongsheng@627
|
10180 "Choosing the first <quote>good</quote> and <quote>bad</quote> changesets that "
|
|
dongsheng@627
|
10181 "will mark the end points of your search is often easy, but it bears a little "
|
|
dongsheng@627
|
10182 "discussion nevertheless. From the perspective of <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
10183 "bisect</command>, the <quote>newest</quote> changeset is conventionally "
|
|
dongsheng@627
|
10184 "<quote>bad</quote>, and the older changeset is <quote>good</quote>."
|
|
dongsheng@627
|
10185 msgstr ""
|
|
dongsheng@627
|
10186
|
|
dongsheng@627
|
10187 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10188 #: ../en/ch09-undo.xml:1060
|
|
dongsheng@627
|
10189 msgid ""
|
|
dongsheng@627
|
10190 "If you're having trouble remembering when a suitable <quote>good</quote> "
|
|
dongsheng@627
|
10191 "change was, so that you can tell <command role=\"hg-cmd\">hg bisect</"
|
|
dongsheng@627
|
10192 "command>, you could do worse than testing changesets at random. Just "
|
|
dongsheng@627
|
10193 "remember to eliminate contenders that can't possibly exhibit the bug (perhaps "
|
|
dongsheng@627
|
10194 "because the feature with the bug isn't present yet) and those where another "
|
|
dongsheng@627
|
10195 "problem masks the bug (as I discussed above)."
|
|
dongsheng@627
|
10196 msgstr ""
|
|
dongsheng@627
|
10197
|
|
dongsheng@627
|
10198 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
10199 #: ../en/ch09-undo.xml:1069
|
|
dongsheng@627
|
10200 msgid ""
|
|
dongsheng@627
|
10201 "Even if you end up <quote>early</quote> by thousands of changesets or months "
|
|
dongsheng@627
|
10202 "of history, you will only add a handful of tests to the total number that "
|
|
dongsheng@627
|
10203 "<command role=\"hg-cmd\">hg bisect</command> must perform, thanks to its "
|
|
dongsheng@627
|
10204 "logarithmic behaviour."
|
|
dongsheng@627
|
10205 msgstr ""
|
|
dongsheng@627
|
10206
|
|
dongsheng@627
|
10207 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
10208 #: ../en/ch10-hook.xml:5
|
|
dongsheng@627
|
10209 msgid "Handling repository events with hooks"
|
|
dongsheng@627
|
10210 msgstr "使用钩子处理版本库事件"
|
|
dongsheng@627
|
10211
|
|
dongsheng@627
|
10212 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
10213 #: ../en/ch10-hook.xml:7
|
|
dongsheng@627
|
10214 msgid ""
|
|
dongsheng@627
|
10215 "Mercurial offers a powerful mechanism to let you perform automated actions in "
|
|
dongsheng@627
|
10216 "response to events that occur in a repository. In some cases, you can even "
|
|
dongsheng@627
|
10217 "control Mercurial's response to those events."
|
|
dongsheng@627
|
10218 msgstr ""
|
|
dongsheng@627
|
10219
|
|
dongsheng@627
|
10220 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
10221 #: ../en/ch10-hook.xml:12
|
|
dongsheng@627
|
10222 msgid ""
|
|
dongsheng@627
|
10223 "The name Mercurial uses for one of these actions is a <emphasis>hook</"
|
|
dongsheng@627
|
10224 "emphasis>. Hooks are called <quote>triggers</quote> in some revision control "
|
|
dongsheng@627
|
10225 "systems, but the two names refer to the same idea."
|
|
dongsheng@627
|
10226 msgstr ""
|
|
dongsheng@627
|
10227
|
|
dongsheng@627
|
10228 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
10229 #: ../en/ch10-hook.xml:18
|
|
dongsheng@627
|
10230 msgid "An overview of hooks in Mercurial"
|
|
dongsheng@635
|
10231 msgstr "Mercurial 钩子概述"
|
|
dongsheng@627
|
10232
|
|
dongsheng@627
|
10233 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10234 #: ../en/ch10-hook.xml:20
|
|
dongsheng@627
|
10235 msgid ""
|
|
dongsheng@627
|
10236 "Here is a brief list of the hooks that Mercurial supports. We will revisit "
|
|
dongsheng@627
|
10237 "each of these hooks in more detail later, in section <xref linkend=\"sec.hook."
|
|
dongsheng@627
|
10238 "ref\"/>."
|
|
dongsheng@627
|
10239 msgstr ""
|
|
dongsheng@627
|
10240
|
|
dongsheng@627
|
10241 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10242 #: ../en/ch10-hook.xml:25
|
|
dongsheng@627
|
10243 msgid ""
|
|
dongsheng@627
|
10244 "<literal role=\"hook\">changegroup</literal>: This is run after a group of "
|
|
dongsheng@627
|
10245 "changesets has been brought into the repository from elsewhere."
|
|
dongsheng@627
|
10246 msgstr ""
|
|
dongsheng@627
|
10247
|
|
dongsheng@627
|
10248 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10249 #: ../en/ch10-hook.xml:29
|
|
dongsheng@627
|
10250 msgid ""
|
|
dongsheng@627
|
10251 "<literal role=\"hook\">commit</literal>: This is run after a new changeset "
|
|
dongsheng@627
|
10252 "has been created in the local repository."
|
|
dongsheng@627
|
10253 msgstr ""
|
|
dongsheng@627
|
10254
|
|
dongsheng@627
|
10255 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10256 #: ../en/ch10-hook.xml:33
|
|
dongsheng@627
|
10257 msgid ""
|
|
dongsheng@627
|
10258 "<literal role=\"hook\">incoming</literal>: This is run once for each new "
|
|
dongsheng@627
|
10259 "changeset that is brought into the repository from elsewhere. Notice the "
|
|
dongsheng@627
|
10260 "difference from <literal role=\"hook\">changegroup</literal>, which is run "
|
|
dongsheng@627
|
10261 "once per <emphasis>group</emphasis> of changesets brought in."
|
|
dongsheng@627
|
10262 msgstr ""
|
|
dongsheng@627
|
10263
|
|
dongsheng@627
|
10264 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10265 #: ../en/ch10-hook.xml:40
|
|
dongsheng@627
|
10266 msgid ""
|
|
dongsheng@627
|
10267 "<literal role=\"hook\">outgoing</literal>: This is run after a group of "
|
|
dongsheng@627
|
10268 "changesets has been transmitted from this repository."
|
|
dongsheng@627
|
10269 msgstr ""
|
|
dongsheng@627
|
10270
|
|
dongsheng@627
|
10271 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10272 #: ../en/ch10-hook.xml:44
|
|
dongsheng@627
|
10273 msgid ""
|
|
dongsheng@627
|
10274 "<literal role=\"hook\">prechangegroup</literal>: This is run before starting "
|
|
dongsheng@627
|
10275 "to bring a group of changesets into the repository."
|
|
dongsheng@627
|
10276 msgstr ""
|
|
dongsheng@627
|
10277
|
|
dongsheng@627
|
10278 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10279 #: ../en/ch10-hook.xml:49
|
|
dongsheng@627
|
10280 msgid ""
|
|
dongsheng@627
|
10281 "<literal role=\"hook\">precommit</literal>: Controlling. This is run before "
|
|
dongsheng@627
|
10282 "starting a commit."
|
|
dongsheng@627
|
10283 msgstr ""
|
|
dongsheng@627
|
10284
|
|
dongsheng@627
|
10285 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10286 #: ../en/ch10-hook.xml:53
|
|
dongsheng@627
|
10287 msgid ""
|
|
dongsheng@627
|
10288 "<literal role=\"hook\">preoutgoing</literal>: Controlling. This is run before "
|
|
dongsheng@627
|
10289 "starting to transmit a group of changesets from this repository."
|
|
dongsheng@627
|
10290 msgstr ""
|
|
dongsheng@627
|
10291
|
|
dongsheng@627
|
10292 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10293 #: ../en/ch10-hook.xml:58
|
|
dongsheng@627
|
10294 msgid ""
|
|
dongsheng@627
|
10295 "<literal role=\"hook\">pretag</literal>: Controlling. This is run before "
|
|
dongsheng@627
|
10296 "creating a tag."
|
|
dongsheng@627
|
10297 msgstr ""
|
|
dongsheng@627
|
10298
|
|
dongsheng@627
|
10299 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10300 #: ../en/ch10-hook.xml:62
|
|
dongsheng@627
|
10301 msgid ""
|
|
dongsheng@627
|
10302 "<literal role=\"hook\">pretxnchangegroup</literal>: Controlling. This is run "
|
|
dongsheng@627
|
10303 "after a group of changesets has been brought into the local repository from "
|
|
dongsheng@627
|
10304 "another, but before the transaction completes that will make the changes "
|
|
dongsheng@627
|
10305 "permanent in the repository."
|
|
dongsheng@627
|
10306 msgstr ""
|
|
dongsheng@627
|
10307
|
|
dongsheng@627
|
10308 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10309 #: ../en/ch10-hook.xml:70
|
|
dongsheng@627
|
10310 msgid ""
|
|
dongsheng@627
|
10311 "<literal role=\"hook\">pretxncommit</literal>: Controlling. This is run after "
|
|
dongsheng@627
|
10312 "a new changeset has been created in the local repository, but before the "
|
|
dongsheng@627
|
10313 "transaction completes that will make it permanent."
|
|
dongsheng@627
|
10314 msgstr ""
|
|
dongsheng@627
|
10315
|
|
dongsheng@627
|
10316 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10317 #: ../en/ch10-hook.xml:76
|
|
dongsheng@627
|
10318 msgid ""
|
|
dongsheng@627
|
10319 "<literal role=\"hook\">preupdate</literal>: Controlling. This is run before "
|
|
dongsheng@627
|
10320 "starting an update or merge of the working directory."
|
|
dongsheng@627
|
10321 msgstr ""
|
|
dongsheng@627
|
10322
|
|
dongsheng@627
|
10323 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10324 #: ../en/ch10-hook.xml:81
|
|
dongsheng@627
|
10325 msgid ""
|
|
dongsheng@627
|
10326 "<literal role=\"hook\">tag</literal>: This is run after a tag is created."
|
|
dongsheng@627
|
10327 msgstr ""
|
|
dongsheng@627
|
10328
|
|
dongsheng@627
|
10329 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
10330 #: ../en/ch10-hook.xml:85
|
|
dongsheng@627
|
10331 msgid ""
|
|
dongsheng@627
|
10332 "<literal role=\"hook\">update</literal>: This is run after an update or merge "
|
|
dongsheng@627
|
10333 "of the working directory has finished."
|
|
dongsheng@627
|
10334 msgstr ""
|
|
dongsheng@627
|
10335
|
|
dongsheng@627
|
10336 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10337 #: ../en/ch10-hook.xml:90
|
|
dongsheng@627
|
10338 msgid ""
|
|
dongsheng@627
|
10339 "Each of the hooks whose description begins with the word <quote>Controlling</"
|
|
dongsheng@627
|
10340 "quote> has the ability to determine whether an activity can proceed. If the "
|
|
dongsheng@627
|
10341 "hook succeeds, the activity may proceed; if it fails, the activity is either "
|
|
dongsheng@627
|
10342 "not permitted or undone, depending on the hook."
|
|
dongsheng@627
|
10343 msgstr ""
|
|
dongsheng@627
|
10344
|
|
dongsheng@627
|
10345 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
10346 #: ../en/ch10-hook.xml:99
|
|
dongsheng@627
|
10347 msgid "Hooks and security"
|
|
dongsheng@635
|
10348 msgstr "钩子与安全性"
|
|
dongsheng@627
|
10349
|
|
dongsheng@627
|
10350 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10351 #: ../en/ch10-hook.xml:102
|
|
dongsheng@627
|
10352 msgid "Hooks are run with your privileges"
|
|
dongsheng@635
|
10353 msgstr "钩子以你的特权执行"
|
|
dongsheng@627
|
10354
|
|
dongsheng@627
|
10355 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10356 #: ../en/ch10-hook.xml:104
|
|
dongsheng@627
|
10357 msgid ""
|
|
dongsheng@627
|
10358 "When you run a Mercurial command in a repository, and the command causes a "
|
|
dongsheng@627
|
10359 "hook to run, that hook runs on <emphasis>your</emphasis> system, under "
|
|
dongsheng@627
|
10360 "<emphasis>your</emphasis> user account, with <emphasis>your</emphasis> "
|
|
dongsheng@627
|
10361 "privilege level. Since hooks are arbitrary pieces of executable code, you "
|
|
dongsheng@627
|
10362 "should treat them with an appropriate level of suspicion. Do not install a "
|
|
dongsheng@627
|
10363 "hook unless you are confident that you know who created it and what it does."
|
|
dongsheng@627
|
10364 msgstr ""
|
|
dongsheng@627
|
10365
|
|
dongsheng@627
|
10366 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10367 #: ../en/ch10-hook.xml:115
|
|
dongsheng@627
|
10368 msgid ""
|
|
dongsheng@627
|
10369 "In some cases, you may be exposed to hooks that you did not install "
|
|
dongsheng@627
|
10370 "yourself. If you work with Mercurial on an unfamiliar system, Mercurial will "
|
|
dongsheng@627
|
10371 "run hooks defined in that system's global <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
10372 "filename>\\ file."
|
|
dongsheng@627
|
10373 msgstr ""
|
|
dongsheng@627
|
10374
|
|
dongsheng@627
|
10375 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10376 #: ../en/ch10-hook.xml:122
|
|
dongsheng@627
|
10377 msgid ""
|
|
dongsheng@627
|
10378 "If you are working with a repository owned by another user, Mercurial can run "
|
|
dongsheng@627
|
10379 "hooks defined in that user's repository, but it will still run them as "
|
|
dongsheng@627
|
10380 "<quote>you</quote>. For example, if you <command role=\"hg-cmd\">hg pull</"
|
|
dongsheng@627
|
10381 "command> from that repository, and its <filename role=\"special\">.hg/hgrc</"
|
|
dongsheng@627
|
10382 "filename> defines a local <literal role=\"hook\">outgoing</literal> hook, "
|
|
dongsheng@627
|
10383 "that hook will run under your user account, even though you don't own that "
|
|
dongsheng@627
|
10384 "repository."
|
|
dongsheng@627
|
10385 msgstr ""
|
|
dongsheng@627
|
10386
|
|
dongsheng@627
|
10387 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@627
|
10388 #: ../en/ch10-hook.xml:134
|
|
dongsheng@627
|
10389 msgid ""
|
|
dongsheng@627
|
10390 "This only applies if you are pulling from a repository on a local or network "
|
|
dongsheng@627
|
10391 "filesystem. If you're pulling over http or ssh, any <literal role=\"hook"
|
|
dongsheng@627
|
10392 "\">outgoing</literal> hook will run under whatever account is executing the "
|
|
dongsheng@627
|
10393 "server process, on the server."
|
|
dongsheng@627
|
10394 msgstr ""
|
|
dongsheng@627
|
10395
|
|
dongsheng@627
|
10396 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10397 #: ../en/ch10-hook.xml:142
|
|
dongsheng@627
|
10398 msgid ""
|
|
dongsheng@627
|
10399 "XXX To see what hooks are defined in a repository, use the <command role=\"hg-"
|
|
dongsheng@627
|
10400 "cmd\">hg config hooks</command> command. If you are working in one "
|
|
dongsheng@627
|
10401 "repository, but talking to another that you do not own (e.g. using <command "
|
|
dongsheng@627
|
10402 "role=\"hg-cmd\">hg pull</command> or <command role=\"hg-cmd\">hg incoming</"
|
|
dongsheng@627
|
10403 "command>), remember that it is the other repository's hooks you should be "
|
|
dongsheng@627
|
10404 "checking, not your own."
|
|
dongsheng@627
|
10405 msgstr ""
|
|
dongsheng@627
|
10406
|
|
dongsheng@627
|
10407 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10408 #: ../en/ch10-hook.xml:153
|
|
dongsheng@627
|
10409 msgid "Hooks do not propagate"
|
|
dongsheng@635
|
10410 msgstr "钩子不会传播"
|
|
dongsheng@627
|
10411
|
|
dongsheng@627
|
10412 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10413 #: ../en/ch10-hook.xml:155
|
|
dongsheng@627
|
10414 msgid ""
|
|
dongsheng@627
|
10415 "In Mercurial, hooks are not revision controlled, and do not propagate when "
|
|
dongsheng@627
|
10416 "you clone, or pull from, a repository. The reason for this is simple: a hook "
|
|
dongsheng@627
|
10417 "is a completely arbitrary piece of executable code. It runs under your user "
|
|
dongsheng@627
|
10418 "identity, with your privilege level, on your machine."
|
|
dongsheng@627
|
10419 msgstr ""
|
|
dongsheng@627
|
10420
|
|
dongsheng@627
|
10421 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10422 #: ../en/ch10-hook.xml:162
|
|
dongsheng@627
|
10423 msgid ""
|
|
dongsheng@627
|
10424 "It would be extremely reckless for any distributed revision control system to "
|
|
dongsheng@627
|
10425 "implement revision-controlled hooks, as this would offer an easily "
|
|
dongsheng@627
|
10426 "exploitable way to subvert the accounts of users of the revision control "
|
|
dongsheng@627
|
10427 "system."
|
|
dongsheng@627
|
10428 msgstr ""
|
|
dongsheng@627
|
10429
|
|
dongsheng@627
|
10430 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10431 #: ../en/ch10-hook.xml:168
|
|
dongsheng@627
|
10432 msgid ""
|
|
dongsheng@627
|
10433 "Since Mercurial does not propagate hooks, if you are collaborating with other "
|
|
dongsheng@627
|
10434 "people on a common project, you should not assume that they are using the "
|
|
dongsheng@627
|
10435 "same Mercurial hooks as you are, or that theirs are correctly configured. "
|
|
dongsheng@627
|
10436 "You should document the hooks you expect people to use."
|
|
dongsheng@627
|
10437 msgstr ""
|
|
dongsheng@627
|
10438
|
|
dongsheng@627
|
10439 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10440 #: ../en/ch10-hook.xml:175
|
|
dongsheng@627
|
10441 msgid ""
|
|
dongsheng@627
|
10442 "In a corporate intranet, this is somewhat easier to control, as you can for "
|
|
dongsheng@627
|
10443 "example provide a <quote>standard</quote> installation of Mercurial on an NFS "
|
|
dongsheng@627
|
10444 "filesystem, and use a site-wide <filename role=\"special\"> /.hgrc</filename>"
|
|
dongsheng@627
|
10445 "\\ file to define hooks that all users will see. However, this too has its "
|
|
dongsheng@627
|
10446 "limits; see below."
|
|
dongsheng@627
|
10447 msgstr ""
|
|
dongsheng@627
|
10448
|
|
dongsheng@627
|
10449 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10450 #: ../en/ch10-hook.xml:185
|
|
dongsheng@627
|
10451 msgid "Hooks can be overridden"
|
|
dongsheng@635
|
10452 msgstr "钩子可以被覆盖"
|
|
dongsheng@627
|
10453
|
|
dongsheng@627
|
10454 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10455 #: ../en/ch10-hook.xml:187
|
|
dongsheng@627
|
10456 msgid ""
|
|
dongsheng@627
|
10457 "Mercurial allows you to override a hook definition by redefining the hook. "
|
|
dongsheng@627
|
10458 "You can disable it by setting its value to the empty string, or change its "
|
|
dongsheng@627
|
10459 "behaviour as you wish."
|
|
dongsheng@627
|
10460 msgstr ""
|
|
dongsheng@627
|
10461
|
|
dongsheng@627
|
10462 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10463 #: ../en/ch10-hook.xml:192
|
|
dongsheng@627
|
10464 msgid ""
|
|
dongsheng@627
|
10465 "If you deploy a system- or site-wide <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
10466 "filename>\\ file that defines some hooks, you should thus understand that "
|
|
dongsheng@627
|
10467 "your users can disable or override those hooks."
|
|
dongsheng@627
|
10468 msgstr ""
|
|
dongsheng@627
|
10469
|
|
dongsheng@627
|
10470 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10471 #: ../en/ch10-hook.xml:200
|
|
dongsheng@627
|
10472 msgid "Ensuring that critical hooks are run"
|
|
dongsheng@635
|
10473 msgstr "确保关键钩子的执行"
|
|
dongsheng@627
|
10474
|
|
dongsheng@627
|
10475 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10476 #: ../en/ch10-hook.xml:202
|
|
dongsheng@627
|
10477 msgid ""
|
|
dongsheng@627
|
10478 "Sometimes you may want to enforce a policy that you do not want others to be "
|
|
dongsheng@627
|
10479 "able to work around. For example, you may have a requirement that every "
|
|
dongsheng@627
|
10480 "changeset must pass a rigorous set of tests. Defining this requirement via a "
|
|
dongsheng@627
|
10481 "hook in a site-wide <filename role=\"special\"> /.hgrc</filename>\\ won't "
|
|
dongsheng@627
|
10482 "work for remote users on laptops, and of course local users can subvert it at "
|
|
dongsheng@627
|
10483 "will by overriding the hook."
|
|
dongsheng@627
|
10484 msgstr ""
|
|
dongsheng@627
|
10485
|
|
dongsheng@627
|
10486 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10487 #: ../en/ch10-hook.xml:211
|
|
dongsheng@627
|
10488 msgid ""
|
|
dongsheng@627
|
10489 "Instead, you can set up your policies for use of Mercurial so that people are "
|
|
dongsheng@627
|
10490 "expected to propagate changes through a well-known <quote>canonical</quote> "
|
|
dongsheng@627
|
10491 "server that you have locked down and configured appropriately."
|
|
dongsheng@627
|
10492 msgstr ""
|
|
dongsheng@627
|
10493
|
|
dongsheng@627
|
10494 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10495 #: ../en/ch10-hook.xml:217
|
|
dongsheng@627
|
10496 msgid ""
|
|
dongsheng@627
|
10497 "One way to do this is via a combination of social engineering and "
|
|
dongsheng@627
|
10498 "technology. Set up a restricted-access account; users can push changes over "
|
|
dongsheng@627
|
10499 "the network to repositories managed by this account, but they cannot log into "
|
|
dongsheng@627
|
10500 "the account and run normal shell commands. In this scenario, a user can "
|
|
dongsheng@627
|
10501 "commit a changeset that contains any old garbage they want."
|
|
dongsheng@627
|
10502 msgstr ""
|
|
dongsheng@627
|
10503
|
|
dongsheng@627
|
10504 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10505 #: ../en/ch10-hook.xml:226
|
|
dongsheng@627
|
10506 msgid ""
|
|
dongsheng@627
|
10507 "When someone pushes a changeset to the server that everyone pulls from, the "
|
|
dongsheng@627
|
10508 "server will test the changeset before it accepts it as permanent, and reject "
|
|
dongsheng@627
|
10509 "it if it fails to pass the test suite. If people only pull changes from this "
|
|
dongsheng@627
|
10510 "filtering server, it will serve to ensure that all changes that people pull "
|
|
dongsheng@627
|
10511 "have been automatically vetted."
|
|
dongsheng@627
|
10512 msgstr ""
|
|
dongsheng@627
|
10513
|
|
dongsheng@627
|
10514 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
10515 #: ../en/ch10-hook.xml:237
|
|
dongsheng@627
|
10516 msgid "Care with <literal>pretxn</literal> hooks in a shared-access repository"
|
|
dongsheng@635
|
10517 msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子"
|
|
dongsheng@627
|
10518
|
|
dongsheng@627
|
10519 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10520 #: ../en/ch10-hook.xml:240
|
|
dongsheng@627
|
10521 msgid ""
|
|
dongsheng@627
|
10522 "If you want to use hooks to do some automated work in a repository that a "
|
|
dongsheng@627
|
10523 "number of people have shared access to, you need to be careful in how you do "
|
|
dongsheng@627
|
10524 "this."
|
|
dongsheng@627
|
10525 msgstr ""
|
|
dongsheng@627
|
10526
|
|
dongsheng@627
|
10527 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10528 #: ../en/ch10-hook.xml:245
|
|
dongsheng@627
|
10529 msgid ""
|
|
dongsheng@627
|
10530 "Mercurial only locks a repository when it is writing to the repository, and "
|
|
dongsheng@627
|
10531 "only the parts of Mercurial that write to the repository pay attention to "
|
|
dongsheng@627
|
10532 "locks. Write locks are necessary to prevent multiple simultaneous writers "
|
|
dongsheng@627
|
10533 "from scribbling on each other's work, corrupting the repository."
|
|
dongsheng@627
|
10534 msgstr ""
|
|
dongsheng@627
|
10535
|
|
dongsheng@627
|
10536 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10537 #: ../en/ch10-hook.xml:252
|
|
dongsheng@627
|
10538 msgid ""
|
|
dongsheng@627
|
10539 "Because Mercurial is careful with the order in which it reads and writes "
|
|
dongsheng@627
|
10540 "data, it does not need to acquire a lock when it wants to read data from the "
|
|
dongsheng@627
|
10541 "repository. The parts of Mercurial that read from the repository never pay "
|
|
dongsheng@627
|
10542 "attention to locks. This lockless reading scheme greatly increases "
|
|
dongsheng@627
|
10543 "performance and concurrency."
|
|
dongsheng@627
|
10544 msgstr ""
|
|
dongsheng@627
|
10545
|
|
dongsheng@627
|
10546 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10547 #: ../en/ch10-hook.xml:260
|
|
dongsheng@627
|
10548 msgid ""
|
|
dongsheng@627
|
10549 "With great performance comes a trade-off, though, one which has the potential "
|
|
dongsheng@627
|
10550 "to cause you trouble unless you're aware of it. To describe this requires a "
|
|
dongsheng@627
|
10551 "little detail about how Mercurial adds changesets to a repository and reads "
|
|
dongsheng@627
|
10552 "those changes."
|
|
dongsheng@627
|
10553 msgstr ""
|
|
dongsheng@627
|
10554
|
|
dongsheng@627
|
10555 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10556 #: ../en/ch10-hook.xml:267
|
|
dongsheng@627
|
10557 msgid ""
|
|
dongsheng@627
|
10558 "When Mercurial <emphasis>writes</emphasis> metadata, it writes it straight "
|
|
dongsheng@627
|
10559 "into the destination file. It writes file data first, then manifest data "
|
|
dongsheng@627
|
10560 "(which contains pointers to the new file data), then changelog data (which "
|
|
dongsheng@627
|
10561 "contains pointers to the new manifest data). Before the first write to each "
|
|
dongsheng@627
|
10562 "file, it stores a record of where the end of the file was in its transaction "
|
|
dongsheng@627
|
10563 "log. If the transaction must be rolled back, Mercurial simply truncates each "
|
|
dongsheng@627
|
10564 "file back to the size it was before the transaction began."
|
|
dongsheng@627
|
10565 msgstr ""
|
|
dongsheng@627
|
10566
|
|
dongsheng@627
|
10567 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10568 #: ../en/ch10-hook.xml:278
|
|
dongsheng@627
|
10569 msgid ""
|
|
dongsheng@627
|
10570 "When Mercurial <emphasis>reads</emphasis> metadata, it reads the changelog "
|
|
dongsheng@627
|
10571 "first, then everything else. Since a reader will only access parts of the "
|
|
dongsheng@627
|
10572 "manifest or file metadata that it can see in the changelog, it can never see "
|
|
dongsheng@627
|
10573 "partially written data."
|
|
dongsheng@627
|
10574 msgstr ""
|
|
dongsheng@627
|
10575
|
|
dongsheng@627
|
10576 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10577 #: ../en/ch10-hook.xml:284
|
|
dongsheng@627
|
10578 msgid ""
|
|
dongsheng@627
|
10579 "Some controlling hooks (<literal role=\"hook\">pretxncommit</literal> and "
|
|
dongsheng@627
|
10580 "<literal role=\"hook\">pretxnchangegroup</literal>) run when a transaction is "
|
|
dongsheng@627
|
10581 "almost complete. All of the metadata has been written, but Mercurial can "
|
|
dongsheng@627
|
10582 "still roll the transaction back and cause the newly-written data to disappear."
|
|
dongsheng@627
|
10583 msgstr ""
|
|
dongsheng@627
|
10584
|
|
dongsheng@627
|
10585 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10586 #: ../en/ch10-hook.xml:292
|
|
dongsheng@627
|
10587 msgid ""
|
|
dongsheng@627
|
10588 "If one of these hooks runs for long, it opens a window of time during which a "
|
|
dongsheng@627
|
10589 "reader can see the metadata for changesets that are not yet permanent, and "
|
|
dongsheng@627
|
10590 "should not be thought of as <quote>really there</quote>. The longer the hook "
|
|
dongsheng@627
|
10591 "runs, the longer that window is open."
|
|
dongsheng@627
|
10592 msgstr ""
|
|
dongsheng@627
|
10593
|
|
dongsheng@627
|
10594 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10595 #: ../en/ch10-hook.xml:300
|
|
dongsheng@627
|
10596 msgid "The problem illustrated"
|
|
dongsheng@635
|
10597 msgstr "问题的演示"
|
|
dongsheng@627
|
10598
|
|
dongsheng@627
|
10599 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10600 #: ../en/ch10-hook.xml:302
|
|
dongsheng@627
|
10601 msgid ""
|
|
dongsheng@627
|
10602 "In principle, a good use for the <literal role=\"hook\">pretxnchangegroup</"
|
|
dongsheng@627
|
10603 "literal> hook would be to automatically build and test incoming changes "
|
|
dongsheng@627
|
10604 "before they are accepted into a central repository. This could let you "
|
|
dongsheng@627
|
10605 "guarantee that nobody can push changes to this repository that <quote>break "
|
|
dongsheng@627
|
10606 "the build</quote>. But if a client can pull changes while they're being "
|
|
dongsheng@627
|
10607 "tested, the usefulness of the test is zero; an unsuspecting someone can pull "
|
|
dongsheng@627
|
10608 "untested changes, potentially breaking their build."
|
|
dongsheng@627
|
10609 msgstr ""
|
|
dongsheng@627
|
10610
|
|
dongsheng@627
|
10611 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10612 #: ../en/ch10-hook.xml:313
|
|
dongsheng@627
|
10613 msgid ""
|
|
dongsheng@627
|
10614 "The safest technological answer to this challenge is to set up such a "
|
|
dongsheng@627
|
10615 "<quote>gatekeeper</quote> repository as <emphasis>unidirectional</emphasis>. "
|
|
dongsheng@627
|
10616 "Let it take changes pushed in from the outside, but do not allow anyone to "
|
|
dongsheng@627
|
10617 "pull changes from it (use the <literal role=\"hook\">preoutgoing</literal> "
|
|
dongsheng@627
|
10618 "hook to lock it down). Configure a <literal role=\"hook\">changegroup</"
|
|
dongsheng@627
|
10619 "literal> hook so that if a build or test succeeds, the hook will push the new "
|
|
dongsheng@627
|
10620 "changes out to another repository that people <emphasis>can</emphasis> pull "
|
|
dongsheng@627
|
10621 "from."
|
|
dongsheng@627
|
10622 msgstr ""
|
|
dongsheng@627
|
10623
|
|
dongsheng@627
|
10624 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10625 #: ../en/ch10-hook.xml:325
|
|
dongsheng@627
|
10626 msgid ""
|
|
dongsheng@627
|
10627 "In practice, putting a centralised bottleneck like this in place is not often "
|
|
dongsheng@627
|
10628 "a good idea, and transaction visibility has nothing to do with the problem. "
|
|
dongsheng@627
|
10629 "As the size of a project&emdash;and the time it takes to build and "
|
|
dongsheng@627
|
10630 "test&emdash;grows, you rapidly run into a wall with this <quote>try before "
|
|
dongsheng@627
|
10631 "you buy</quote> approach, where you have more changesets to test than time in "
|
|
dongsheng@627
|
10632 "which to deal with them. The inevitable result is frustration on the part of "
|
|
dongsheng@627
|
10633 "all involved."
|
|
dongsheng@627
|
10634 msgstr ""
|
|
dongsheng@627
|
10635
|
|
dongsheng@627
|
10636 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10637 #: ../en/ch10-hook.xml:336
|
|
dongsheng@627
|
10638 msgid ""
|
|
dongsheng@627
|
10639 "An approach that scales better is to get people to build and test before they "
|
|
dongsheng@627
|
10640 "push, then run automated builds and tests centrally <emphasis>after</"
|
|
dongsheng@627
|
10641 "emphasis> a push, to be sure all is well. The advantage of this approach is "
|
|
dongsheng@627
|
10642 "that it does not impose a limit on the rate at which the repository can "
|
|
dongsheng@627
|
10643 "accept changes."
|
|
dongsheng@627
|
10644 msgstr ""
|
|
dongsheng@627
|
10645
|
|
dongsheng@627
|
10646 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
10647 #: ../en/ch10-hook.xml:347
|
|
dongsheng@627
|
10648 msgid "A short tutorial on using hooks"
|
|
dongsheng@635
|
10649 msgstr "使用钩子的简短指南"
|
|
dongsheng@627
|
10650
|
|
dongsheng@627
|
10651 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10652 #: ../en/ch10-hook.xml:349
|
|
dongsheng@627
|
10653 msgid ""
|
|
dongsheng@627
|
10654 "It is easy to write a Mercurial hook. Let's start with a hook that runs when "
|
|
dongsheng@627
|
10655 "you finish a <command role=\"hg-cmd\">hg commit</command>, and simply prints "
|
|
dongsheng@627
|
10656 "the hash of the changeset you just created. The hook is called <literal role="
|
|
dongsheng@627
|
10657 "\"hook\">commit</literal>."
|
|
dongsheng@627
|
10658 msgstr ""
|
|
dongsheng@627
|
10659
|
|
dongsheng@627
|
10660 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10661 #: ../en/ch10-hook.xml:356
|
|
dongsheng@627
|
10662 msgid "All hooks follow the pattern in this example."
|
|
dongsheng@627
|
10663 msgstr ""
|
|
dongsheng@627
|
10664
|
|
dongsheng@627
|
10665 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10666 #: ../en/ch10-hook.xml:360
|
|
dongsheng@627
|
10667 msgid ""
|
|
dongsheng@627
|
10668 "You add an entry to the <literal role=\"rc-hooks\">hooks</literal> section of "
|
|
dongsheng@627
|
10669 "your <filename role=\"special\"> /.hgrc</filename>. On the left is the name "
|
|
dongsheng@627
|
10670 "of the event to trigger on; on the right is the action to take. As you can "
|
|
dongsheng@627
|
10671 "see, you can run an arbitrary shell command in a hook. Mercurial passes "
|
|
dongsheng@627
|
10672 "extra information to the hook using environment variables (look for "
|
|
dongsheng@627
|
10673 "<envar>HG_NODE</envar> in the example)."
|
|
dongsheng@627
|
10674 msgstr ""
|
|
dongsheng@627
|
10675
|
|
dongsheng@627
|
10676 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10677 #: ../en/ch10-hook.xml:370
|
|
dongsheng@627
|
10678 msgid "Performing multiple actions per event"
|
|
dongsheng@635
|
10679 msgstr "每个事件执行多个操作"
|
|
dongsheng@627
|
10680
|
|
dongsheng@627
|
10681 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10682 #: ../en/ch10-hook.xml:372
|
|
dongsheng@627
|
10683 msgid ""
|
|
dongsheng@627
|
10684 "Quite often, you will want to define more than one hook for a particular kind "
|
|
dongsheng@627
|
10685 "of event, as shown below."
|
|
dongsheng@627
|
10686 msgstr ""
|
|
dongsheng@627
|
10687
|
|
dongsheng@627
|
10688 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10689 #: ../en/ch10-hook.xml:377
|
|
dongsheng@627
|
10690 msgid ""
|
|
dongsheng@627
|
10691 "Mercurial lets you do this by adding an <emphasis>extension</emphasis> to the "
|
|
dongsheng@627
|
10692 "end of a hook's name. You extend a hook's name by giving the name of the "
|
|
dongsheng@627
|
10693 "hook, followed by a full stop (the <quote><literal>.</literal></quote> "
|
|
dongsheng@627
|
10694 "character), followed by some more text of your choosing. For example, "
|
|
dongsheng@627
|
10695 "Mercurial will run both <literal>commit.foo</literal> and <literal>commit."
|
|
dongsheng@627
|
10696 "bar</literal> when the <literal>commit</literal> event occurs."
|
|
dongsheng@627
|
10697 msgstr ""
|
|
dongsheng@627
|
10698
|
|
dongsheng@627
|
10699 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10700 #: ../en/ch10-hook.xml:388
|
|
dongsheng@627
|
10701 msgid ""
|
|
dongsheng@627
|
10702 "To give a well-defined order of execution when there are multiple hooks "
|
|
dongsheng@627
|
10703 "defined for an event, Mercurial sorts hooks by extension, and executes the "
|
|
dongsheng@627
|
10704 "hook commands in this sorted order. In the above example, it will execute "
|
|
dongsheng@627
|
10705 "<literal>commit.bar</literal> before <literal>commit.foo</literal>, and "
|
|
dongsheng@627
|
10706 "<literal>commit</literal> before both."
|
|
dongsheng@627
|
10707 msgstr ""
|
|
dongsheng@627
|
10708
|
|
dongsheng@627
|
10709 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10710 #: ../en/ch10-hook.xml:397
|
|
dongsheng@627
|
10711 msgid ""
|
|
dongsheng@627
|
10712 "It is a good idea to use a somewhat descriptive extension when you define a "
|
|
dongsheng@627
|
10713 "new hook. This will help you to remember what the hook was for. If the hook "
|
|
dongsheng@627
|
10714 "fails, you'll get an error message that contains the hook name and extension, "
|
|
dongsheng@627
|
10715 "so using a descriptive extension could give you an immediate hint as to why "
|
|
dongsheng@627
|
10716 "the hook failed (see section <xref linkend=\"sec.hook.perm\"/> for an "
|
|
dongsheng@627
|
10717 "example)."
|
|
dongsheng@627
|
10718 msgstr ""
|
|
dongsheng@627
|
10719
|
|
dongsheng@627
|
10720 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10721 #: ../en/ch10-hook.xml:408
|
|
dongsheng@627
|
10722 msgid "Controlling whether an activity can proceed"
|
|
dongsheng@635
|
10723 msgstr "控制处理的活动"
|
|
dongsheng@627
|
10724
|
|
dongsheng@627
|
10725 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10726 #: ../en/ch10-hook.xml:410
|
|
dongsheng@627
|
10727 msgid ""
|
|
dongsheng@627
|
10728 "In our earlier examples, we used the <literal role=\"hook\">commit</literal> "
|
|
dongsheng@627
|
10729 "hook, which is run after a commit has completed. This is one of several "
|
|
dongsheng@627
|
10730 "Mercurial hooks that run after an activity finishes. Such hooks have no way "
|
|
dongsheng@627
|
10731 "of influencing the activity itself."
|
|
dongsheng@627
|
10732 msgstr ""
|
|
dongsheng@627
|
10733
|
|
dongsheng@627
|
10734 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10735 #: ../en/ch10-hook.xml:417
|
|
dongsheng@627
|
10736 msgid ""
|
|
dongsheng@627
|
10737 "Mercurial defines a number of events that occur before an activity starts; or "
|
|
dongsheng@627
|
10738 "after it starts, but before it finishes. Hooks that trigger on these events "
|
|
dongsheng@627
|
10739 "have the added ability to choose whether the activity can continue, or will "
|
|
dongsheng@627
|
10740 "abort."
|
|
dongsheng@627
|
10741 msgstr ""
|
|
dongsheng@627
|
10742
|
|
dongsheng@627
|
10743 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10744 #: ../en/ch10-hook.xml:423
|
|
dongsheng@627
|
10745 msgid ""
|
|
dongsheng@627
|
10746 "The <literal role=\"hook\">pretxncommit</literal> hook runs after a commit "
|
|
dongsheng@627
|
10747 "has all but completed. In other words, the metadata representing the "
|
|
dongsheng@627
|
10748 "changeset has been written out to disk, but the transaction has not yet been "
|
|
dongsheng@627
|
10749 "allowed to complete. The <literal role=\"hook\">pretxncommit</literal> hook "
|
|
dongsheng@627
|
10750 "has the ability to decide whether the transaction can complete, or must be "
|
|
dongsheng@627
|
10751 "rolled back."
|
|
dongsheng@627
|
10752 msgstr ""
|
|
dongsheng@627
|
10753
|
|
dongsheng@627
|
10754 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10755 #: ../en/ch10-hook.xml:432
|
|
dongsheng@627
|
10756 msgid ""
|
|
dongsheng@627
|
10757 "If the <literal role=\"hook\">pretxncommit</literal> hook exits with a status "
|
|
dongsheng@627
|
10758 "code of zero, the transaction is allowed to complete; the commit finishes; "
|
|
dongsheng@627
|
10759 "and the <literal role=\"hook\">commit</literal> hook is run. If the <literal "
|
|
dongsheng@627
|
10760 "role=\"hook\">pretxncommit</literal> hook exits with a non-zero status code, "
|
|
dongsheng@627
|
10761 "the transaction is rolled back; the metadata representing the changeset is "
|
|
dongsheng@627
|
10762 "erased; and the <literal role=\"hook\">commit</literal> hook is not run."
|
|
dongsheng@627
|
10763 msgstr ""
|
|
dongsheng@627
|
10764
|
|
dongsheng@627
|
10765 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10766 #: ../en/ch10-hook.xml:444
|
|
dongsheng@627
|
10767 msgid ""
|
|
dongsheng@627
|
10768 "The hook in the example above checks that a commit comment contains a bug "
|
|
dongsheng@627
|
10769 "ID. If it does, the commit can complete. If not, the commit is rolled back."
|
|
dongsheng@627
|
10770 msgstr ""
|
|
dongsheng@627
|
10771
|
|
dongsheng@627
|
10772 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
10773 #: ../en/ch10-hook.xml:452
|
|
dongsheng@627
|
10774 msgid "Writing your own hooks"
|
|
dongsheng@635
|
10775 msgstr "编写钩子"
|
|
dongsheng@627
|
10776
|
|
dongsheng@627
|
10777 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
10778 #: ../en/ch10-hook.xml:454
|
|
dongsheng@627
|
10779 msgid ""
|
|
dongsheng@627
|
10780 "When you are writing a hook, you might find it useful to run Mercurial either "
|
|
dongsheng@627
|
10781 "with the <option role=\"hg-opt-global\">-v</option> option, or the <envar "
|
|
dongsheng@627
|
10782 "role=\"rc-item-ui\">verbose</envar> config item set to <quote>true</quote>. "
|
|
dongsheng@627
|
10783 "When you do so, Mercurial will print a message before it calls each hook."
|
|
dongsheng@627
|
10784 msgstr ""
|
|
dongsheng@627
|
10785
|
|
dongsheng@627
|
10786 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10787 #: ../en/ch10-hook.xml:463
|
|
dongsheng@627
|
10788 msgid "Choosing how your hook should run"
|
|
dongsheng@635
|
10789 msgstr "选择钩子的执行方式"
|
|
dongsheng@627
|
10790
|
|
dongsheng@627
|
10791 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10792 #: ../en/ch10-hook.xml:465
|
|
dongsheng@627
|
10793 msgid ""
|
|
dongsheng@627
|
10794 "You can write a hook either as a normal program&emdash;typically a shell "
|
|
dongsheng@627
|
10795 "script&emdash;or as a Python function that is executed within the Mercurial "
|
|
dongsheng@627
|
10796 "process."
|
|
dongsheng@627
|
10797 msgstr ""
|
|
dongsheng@627
|
10798
|
|
dongsheng@627
|
10799 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10800 #: ../en/ch10-hook.xml:470
|
|
dongsheng@627
|
10801 msgid ""
|
|
dongsheng@627
|
10802 "Writing a hook as an external program has the advantage that it requires no "
|
|
dongsheng@627
|
10803 "knowledge of Mercurial's internals. You can call normal Mercurial commands "
|
|
dongsheng@627
|
10804 "to get any added information you need. The trade-off is that external hooks "
|
|
dongsheng@627
|
10805 "are slower than in-process hooks."
|
|
dongsheng@627
|
10806 msgstr ""
|
|
dongsheng@627
|
10807
|
|
dongsheng@627
|
10808 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10809 #: ../en/ch10-hook.xml:477
|
|
dongsheng@627
|
10810 msgid ""
|
|
dongsheng@627
|
10811 "An in-process Python hook has complete access to the Mercurial API, and does "
|
|
dongsheng@627
|
10812 "not <quote>shell out</quote> to another process, so it is inherently faster "
|
|
dongsheng@627
|
10813 "than an external hook. It is also easier to obtain much of the information "
|
|
dongsheng@627
|
10814 "that a hook requires by using the Mercurial API than by running Mercurial "
|
|
dongsheng@627
|
10815 "commands."
|
|
dongsheng@627
|
10816 msgstr ""
|
|
dongsheng@627
|
10817
|
|
dongsheng@627
|
10818 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10819 #: ../en/ch10-hook.xml:485
|
|
dongsheng@627
|
10820 msgid ""
|
|
dongsheng@627
|
10821 "If you are comfortable with Python, or require high performance, writing your "
|
|
dongsheng@627
|
10822 "hooks in Python may be a good choice. However, when you have a "
|
|
dongsheng@627
|
10823 "straightforward hook to write and you don't need to care about performance "
|
|
dongsheng@627
|
10824 "(probably the majority of hooks), a shell script is perfectly fine."
|
|
dongsheng@627
|
10825 msgstr ""
|
|
dongsheng@627
|
10826
|
|
dongsheng@627
|
10827 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10828 #: ../en/ch10-hook.xml:494
|
|
dongsheng@627
|
10829 msgid "Hook parameters"
|
|
dongsheng@635
|
10830 msgstr "钩子的参数"
|
|
dongsheng@627
|
10831
|
|
dongsheng@627
|
10832 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10833 #: ../en/ch10-hook.xml:496
|
|
dongsheng@627
|
10834 msgid ""
|
|
dongsheng@627
|
10835 "Mercurial calls each hook with a set of well-defined parameters. In Python, "
|
|
dongsheng@627
|
10836 "a parameter is passed as a keyword argument to your hook function. For an "
|
|
dongsheng@627
|
10837 "external program, a parameter is passed as an environment variable."
|
|
dongsheng@627
|
10838 msgstr ""
|
|
dongsheng@627
|
10839
|
|
dongsheng@627
|
10840 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10841 #: ../en/ch10-hook.xml:502
|
|
dongsheng@627
|
10842 msgid ""
|
|
dongsheng@627
|
10843 "Whether your hook is written in Python or as a shell script, the hook-"
|
|
dongsheng@627
|
10844 "specific parameter names and values will be the same. A boolean parameter "
|
|
dongsheng@627
|
10845 "will be represented as a boolean value in Python, but as the number 1 (for "
|
|
dongsheng@627
|
10846 "<quote>true</quote>) or 0 (for <quote>false</quote>) as an environment "
|
|
dongsheng@627
|
10847 "variable for an external hook. If a hook parameter is named <literal>foo</"
|
|
dongsheng@627
|
10848 "literal>, the keyword argument for a Python hook will also be named "
|
|
dongsheng@627
|
10849 "<literal>foo</literal>, while the environment variable for an external hook "
|
|
dongsheng@627
|
10850 "will be named <literal>HG_FOO</literal>."
|
|
dongsheng@627
|
10851 msgstr ""
|
|
dongsheng@627
|
10852
|
|
dongsheng@627
|
10853 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10854 #: ../en/ch10-hook.xml:516
|
|
dongsheng@627
|
10855 msgid "Hook return values and activity control"
|
|
dongsheng@635
|
10856 msgstr "钩子的返回值与活动控制"
|
|
dongsheng@627
|
10857
|
|
dongsheng@627
|
10858 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10859 #: ../en/ch10-hook.xml:518
|
|
dongsheng@627
|
10860 msgid ""
|
|
dongsheng@627
|
10861 "A hook that executes successfully must exit with a status of zero if "
|
|
dongsheng@627
|
10862 "external, or return boolean <quote>false</quote> if in-process. Failure is "
|
|
dongsheng@627
|
10863 "indicated with a non-zero exit status from an external hook, or an in-process "
|
|
dongsheng@627
|
10864 "hook returning boolean <quote>true</quote>. If an in-process hook raises an "
|
|
dongsheng@627
|
10865 "exception, the hook is considered to have failed."
|
|
dongsheng@627
|
10866 msgstr ""
|
|
dongsheng@627
|
10867
|
|
dongsheng@627
|
10868 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10869 #: ../en/ch10-hook.xml:526
|
|
dongsheng@627
|
10870 msgid ""
|
|
dongsheng@627
|
10871 "For a hook that controls whether an activity can proceed, zero/false means "
|
|
dongsheng@627
|
10872 "<quote>allow</quote>, while non-zero/true/exception means <quote>deny</quote>."
|
|
dongsheng@627
|
10873 msgstr ""
|
|
dongsheng@627
|
10874
|
|
dongsheng@627
|
10875 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10876 #: ../en/ch10-hook.xml:533
|
|
dongsheng@627
|
10877 msgid "Writing an external hook"
|
|
dongsheng@635
|
10878 msgstr "编写外部钩子"
|
|
dongsheng@627
|
10879
|
|
dongsheng@627
|
10880 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10881 #: ../en/ch10-hook.xml:535
|
|
dongsheng@627
|
10882 msgid ""
|
|
dongsheng@627
|
10883 "When you define an external hook in your <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
10884 "filename>\\ and the hook is run, its value is passed to your shell, which "
|
|
dongsheng@627
|
10885 "interprets it. This means that you can use normal shell constructs in the "
|
|
dongsheng@627
|
10886 "body of the hook."
|
|
dongsheng@627
|
10887 msgstr ""
|
|
dongsheng@627
|
10888
|
|
dongsheng@627
|
10889 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10890 #: ../en/ch10-hook.xml:542
|
|
dongsheng@627
|
10891 msgid ""
|
|
dongsheng@627
|
10892 "An executable hook is always run with its current directory set to a "
|
|
dongsheng@627
|
10893 "repository's root directory."
|
|
dongsheng@627
|
10894 msgstr ""
|
|
dongsheng@627
|
10895
|
|
dongsheng@627
|
10896 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10897 #: ../en/ch10-hook.xml:546
|
|
dongsheng@627
|
10898 msgid ""
|
|
dongsheng@627
|
10899 "Each hook parameter is passed in as an environment variable; the name is "
|
|
dongsheng@627
|
10900 "upper-cased, and prefixed with the string <quote><literal>HG_</literal></"
|
|
dongsheng@627
|
10901 "quote>."
|
|
dongsheng@627
|
10902 msgstr ""
|
|
dongsheng@627
|
10903
|
|
dongsheng@627
|
10904 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10905 #: ../en/ch10-hook.xml:551
|
|
dongsheng@627
|
10906 msgid ""
|
|
dongsheng@627
|
10907 "With the exception of hook parameters, Mercurial does not set or modify any "
|
|
dongsheng@627
|
10908 "environment variables when running a hook. This is useful to remember if you "
|
|
dongsheng@627
|
10909 "are writing a site-wide hook that may be run by a number of different users "
|
|
dongsheng@627
|
10910 "with differing environment variables set. In multi-user situations, you "
|
|
dongsheng@627
|
10911 "should not rely on environment variables being set to the values you have in "
|
|
dongsheng@627
|
10912 "your environment when testing the hook."
|
|
dongsheng@627
|
10913 msgstr ""
|
|
dongsheng@627
|
10914
|
|
dongsheng@627
|
10915 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10916 #: ../en/ch10-hook.xml:562
|
|
dongsheng@627
|
10917 msgid "Telling Mercurial to use an in-process hook"
|
|
dongsheng@642
|
10918 msgstr "让 Mercurial 使用进程内钩子"
|
|
dongsheng@627
|
10919
|
|
dongsheng@627
|
10920 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10921 #: ../en/ch10-hook.xml:564
|
|
dongsheng@627
|
10922 msgid ""
|
|
dongsheng@627
|
10923 "The <filename role=\"special\"> /.hgrc</filename>\\ syntax for defining an in-"
|
|
dongsheng@627
|
10924 "process hook is slightly different than for an executable hook. The value of "
|
|
dongsheng@627
|
10925 "the hook must start with the text <quote><literal>python:</literal></quote>, "
|
|
dongsheng@627
|
10926 "and continue with the fully-qualified name of a callable object to use as the "
|
|
dongsheng@627
|
10927 "hook's value."
|
|
dongsheng@627
|
10928 msgstr ""
|
|
dongsheng@627
|
10929
|
|
dongsheng@627
|
10930 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10931 #: ../en/ch10-hook.xml:572
|
|
dongsheng@627
|
10932 msgid ""
|
|
dongsheng@627
|
10933 "The module in which a hook lives is automatically imported when a hook is "
|
|
dongsheng@627
|
10934 "run. So long as you have the module name and <envar>PYTHONPATH</envar> "
|
|
dongsheng@627
|
10935 "right, it should <quote>just work</quote>."
|
|
dongsheng@627
|
10936 msgstr ""
|
|
dongsheng@627
|
10937
|
|
dongsheng@627
|
10938 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10939 #: ../en/ch10-hook.xml:578
|
|
dongsheng@627
|
10940 msgid ""
|
|
dongsheng@627
|
10941 "The following <filename role=\"special\"> /.hgrc</filename>\\ example snippet "
|
|
dongsheng@627
|
10942 "illustrates the syntax and meaning of the notions we just described."
|
|
dongsheng@627
|
10943 msgstr ""
|
|
dongsheng@627
|
10944
|
|
dongsheng@627
|
10945 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10946 #: ../en/ch10-hook.xml:584
|
|
dongsheng@627
|
10947 msgid ""
|
|
dongsheng@627
|
10948 "When Mercurial runs the <literal>commit.example</literal> hook, it imports "
|
|
dongsheng@627
|
10949 "<literal>mymodule.submodule</literal>, looks for the callable object named "
|
|
dongsheng@627
|
10950 "<literal>myhook</literal>, and calls it."
|
|
dongsheng@627
|
10951 msgstr ""
|
|
dongsheng@627
|
10952
|
|
dongsheng@627
|
10953 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10954 #: ../en/ch10-hook.xml:592
|
|
dongsheng@627
|
10955 msgid "Writing an in-process hook"
|
|
dongsheng@635
|
10956 msgstr "编写进程内钩子"
|
|
dongsheng@627
|
10957
|
|
dongsheng@627
|
10958 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10959 #: ../en/ch10-hook.xml:594
|
|
dongsheng@627
|
10960 msgid ""
|
|
dongsheng@627
|
10961 "The simplest in-process hook does nothing, but illustrates the basic shape of "
|
|
dongsheng@627
|
10962 "the hook API:"
|
|
dongsheng@627
|
10963 msgstr ""
|
|
dongsheng@627
|
10964
|
|
dongsheng@627
|
10965 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10966 #: ../en/ch10-hook.xml:599
|
|
dongsheng@627
|
10967 msgid ""
|
|
dongsheng@627
|
10968 "The first argument to a Python hook is always a <literal role=\"py-mod-"
|
|
dongsheng@627
|
10969 "mercurial.ui\">ui</literal> object. The second is a repository object; at "
|
|
dongsheng@627
|
10970 "the moment, it is always an instance of <literal role=\"py-mod-mercurial."
|
|
dongsheng@627
|
10971 "localrepo\">localrepository</literal>. Following these two arguments are "
|
|
dongsheng@627
|
10972 "other keyword arguments. Which ones are passed in depends on the hook being "
|
|
dongsheng@627
|
10973 "called, but a hook can ignore arguments it doesn't care about by dropping "
|
|
dongsheng@627
|
10974 "them into a keyword argument dict, as with <literal>**kwargs</literal> above."
|
|
dongsheng@627
|
10975 msgstr ""
|
|
dongsheng@627
|
10976
|
|
dongsheng@627
|
10977 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
10978 #: ../en/ch10-hook.xml:614
|
|
dongsheng@627
|
10979 msgid "Some hook examples"
|
|
dongsheng@635
|
10980 msgstr "钩子样例"
|
|
dongsheng@627
|
10981
|
|
dongsheng@627
|
10982 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10983 #: ../en/ch10-hook.xml:617
|
|
dongsheng@627
|
10984 msgid "Writing meaningful commit messages"
|
|
dongsheng@635
|
10985 msgstr "编写有意义的提交日志"
|
|
dongsheng@627
|
10986
|
|
dongsheng@627
|
10987 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
10988 #: ../en/ch10-hook.xml:619
|
|
dongsheng@627
|
10989 msgid ""
|
|
dongsheng@627
|
10990 "It's hard to imagine a useful commit message being very short. The simple "
|
|
dongsheng@627
|
10991 "<literal role=\"hook\">pretxncommit</literal> hook of the example below will "
|
|
dongsheng@627
|
10992 "prevent you from committing a changeset with a message that is less than ten "
|
|
dongsheng@627
|
10993 "bytes long."
|
|
dongsheng@627
|
10994 msgstr ""
|
|
dongsheng@627
|
10995
|
|
dongsheng@627
|
10996 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
10997 #: ../en/ch10-hook.xml:629
|
|
dongsheng@627
|
10998 msgid "Checking for trailing whitespace"
|
|
dongsheng@635
|
10999 msgstr "检查行尾空格"
|
|
dongsheng@627
|
11000
|
|
dongsheng@627
|
11001 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11002 #: ../en/ch10-hook.xml:631
|
|
dongsheng@627
|
11003 msgid ""
|
|
dongsheng@627
|
11004 "An interesting use of a commit-related hook is to help you to write cleaner "
|
|
dongsheng@627
|
11005 "code. A simple example of <quote>cleaner code</quote> is the dictum that a "
|
|
dongsheng@627
|
11006 "change should not add any new lines of text that contain <quote>trailing "
|
|
dongsheng@627
|
11007 "whitespace</quote>. Trailing whitespace is a series of space and tab "
|
|
dongsheng@627
|
11008 "characters at the end of a line of text. In most cases, trailing whitespace "
|
|
dongsheng@627
|
11009 "is unnecessary, invisible noise, but it is occasionally problematic, and "
|
|
dongsheng@627
|
11010 "people often prefer to get rid of it."
|
|
dongsheng@627
|
11011 msgstr ""
|
|
dongsheng@627
|
11012
|
|
dongsheng@627
|
11013 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11014 #: ../en/ch10-hook.xml:642
|
|
dongsheng@627
|
11015 msgid ""
|
|
dongsheng@627
|
11016 "You can use either the <literal role=\"hook\">precommit</literal> or <literal "
|
|
dongsheng@627
|
11017 "role=\"hook\">pretxncommit</literal> hook to tell whether you have a trailing "
|
|
dongsheng@627
|
11018 "whitespace problem. If you use the <literal role=\"hook\">precommit</"
|
|
dongsheng@627
|
11019 "literal> hook, the hook will not know which files you are committing, so it "
|
|
dongsheng@627
|
11020 "will have to check every modified file in the repository for trailing white "
|
|
dongsheng@627
|
11021 "space. If you want to commit a change to just the file <filename>foo</"
|
|
dongsheng@627
|
11022 "filename>, but the file <filename>bar</filename> contains trailing "
|
|
dongsheng@627
|
11023 "whitespace, doing a check in the <literal role=\"hook\">precommit</literal> "
|
|
dongsheng@627
|
11024 "hook will prevent you from committing <filename>foo</filename> due to the "
|
|
dongsheng@627
|
11025 "problem with <filename>bar</filename>. This doesn't seem right."
|
|
dongsheng@627
|
11026 msgstr ""
|
|
dongsheng@627
|
11027
|
|
dongsheng@627
|
11028 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11029 #: ../en/ch10-hook.xml:658
|
|
dongsheng@627
|
11030 msgid ""
|
|
dongsheng@627
|
11031 "Should you choose the <literal role=\"hook\">pretxncommit</literal> hook, the "
|
|
dongsheng@627
|
11032 "check won't occur until just before the transaction for the commit "
|
|
dongsheng@627
|
11033 "completes. This will allow you to check for problems only the exact files "
|
|
dongsheng@627
|
11034 "that are being committed. However, if you entered the commit message "
|
|
dongsheng@627
|
11035 "interactively and the hook fails, the transaction will roll back; you'll have "
|
|
dongsheng@627
|
11036 "to re-enter the commit message after you fix the trailing whitespace and run "
|
|
dongsheng@627
|
11037 "<command role=\"hg-cmd\">hg commit</command> again."
|
|
dongsheng@627
|
11038 msgstr ""
|
|
dongsheng@627
|
11039
|
|
dongsheng@627
|
11040 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11041 #: ../en/ch10-hook.xml:671
|
|
dongsheng@627
|
11042 msgid ""
|
|
dongsheng@627
|
11043 "In this example, we introduce a simple <literal role=\"hook\">pretxncommit</"
|
|
dongsheng@627
|
11044 "literal> hook that checks for trailing whitespace. This hook is short, but "
|
|
dongsheng@627
|
11045 "not very helpful. It exits with an error status if a change adds a line with "
|
|
dongsheng@627
|
11046 "trailing whitespace to any file, but does not print any information that "
|
|
dongsheng@627
|
11047 "might help us to identify the offending file or line. It also has the nice "
|
|
dongsheng@627
|
11048 "property of not paying attention to unmodified lines; only lines that "
|
|
dongsheng@627
|
11049 "introduce new trailing whitespace cause problems."
|
|
dongsheng@627
|
11050 msgstr ""
|
|
dongsheng@627
|
11051
|
|
dongsheng@627
|
11052 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11053 #: ../en/ch10-hook.xml:682
|
|
dongsheng@627
|
11054 msgid ""
|
|
dongsheng@627
|
11055 "The above version is much more complex, but also more useful. It parses a "
|
|
dongsheng@627
|
11056 "unified diff to see if any lines add trailing whitespace, and prints the name "
|
|
dongsheng@627
|
11057 "of the file and the line number of each such occurrence. Even better, if the "
|
|
dongsheng@627
|
11058 "change adds trailing whitespace, this hook saves the commit comment and "
|
|
dongsheng@627
|
11059 "prints the name of the save file before exiting and telling Mercurial to roll "
|
|
dongsheng@627
|
11060 "the transaction back, so you can use the <option role=\"hg-opt-commit\">-l "
|
|
dongsheng@627
|
11061 "filename</option> option to <command role=\"hg-cmd\">hg commit</command> to "
|
|
dongsheng@627
|
11062 "reuse the saved commit message once you've corrected the problem."
|
|
dongsheng@627
|
11063 msgstr ""
|
|
dongsheng@627
|
11064
|
|
dongsheng@627
|
11065 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11066 #: ../en/ch10-hook.xml:696
|
|
dongsheng@627
|
11067 msgid ""
|
|
dongsheng@627
|
11068 "As a final aside, note in the example above the use of <command>perl</"
|
|
dongsheng@627
|
11069 "command>'s in-place editing feature to get rid of trailing whitespace from a "
|
|
dongsheng@627
|
11070 "file. This is concise and useful enough that I will reproduce it here."
|
|
dongsheng@627
|
11071 msgstr ""
|
|
dongsheng@627
|
11072
|
|
dongsheng@627
|
11073 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
11074 #: ../en/ch10-hook.xml:706
|
|
dongsheng@627
|
11075 msgid "Bundled hooks"
|
|
dongsheng@635
|
11076 msgstr "内置的钩子"
|
|
dongsheng@627
|
11077
|
|
dongsheng@627
|
11078 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
11079 #: ../en/ch10-hook.xml:708
|
|
dongsheng@627
|
11080 msgid ""
|
|
dongsheng@627
|
11081 "Mercurial ships with several bundled hooks. You can find them in the "
|
|
dongsheng@627
|
11082 "<filename class=\"directory\">hgext</filename> directory of a Mercurial "
|
|
dongsheng@627
|
11083 "source tree. If you are using a Mercurial binary package, the hooks will be "
|
|
dongsheng@627
|
11084 "located in the <filename class=\"directory\">hgext</filename> directory of "
|
|
dongsheng@627
|
11085 "wherever your package installer put Mercurial."
|
|
dongsheng@627
|
11086 msgstr ""
|
|
dongsheng@627
|
11087
|
|
dongsheng@627
|
11088 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
11089 #: ../en/ch10-hook.xml:717
|
|
dongsheng@627
|
11090 msgid ""
|
|
dongsheng@627
|
11091 "<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a "
|
|
dongsheng@627
|
11092 "repository"
|
|
dongsheng@635
|
11093 msgstr "<literal role=\"hg-ext\">acl</literal>&emdash;版本库的访问控制"
|
|
dongsheng@627
|
11094
|
|
dongsheng@627
|
11095 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11096 #: ../en/ch10-hook.xml:720
|
|
dongsheng@627
|
11097 msgid ""
|
|
dongsheng@627
|
11098 "The <literal role=\"hg-ext\">acl</literal> extension lets you control which "
|
|
dongsheng@627
|
11099 "remote users are allowed to push changesets to a networked server. You can "
|
|
dongsheng@627
|
11100 "protect any portion of a repository (including the entire repo), so that a "
|
|
dongsheng@627
|
11101 "specific remote user can push changes that do not affect the protected "
|
|
dongsheng@627
|
11102 "portion."
|
|
dongsheng@627
|
11103 msgstr ""
|
|
dongsheng@627
|
11104
|
|
dongsheng@627
|
11105 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11106 #: ../en/ch10-hook.xml:728
|
|
dongsheng@627
|
11107 msgid ""
|
|
dongsheng@627
|
11108 "This extension implements access control based on the identity of the user "
|
|
dongsheng@627
|
11109 "performing a push, <emphasis>not</emphasis> on who committed the changesets "
|
|
dongsheng@627
|
11110 "they're pushing. It makes sense to use this hook only if you have a locked-"
|
|
dongsheng@627
|
11111 "down server environment that authenticates remote users, and you want to be "
|
|
dongsheng@627
|
11112 "sure that only specific users are allowed to push changes to that server."
|
|
dongsheng@627
|
11113 msgstr ""
|
|
dongsheng@627
|
11114
|
|
dongsheng@627
|
11115 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11116 #: ../en/ch10-hook.xml:738
|
|
dongsheng@627
|
11117 msgid "Configuring the <literal role=\"hook\">acl</literal> hook"
|
|
dongsheng@635
|
11118 msgstr "配置 <literal role=\"hook\">acl</literal> 钩子"
|
|
dongsheng@627
|
11119
|
|
dongsheng@627
|
11120 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11121 #: ../en/ch10-hook.xml:741
|
|
dongsheng@627
|
11122 msgid ""
|
|
dongsheng@627
|
11123 "In order to manage incoming changesets, the <literal role=\"hg-ext\">acl</"
|
|
dongsheng@627
|
11124 "literal> hook must be used as a <literal role=\"hook\">pretxnchangegroup</"
|
|
dongsheng@627
|
11125 "literal> hook. This lets it see which files are modified by each incoming "
|
|
dongsheng@627
|
11126 "changeset, and roll back a group of changesets if they modify "
|
|
dongsheng@627
|
11127 "<quote>forbidden</quote> files. Example:"
|
|
dongsheng@627
|
11128 msgstr ""
|
|
dongsheng@627
|
11129
|
|
dongsheng@627
|
11130 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11131 #: ../en/ch10-hook.xml:751
|
|
dongsheng@627
|
11132 msgid ""
|
|
dongsheng@627
|
11133 "The <literal role=\"hg-ext\">acl</literal> extension is configured using "
|
|
dongsheng@627
|
11134 "three sections."
|
|
dongsheng@627
|
11135 msgstr ""
|
|
dongsheng@627
|
11136
|
|
dongsheng@627
|
11137 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11138 #: ../en/ch10-hook.xml:755
|
|
dongsheng@627
|
11139 msgid ""
|
|
dongsheng@627
|
11140 "The <literal role=\"rc-acl\">acl</literal> section has only one entry, <envar "
|
|
dongsheng@627
|
11141 "role=\"rc-item-acl\">sources</envar>, which lists the sources of incoming "
|
|
dongsheng@627
|
11142 "changesets that the hook should pay attention to. You don't normally need to "
|
|
dongsheng@627
|
11143 "configure this section."
|
|
dongsheng@627
|
11144 msgstr ""
|
|
dongsheng@627
|
11145
|
|
dongsheng@627
|
11146 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11147 #: ../en/ch10-hook.xml:762
|
|
dongsheng@627
|
11148 msgid ""
|
|
dongsheng@627
|
11149 "<envar role=\"rc-item-acl\">serve</envar>: Control incoming changesets that "
|
|
dongsheng@627
|
11150 "are arriving from a remote repository over http or ssh. This is the default "
|
|
dongsheng@627
|
11151 "value of <envar role=\"rc-item-acl\">sources</envar>, and usually the only "
|
|
dongsheng@627
|
11152 "setting you'll need for this configuration item."
|
|
dongsheng@627
|
11153 msgstr ""
|
|
dongsheng@627
|
11154
|
|
dongsheng@627
|
11155 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11156 #: ../en/ch10-hook.xml:770
|
|
dongsheng@627
|
11157 msgid ""
|
|
dongsheng@627
|
11158 "<envar role=\"rc-item-acl\">pull</envar>: Control incoming changesets that "
|
|
dongsheng@627
|
11159 "are arriving via a pull from a local repository."
|
|
dongsheng@627
|
11160 msgstr ""
|
|
dongsheng@627
|
11161
|
|
dongsheng@627
|
11162 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11163 #: ../en/ch10-hook.xml:775
|
|
dongsheng@627
|
11164 msgid ""
|
|
dongsheng@627
|
11165 "<envar role=\"rc-item-acl\">push</envar>: Control incoming changesets that "
|
|
dongsheng@627
|
11166 "are arriving via a push from a local repository."
|
|
dongsheng@627
|
11167 msgstr ""
|
|
dongsheng@627
|
11168
|
|
dongsheng@627
|
11169 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11170 #: ../en/ch10-hook.xml:780
|
|
dongsheng@627
|
11171 msgid ""
|
|
dongsheng@627
|
11172 "<envar role=\"rc-item-acl\">bundle</envar>: Control incoming changesets that "
|
|
dongsheng@627
|
11173 "are arriving from another repository via a bundle."
|
|
dongsheng@627
|
11174 msgstr ""
|
|
dongsheng@627
|
11175
|
|
dongsheng@627
|
11176 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11177 #: ../en/ch10-hook.xml:786
|
|
dongsheng@627
|
11178 msgid ""
|
|
dongsheng@627
|
11179 "The <literal role=\"rc-acl.allow\">acl.allow</literal> section controls the "
|
|
dongsheng@627
|
11180 "users that are allowed to add changesets to the repository. If this section "
|
|
dongsheng@627
|
11181 "is not present, all users that are not explicitly denied are allowed. If "
|
|
dongsheng@627
|
11182 "this section is present, all users that are not explicitly allowed are denied "
|
|
dongsheng@627
|
11183 "(so an empty section means that all users are denied)."
|
|
dongsheng@627
|
11184 msgstr ""
|
|
dongsheng@627
|
11185
|
|
dongsheng@627
|
11186 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11187 #: ../en/ch10-hook.xml:795
|
|
dongsheng@627
|
11188 msgid ""
|
|
dongsheng@627
|
11189 "The <literal role=\"rc-acl.deny\">acl.deny</literal> section determines which "
|
|
dongsheng@627
|
11190 "users are denied from adding changesets to the repository. If this section "
|
|
dongsheng@627
|
11191 "is not present or is empty, no users are denied."
|
|
dongsheng@627
|
11192 msgstr ""
|
|
dongsheng@627
|
11193
|
|
dongsheng@627
|
11194 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11195 #: ../en/ch10-hook.xml:801
|
|
dongsheng@627
|
11196 msgid ""
|
|
dongsheng@627
|
11197 "The syntaxes for the <literal role=\"rc-acl.allow\">acl.allow</literal> and "
|
|
dongsheng@627
|
11198 "<literal role=\"rc-acl.deny\">acl.deny</literal> sections are identical. On "
|
|
dongsheng@627
|
11199 "the left of each entry is a glob pattern that matches files or directories, "
|
|
dongsheng@627
|
11200 "relative to the root of the repository; on the right, a user name."
|
|
dongsheng@627
|
11201 msgstr ""
|
|
dongsheng@627
|
11202
|
|
dongsheng@627
|
11203 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11204 #: ../en/ch10-hook.xml:809
|
|
dongsheng@627
|
11205 msgid ""
|
|
dongsheng@627
|
11206 "In the following example, the user <literal>docwriter</literal> can only push "
|
|
dongsheng@627
|
11207 "changes to the <filename class=\"directory\">docs</filename> subtree of the "
|
|
dongsheng@627
|
11208 "repository, while <literal>intern</literal> can push changes to any file or "
|
|
dongsheng@627
|
11209 "directory except <filename class=\"directory\">source/sensitive</filename>."
|
|
dongsheng@627
|
11210 msgstr ""
|
|
dongsheng@627
|
11211
|
|
dongsheng@627
|
11212 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11213 #: ../en/ch10-hook.xml:821 ../en/ch10-hook.xml:1095 ../en/ch10-hook.xml:1308
|
|
dongsheng@627
|
11214 msgid "Testing and troubleshooting"
|
|
dongsheng@635
|
11215 msgstr "测试与问题处理"
|
|
dongsheng@627
|
11216
|
|
dongsheng@627
|
11217 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11218 #: ../en/ch10-hook.xml:823
|
|
dongsheng@627
|
11219 msgid ""
|
|
dongsheng@627
|
11220 "If you want to test the <literal role=\"hg-ext\">acl</literal> hook, run it "
|
|
dongsheng@627
|
11221 "with Mercurial's debugging output enabled. Since you'll probably be running "
|
|
dongsheng@627
|
11222 "it on a server where it's not convenient (or sometimes possible) to pass in "
|
|
dongsheng@627
|
11223 "the <option role=\"hg-opt-global\">--debug</option> option, don't forget that "
|
|
dongsheng@627
|
11224 "you can enable debugging output in your <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
11225 "filename>:"
|
|
dongsheng@627
|
11226 msgstr ""
|
|
dongsheng@627
|
11227
|
|
dongsheng@627
|
11228 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11229 #: ../en/ch10-hook.xml:833
|
|
dongsheng@627
|
11230 msgid ""
|
|
dongsheng@627
|
11231 "With this enabled, the <literal role=\"hg-ext\">acl</literal> hook will print "
|
|
dongsheng@627
|
11232 "enough information to let you figure out why it is allowing or forbidding "
|
|
dongsheng@627
|
11233 "pushes from specific users."
|
|
dongsheng@627
|
11234 msgstr ""
|
|
dongsheng@627
|
11235
|
|
dongsheng@627
|
11236 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
11237 #: ../en/ch10-hook.xml:842
|
|
dongsheng@627
|
11238 msgid ""
|
|
dongsheng@627
|
11239 "<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla"
|
|
dongsheng@635
|
11240 msgstr "<literal role=\"hg-ext\">bugzilla</literal>&emdash;与 Bugzilla 的集成"
|
|
dongsheng@627
|
11241
|
|
dongsheng@627
|
11242 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11243 #: ../en/ch10-hook.xml:846
|
|
dongsheng@627
|
11244 msgid ""
|
|
dongsheng@627
|
11245 "The <literal role=\"hg-ext\">bugzilla</literal> extension adds a comment to a "
|
|
dongsheng@627
|
11246 "Bugzilla bug whenever it finds a reference to that bug ID in a commit "
|
|
dongsheng@627
|
11247 "comment. You can install this hook on a shared server, so that any time a "
|
|
dongsheng@627
|
11248 "remote user pushes changes to this server, the hook gets run."
|
|
dongsheng@627
|
11249 msgstr ""
|
|
dongsheng@627
|
11250
|
|
dongsheng@627
|
11251 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11252 #: ../en/ch10-hook.xml:853
|
|
dongsheng@627
|
11253 msgid ""
|
|
dongsheng@627
|
11254 "It adds a comment to the bug that looks like this (you can configure the "
|
|
dongsheng@627
|
11255 "contents of the comment&emdash;see below):"
|
|
dongsheng@627
|
11256 msgstr ""
|
|
dongsheng@627
|
11257
|
|
dongsheng@627
|
11258 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11259 #: ../en/ch10-hook.xml:862
|
|
dongsheng@627
|
11260 msgid ""
|
|
dongsheng@627
|
11261 "The value of this hook is that it automates the process of updating a bug any "
|
|
dongsheng@627
|
11262 "time a changeset refers to it. If you configure the hook properly, it makes "
|
|
dongsheng@627
|
11263 "it easy for people to browse straight from a Bugzilla bug to a changeset that "
|
|
dongsheng@627
|
11264 "refers to that bug."
|
|
dongsheng@627
|
11265 msgstr ""
|
|
dongsheng@627
|
11266
|
|
dongsheng@627
|
11267 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11268 #: ../en/ch10-hook.xml:869
|
|
dongsheng@627
|
11269 msgid ""
|
|
dongsheng@627
|
11270 "You can use the code in this hook as a starting point for some more exotic "
|
|
dongsheng@627
|
11271 "Bugzilla integration recipes. Here are a few possibilities:"
|
|
dongsheng@627
|
11272 msgstr ""
|
|
dongsheng@627
|
11273
|
|
dongsheng@627
|
11274 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11275 #: ../en/ch10-hook.xml:874
|
|
dongsheng@627
|
11276 msgid ""
|
|
dongsheng@627
|
11277 "Require that every changeset pushed to the server have a valid bug ID in its "
|
|
dongsheng@627
|
11278 "commit comment. In this case, you'd want to configure the hook as a <literal "
|
|
dongsheng@627
|
11279 "role=\"hook\">pretxncommit</literal> hook. This would allow the hook to "
|
|
dongsheng@627
|
11280 "reject changes that didn't contain bug IDs."
|
|
dongsheng@627
|
11281 msgstr ""
|
|
dongsheng@627
|
11282
|
|
dongsheng@627
|
11283 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11284 #: ../en/ch10-hook.xml:882
|
|
dongsheng@627
|
11285 msgid ""
|
|
dongsheng@627
|
11286 "Allow incoming changesets to automatically modify the <emphasis>state</"
|
|
dongsheng@627
|
11287 "emphasis> of a bug, as well as simply adding a comment. For example, the "
|
|
dongsheng@627
|
11288 "hook could recognise the string <quote>fixed bug 31337</quote> as indicating "
|
|
dongsheng@627
|
11289 "that it should update the state of bug 31337 to <quote>requires testing</"
|
|
dongsheng@627
|
11290 "quote>."
|
|
dongsheng@627
|
11291 msgstr ""
|
|
dongsheng@627
|
11292
|
|
dongsheng@627
|
11293 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11294 #: ../en/ch10-hook.xml:892
|
|
dongsheng@627
|
11295 msgid "Configuring the <literal role=\"hook\">bugzilla</literal> hook"
|
|
dongsheng@635
|
11296 msgstr "配置 <literal role=\"hook\">bugzilla</literal> 钩子"
|
|
dongsheng@627
|
11297
|
|
dongsheng@627
|
11298 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11299 #: ../en/ch10-hook.xml:895
|
|
dongsheng@627
|
11300 msgid ""
|
|
dongsheng@627
|
11301 "You should configure this hook in your server's <filename role=\"special\"> /."
|
|
dongsheng@627
|
11302 "hgrc</filename>\\ as an <literal role=\"hook\">incoming</literal> hook, for "
|
|
dongsheng@627
|
11303 "example as follows:"
|
|
dongsheng@627
|
11304 msgstr ""
|
|
dongsheng@627
|
11305
|
|
dongsheng@627
|
11306 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11307 #: ../en/ch10-hook.xml:903
|
|
dongsheng@627
|
11308 msgid ""
|
|
dongsheng@627
|
11309 "Because of the specialised nature of this hook, and because Bugzilla was not "
|
|
dongsheng@627
|
11310 "written with this kind of integration in mind, configuring this hook is a "
|
|
dongsheng@627
|
11311 "somewhat involved process."
|
|
dongsheng@627
|
11312 msgstr ""
|
|
dongsheng@627
|
11313
|
|
dongsheng@627
|
11314 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11315 #: ../en/ch10-hook.xml:909
|
|
dongsheng@627
|
11316 msgid ""
|
|
dongsheng@627
|
11317 "Before you begin, you must install the MySQL bindings for Python on the host"
|
|
dongsheng@627
|
11318 "(s) where you'll be running the hook. If this is not available as a binary "
|
|
dongsheng@627
|
11319 "package for your system, you can download it from <citation>web:mysql-python</"
|
|
dongsheng@627
|
11320 "citation>."
|
|
dongsheng@627
|
11321 msgstr ""
|
|
dongsheng@627
|
11322
|
|
dongsheng@627
|
11323 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11324 #: ../en/ch10-hook.xml:916
|
|
dongsheng@627
|
11325 msgid ""
|
|
dongsheng@627
|
11326 "Configuration information for this hook lives in the <literal role=\"rc-"
|
|
dongsheng@627
|
11327 "bugzilla\">bugzilla</literal> section of your <filename role=\"special\"> /."
|
|
dongsheng@627
|
11328 "hgrc</filename>."
|
|
dongsheng@627
|
11329 msgstr ""
|
|
dongsheng@627
|
11330
|
|
dongsheng@627
|
11331 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11332 #: ../en/ch10-hook.xml:921
|
|
dongsheng@627
|
11333 msgid ""
|
|
dongsheng@627
|
11334 "<envar role=\"rc-item-bugzilla\">version</envar>: The version of Bugzilla "
|
|
dongsheng@627
|
11335 "installed on the server. The database schema that Bugzilla uses changes "
|
|
dongsheng@627
|
11336 "occasionally, so this hook has to know exactly which schema to use. At the "
|
|
dongsheng@627
|
11337 "moment, the only version supported is <literal>2.16</literal>."
|
|
dongsheng@627
|
11338 msgstr ""
|
|
dongsheng@627
|
11339
|
|
dongsheng@627
|
11340 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11341 #: ../en/ch10-hook.xml:930
|
|
dongsheng@627
|
11342 msgid ""
|
|
dongsheng@627
|
11343 "<envar role=\"rc-item-bugzilla\">host</envar>: The hostname of the MySQL "
|
|
dongsheng@627
|
11344 "server that stores your Bugzilla data. The database must be configured to "
|
|
dongsheng@627
|
11345 "allow connections from whatever host you are running the <literal role=\"hook"
|
|
dongsheng@627
|
11346 "\">bugzilla</literal> hook on."
|
|
dongsheng@627
|
11347 msgstr ""
|
|
dongsheng@627
|
11348
|
|
dongsheng@627
|
11349 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11350 #: ../en/ch10-hook.xml:937
|
|
dongsheng@627
|
11351 msgid ""
|
|
dongsheng@627
|
11352 "<envar role=\"rc-item-bugzilla\">user</envar>: The username with which to "
|
|
dongsheng@627
|
11353 "connect to the MySQL server. The database must be configured to allow this "
|
|
dongsheng@627
|
11354 "user to connect from whatever host you are running the <literal role=\"hook"
|
|
dongsheng@627
|
11355 "\">bugzilla</literal> hook on. This user must be able to access and modify "
|
|
dongsheng@627
|
11356 "Bugzilla tables. The default value of this item is <literal>bugs</literal>, "
|
|
dongsheng@627
|
11357 "which is the standard name of the Bugzilla user in a MySQL database."
|
|
dongsheng@627
|
11358 msgstr ""
|
|
dongsheng@627
|
11359
|
|
dongsheng@627
|
11360 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11361 #: ../en/ch10-hook.xml:948
|
|
dongsheng@627
|
11362 msgid ""
|
|
dongsheng@627
|
11363 "<envar role=\"rc-item-bugzilla\">password</envar>: The MySQL password for the "
|
|
dongsheng@627
|
11364 "user you configured above. This is stored as plain text, so you should make "
|
|
dongsheng@627
|
11365 "sure that unauthorised users cannot read the <filename role=\"special\"> /."
|
|
dongsheng@627
|
11366 "hgrc</filename>\\ file where you store this information."
|
|
dongsheng@627
|
11367 msgstr ""
|
|
dongsheng@627
|
11368
|
|
dongsheng@627
|
11369 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11370 #: ../en/ch10-hook.xml:957
|
|
dongsheng@627
|
11371 msgid ""
|
|
dongsheng@627
|
11372 "<envar role=\"rc-item-bugzilla\">db</envar>: The name of the Bugzilla "
|
|
dongsheng@627
|
11373 "database on the MySQL server. The default value of this item is "
|
|
dongsheng@627
|
11374 "<literal>bugs</literal>, which is the standard name of the MySQL database "
|
|
dongsheng@627
|
11375 "where Bugzilla stores its data."
|
|
dongsheng@627
|
11376 msgstr ""
|
|
dongsheng@627
|
11377
|
|
dongsheng@627
|
11378 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11379 #: ../en/ch10-hook.xml:964
|
|
dongsheng@627
|
11380 msgid ""
|
|
dongsheng@627
|
11381 "<envar role=\"rc-item-bugzilla\">notify</envar>: If you want Bugzilla to send "
|
|
dongsheng@627
|
11382 "out a notification email to subscribers after this hook has added a comment "
|
|
dongsheng@627
|
11383 "to a bug, you will need this hook to run a command whenever it updates the "
|
|
dongsheng@627
|
11384 "database. The command to run depends on where you have installed Bugzilla, "
|
|
dongsheng@627
|
11385 "but it will typically look something like this, if you have Bugzilla "
|
|
dongsheng@627
|
11386 "installed in <filename class=\"directory\">/var/www/html/bugzilla</filename>:"
|
|
dongsheng@627
|
11387 msgstr ""
|
|
dongsheng@627
|
11388
|
|
dongsheng@627
|
11389 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11390 #: ../en/ch10-hook.xml:977
|
|
dongsheng@627
|
11391 msgid ""
|
|
dongsheng@627
|
11392 "The Bugzilla <literal>processmail</literal> program expects to be given a bug "
|
|
dongsheng@627
|
11393 "ID (the hook replaces <quote><literal>%s</literal></quote> with the bug ID) "
|
|
dongsheng@627
|
11394 "and an email address. It also expects to be able to write to some files in "
|
|
dongsheng@627
|
11395 "the directory that it runs in. If Bugzilla and this hook are not installed "
|
|
dongsheng@627
|
11396 "on the same machine, you will need to find a way to run <literal>processmail</"
|
|
dongsheng@627
|
11397 "literal> on the server where Bugzilla is installed."
|
|
dongsheng@627
|
11398 msgstr ""
|
|
dongsheng@627
|
11399
|
|
dongsheng@627
|
11400 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11401 #: ../en/ch10-hook.xml:992
|
|
dongsheng@627
|
11402 msgid "Mapping committer names to Bugzilla user names"
|
|
dongsheng@635
|
11403 msgstr "提交者的名称与 Bugzilla 用户名称的映射"
|
|
dongsheng@627
|
11404
|
|
dongsheng@627
|
11405 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11406 #: ../en/ch10-hook.xml:994
|
|
dongsheng@627
|
11407 msgid ""
|
|
dongsheng@627
|
11408 "By default, the <literal role=\"hg-ext\">bugzilla</literal> hook tries to use "
|
|
dongsheng@627
|
11409 "the email address of a changeset's committer as the Bugzilla user name with "
|
|
dongsheng@627
|
11410 "which to update a bug. If this does not suit your needs, you can map "
|
|
dongsheng@627
|
11411 "committer email addresses to Bugzilla user names using a <literal role=\"rc-"
|
|
dongsheng@627
|
11412 "usermap\">usermap</literal> section."
|
|
dongsheng@627
|
11413 msgstr ""
|
|
dongsheng@627
|
11414
|
|
dongsheng@627
|
11415 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11416 #: ../en/ch10-hook.xml:1003
|
|
dongsheng@627
|
11417 msgid ""
|
|
dongsheng@627
|
11418 "Each item in the <literal role=\"rc-usermap\">usermap</literal> section "
|
|
dongsheng@627
|
11419 "contains an email address on the left, and a Bugzilla user name on the right."
|
|
dongsheng@627
|
11420 msgstr ""
|
|
dongsheng@627
|
11421
|
|
dongsheng@627
|
11422 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11423 #: ../en/ch10-hook.xml:1010
|
|
dongsheng@627
|
11424 msgid ""
|
|
dongsheng@627
|
11425 "You can either keep the <literal role=\"rc-usermap\">usermap</literal> data "
|
|
dongsheng@627
|
11426 "in a normal <filename role=\"special\">~/.hgrc</filename>, or tell the "
|
|
dongsheng@627
|
11427 "<literal role=\"hg-ext\">bugzilla</literal> hook to read the information from "
|
|
dongsheng@627
|
11428 "an external <filename>usermap</filename> file. In the latter case, you can "
|
|
dongsheng@627
|
11429 "store <filename>usermap</filename> data by itself in (for example) a user-"
|
|
dongsheng@627
|
11430 "modifiable repository. This makes it possible to let your users maintain "
|
|
dongsheng@627
|
11431 "their own <envar role=\"rc-item-bugzilla\">usermap</envar> entries. The main "
|
|
dongsheng@627
|
11432 "<filename role=\"special\"> /.hgrc</filename>\\ file might look like this:"
|
|
dongsheng@627
|
11433 msgstr ""
|
|
dongsheng@627
|
11434
|
|
dongsheng@627
|
11435 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11436 #: ../en/ch10-hook.xml:1026
|
|
dongsheng@627
|
11437 msgid ""
|
|
dongsheng@627
|
11438 "While the <filename>usermap</filename> file that it refers to might look like "
|
|
dongsheng@627
|
11439 "this:"
|
|
dongsheng@627
|
11440 msgstr ""
|
|
dongsheng@627
|
11441
|
|
dongsheng@627
|
11442 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11443 #: ../en/ch10-hook.xml:1035
|
|
dongsheng@627
|
11444 msgid "Configuring the text that gets added to a bug"
|
|
dongsheng@635
|
11445 msgstr "配置增加到问题中的正文"
|
|
dongsheng@627
|
11446
|
|
dongsheng@627
|
11447 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11448 #: ../en/ch10-hook.xml:1037
|
|
dongsheng@627
|
11449 msgid ""
|
|
dongsheng@627
|
11450 "You can configure the text that this hook adds as a comment; you specify it "
|
|
dongsheng@627
|
11451 "in the form of a Mercurial template. Several <filename role=\"special\"> /."
|
|
dongsheng@627
|
11452 "hgrc</filename>\\ entries (still in the <literal role=\"rc-bugzilla"
|
|
dongsheng@627
|
11453 "\">bugzilla</literal> section) control this behaviour."
|
|
dongsheng@627
|
11454 msgstr ""
|
|
dongsheng@627
|
11455
|
|
dongsheng@627
|
11456 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11457 #: ../en/ch10-hook.xml:1044
|
|
dongsheng@627
|
11458 msgid ""
|
|
dongsheng@627
|
11459 "<literal>strip</literal>: The number of leading path elements to strip from a "
|
|
dongsheng@627
|
11460 "repository's path name to construct a partial path for a URL. For example, if "
|
|
dongsheng@627
|
11461 "the repositories on your server live under <filename class=\"directory\">/"
|
|
dongsheng@627
|
11462 "home/hg/repos</filename>, and you have a repository whose path is <filename "
|
|
dongsheng@627
|
11463 "class=\"directory\">/home/hg/repos/app/tests</filename>, then setting "
|
|
dongsheng@627
|
11464 "<literal>strip</literal> to <literal>4</literal> will give a partial path of "
|
|
dongsheng@627
|
11465 "<filename class=\"directory\">app/tests</filename>. The hook will make this "
|
|
dongsheng@627
|
11466 "partial path available when expanding a template, as <literal>webroot</"
|
|
dongsheng@627
|
11467 "literal>."
|
|
dongsheng@627
|
11468 msgstr ""
|
|
dongsheng@627
|
11469
|
|
dongsheng@627
|
11470 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11471 #: ../en/ch10-hook.xml:1058
|
|
dongsheng@627
|
11472 msgid ""
|
|
dongsheng@627
|
11473 "<literal>template</literal>: The text of the template to use. In addition to "
|
|
dongsheng@627
|
11474 "the usual changeset-related variables, this template can use <literal>hgweb</"
|
|
dongsheng@627
|
11475 "literal> (the value of the <literal>hgweb</literal> configuration item above) "
|
|
dongsheng@627
|
11476 "and <literal>webroot</literal> (the path constructed using <literal>strip</"
|
|
dongsheng@627
|
11477 "literal> above)."
|
|
dongsheng@627
|
11478 msgstr ""
|
|
dongsheng@627
|
11479
|
|
dongsheng@627
|
11480 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11481 #: ../en/ch10-hook.xml:1068
|
|
dongsheng@627
|
11482 msgid ""
|
|
dongsheng@627
|
11483 "In addition, you can add a <envar role=\"rc-item-web\">baseurl</envar> item "
|
|
dongsheng@627
|
11484 "to the <literal role=\"rc-web\">web</literal> section of your <filename role="
|
|
dongsheng@627
|
11485 "\"special\"> /.hgrc</filename>. The <literal role=\"hg-ext\">bugzilla</"
|
|
dongsheng@627
|
11486 "literal> hook will make this available when expanding a template, as the base "
|
|
dongsheng@627
|
11487 "string to use when constructing a URL that will let users browse from a "
|
|
dongsheng@627
|
11488 "Bugzilla comment to view a changeset. Example:"
|
|
dongsheng@627
|
11489 msgstr ""
|
|
dongsheng@627
|
11490
|
|
dongsheng@627
|
11491 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11492 #: ../en/ch10-hook.xml:1080
|
|
dongsheng@627
|
11493 msgid ""
|
|
dongsheng@627
|
11494 "Here is an example set of <literal role=\"hg-ext\">bugzilla</literal> hook "
|
|
dongsheng@627
|
11495 "config information."
|
|
dongsheng@627
|
11496 msgstr ""
|
|
dongsheng@627
|
11497
|
|
dongsheng@627
|
11498 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11499 #: ../en/ch10-hook.xml:1097
|
|
dongsheng@627
|
11500 msgid ""
|
|
dongsheng@627
|
11501 "The most common problems with configuring the <literal role=\"hg-ext"
|
|
dongsheng@627
|
11502 "\">bugzilla</literal> hook relate to running Bugzilla's "
|
|
dongsheng@627
|
11503 "<filename>processmail</filename> script and mapping committer names to user "
|
|
dongsheng@627
|
11504 "names."
|
|
dongsheng@627
|
11505 msgstr ""
|
|
dongsheng@627
|
11506
|
|
dongsheng@627
|
11507 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11508 #: ../en/ch10-hook.xml:1103
|
|
dongsheng@627
|
11509 msgid ""
|
|
dongsheng@627
|
11510 "Recall from section <xref linkend=\"sec.hook.bugzilla.config\"/> above that "
|
|
dongsheng@627
|
11511 "the user that runs the Mercurial process on the server is also the one that "
|
|
dongsheng@627
|
11512 "will run the <filename>processmail</filename> script. The "
|
|
dongsheng@627
|
11513 "<filename>processmail</filename> script sometimes causes Bugzilla to write to "
|
|
dongsheng@627
|
11514 "files in its configuration directory, and Bugzilla's configuration files are "
|
|
dongsheng@627
|
11515 "usually owned by the user that your web server runs under."
|
|
dongsheng@627
|
11516 msgstr ""
|
|
dongsheng@627
|
11517
|
|
dongsheng@627
|
11518 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11519 #: ../en/ch10-hook.xml:1114
|
|
dongsheng@627
|
11520 msgid ""
|
|
dongsheng@627
|
11521 "You can cause <filename>processmail</filename> to be run with the suitable "
|
|
dongsheng@627
|
11522 "user's identity using the <command>sudo</command> command. Here is an "
|
|
dongsheng@627
|
11523 "example entry for a <filename>sudoers</filename> file."
|
|
dongsheng@627
|
11524 msgstr ""
|
|
dongsheng@627
|
11525
|
|
dongsheng@627
|
11526 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11527 #: ../en/ch10-hook.xml:1122
|
|
dongsheng@627
|
11528 msgid ""
|
|
dongsheng@627
|
11529 "This allows the <literal>hg_user</literal> user to run a "
|
|
dongsheng@627
|
11530 "<filename>processmail-wrapper</filename> program under the identity of "
|
|
dongsheng@627
|
11531 "<literal>httpd_user</literal>."
|
|
dongsheng@627
|
11532 msgstr ""
|
|
dongsheng@627
|
11533
|
|
dongsheng@627
|
11534 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11535 #: ../en/ch10-hook.xml:1127
|
|
dongsheng@627
|
11536 msgid ""
|
|
dongsheng@627
|
11537 "This indirection through a wrapper script is necessary, because "
|
|
dongsheng@627
|
11538 "<filename>processmail</filename> expects to be run with its current directory "
|
|
dongsheng@627
|
11539 "set to wherever you installed Bugzilla; you can't specify that kind of "
|
|
dongsheng@627
|
11540 "constraint in a <filename>sudoers</filename> file. The contents of the "
|
|
dongsheng@627
|
11541 "wrapper script are simple:"
|
|
dongsheng@627
|
11542 msgstr ""
|
|
dongsheng@627
|
11543
|
|
dongsheng@627
|
11544 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11545 #: ../en/ch10-hook.xml:1136
|
|
dongsheng@627
|
11546 msgid ""
|
|
dongsheng@627
|
11547 "It doesn't seem to matter what email address you pass to "
|
|
dongsheng@627
|
11548 "<filename>processmail</filename>."
|
|
dongsheng@627
|
11549 msgstr ""
|
|
dongsheng@627
|
11550
|
|
dongsheng@627
|
11551 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11552 #: ../en/ch10-hook.xml:1140
|
|
dongsheng@627
|
11553 msgid ""
|
|
dongsheng@627
|
11554 "If your <literal role=\"rc-usermap\">usermap</literal> is not set up "
|
|
dongsheng@627
|
11555 "correctly, users will see an error message from the <literal role=\"hg-ext"
|
|
dongsheng@627
|
11556 "\">bugzilla</literal> hook when they push changes to the server. The error "
|
|
dongsheng@627
|
11557 "message will look like this:"
|
|
dongsheng@627
|
11558 msgstr ""
|
|
dongsheng@627
|
11559
|
|
dongsheng@627
|
11560 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11561 #: ../en/ch10-hook.xml:1148
|
|
dongsheng@627
|
11562 msgid ""
|
|
dongsheng@627
|
11563 "What this means is that the committer's address, <literal>john.q."
|
|
dongsheng@627
|
11564 "public@example.com</literal>, is not a valid Bugzilla user name, nor does it "
|
|
dongsheng@627
|
11565 "have an entry in your <literal role=\"rc-usermap\">usermap</literal> that "
|
|
dongsheng@627
|
11566 "maps it to a valid Bugzilla user name."
|
|
dongsheng@627
|
11567 msgstr ""
|
|
dongsheng@627
|
11568
|
|
dongsheng@627
|
11569 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
11570 #: ../en/ch10-hook.xml:1158
|
|
dongsheng@627
|
11571 msgid ""
|
|
dongsheng@627
|
11572 "<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications"
|
|
dongsheng@635
|
11573 msgstr "<literal role=\"hg-ext\">notify</literal>&emdash;邮件通知"
|
|
dongsheng@627
|
11574
|
|
dongsheng@627
|
11575 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11576 #: ../en/ch10-hook.xml:1161
|
|
dongsheng@627
|
11577 msgid ""
|
|
dongsheng@627
|
11578 "Although Mercurial's built-in web server provides RSS feeds of changes in "
|
|
dongsheng@627
|
11579 "every repository, many people prefer to receive change notifications via "
|
|
dongsheng@627
|
11580 "email. The <literal role=\"hg-ext\">notify</literal> hook lets you send out "
|
|
dongsheng@627
|
11581 "notifications to a set of email addresses whenever changesets arrive that "
|
|
dongsheng@627
|
11582 "those subscribers are interested in."
|
|
dongsheng@627
|
11583 msgstr ""
|
|
dongsheng@627
|
11584
|
|
dongsheng@627
|
11585 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11586 #: ../en/ch10-hook.xml:1169
|
|
dongsheng@627
|
11587 msgid ""
|
|
dongsheng@627
|
11588 "As with the <literal role=\"hg-ext\">bugzilla</literal> hook, the <literal "
|
|
dongsheng@627
|
11589 "role=\"hg-ext\">notify</literal> hook is template-driven, so you can "
|
|
dongsheng@627
|
11590 "customise the contents of the notification messages that it sends."
|
|
dongsheng@627
|
11591 msgstr ""
|
|
dongsheng@627
|
11592
|
|
dongsheng@627
|
11593 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11594 #: ../en/ch10-hook.xml:1175
|
|
dongsheng@627
|
11595 msgid ""
|
|
dongsheng@627
|
11596 "By default, the <literal role=\"hg-ext\">notify</literal> hook includes a "
|
|
dongsheng@627
|
11597 "diff of every changeset that it sends out; you can limit the size of the "
|
|
dongsheng@627
|
11598 "diff, or turn this feature off entirely. It is useful for letting "
|
|
dongsheng@627
|
11599 "subscribers review changes immediately, rather than clicking to follow a URL."
|
|
dongsheng@627
|
11600 msgstr ""
|
|
dongsheng@627
|
11601
|
|
dongsheng@627
|
11602 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11603 #: ../en/ch10-hook.xml:1183
|
|
dongsheng@627
|
11604 msgid "Configuring the <literal role=\"hg-ext\">notify</literal> hook"
|
|
dongsheng@635
|
11605 msgstr "配置 <literal role=\"hg-ext\">notify</literal> 钩子"
|
|
dongsheng@627
|
11606
|
|
dongsheng@627
|
11607 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11608 #: ../en/ch10-hook.xml:1186
|
|
dongsheng@627
|
11609 msgid ""
|
|
dongsheng@627
|
11610 "You can set up the <literal role=\"hg-ext\">notify</literal> hook to send one "
|
|
dongsheng@627
|
11611 "email message per incoming changeset, or one per incoming group of changesets "
|
|
dongsheng@627
|
11612 "(all those that arrived in a single pull or push)."
|
|
dongsheng@627
|
11613 msgstr ""
|
|
dongsheng@627
|
11614
|
|
dongsheng@627
|
11615 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11616 #: ../en/ch10-hook.xml:1197
|
|
dongsheng@627
|
11617 msgid ""
|
|
dongsheng@627
|
11618 "Configuration information for this hook lives in the <literal role=\"rc-notify"
|
|
dongsheng@627
|
11619 "\">notify</literal> section of a <filename role=\"special\"> /.hgrc</filename>"
|
|
dongsheng@627
|
11620 "\\ file."
|
|
dongsheng@627
|
11621 msgstr ""
|
|
dongsheng@627
|
11622
|
|
dongsheng@627
|
11623 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11624 #: ../en/ch10-hook.xml:1202
|
|
dongsheng@627
|
11625 msgid ""
|
|
dongsheng@627
|
11626 "<envar role=\"rc-item-notify\">test</envar>: By default, this hook does not "
|
|
dongsheng@627
|
11627 "send out email at all; instead, it prints the message that it "
|
|
dongsheng@627
|
11628 "<emphasis>would</emphasis> send. Set this item to <literal>false</literal> "
|
|
dongsheng@627
|
11629 "to allow email to be sent. The reason that sending of email is turned off by "
|
|
dongsheng@627
|
11630 "default is that it takes several tries to configure this extension exactly as "
|
|
dongsheng@627
|
11631 "you would like, and it would be bad form to spam subscribers with a number of "
|
|
dongsheng@627
|
11632 "<quote>broken</quote> notifications while you debug your configuration."
|
|
dongsheng@627
|
11633 msgstr ""
|
|
dongsheng@627
|
11634
|
|
dongsheng@627
|
11635 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11636 #: ../en/ch10-hook.xml:1214
|
|
dongsheng@627
|
11637 msgid ""
|
|
dongsheng@627
|
11638 "<envar role=\"rc-item-notify\">config</envar>: The path to a configuration "
|
|
dongsheng@627
|
11639 "file that contains subscription information. This is kept separate from the "
|
|
dongsheng@627
|
11640 "main <filename role=\"special\"> /.hgrc</filename>\\ so that you can maintain "
|
|
dongsheng@627
|
11641 "it in a repository of its own. People can then clone that repository, update "
|
|
dongsheng@627
|
11642 "their subscriptions, and push the changes back to your server."
|
|
dongsheng@627
|
11643 msgstr ""
|
|
dongsheng@627
|
11644
|
|
dongsheng@627
|
11645 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11646 #: ../en/ch10-hook.xml:1223
|
|
dongsheng@627
|
11647 msgid ""
|
|
dongsheng@627
|
11648 "<envar role=\"rc-item-notify\">strip</envar>: The number of leading path "
|
|
dongsheng@627
|
11649 "separator characters to strip from a repository's path, when deciding whether "
|
|
dongsheng@627
|
11650 "a repository has subscribers. For example, if the repositories on your "
|
|
dongsheng@627
|
11651 "server live in <filename class=\"directory\">/home/hg/repos</filename>, and "
|
|
dongsheng@627
|
11652 "<literal role=\"hg-ext\">notify</literal> is considering a repository named "
|
|
dongsheng@627
|
11653 "<filename class=\"directory\">/home/hg/repos/shared/test</filename>, setting "
|
|
dongsheng@627
|
11654 "<envar role=\"rc-item-notify\">strip</envar> to <literal>4</literal> will "
|
|
dongsheng@627
|
11655 "cause <literal role=\"hg-ext\">notify</literal> to trim the path it considers "
|
|
dongsheng@627
|
11656 "down to <filename class=\"directory\">shared/test</filename>, and it will "
|
|
dongsheng@627
|
11657 "match subscribers against that."
|
|
dongsheng@627
|
11658 msgstr ""
|
|
dongsheng@627
|
11659
|
|
dongsheng@627
|
11660 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11661 #: ../en/ch10-hook.xml:1240
|
|
dongsheng@627
|
11662 msgid ""
|
|
dongsheng@627
|
11663 "<envar role=\"rc-item-notify\">template</envar>: The template text to use "
|
|
dongsheng@627
|
11664 "when sending messages. This specifies both the contents of the message "
|
|
dongsheng@627
|
11665 "header and its body."
|
|
dongsheng@627
|
11666 msgstr ""
|
|
dongsheng@627
|
11667
|
|
dongsheng@627
|
11668 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11669 #: ../en/ch10-hook.xml:1246
|
|
dongsheng@627
|
11670 msgid ""
|
|
dongsheng@627
|
11671 "<envar role=\"rc-item-notify\">maxdiff</envar>: The maximum number of lines "
|
|
dongsheng@627
|
11672 "of diff data to append to the end of a message. If a diff is longer than "
|
|
dongsheng@627
|
11673 "this, it is truncated. By default, this is set to 300. Set this to "
|
|
dongsheng@627
|
11674 "<literal>0</literal> to omit diffs from notification emails."
|
|
dongsheng@627
|
11675 msgstr ""
|
|
dongsheng@627
|
11676
|
|
dongsheng@627
|
11677 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11678 #: ../en/ch10-hook.xml:1255
|
|
dongsheng@627
|
11679 msgid ""
|
|
dongsheng@627
|
11680 "<envar role=\"rc-item-notify\">sources</envar>: A list of sources of "
|
|
dongsheng@627
|
11681 "changesets to consider. This lets you limit <literal role=\"hg-ext\">notify</"
|
|
dongsheng@627
|
11682 "literal> to only sending out email about changes that remote users pushed "
|
|
dongsheng@627
|
11683 "into this repository via a server, for example. See section <xref linkend="
|
|
dongsheng@627
|
11684 "\"sec.hook.sources\"/> for the sources you can specify here."
|
|
dongsheng@627
|
11685 msgstr ""
|
|
dongsheng@627
|
11686
|
|
dongsheng@627
|
11687 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11688 #: ../en/ch10-hook.xml:1267
|
|
dongsheng@627
|
11689 msgid ""
|
|
dongsheng@627
|
11690 "If you set the <envar role=\"rc-item-web\">baseurl</envar> item in the "
|
|
dongsheng@627
|
11691 "<literal role=\"rc-web\">web</literal> section, you can use it in a template; "
|
|
dongsheng@627
|
11692 "it will be available as <literal>webroot</literal>."
|
|
dongsheng@627
|
11693 msgstr ""
|
|
dongsheng@627
|
11694
|
|
dongsheng@627
|
11695 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11696 #: ../en/ch10-hook.xml:1273
|
|
dongsheng@627
|
11697 msgid ""
|
|
dongsheng@627
|
11698 "Here is an example set of <literal role=\"hg-ext\">notify</literal> "
|
|
dongsheng@627
|
11699 "configuration information."
|
|
dongsheng@627
|
11700 msgstr ""
|
|
dongsheng@627
|
11701
|
|
dongsheng@627
|
11702 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11703 #: ../en/ch10-hook.xml:1289
|
|
dongsheng@627
|
11704 msgid "This will produce a message that looks like the following:"
|
|
dongsheng@627
|
11705 msgstr ""
|
|
dongsheng@627
|
11706
|
|
dongsheng@627
|
11707 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11708 #: ../en/ch10-hook.xml:1310
|
|
dongsheng@627
|
11709 msgid ""
|
|
dongsheng@627
|
11710 "Do not forget that by default, the <literal role=\"hg-ext\">notify</literal> "
|
|
dongsheng@627
|
11711 "extension <emphasis>will not send any mail</emphasis> until you explicitly "
|
|
dongsheng@627
|
11712 "configure it to do so, by setting <envar role=\"rc-item-notify\">test</envar> "
|
|
dongsheng@627
|
11713 "to <literal>false</literal>. Until you do that, it simply prints the message "
|
|
dongsheng@627
|
11714 "it <emphasis>would</emphasis> send."
|
|
dongsheng@627
|
11715 msgstr ""
|
|
dongsheng@627
|
11716
|
|
dongsheng@627
|
11717 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
11718 #: ../en/ch10-hook.xml:1322
|
|
dongsheng@627
|
11719 msgid "Information for writers of hooks"
|
|
dongsheng@635
|
11720 msgstr "编写钩子的信息"
|
|
dongsheng@627
|
11721
|
|
dongsheng@627
|
11722 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
11723 #: ../en/ch10-hook.xml:1325
|
|
dongsheng@627
|
11724 msgid "In-process hook execution"
|
|
dongsheng@635
|
11725 msgstr "进程内钩子的执行"
|
|
dongsheng@627
|
11726
|
|
dongsheng@627
|
11727 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11728 #: ../en/ch10-hook.xml:1327
|
|
dongsheng@627
|
11729 msgid "An in-process hook is called with arguments of the following form:"
|
|
dongsheng@627
|
11730 msgstr ""
|
|
dongsheng@627
|
11731
|
|
dongsheng@627
|
11732 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11733 #: ../en/ch10-hook.xml:1333
|
|
dongsheng@627
|
11734 msgid ""
|
|
dongsheng@627
|
11735 "The <literal>ui</literal> parameter is a <literal role=\"py-mod-mercurial.ui"
|
|
dongsheng@627
|
11736 "\">ui</literal> object. The <literal>repo</literal> parameter is a <literal "
|
|
dongsheng@627
|
11737 "role=\"py-mod-mercurial.localrepo\">localrepository</literal> object. The "
|
|
dongsheng@627
|
11738 "names and values of the <literal>**kwargs</literal> parameters depend on the "
|
|
dongsheng@627
|
11739 "hook being invoked, with the following common features:"
|
|
dongsheng@627
|
11740 msgstr ""
|
|
dongsheng@627
|
11741
|
|
dongsheng@627
|
11742 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11743 #: ../en/ch10-hook.xml:1342
|
|
dongsheng@627
|
11744 msgid ""
|
|
dongsheng@627
|
11745 "If a parameter is named <literal>node</literal> or <literal>parentN</"
|
|
dongsheng@627
|
11746 "literal>, it will contain a hexadecimal changeset ID. The empty string is "
|
|
dongsheng@627
|
11747 "used to represent <quote>null changeset ID</quote> instead of a string of "
|
|
dongsheng@627
|
11748 "zeroes."
|
|
dongsheng@627
|
11749 msgstr ""
|
|
dongsheng@627
|
11750
|
|
dongsheng@627
|
11751 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11752 #: ../en/ch10-hook.xml:1349
|
|
dongsheng@627
|
11753 msgid ""
|
|
dongsheng@627
|
11754 "If a parameter is named <literal>url</literal>, it will contain the URL of a "
|
|
dongsheng@627
|
11755 "remote repository, if that can be determined."
|
|
dongsheng@627
|
11756 msgstr ""
|
|
dongsheng@627
|
11757
|
|
dongsheng@627
|
11758 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11759 #: ../en/ch10-hook.xml:1354
|
|
dongsheng@627
|
11760 msgid ""
|
|
dongsheng@627
|
11761 "Boolean-valued parameters are represented as Python <literal>bool</literal> "
|
|
dongsheng@627
|
11762 "objects."
|
|
dongsheng@627
|
11763 msgstr ""
|
|
dongsheng@627
|
11764
|
|
dongsheng@627
|
11765 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11766 #: ../en/ch10-hook.xml:1359
|
|
dongsheng@627
|
11767 msgid ""
|
|
dongsheng@627
|
11768 "An in-process hook is called without a change to the process's working "
|
|
dongsheng@627
|
11769 "directory (unlike external hooks, which are run in the root of the "
|
|
dongsheng@627
|
11770 "repository). It must not change the process's working directory, or it will "
|
|
dongsheng@627
|
11771 "cause any calls it makes into the Mercurial API to fail."
|
|
dongsheng@627
|
11772 msgstr ""
|
|
dongsheng@627
|
11773
|
|
dongsheng@627
|
11774 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11775 #: ../en/ch10-hook.xml:1366
|
|
dongsheng@627
|
11776 msgid ""
|
|
dongsheng@627
|
11777 "If a hook returns a boolean <quote>false</quote> value, it is considered to "
|
|
dongsheng@627
|
11778 "have succeeded. If it returns a boolean <quote>true</quote> value or raises "
|
|
dongsheng@627
|
11779 "an exception, it is considered to have failed. A useful way to think of the "
|
|
dongsheng@627
|
11780 "calling convention is <quote>tell me if you fail</quote>."
|
|
dongsheng@627
|
11781 msgstr ""
|
|
dongsheng@627
|
11782
|
|
dongsheng@627
|
11783 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11784 #: ../en/ch10-hook.xml:1373
|
|
dongsheng@627
|
11785 msgid ""
|
|
dongsheng@627
|
11786 "Note that changeset IDs are passed into Python hooks as hexadecimal strings, "
|
|
dongsheng@627
|
11787 "not the binary hashes that Mercurial's APIs normally use. To convert a hash "
|
|
dongsheng@627
|
11788 "from hex to binary, use the \\pymodfunc{mercurial.node}{bin} function."
|
|
dongsheng@627
|
11789 msgstr ""
|
|
dongsheng@627
|
11790
|
|
dongsheng@627
|
11791 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
11792 #: ../en/ch10-hook.xml:1381
|
|
dongsheng@627
|
11793 msgid "External hook execution"
|
|
dongsheng@635
|
11794 msgstr "外部钩子的执行"
|
|
dongsheng@627
|
11795
|
|
dongsheng@627
|
11796 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11797 #: ../en/ch10-hook.xml:1383
|
|
dongsheng@627
|
11798 msgid ""
|
|
dongsheng@627
|
11799 "An external hook is passed to the shell of the user running Mercurial. "
|
|
dongsheng@627
|
11800 "Features of that shell, such as variable substitution and command "
|
|
dongsheng@627
|
11801 "redirection, are available. The hook is run in the root directory of the "
|
|
dongsheng@627
|
11802 "repository (unlike in-process hooks, which are run in the same directory that "
|
|
dongsheng@627
|
11803 "Mercurial was run in)."
|
|
dongsheng@627
|
11804 msgstr ""
|
|
dongsheng@627
|
11805
|
|
dongsheng@627
|
11806 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11807 #: ../en/ch10-hook.xml:1391
|
|
dongsheng@627
|
11808 msgid ""
|
|
dongsheng@627
|
11809 "Hook parameters are passed to the hook as environment variables. Each "
|
|
dongsheng@627
|
11810 "environment variable's name is converted in upper case and prefixed with the "
|
|
dongsheng@627
|
11811 "string <quote><literal>HG_</literal></quote>. For example, if the name of a "
|
|
dongsheng@627
|
11812 "parameter is <quote><literal>node</literal></quote>, the name of the "
|
|
dongsheng@627
|
11813 "environment variable representing that parameter will be "
|
|
dongsheng@627
|
11814 "<quote><literal>HG_NODE</literal></quote>."
|
|
dongsheng@627
|
11815 msgstr ""
|
|
dongsheng@627
|
11816
|
|
dongsheng@627
|
11817 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11818 #: ../en/ch10-hook.xml:1400
|
|
dongsheng@627
|
11819 msgid ""
|
|
dongsheng@627
|
11820 "A boolean parameter is represented as the string <quote><literal>1</literal></"
|
|
dongsheng@627
|
11821 "quote> for <quote>true</quote>, <quote><literal>0</literal></quote> for "
|
|
dongsheng@627
|
11822 "<quote>false</quote>. If an environment variable is named <envar>HG_NODE</"
|
|
dongsheng@627
|
11823 "envar>, <envar>HG_PARENT1</envar> or <envar>HG_PARENT2</envar>, it contains a "
|
|
dongsheng@627
|
11824 "changeset ID represented as a hexadecimal string. The empty string is used "
|
|
dongsheng@627
|
11825 "to represent <quote>null changeset ID</quote> instead of a string of zeroes. "
|
|
dongsheng@627
|
11826 "If an environment variable is named <envar>HG_URL</envar>, it will contain "
|
|
dongsheng@627
|
11827 "the URL of a remote repository, if that can be determined."
|
|
dongsheng@627
|
11828 msgstr ""
|
|
dongsheng@627
|
11829
|
|
dongsheng@627
|
11830 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11831 #: ../en/ch10-hook.xml:1412
|
|
dongsheng@627
|
11832 msgid ""
|
|
dongsheng@627
|
11833 "If a hook exits with a status of zero, it is considered to have succeeded. "
|
|
dongsheng@627
|
11834 "If it exits with a non-zero status, it is considered to have failed."
|
|
dongsheng@627
|
11835 msgstr ""
|
|
dongsheng@627
|
11836
|
|
dongsheng@627
|
11837 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
11838 #: ../en/ch10-hook.xml:1419
|
|
dongsheng@627
|
11839 msgid "Finding out where changesets come from"
|
|
dongsheng@635
|
11840 msgstr "检查修改集来自何处"
|
|
dongsheng@627
|
11841
|
|
dongsheng@627
|
11842 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11843 #: ../en/ch10-hook.xml:1421
|
|
dongsheng@627
|
11844 msgid ""
|
|
dongsheng@627
|
11845 "A hook that involves the transfer of changesets between a local repository "
|
|
dongsheng@627
|
11846 "and another may be able to find out information about the <quote>far side</"
|
|
dongsheng@627
|
11847 "quote>. Mercurial knows <emphasis>how</emphasis> changes are being "
|
|
dongsheng@627
|
11848 "transferred, and in many cases <emphasis>where</emphasis> they are being "
|
|
dongsheng@627
|
11849 "transferred to or from."
|
|
dongsheng@627
|
11850 msgstr ""
|
|
dongsheng@627
|
11851
|
|
dongsheng@627
|
11852 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11853 #: ../en/ch10-hook.xml:1430
|
|
dongsheng@627
|
11854 msgid "Sources of changesets"
|
|
dongsheng@635
|
11855 msgstr "修改集的来源"
|
|
dongsheng@627
|
11856
|
|
dongsheng@627
|
11857 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11858 #: ../en/ch10-hook.xml:1432
|
|
dongsheng@627
|
11859 msgid ""
|
|
dongsheng@627
|
11860 "Mercurial will tell a hook what means are, or were, used to transfer "
|
|
dongsheng@627
|
11861 "changesets between repositories. This is provided by Mercurial in a Python "
|
|
dongsheng@627
|
11862 "parameter named <literal>source</literal>, or an environment variable named "
|
|
dongsheng@627
|
11863 "<envar>HG_SOURCE</envar>."
|
|
dongsheng@627
|
11864 msgstr ""
|
|
dongsheng@627
|
11865
|
|
dongsheng@627
|
11866 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11867 #: ../en/ch10-hook.xml:1440
|
|
dongsheng@627
|
11868 msgid ""
|
|
dongsheng@627
|
11869 "<literal>serve</literal>: Changesets are transferred to or from a remote "
|
|
dongsheng@627
|
11870 "repository over http or ssh."
|
|
dongsheng@627
|
11871 msgstr ""
|
|
dongsheng@627
|
11872
|
|
dongsheng@627
|
11873 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11874 #: ../en/ch10-hook.xml:1445
|
|
dongsheng@627
|
11875 msgid ""
|
|
dongsheng@627
|
11876 "<literal>pull</literal>: Changesets are being transferred via a pull from one "
|
|
dongsheng@627
|
11877 "repository into another."
|
|
dongsheng@627
|
11878 msgstr ""
|
|
dongsheng@627
|
11879
|
|
dongsheng@627
|
11880 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11881 #: ../en/ch10-hook.xml:1450
|
|
dongsheng@627
|
11882 msgid ""
|
|
dongsheng@627
|
11883 "<literal>push</literal>: Changesets are being transferred via a push from one "
|
|
dongsheng@627
|
11884 "repository into another."
|
|
dongsheng@627
|
11885 msgstr ""
|
|
dongsheng@627
|
11886
|
|
dongsheng@627
|
11887 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11888 #: ../en/ch10-hook.xml:1455
|
|
dongsheng@627
|
11889 msgid ""
|
|
dongsheng@627
|
11890 "<literal>bundle</literal>: Changesets are being transferred to or from a "
|
|
dongsheng@627
|
11891 "bundle."
|
|
dongsheng@627
|
11892 msgstr ""
|
|
dongsheng@627
|
11893
|
|
dongsheng@627
|
11894 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
|
|
dongsheng@627
|
11895 #: ../en/ch10-hook.xml:1462
|
|
dongsheng@627
|
11896 msgid "Where changes are going&emdash;remote repository URLs"
|
|
dongsheng@635
|
11897 msgstr "修改集要到哪里&emdash;远程版本库的地址"
|
|
dongsheng@627
|
11898
|
|
dongsheng@627
|
11899 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11900 #: ../en/ch10-hook.xml:1465
|
|
dongsheng@627
|
11901 msgid ""
|
|
dongsheng@627
|
11902 "When possible, Mercurial will tell a hook the location of the <quote>far "
|
|
dongsheng@627
|
11903 "side</quote> of an activity that transfers changeset data between "
|
|
dongsheng@627
|
11904 "repositories. This is provided by Mercurial in a Python parameter named "
|
|
dongsheng@627
|
11905 "<literal>url</literal>, or an environment variable named <envar>HG_URL</"
|
|
dongsheng@627
|
11906 "envar>."
|
|
dongsheng@627
|
11907 msgstr ""
|
|
dongsheng@627
|
11908
|
|
dongsheng@627
|
11909 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
|
|
dongsheng@627
|
11910 #: ../en/ch10-hook.xml:1473
|
|
dongsheng@627
|
11911 msgid ""
|
|
dongsheng@627
|
11912 "This information is not always known. If a hook is invoked in a repository "
|
|
dongsheng@627
|
11913 "that is being served via http or ssh, Mercurial cannot tell where the remote "
|
|
dongsheng@627
|
11914 "repository is, but it may know where the client is connecting from. In such "
|
|
dongsheng@627
|
11915 "cases, the URL will take one of the following forms:"
|
|
dongsheng@627
|
11916 msgstr ""
|
|
dongsheng@627
|
11917
|
|
dongsheng@627
|
11918 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11919 #: ../en/ch10-hook.xml:1480
|
|
dongsheng@627
|
11920 msgid ""
|
|
dongsheng@627
|
11921 "<literal>remote:ssh:1.2.3.4</literal>&emdash;remote ssh client, at the IP "
|
|
dongsheng@627
|
11922 "address <literal>1.2.3.4</literal>."
|
|
dongsheng@627
|
11923 msgstr ""
|
|
dongsheng@627
|
11924
|
|
dongsheng@627
|
11925 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11926 #: ../en/ch10-hook.xml:1485
|
|
dongsheng@627
|
11927 msgid ""
|
|
dongsheng@627
|
11928 "<literal>remote:http:1.2.3.4</literal>&emdash;remote http client, at the IP "
|
|
dongsheng@627
|
11929 "address <literal>1.2.3.4</literal>. If the client is using SSL, this will be "
|
|
dongsheng@627
|
11930 "of the form <literal>remote:https:1.2.3.4</literal>."
|
|
dongsheng@627
|
11931 msgstr ""
|
|
dongsheng@627
|
11932
|
|
dongsheng@627
|
11933 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11934 #: ../en/ch10-hook.xml:1492
|
|
dongsheng@627
|
11935 msgid "Empty&emdash;no information could be discovered about the remote client."
|
|
dongsheng@627
|
11936 msgstr ""
|
|
dongsheng@627
|
11937
|
|
dongsheng@627
|
11938 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
11939 #: ../en/ch10-hook.xml:1501
|
|
dongsheng@627
|
11940 msgid "Hook reference"
|
|
dongsheng@635
|
11941 msgstr "钩子参考"
|
|
dongsheng@627
|
11942
|
|
dongsheng@627
|
11943 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
11944 #: ../en/ch10-hook.xml:1504
|
|
dongsheng@627
|
11945 msgid ""
|
|
dongsheng@627
|
11946 "<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets "
|
|
dongsheng@627
|
11947 "added"
|
|
dongsheng@635
|
11948 msgstr "<literal role=\"hook\">changegroup</literal>&emdash;增加远程修改集之后"
|
|
dongsheng@627
|
11949
|
|
dongsheng@627
|
11950 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11951 #: ../en/ch10-hook.xml:1507
|
|
dongsheng@627
|
11952 msgid ""
|
|
dongsheng@627
|
11953 "This hook is run after a group of pre-existing changesets has been added to "
|
|
dongsheng@627
|
11954 "the repository, for example via a <command role=\"hg-cmd\">hg pull</command> "
|
|
dongsheng@627
|
11955 "or <command role=\"hg-cmd\">hg unbundle</command>. This hook is run once per "
|
|
dongsheng@627
|
11956 "operation that added one or more changesets. This is in contrast to the "
|
|
dongsheng@627
|
11957 "<literal role=\"hook\">incoming</literal> hook, which is run once per "
|
|
dongsheng@627
|
11958 "changeset, regardless of whether the changesets arrive in a group."
|
|
dongsheng@627
|
11959 msgstr ""
|
|
dongsheng@627
|
11960
|
|
dongsheng@627
|
11961 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11962 #: ../en/ch10-hook.xml:1517
|
|
dongsheng@627
|
11963 msgid ""
|
|
dongsheng@627
|
11964 "Some possible uses for this hook include kicking off an automated build or "
|
|
dongsheng@627
|
11965 "test of the added changesets, updating a bug database, or notifying "
|
|
dongsheng@627
|
11966 "subscribers that a repository contains new changes."
|
|
dongsheng@627
|
11967 msgstr ""
|
|
dongsheng@627
|
11968
|
|
dongsheng@627
|
11969 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
11970 #: ../en/ch10-hook.xml:1523 ../en/ch10-hook.xml:1564 ../en/ch10-hook.xml:1607
|
|
dongsheng@627
|
11971 #: ../en/ch10-hook.xml:1649 ../en/ch10-hook.xml:1704 ../en/ch10-hook.xml:1744
|
|
dongsheng@627
|
11972 #: ../en/ch10-hook.xml:1780 ../en/ch10-hook.xml:1815 ../en/ch10-hook.xml:1877
|
|
dongsheng@627
|
11973 #: ../en/ch10-hook.xml:1935 ../en/ch10-hook.xml:1969 ../en/ch10-hook.xml:1997
|
|
dongsheng@627
|
11974 msgid "Parameters to this hook:"
|
|
dongsheng@627
|
11975 msgstr ""
|
|
dongsheng@627
|
11976
|
|
dongsheng@627
|
11977 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11978 #: ../en/ch10-hook.xml:1526 ../en/ch10-hook.xml:1880
|
|
dongsheng@627
|
11979 msgid ""
|
|
dongsheng@627
|
11980 "<literal>node</literal>: A changeset ID. The changeset ID of the first "
|
|
dongsheng@627
|
11981 "changeset in the group that was added. All changesets between this and "
|
|
dongsheng@627
|
11982 "\\index{tags!<literal>tip</literal>}<literal>tip</literal>, inclusive, were "
|
|
dongsheng@627
|
11983 "added by a single <command role=\"hg-cmd\">hg pull</command>, <command role="
|
|
dongsheng@627
|
11984 "\"hg-cmd\">hg push</command> or <command role=\"hg-cmd\">hg unbundle</"
|
|
dongsheng@627
|
11985 "command>."
|
|
dongsheng@627
|
11986 msgstr ""
|
|
dongsheng@627
|
11987
|
|
dongsheng@627
|
11988 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11989 #: ../en/ch10-hook.xml:1536 ../en/ch10-hook.xml:1614 ../en/ch10-hook.xml:1707
|
|
dongsheng@627
|
11990 #: ../en/ch10-hook.xml:1890
|
|
dongsheng@627
|
11991 msgid ""
|
|
dongsheng@627
|
11992 "<literal>source</literal>: A string. The source of these changes. See "
|
|
dongsheng@627
|
11993 "section <xref linkend=\"sec.hook.sources\"/> for details."
|
|
dongsheng@627
|
11994 msgstr ""
|
|
dongsheng@627
|
11995
|
|
dongsheng@627
|
11996 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
11997 #: ../en/ch10-hook.xml:1541 ../en/ch10-hook.xml:1619 ../en/ch10-hook.xml:1670
|
|
dongsheng@627
|
11998 #: ../en/ch10-hook.xml:1712 ../en/ch10-hook.xml:1794 ../en/ch10-hook.xml:1895
|
|
dongsheng@627
|
11999 msgid ""
|
|
dongsheng@627
|
12000 "<literal>url</literal>: A URL. The location of the remote repository, if "
|
|
dongsheng@627
|
12001 "known. See section <xref linkend=\"sec.hook.url\"/> for more information."
|
|
dongsheng@627
|
12002 msgstr ""
|
|
dongsheng@627
|
12003
|
|
dongsheng@627
|
12004 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12005 #: ../en/ch10-hook.xml:1548
|
|
dongsheng@627
|
12006 msgid ""
|
|
dongsheng@627
|
12007 "See also: <literal role=\"hook\">incoming</literal> (section <xref linkend="
|
|
dongsheng@627
|
12008 "\"sec.hook.incoming\"/>), <literal role=\"hook\">prechangegroup</literal> "
|
|
dongsheng@627
|
12009 "(section <xref linkend=\"sec.hook.prechangegroup\"/>), <literal role=\"hook"
|
|
dongsheng@627
|
12010 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
|
|
dongsheng@627
|
12011 "pretxnchangegroup\"/>)"
|
|
dongsheng@627
|
12012 msgstr ""
|
|
dongsheng@627
|
12013
|
|
dongsheng@627
|
12014 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12015 #: ../en/ch10-hook.xml:1558
|
|
dongsheng@627
|
12016 msgid ""
|
|
dongsheng@627
|
12017 "<literal role=\"hook\">commit</literal>&emdash;after a new changeset is "
|
|
dongsheng@627
|
12018 "created"
|
|
dongsheng@635
|
12019 msgstr "<literal role=\"hook\">commit</literal>&emdash;创建新修改集之后"
|
|
dongsheng@627
|
12020
|
|
dongsheng@627
|
12021 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12022 #: ../en/ch10-hook.xml:1561
|
|
dongsheng@627
|
12023 msgid "This hook is run after a new changeset has been created."
|
|
dongsheng@627
|
12024 msgstr ""
|
|
dongsheng@627
|
12025
|
|
dongsheng@627
|
12026 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12027 #: ../en/ch10-hook.xml:1567 ../en/ch10-hook.xml:1938
|
|
dongsheng@627
|
12028 msgid ""
|
|
dongsheng@627
|
12029 "<literal>node</literal>: A changeset ID. The changeset ID of the newly "
|
|
dongsheng@627
|
12030 "committed changeset."
|
|
dongsheng@627
|
12031 msgstr ""
|
|
dongsheng@627
|
12032
|
|
dongsheng@627
|
12033 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12034 #: ../en/ch10-hook.xml:1571 ../en/ch10-hook.xml:1942
|
|
dongsheng@627
|
12035 msgid ""
|
|
dongsheng@627
|
12036 "<literal>parent1</literal>: A changeset ID. The changeset ID of the first "
|
|
dongsheng@627
|
12037 "parent of the newly committed changeset."
|
|
dongsheng@627
|
12038 msgstr ""
|
|
dongsheng@627
|
12039
|
|
dongsheng@627
|
12040 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12041 #: ../en/ch10-hook.xml:1576 ../en/ch10-hook.xml:1947
|
|
dongsheng@627
|
12042 msgid ""
|
|
dongsheng@627
|
12043 "<literal>parent2</literal>: A changeset ID. The changeset ID of the second "
|
|
dongsheng@627
|
12044 "parent of the newly committed changeset."
|
|
dongsheng@627
|
12045 msgstr ""
|
|
dongsheng@627
|
12046
|
|
dongsheng@627
|
12047 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12048 #: ../en/ch10-hook.xml:1582
|
|
dongsheng@627
|
12049 msgid ""
|
|
dongsheng@627
|
12050 "See also: <literal role=\"hook\">precommit</literal> (section <xref linkend="
|
|
dongsheng@627
|
12051 "\"sec.hook.precommit\"/>), <literal role=\"hook\">pretxncommit</literal> "
|
|
dongsheng@627
|
12052 "(section <xref linkend=\"sec.hook.pretxncommit\"/>)"
|
|
dongsheng@627
|
12053 msgstr ""
|
|
dongsheng@627
|
12054
|
|
dongsheng@627
|
12055 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12056 #: ../en/ch10-hook.xml:1590
|
|
dongsheng@627
|
12057 msgid ""
|
|
dongsheng@627
|
12058 "<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset "
|
|
dongsheng@627
|
12059 "is added"
|
|
dongsheng@635
|
12060 msgstr "<literal role=\"hook\">incoming</literal>&emdash;增加远程修改集之后"
|
|
dongsheng@627
|
12061
|
|
dongsheng@627
|
12062 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12063 #: ../en/ch10-hook.xml:1593
|
|
dongsheng@627
|
12064 msgid ""
|
|
dongsheng@627
|
12065 "This hook is run after a pre-existing changeset has been added to the "
|
|
dongsheng@627
|
12066 "repository, for example via a <command role=\"hg-cmd\">hg push</command>. If "
|
|
dongsheng@627
|
12067 "a group of changesets was added in a single operation, this hook is called "
|
|
dongsheng@627
|
12068 "once for each added changeset."
|
|
dongsheng@627
|
12069 msgstr ""
|
|
dongsheng@627
|
12070
|
|
dongsheng@627
|
12071 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12072 #: ../en/ch10-hook.xml:1600
|
|
dongsheng@627
|
12073 msgid ""
|
|
dongsheng@627
|
12074 "You can use this hook for the same purposes as the <literal role=\"hook"
|
|
dongsheng@627
|
12075 "\">changegroup</literal> hook (section <xref linkend=\"sec.hook.changegroup\"/"
|
|
dongsheng@627
|
12076 ">); it's simply more convenient sometimes to run a hook once per group of "
|
|
dongsheng@627
|
12077 "changesets, while other times it's handier once per changeset."
|
|
dongsheng@627
|
12078 msgstr ""
|
|
dongsheng@627
|
12079
|
|
dongsheng@627
|
12080 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12081 #: ../en/ch10-hook.xml:1610
|
|
dongsheng@627
|
12082 msgid ""
|
|
dongsheng@627
|
12083 "<literal>node</literal>: A changeset ID. The ID of the newly added changeset."
|
|
dongsheng@627
|
12084 msgstr ""
|
|
dongsheng@627
|
12085
|
|
dongsheng@627
|
12086 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12087 #: ../en/ch10-hook.xml:1626
|
|
dongsheng@627
|
12088 msgid ""
|
|
dongsheng@627
|
12089 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
|
|
dongsheng@627
|
12090 "\"sec.hook.changegroup\"/>) <literal role=\"hook\">prechangegroup</literal> "
|
|
dongsheng@627
|
12091 "(section <xref linkend=\"sec.hook.prechangegroup\"/>), <literal role=\"hook"
|
|
dongsheng@627
|
12092 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
|
|
dongsheng@627
|
12093 "pretxnchangegroup\"/>)"
|
|
dongsheng@627
|
12094 msgstr ""
|
|
dongsheng@627
|
12095
|
|
dongsheng@627
|
12096 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12097 #: ../en/ch10-hook.xml:1636
|
|
dongsheng@627
|
12098 msgid ""
|
|
dongsheng@627
|
12099 "<literal role=\"hook\">outgoing</literal>&emdash;after changesets are "
|
|
dongsheng@627
|
12100 "propagated"
|
|
dongsheng@635
|
12101 msgstr "<literal role=\"hook\">outgoing</literal>&emdash;传播修改集之后"
|
|
dongsheng@627
|
12102
|
|
dongsheng@627
|
12103 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12104 #: ../en/ch10-hook.xml:1639
|
|
dongsheng@627
|
12105 msgid ""
|
|
dongsheng@627
|
12106 "This hook is run after a group of changesets has been propagated out of this "
|
|
dongsheng@627
|
12107 "repository, for example by a <command role=\"hg-cmd\">hg push</command> or "
|
|
dongsheng@627
|
12108 "<command role=\"hg-cmd\">hg bundle</command> command."
|
|
dongsheng@627
|
12109 msgstr ""
|
|
dongsheng@627
|
12110
|
|
dongsheng@627
|
12111 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12112 #: ../en/ch10-hook.xml:1645
|
|
dongsheng@627
|
12113 msgid ""
|
|
dongsheng@627
|
12114 "One possible use for this hook is to notify administrators that changes have "
|
|
dongsheng@627
|
12115 "been pulled."
|
|
dongsheng@627
|
12116 msgstr ""
|
|
dongsheng@627
|
12117
|
|
dongsheng@627
|
12118 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12119 #: ../en/ch10-hook.xml:1652
|
|
dongsheng@627
|
12120 msgid ""
|
|
dongsheng@627
|
12121 "<literal>node</literal>: A changeset ID. The changeset ID of the first "
|
|
dongsheng@627
|
12122 "changeset of the group that was sent."
|
|
dongsheng@627
|
12123 msgstr ""
|
|
dongsheng@627
|
12124
|
|
dongsheng@627
|
12125 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12126 #: ../en/ch10-hook.xml:1657
|
|
dongsheng@627
|
12127 msgid ""
|
|
dongsheng@627
|
12128 "<literal>source</literal>: A string. The source of the of the operation (see "
|
|
dongsheng@627
|
12129 "section <xref linkend=\"sec.hook.sources\"/>). If a remote client pulled "
|
|
dongsheng@627
|
12130 "changes from this repository, <literal>source</literal> will be "
|
|
dongsheng@627
|
12131 "<literal>serve</literal>. If the client that obtained changes from this "
|
|
dongsheng@627
|
12132 "repository was local, <literal>source</literal> will be <literal>bundle</"
|
|
dongsheng@627
|
12133 "literal>, <literal>pull</literal>, or <literal>push</literal>, depending on "
|
|
dongsheng@627
|
12134 "the operation the client performed."
|
|
dongsheng@627
|
12135 msgstr ""
|
|
dongsheng@627
|
12136
|
|
dongsheng@627
|
12137 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12138 #: ../en/ch10-hook.xml:1677
|
|
dongsheng@627
|
12139 msgid ""
|
|
dongsheng@627
|
12140 "See also: <literal role=\"hook\">preoutgoing</literal> (section <xref linkend="
|
|
dongsheng@627
|
12141 "\"sec.hook.preoutgoing\"/>)"
|
|
dongsheng@627
|
12142 msgstr ""
|
|
dongsheng@627
|
12143
|
|
dongsheng@627
|
12144 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12145 #: ../en/ch10-hook.xml:1683
|
|
dongsheng@627
|
12146 msgid ""
|
|
dongsheng@627
|
12147 "<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add "
|
|
dongsheng@627
|
12148 "remote changesets"
|
|
dongsheng@627
|
12149 msgstr ""
|
|
dongsheng@635
|
12150 "<literal role=\"hook\">prechangegroup</literal>&emdash;增加远程修改集之前"
|
|
dongsheng@627
|
12151
|
|
dongsheng@627
|
12152 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12153 #: ../en/ch10-hook.xml:1687
|
|
dongsheng@627
|
12154 msgid ""
|
|
dongsheng@627
|
12155 "This controlling hook is run before Mercurial begins to add a group of "
|
|
dongsheng@627
|
12156 "changesets from another repository."
|
|
dongsheng@627
|
12157 msgstr ""
|
|
dongsheng@627
|
12158
|
|
dongsheng@627
|
12159 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12160 #: ../en/ch10-hook.xml:1691
|
|
dongsheng@627
|
12161 msgid ""
|
|
dongsheng@627
|
12162 "This hook does not have any information about the changesets to be added, "
|
|
dongsheng@627
|
12163 "because it is run before transmission of those changesets is allowed to "
|
|
dongsheng@627
|
12164 "begin. If this hook fails, the changesets will not be transmitted."
|
|
dongsheng@627
|
12165 msgstr ""
|
|
dongsheng@627
|
12166
|
|
dongsheng@627
|
12167 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12168 #: ../en/ch10-hook.xml:1697
|
|
dongsheng@627
|
12169 msgid ""
|
|
dongsheng@627
|
12170 "One use for this hook is to prevent external changes from being added to a "
|
|
dongsheng@627
|
12171 "repository. For example, you could use this to <quote>freeze</quote> a "
|
|
dongsheng@627
|
12172 "server-hosted branch temporarily or permanently so that users cannot push to "
|
|
dongsheng@627
|
12173 "it, while still allowing a local administrator to modify the repository."
|
|
dongsheng@627
|
12174 msgstr ""
|
|
dongsheng@627
|
12175
|
|
dongsheng@627
|
12176 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12177 #: ../en/ch10-hook.xml:1719
|
|
dongsheng@627
|
12178 msgid ""
|
|
dongsheng@627
|
12179 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
|
|
dongsheng@627
|
12180 "\"sec.hook.changegroup\"/>), <literal role=\"hook\">incoming</literal> "
|
|
dongsheng@627
|
12181 "(section <xref linkend=\"sec.hook.incoming\"/>), , <literal role=\"hook"
|
|
dongsheng@627
|
12182 "\">pretxnchangegroup</literal> (section <xref linkend=\"sec.hook."
|
|
dongsheng@627
|
12183 "pretxnchangegroup\"/>)"
|
|
dongsheng@627
|
12184 msgstr ""
|
|
dongsheng@627
|
12185
|
|
dongsheng@627
|
12186 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12187 #: ../en/ch10-hook.xml:1729
|
|
dongsheng@627
|
12188 msgid ""
|
|
dongsheng@627
|
12189 "<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a "
|
|
dongsheng@627
|
12190 "changeset"
|
|
dongsheng@635
|
12191 msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前"
|
|
dongsheng@627
|
12192
|
|
dongsheng@627
|
12193 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12194 #: ../en/ch10-hook.xml:1732
|
|
dongsheng@627
|
12195 msgid ""
|
|
dongsheng@627
|
12196 "This hook is run before Mercurial begins to commit a new changeset. It is run "
|
|
dongsheng@627
|
12197 "before Mercurial has any of the metadata for the commit, such as the files to "
|
|
dongsheng@627
|
12198 "be committed, the commit message, or the commit date."
|
|
dongsheng@627
|
12199 msgstr ""
|
|
dongsheng@627
|
12200
|
|
dongsheng@627
|
12201 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12202 #: ../en/ch10-hook.xml:1738
|
|
dongsheng@627
|
12203 msgid ""
|
|
dongsheng@627
|
12204 "One use for this hook is to disable the ability to commit new changesets, "
|
|
dongsheng@627
|
12205 "while still allowing incoming changesets. Another is to run a build or test, "
|
|
dongsheng@627
|
12206 "and only allow the commit to begin if the build or test succeeds."
|
|
dongsheng@627
|
12207 msgstr ""
|
|
dongsheng@627
|
12208
|
|
dongsheng@627
|
12209 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12210 #: ../en/ch10-hook.xml:1747
|
|
dongsheng@627
|
12211 msgid ""
|
|
dongsheng@627
|
12212 "<literal>parent1</literal>: A changeset ID. The changeset ID of the first "
|
|
dongsheng@627
|
12213 "parent of the working directory."
|
|
dongsheng@627
|
12214 msgstr ""
|
|
dongsheng@627
|
12215
|
|
dongsheng@627
|
12216 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12217 #: ../en/ch10-hook.xml:1752
|
|
dongsheng@627
|
12218 msgid ""
|
|
dongsheng@627
|
12219 "<literal>parent2</literal>: A changeset ID. The changeset ID of the second "
|
|
dongsheng@627
|
12220 "parent of the working directory."
|
|
dongsheng@627
|
12221 msgstr ""
|
|
dongsheng@627
|
12222
|
|
dongsheng@627
|
12223 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12224 #: ../en/ch10-hook.xml:1757
|
|
dongsheng@627
|
12225 msgid ""
|
|
dongsheng@627
|
12226 "If the commit proceeds, the parents of the working directory will become the "
|
|
dongsheng@627
|
12227 "parents of the new changeset."
|
|
dongsheng@627
|
12228 msgstr ""
|
|
dongsheng@627
|
12229
|
|
dongsheng@627
|
12230 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12231 #: ../en/ch10-hook.xml:1761
|
|
dongsheng@627
|
12232 msgid ""
|
|
dongsheng@627
|
12233 "See also: <literal role=\"hook\">commit</literal> (section <xref linkend="
|
|
dongsheng@627
|
12234 "\"sec.hook.commit\"/>), <literal role=\"hook\">pretxncommit</literal> "
|
|
dongsheng@627
|
12235 "(section <xref linkend=\"sec.hook.pretxncommit\"/>)"
|
|
dongsheng@627
|
12236 msgstr ""
|
|
dongsheng@627
|
12237
|
|
dongsheng@627
|
12238 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12239 #: ../en/ch10-hook.xml:1769
|
|
dongsheng@627
|
12240 msgid ""
|
|
dongsheng@627
|
12241 "<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to "
|
|
dongsheng@627
|
12242 "propagate changesets"
|
|
dongsheng@635
|
12243 msgstr "<literal role=\"hook\">preoutgoing</literal>&emdash;传播修改集之前"
|
|
dongsheng@627
|
12244
|
|
dongsheng@627
|
12245 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12246 #: ../en/ch10-hook.xml:1772
|
|
dongsheng@627
|
12247 msgid ""
|
|
dongsheng@627
|
12248 "This hook is invoked before Mercurial knows the identities of the changesets "
|
|
dongsheng@627
|
12249 "to be transmitted."
|
|
dongsheng@627
|
12250 msgstr ""
|
|
dongsheng@627
|
12251
|
|
dongsheng@627
|
12252 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12253 #: ../en/ch10-hook.xml:1776
|
|
dongsheng@627
|
12254 msgid ""
|
|
dongsheng@627
|
12255 "One use for this hook is to prevent changes from being transmitted to another "
|
|
dongsheng@627
|
12256 "repository."
|
|
dongsheng@627
|
12257 msgstr ""
|
|
dongsheng@627
|
12258
|
|
dongsheng@627
|
12259 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12260 #: ../en/ch10-hook.xml:1783
|
|
dongsheng@627
|
12261 msgid ""
|
|
dongsheng@627
|
12262 "<literal>source</literal>: A string. The source of the operation that is "
|
|
dongsheng@627
|
12263 "attempting to obtain changes from this repository (see section <xref linkend="
|
|
dongsheng@627
|
12264 "\"sec.hook.sources\"/>). See the documentation for the <literal>source</"
|
|
dongsheng@627
|
12265 "literal> parameter to the <literal role=\"hook\">outgoing</literal> hook, in "
|
|
dongsheng@627
|
12266 "section <xref linkend=\"sec.hook.outgoing\"/>, for possible values of this "
|
|
dongsheng@627
|
12267 "parameter."
|
|
dongsheng@627
|
12268 msgstr ""
|
|
dongsheng@627
|
12269
|
|
dongsheng@627
|
12270 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12271 #: ../en/ch10-hook.xml:1801
|
|
dongsheng@627
|
12272 msgid ""
|
|
dongsheng@627
|
12273 "See also: <literal role=\"hook\">outgoing</literal> (section <xref linkend="
|
|
dongsheng@627
|
12274 "\"sec.hook.outgoing\"/>)"
|
|
dongsheng@627
|
12275 msgstr ""
|
|
dongsheng@627
|
12276
|
|
dongsheng@627
|
12277 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12278 #: ../en/ch10-hook.xml:1807
|
|
dongsheng@627
|
12279 msgid ""
|
|
dongsheng@627
|
12280 "<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset"
|
|
dongsheng@635
|
12281 msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前"
|
|
dongsheng@627
|
12282
|
|
dongsheng@627
|
12283 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12284 #: ../en/ch10-hook.xml:1810
|
|
dongsheng@627
|
12285 msgid ""
|
|
dongsheng@627
|
12286 "This controlling hook is run before a tag is created. If the hook succeeds, "
|
|
dongsheng@627
|
12287 "creation of the tag proceeds. If the hook fails, the tag is not created."
|
|
dongsheng@627
|
12288 msgstr ""
|
|
dongsheng@627
|
12289
|
|
dongsheng@627
|
12290 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12291 #: ../en/ch10-hook.xml:1818
|
|
dongsheng@627
|
12292 msgid ""
|
|
dongsheng@627
|
12293 "<literal>local</literal>: A boolean. Whether the tag is local to this "
|
|
dongsheng@627
|
12294 "repository instance (i.e. stored in <filename role=\"special\">.hg/localtags</"
|
|
dongsheng@627
|
12295 "filename>) or managed by Mercurial (stored in <filename role=\"special\">."
|
|
dongsheng@627
|
12296 "hgtags</filename>)."
|
|
dongsheng@627
|
12297 msgstr ""
|
|
dongsheng@627
|
12298
|
|
dongsheng@627
|
12299 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12300 #: ../en/ch10-hook.xml:1825
|
|
dongsheng@627
|
12301 msgid ""
|
|
dongsheng@627
|
12302 "<literal>node</literal>: A changeset ID. The ID of the changeset to be "
|
|
dongsheng@627
|
12303 "tagged."
|
|
dongsheng@627
|
12304 msgstr ""
|
|
dongsheng@627
|
12305
|
|
dongsheng@627
|
12306 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12307 #: ../en/ch10-hook.xml:1829
|
|
dongsheng@627
|
12308 msgid "<literal>tag</literal>: A string. The name of the tag to be created."
|
|
dongsheng@627
|
12309 msgstr ""
|
|
dongsheng@627
|
12310
|
|
dongsheng@627
|
12311 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12312 #: ../en/ch10-hook.xml:1834
|
|
dongsheng@627
|
12313 msgid ""
|
|
dongsheng@627
|
12314 "If the tag to be created is revision-controlled, the <literal role=\"hook"
|
|
dongsheng@627
|
12315 "\">precommit</literal> and <literal role=\"hook\">pretxncommit</literal> "
|
|
dongsheng@627
|
12316 "hooks (sections <xref linkend=\"sec.hook.commit\"/> and <xref linkend=\"sec."
|
|
dongsheng@627
|
12317 "hook.pretxncommit\"/>) will also be run."
|
|
dongsheng@627
|
12318 msgstr ""
|
|
dongsheng@627
|
12319
|
|
dongsheng@627
|
12320 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12321 #: ../en/ch10-hook.xml:1841
|
|
dongsheng@627
|
12322 msgid ""
|
|
dongsheng@627
|
12323 "See also: <literal role=\"hook\">tag</literal> (section <xref linkend=\"sec."
|
|
dongsheng@627
|
12324 "hook.tag\"/>)"
|
|
dongsheng@627
|
12325 msgstr ""
|
|
dongsheng@627
|
12326
|
|
dongsheng@627
|
12327 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12328 #: ../en/ch10-hook.xml:1846
|
|
dongsheng@627
|
12329 msgid ""
|
|
dongsheng@627
|
12330 "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing "
|
|
dongsheng@627
|
12331 "addition of remote changesets"
|
|
dongsheng@627
|
12332 msgstr ""
|
|
dongsheng@635
|
12333 "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;完成增加远程修改集之"
|
|
dongsheng@635
|
12334 "前"
|
|
dongsheng@627
|
12335
|
|
dongsheng@627
|
12336 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12337 #: ../en/ch10-hook.xml:1850
|
|
dongsheng@627
|
12338 msgid ""
|
|
dongsheng@627
|
12339 "This controlling hook is run before a transaction&emdash;that manages the "
|
|
dongsheng@627
|
12340 "addition of a group of new changesets from outside the repository&emdash;"
|
|
dongsheng@627
|
12341 "completes. If the hook succeeds, the transaction completes, and all of the "
|
|
dongsheng@627
|
12342 "changesets become permanent within this repository. If the hook fails, the "
|
|
dongsheng@627
|
12343 "transaction is rolled back, and the data for the changesets is erased."
|
|
dongsheng@627
|
12344 msgstr ""
|
|
dongsheng@627
|
12345
|
|
dongsheng@627
|
12346 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12347 #: ../en/ch10-hook.xml:1859
|
|
dongsheng@627
|
12348 msgid ""
|
|
dongsheng@627
|
12349 "This hook can access the metadata associated with the almost-added "
|
|
dongsheng@627
|
12350 "changesets, but it should not do anything permanent with this data. It must "
|
|
dongsheng@627
|
12351 "also not modify the working directory."
|
|
dongsheng@627
|
12352 msgstr ""
|
|
dongsheng@627
|
12353
|
|
dongsheng@627
|
12354 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12355 #: ../en/ch10-hook.xml:1865
|
|
dongsheng@627
|
12356 msgid ""
|
|
dongsheng@627
|
12357 "While this hook is running, if other Mercurial processes access this "
|
|
dongsheng@627
|
12358 "repository, they will be able to see the almost-added changesets as if they "
|
|
dongsheng@627
|
12359 "are permanent. This may lead to race conditions if you do not take steps to "
|
|
dongsheng@627
|
12360 "avoid them."
|
|
dongsheng@627
|
12361 msgstr ""
|
|
dongsheng@627
|
12362
|
|
dongsheng@627
|
12363 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12364 #: ../en/ch10-hook.xml:1872
|
|
dongsheng@627
|
12365 msgid ""
|
|
dongsheng@627
|
12366 "This hook can be used to automatically vet a group of changesets. If the "
|
|
dongsheng@627
|
12367 "hook fails, all of the changesets are <quote>rejected</quote> when the "
|
|
dongsheng@627
|
12368 "transaction rolls back."
|
|
dongsheng@627
|
12369 msgstr ""
|
|
dongsheng@627
|
12370
|
|
dongsheng@627
|
12371 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12372 #: ../en/ch10-hook.xml:1902
|
|
dongsheng@627
|
12373 msgid ""
|
|
dongsheng@627
|
12374 "See also: <literal role=\"hook\">changegroup</literal> (section <xref linkend="
|
|
dongsheng@627
|
12375 "\"sec.hook.changegroup\"/>), <literal role=\"hook\">incoming</literal> "
|
|
dongsheng@627
|
12376 "(section <xref linkend=\"sec.hook.incoming\"/>), <literal role=\"hook"
|
|
dongsheng@627
|
12377 "\">prechangegroup</literal> (section <xref linkend=\"sec.hook.prechangegroup"
|
|
dongsheng@627
|
12378 "\"/>)"
|
|
dongsheng@627
|
12379 msgstr ""
|
|
dongsheng@627
|
12380
|
|
dongsheng@627
|
12381 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12382 #: ../en/ch10-hook.xml:1912
|
|
dongsheng@627
|
12383 msgid ""
|
|
dongsheng@627
|
12384 "<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit "
|
|
dongsheng@627
|
12385 "of new changeset"
|
|
dongsheng@635
|
12386 msgstr "<literal role=\"hook\">pretxncommit</literal>&emdash;完成提交之前"
|
|
dongsheng@627
|
12387
|
|
dongsheng@627
|
12388 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12389 #: ../en/ch10-hook.xml:1915
|
|
dongsheng@627
|
12390 msgid ""
|
|
dongsheng@627
|
12391 "This controlling hook is run before a transaction&emdash;that manages a new "
|
|
dongsheng@627
|
12392 "commit&emdash;completes. If the hook succeeds, the transaction completes and "
|
|
dongsheng@627
|
12393 "the changeset becomes permanent within this repository. If the hook fails, "
|
|
dongsheng@627
|
12394 "the transaction is rolled back, and the commit data is erased."
|
|
dongsheng@627
|
12395 msgstr ""
|
|
dongsheng@627
|
12396
|
|
dongsheng@627
|
12397 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12398 #: ../en/ch10-hook.xml:1923
|
|
dongsheng@627
|
12399 msgid ""
|
|
dongsheng@627
|
12400 "This hook can access the metadata associated with the almost-new changeset, "
|
|
dongsheng@627
|
12401 "but it should not do anything permanent with this data. It must also not "
|
|
dongsheng@627
|
12402 "modify the working directory."
|
|
dongsheng@627
|
12403 msgstr ""
|
|
dongsheng@627
|
12404
|
|
dongsheng@627
|
12405 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12406 #: ../en/ch10-hook.xml:1929
|
|
dongsheng@627
|
12407 msgid ""
|
|
dongsheng@627
|
12408 "While this hook is running, if other Mercurial processes access this "
|
|
dongsheng@627
|
12409 "repository, they will be able to see the almost-new changeset as if it is "
|
|
dongsheng@627
|
12410 "permanent. This may lead to race conditions if you do not take steps to "
|
|
dongsheng@627
|
12411 "avoid them."
|
|
dongsheng@627
|
12412 msgstr ""
|
|
dongsheng@627
|
12413
|
|
dongsheng@627
|
12414 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12415 #: ../en/ch10-hook.xml:1953
|
|
dongsheng@627
|
12416 msgid ""
|
|
dongsheng@627
|
12417 "See also: <literal role=\"hook\">precommit</literal> (section <xref linkend="
|
|
dongsheng@627
|
12418 "\"sec.hook.precommit\"/>)"
|
|
dongsheng@627
|
12419 msgstr ""
|
|
dongsheng@627
|
12420
|
|
dongsheng@627
|
12421 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12422 #: ../en/ch10-hook.xml:1959
|
|
dongsheng@627
|
12423 msgid ""
|
|
dongsheng@627
|
12424 "<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging "
|
|
dongsheng@627
|
12425 "working directory"
|
|
dongsheng@627
|
12426 msgstr ""
|
|
dongsheng@635
|
12427 "<literal role=\"hook\">preupdate</literal>&emdash;更新或合并工作目录之前"
|
|
dongsheng@627
|
12428
|
|
dongsheng@627
|
12429 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12430 #: ../en/ch10-hook.xml:1962
|
|
dongsheng@627
|
12431 msgid ""
|
|
dongsheng@627
|
12432 "This controlling hook is run before an update or merge of the working "
|
|
dongsheng@627
|
12433 "directory begins. It is run only if Mercurial's normal pre-update checks "
|
|
dongsheng@627
|
12434 "determine that the update or merge can proceed. If the hook succeeds, the "
|
|
dongsheng@627
|
12435 "update or merge may proceed; if it fails, the update or merge does not start."
|
|
dongsheng@627
|
12436 msgstr ""
|
|
dongsheng@627
|
12437
|
|
dongsheng@627
|
12438 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12439 #: ../en/ch10-hook.xml:1972
|
|
dongsheng@627
|
12440 msgid ""
|
|
dongsheng@627
|
12441 "<literal>parent1</literal>: A changeset ID. The ID of the parent that the "
|
|
dongsheng@627
|
12442 "working directory is to be updated to. If the working directory is being "
|
|
dongsheng@627
|
12443 "merged, it will not change this parent."
|
|
dongsheng@627
|
12444 msgstr ""
|
|
dongsheng@627
|
12445
|
|
dongsheng@627
|
12446 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12447 #: ../en/ch10-hook.xml:1978
|
|
dongsheng@627
|
12448 msgid ""
|
|
dongsheng@627
|
12449 "<literal>parent2</literal>: A changeset ID. Only set if the working "
|
|
dongsheng@627
|
12450 "directory is being merged. The ID of the revision that the working directory "
|
|
dongsheng@627
|
12451 "is being merged with."
|
|
dongsheng@627
|
12452 msgstr ""
|
|
dongsheng@627
|
12453
|
|
dongsheng@627
|
12454 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12455 #: ../en/ch10-hook.xml:1985
|
|
dongsheng@627
|
12456 msgid ""
|
|
dongsheng@627
|
12457 "See also: <literal role=\"hook\">update</literal> (section <xref linkend="
|
|
dongsheng@627
|
12458 "\"sec.hook.update\"/>)"
|
|
dongsheng@627
|
12459 msgstr ""
|
|
dongsheng@627
|
12460
|
|
dongsheng@627
|
12461 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12462 #: ../en/ch10-hook.xml:1991
|
|
dongsheng@627
|
12463 msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset"
|
|
dongsheng@635
|
12464 msgstr "<literal role=\"hook\">tag</literal>&emdash;创建标签之后"
|
|
dongsheng@627
|
12465
|
|
dongsheng@627
|
12466 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12467 #: ../en/ch10-hook.xml:1994
|
|
dongsheng@627
|
12468 msgid "This hook is run after a tag has been created."
|
|
dongsheng@627
|
12469 msgstr ""
|
|
dongsheng@627
|
12470
|
|
dongsheng@627
|
12471 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12472 #: ../en/ch10-hook.xml:2000
|
|
dongsheng@627
|
12473 msgid ""
|
|
dongsheng@627
|
12474 "<literal>local</literal>: A boolean. Whether the new tag is local to this "
|
|
dongsheng@627
|
12475 "repository instance (i.e. stored in <filename role=\"special\">.hg/"
|
|
dongsheng@627
|
12476 "localtags</filename>) or managed by Mercurial (stored in <filename role="
|
|
dongsheng@627
|
12477 "\"special\">.hgtags</filename>)."
|
|
dongsheng@627
|
12478 msgstr ""
|
|
dongsheng@627
|
12479
|
|
dongsheng@627
|
12480 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12481 #: ../en/ch10-hook.xml:2008
|
|
dongsheng@627
|
12482 msgid ""
|
|
dongsheng@627
|
12483 "<literal>node</literal>: A changeset ID. The ID of the changeset that was "
|
|
dongsheng@627
|
12484 "tagged."
|
|
dongsheng@627
|
12485 msgstr ""
|
|
dongsheng@627
|
12486
|
|
dongsheng@627
|
12487 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12488 #: ../en/ch10-hook.xml:2012
|
|
dongsheng@627
|
12489 msgid "<literal>tag</literal>: A string. The name of the tag that was created."
|
|
dongsheng@627
|
12490 msgstr ""
|
|
dongsheng@627
|
12491
|
|
dongsheng@627
|
12492 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12493 #: ../en/ch10-hook.xml:2017
|
|
dongsheng@627
|
12494 msgid ""
|
|
dongsheng@627
|
12495 "If the created tag is revision-controlled, the <literal role=\"hook\">commit</"
|
|
dongsheng@627
|
12496 "literal> hook (section <xref linkend=\"sec.hook.commit\"/>) is run before "
|
|
dongsheng@627
|
12497 "this hook."
|
|
dongsheng@627
|
12498 msgstr ""
|
|
dongsheng@627
|
12499
|
|
dongsheng@627
|
12500 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12501 #: ../en/ch10-hook.xml:2022
|
|
dongsheng@627
|
12502 msgid ""
|
|
dongsheng@627
|
12503 "See also: <literal role=\"hook\">pretag</literal> (section <xref linkend="
|
|
dongsheng@627
|
12504 "\"sec.hook.pretag\"/>)"
|
|
dongsheng@627
|
12505 msgstr ""
|
|
dongsheng@627
|
12506
|
|
dongsheng@627
|
12507 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12508 #: ../en/ch10-hook.xml:2028
|
|
dongsheng@627
|
12509 msgid ""
|
|
dongsheng@627
|
12510 "<literal role=\"hook\">update</literal>&emdash;after updating or merging "
|
|
dongsheng@627
|
12511 "working directory"
|
|
dongsheng@635
|
12512 msgstr "<literal role=\"hook\">update</literal>&emdash;更新或合并工作目录之后"
|
|
dongsheng@627
|
12513
|
|
dongsheng@627
|
12514 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12515 #: ../en/ch10-hook.xml:2031
|
|
dongsheng@627
|
12516 msgid ""
|
|
dongsheng@627
|
12517 "This hook is run after an update or merge of the working directory "
|
|
dongsheng@627
|
12518 "completes. Since a merge can fail (if the external <command>hgmerge</"
|
|
dongsheng@627
|
12519 "command> command fails to resolve conflicts in a file), this hook "
|
|
dongsheng@627
|
12520 "communicates whether the update or merge completed cleanly."
|
|
dongsheng@627
|
12521 msgstr ""
|
|
dongsheng@627
|
12522
|
|
dongsheng@627
|
12523 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12524 #: ../en/ch10-hook.xml:2039
|
|
dongsheng@627
|
12525 msgid ""
|
|
dongsheng@627
|
12526 "<literal>error</literal>: A boolean. Indicates whether the update or merge "
|
|
dongsheng@627
|
12527 "completed successfully."
|
|
dongsheng@627
|
12528 msgstr ""
|
|
dongsheng@627
|
12529
|
|
dongsheng@627
|
12530 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12531 #: ../en/ch10-hook.xml:2044
|
|
dongsheng@627
|
12532 msgid ""
|
|
dongsheng@627
|
12533 "<literal>parent1</literal>: A changeset ID. The ID of the parent that the "
|
|
dongsheng@627
|
12534 "working directory was updated to. If the working directory was merged, it "
|
|
dongsheng@627
|
12535 "will not have changed this parent."
|
|
dongsheng@627
|
12536 msgstr ""
|
|
dongsheng@627
|
12537
|
|
dongsheng@627
|
12538 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12539 #: ../en/ch10-hook.xml:2050
|
|
dongsheng@627
|
12540 msgid ""
|
|
dongsheng@627
|
12541 "<literal>parent2</literal>: A changeset ID. Only set if the working "
|
|
dongsheng@627
|
12542 "directory was merged. The ID of the revision that the working directory was "
|
|
dongsheng@627
|
12543 "merged with."
|
|
dongsheng@627
|
12544 msgstr ""
|
|
dongsheng@627
|
12545
|
|
dongsheng@627
|
12546 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12547 #: ../en/ch10-hook.xml:2056
|
|
dongsheng@627
|
12548 msgid ""
|
|
dongsheng@627
|
12549 "See also: <literal role=\"hook\">preupdate</literal> (section <xref linkend="
|
|
dongsheng@627
|
12550 "\"sec.hook.preupdate\"/>)"
|
|
dongsheng@627
|
12551 msgstr ""
|
|
dongsheng@627
|
12552
|
|
dongsheng@627
|
12553 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
12554 #: ../en/ch11-template.xml:5
|
|
dongsheng@627
|
12555 msgid "Customising the output of Mercurial"
|
|
dongsheng@627
|
12556 msgstr "定制 Mercurial 的输出"
|
|
dongsheng@627
|
12557
|
|
dongsheng@627
|
12558 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
12559 #: ../en/ch11-template.xml:7
|
|
dongsheng@627
|
12560 msgid ""
|
|
dongsheng@627
|
12561 "Mercurial provides a powerful mechanism to let you control how it displays "
|
|
dongsheng@627
|
12562 "information. The mechanism is based on templates. You can use templates to "
|
|
dongsheng@627
|
12563 "generate specific output for a single command, or to customise the entire "
|
|
dongsheng@627
|
12564 "appearance of the built-in web interface."
|
|
dongsheng@627
|
12565 msgstr ""
|
|
dongsheng@627
|
12566
|
|
dongsheng@627
|
12567 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
12568 #: ../en/ch11-template.xml:14
|
|
dongsheng@627
|
12569 msgid "Using precanned output styles"
|
|
dongsheng@636
|
12570 msgstr "使用预定义的输出样式"
|
|
dongsheng@627
|
12571
|
|
dongsheng@627
|
12572 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12573 #: ../en/ch11-template.xml:16
|
|
dongsheng@627
|
12574 msgid ""
|
|
dongsheng@627
|
12575 "Packaged with Mercurial are some output styles that you can use immediately. "
|
|
dongsheng@627
|
12576 "A style is simply a precanned template that someone wrote and installed "
|
|
dongsheng@627
|
12577 "somewhere that Mercurial can find."
|
|
dongsheng@627
|
12578 msgstr ""
|
|
dongsheng@627
|
12579
|
|
dongsheng@627
|
12580 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12581 #: ../en/ch11-template.xml:21
|
|
dongsheng@627
|
12582 msgid ""
|
|
dongsheng@627
|
12583 "Before we take a look at Mercurial's bundled styles, let's review its normal "
|
|
dongsheng@627
|
12584 "output."
|
|
dongsheng@627
|
12585 msgstr ""
|
|
dongsheng@627
|
12586
|
|
dongsheng@627
|
12587 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12588 #: ../en/ch11-template.xml:26
|
|
dongsheng@627
|
12589 msgid ""
|
|
dongsheng@627
|
12590 "This is somewhat informative, but it takes up a lot of space&emdash;five "
|
|
dongsheng@627
|
12591 "lines of output per changeset. The <literal>compact</literal> style reduces "
|
|
dongsheng@627
|
12592 "this to three lines, presented in a sparse manner."
|
|
dongsheng@627
|
12593 msgstr ""
|
|
dongsheng@627
|
12594
|
|
dongsheng@627
|
12595 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12596 #: ../en/ch11-template.xml:33
|
|
dongsheng@627
|
12597 msgid ""
|
|
dongsheng@627
|
12598 "The <literal>changelog</literal> style hints at the expressive power of "
|
|
dongsheng@627
|
12599 "Mercurial's templating engine. This style attempts to follow the GNU "
|
|
dongsheng@627
|
12600 "Project's changelog guidelines<citation>web:changelog</citation>."
|
|
dongsheng@627
|
12601 msgstr ""
|
|
dongsheng@627
|
12602
|
|
dongsheng@627
|
12603 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12604 #: ../en/ch11-template.xml:40
|
|
dongsheng@627
|
12605 msgid ""
|
|
dongsheng@627
|
12606 "You will not be shocked to learn that Mercurial's default output style is "
|
|
dongsheng@627
|
12607 "named <literal>default</literal>."
|
|
dongsheng@627
|
12608 msgstr ""
|
|
dongsheng@627
|
12609
|
|
dongsheng@627
|
12610 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
12611 #: ../en/ch11-template.xml:44
|
|
dongsheng@627
|
12612 msgid "Setting a default style"
|
|
dongsheng@636
|
12613 msgstr "设置默认样式"
|
|
dongsheng@627
|
12614
|
|
dongsheng@627
|
12615 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12616 #: ../en/ch11-template.xml:46
|
|
dongsheng@627
|
12617 msgid ""
|
|
dongsheng@627
|
12618 "You can modify the output style that Mercurial will use for every command by "
|
|
dongsheng@627
|
12619 "editing your <filename role=\"special\"> /.hgrc</filename>\\ file, naming the "
|
|
dongsheng@627
|
12620 "style you would prefer to use."
|
|
dongsheng@627
|
12621 msgstr ""
|
|
dongsheng@627
|
12622
|
|
dongsheng@627
|
12623 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
12624 #: ../en/ch11-template.xml:53
|
|
dongsheng@627
|
12625 msgid ""
|
|
dongsheng@627
|
12626 "If you write a style of your own, you can use it by either providing the path "
|
|
dongsheng@627
|
12627 "to your style file, or copying your style file into a location where "
|
|
dongsheng@627
|
12628 "Mercurial can find it (typically the <literal>templates</literal> "
|
|
dongsheng@627
|
12629 "subdirectory of your Mercurial install directory)."
|
|
dongsheng@627
|
12630 msgstr ""
|
|
dongsheng@627
|
12631
|
|
dongsheng@627
|
12632 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
12633 #: ../en/ch11-template.xml:62
|
|
dongsheng@627
|
12634 msgid "Commands that support styles and templates"
|
|
dongsheng@636
|
12635 msgstr "支持样式和模版的命令"
|
|
dongsheng@627
|
12636
|
|
dongsheng@627
|
12637 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12638 #: ../en/ch11-template.xml:64
|
|
dongsheng@627
|
12639 msgid ""
|
|
dongsheng@627
|
12640 "All of Mercurial's <quote><literal>log</literal>-like</quote> commands let "
|
|
dongsheng@627
|
12641 "you use styles and templates: <command role=\"hg-cmd\">hg incoming</command>, "
|
|
dongsheng@627
|
12642 "<command role=\"hg-cmd\">hg log</command>, <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
12643 "outgoing</command>, and <command role=\"hg-cmd\">hg tip</command>."
|
|
dongsheng@627
|
12644 msgstr ""
|
|
dongsheng@627
|
12645
|
|
dongsheng@627
|
12646 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12647 #: ../en/ch11-template.xml:71
|
|
dongsheng@627
|
12648 msgid ""
|
|
dongsheng@627
|
12649 "As I write this manual, these are so far the only commands that support "
|
|
dongsheng@627
|
12650 "styles and templates. Since these are the most important commands that need "
|
|
dongsheng@627
|
12651 "customisable output, there has been little pressure from the Mercurial user "
|
|
dongsheng@627
|
12652 "community to add style and template support to other commands."
|
|
dongsheng@627
|
12653 msgstr ""
|
|
dongsheng@627
|
12654
|
|
dongsheng@627
|
12655 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
12656 #: ../en/ch11-template.xml:79
|
|
dongsheng@627
|
12657 msgid "The basics of templating"
|
|
dongsheng@636
|
12658 msgstr "模版基础"
|
|
dongsheng@627
|
12659
|
|
dongsheng@627
|
12660 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12661 #: ../en/ch11-template.xml:81
|
|
dongsheng@627
|
12662 msgid ""
|
|
dongsheng@627
|
12663 "At its simplest, a Mercurial template is a piece of text. Some of the text "
|
|
dongsheng@627
|
12664 "never changes, while other parts are <emphasis>expanded</emphasis>, or "
|
|
dongsheng@627
|
12665 "replaced with new text, when necessary."
|
|
dongsheng@627
|
12666 msgstr ""
|
|
dongsheng@627
|
12667
|
|
dongsheng@627
|
12668 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12669 #: ../en/ch11-template.xml:86
|
|
dongsheng@627
|
12670 msgid ""
|
|
dongsheng@627
|
12671 "Before we continue, let's look again at a simple example of Mercurial's "
|
|
dongsheng@627
|
12672 "normal output."
|
|
dongsheng@627
|
12673 msgstr ""
|
|
dongsheng@627
|
12674
|
|
dongsheng@627
|
12675 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12676 #: ../en/ch11-template.xml:91
|
|
dongsheng@627
|
12677 msgid ""
|
|
dongsheng@627
|
12678 "Now, let's run the same command, but using a template to change its output."
|
|
dongsheng@627
|
12679 msgstr ""
|
|
dongsheng@627
|
12680
|
|
dongsheng@627
|
12681 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12682 #: ../en/ch11-template.xml:96
|
|
dongsheng@627
|
12683 msgid ""
|
|
dongsheng@627
|
12684 "The example above illustrates the simplest possible template; it's just a "
|
|
dongsheng@627
|
12685 "piece of static text, printed once for each changeset. The <option role=\"hg-"
|
|
dongsheng@627
|
12686 "opt-log\">--template</option> option to the <command role=\"hg-cmd\">hg log</"
|
|
dongsheng@627
|
12687 "command> command tells Mercurial to use the given text as the template when "
|
|
dongsheng@627
|
12688 "printing each changeset."
|
|
dongsheng@627
|
12689 msgstr ""
|
|
dongsheng@627
|
12690
|
|
dongsheng@627
|
12691 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12692 #: ../en/ch11-template.xml:104
|
|
dongsheng@627
|
12693 msgid ""
|
|
dongsheng@627
|
12694 "Notice that the template string above ends with the text <quote><literal>\\n</"
|
|
dongsheng@627
|
12695 "literal></quote>. This is an <emphasis>escape sequence</emphasis>, telling "
|
|
dongsheng@627
|
12696 "Mercurial to print a newline at the end of each template item. If you omit "
|
|
dongsheng@627
|
12697 "this newline, Mercurial will run each piece of output together. See section "
|
|
dongsheng@627
|
12698 "<xref linkend=\"sec.template.escape\"/> for more details of escape sequences."
|
|
dongsheng@627
|
12699 msgstr ""
|
|
dongsheng@627
|
12700
|
|
dongsheng@627
|
12701 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12702 #: ../en/ch11-template.xml:112
|
|
dongsheng@627
|
12703 msgid ""
|
|
dongsheng@627
|
12704 "A template that prints a fixed string of text all the time isn't very useful; "
|
|
dongsheng@627
|
12705 "let's try something a bit more complex."
|
|
dongsheng@627
|
12706 msgstr ""
|
|
dongsheng@627
|
12707
|
|
dongsheng@627
|
12708 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12709 #: ../en/ch11-template.xml:118
|
|
dongsheng@627
|
12710 msgid ""
|
|
dongsheng@627
|
12711 "As you can see, the string <quote><literal>{desc}</literal></quote> in the "
|
|
dongsheng@627
|
12712 "template has been replaced in the output with the description of each "
|
|
dongsheng@627
|
12713 "changeset. Every time Mercurial finds text enclosed in curly braces "
|
|
dongsheng@627
|
12714 "(<quote><literal>{</literal></quote> and <quote><literal>}</literal></"
|
|
dongsheng@627
|
12715 "quote>), it will try to replace the braces and text with the expansion of "
|
|
dongsheng@627
|
12716 "whatever is inside. To print a literal curly brace, you must escape it, as "
|
|
dongsheng@627
|
12717 "described in section <xref linkend=\"sec.template.escape\"/>."
|
|
dongsheng@627
|
12718 msgstr ""
|
|
dongsheng@627
|
12719
|
|
dongsheng@627
|
12720 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
12721 #: ../en/ch11-template.xml:131
|
|
dongsheng@627
|
12722 msgid "Common template keywords"
|
|
dongsheng@636
|
12723 msgstr "模版关键字"
|
|
dongsheng@627
|
12724
|
|
dongsheng@627
|
12725 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12726 #: ../en/ch11-template.xml:133
|
|
dongsheng@627
|
12727 msgid ""
|
|
dongsheng@627
|
12728 "You can start writing simple templates immediately using the keywords below."
|
|
dongsheng@627
|
12729 msgstr ""
|
|
dongsheng@627
|
12730
|
|
dongsheng@627
|
12731 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12732 #: ../en/ch11-template.xml:137
|
|
dongsheng@627
|
12733 msgid ""
|
|
dongsheng@627
|
12734 "<literal role=\"template-keyword\">author</literal>: String. The unmodified "
|
|
dongsheng@627
|
12735 "author of the changeset."
|
|
dongsheng@627
|
12736 msgstr ""
|
|
dongsheng@627
|
12737
|
|
dongsheng@627
|
12738 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12739 #: ../en/ch11-template.xml:141
|
|
dongsheng@627
|
12740 msgid ""
|
|
dongsheng@627
|
12741 "<literal role=\"template-keyword\">branches</literal>: String. The name of "
|
|
dongsheng@627
|
12742 "the branch on which the changeset was committed. Will be empty if the branch "
|
|
dongsheng@627
|
12743 "name was <literal>default</literal>."
|
|
dongsheng@627
|
12744 msgstr ""
|
|
dongsheng@627
|
12745
|
|
dongsheng@627
|
12746 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12747 #: ../en/ch11-template.xml:147
|
|
dongsheng@627
|
12748 msgid ""
|
|
dongsheng@627
|
12749 "<literal role=\"template-keyword\">date</literal>: Date information. The "
|
|
dongsheng@627
|
12750 "date when the changeset was committed. This is <emphasis>not</emphasis> "
|
|
dongsheng@627
|
12751 "human-readable; you must pass it through a filter that will render it "
|
|
dongsheng@627
|
12752 "appropriately. See section <xref linkend=\"sec.template.filter\"/> for more "
|
|
dongsheng@627
|
12753 "information on filters. The date is expressed as a pair of numbers. The "
|
|
dongsheng@627
|
12754 "first number is a Unix UTC timestamp (seconds since January 1, 1970); the "
|
|
dongsheng@627
|
12755 "second is the offset of the committer's timezone from UTC, in seconds."
|
|
dongsheng@627
|
12756 msgstr ""
|
|
dongsheng@627
|
12757
|
|
dongsheng@627
|
12758 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12759 #: ../en/ch11-template.xml:158
|
|
dongsheng@627
|
12760 msgid ""
|
|
dongsheng@627
|
12761 "<literal role=\"template-keyword\">desc</literal>: String. The text of the "
|
|
dongsheng@627
|
12762 "changeset description."
|
|
dongsheng@627
|
12763 msgstr ""
|
|
dongsheng@627
|
12764
|
|
dongsheng@627
|
12765 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12766 #: ../en/ch11-template.xml:161
|
|
dongsheng@627
|
12767 msgid ""
|
|
dongsheng@627
|
12768 "<literal role=\"template-keyword\">files</literal>: List of strings. All "
|
|
dongsheng@627
|
12769 "files modified, added, or removed by this changeset."
|
|
dongsheng@627
|
12770 msgstr ""
|
|
dongsheng@627
|
12771
|
|
dongsheng@627
|
12772 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12773 #: ../en/ch11-template.xml:166
|
|
dongsheng@627
|
12774 msgid ""
|
|
dongsheng@627
|
12775 "<literal role=\"template-keyword\">file_adds</literal>: List of strings. "
|
|
dongsheng@627
|
12776 "Files added by this changeset."
|
|
dongsheng@627
|
12777 msgstr ""
|
|
dongsheng@627
|
12778
|
|
dongsheng@627
|
12779 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12780 #: ../en/ch11-template.xml:170
|
|
dongsheng@627
|
12781 msgid ""
|
|
dongsheng@627
|
12782 "<literal role=\"template-keyword\">file_dels</literal>: List of strings. "
|
|
dongsheng@627
|
12783 "Files removed by this changeset."
|
|
dongsheng@627
|
12784 msgstr ""
|
|
dongsheng@627
|
12785
|
|
dongsheng@627
|
12786 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12787 #: ../en/ch11-template.xml:174
|
|
dongsheng@627
|
12788 msgid ""
|
|
dongsheng@627
|
12789 "<literal role=\"template-keyword\">node</literal>: String. The changeset "
|
|
dongsheng@627
|
12790 "identification hash, as a 40-character hexadecimal string."
|
|
dongsheng@627
|
12791 msgstr ""
|
|
dongsheng@627
|
12792
|
|
dongsheng@627
|
12793 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12794 #: ../en/ch11-template.xml:178
|
|
dongsheng@627
|
12795 msgid ""
|
|
dongsheng@627
|
12796 "<literal role=\"template-keyword\">parents</literal>: List of strings. The "
|
|
dongsheng@627
|
12797 "parents of the changeset."
|
|
dongsheng@627
|
12798 msgstr ""
|
|
dongsheng@627
|
12799
|
|
dongsheng@627
|
12800 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12801 #: ../en/ch11-template.xml:182
|
|
dongsheng@627
|
12802 msgid ""
|
|
dongsheng@627
|
12803 "<literal role=\"template-keyword\">rev</literal>: Integer. The repository-"
|
|
dongsheng@627
|
12804 "local changeset revision number."
|
|
dongsheng@627
|
12805 msgstr ""
|
|
dongsheng@627
|
12806
|
|
dongsheng@627
|
12807 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12808 #: ../en/ch11-template.xml:186
|
|
dongsheng@627
|
12809 msgid ""
|
|
dongsheng@627
|
12810 "<literal role=\"template-keyword\">tags</literal>: List of strings. Any tags "
|
|
dongsheng@627
|
12811 "associated with the changeset."
|
|
dongsheng@627
|
12812 msgstr ""
|
|
dongsheng@627
|
12813
|
|
dongsheng@627
|
12814 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12815 #: ../en/ch11-template.xml:191
|
|
dongsheng@627
|
12816 msgid ""
|
|
dongsheng@627
|
12817 "A few simple experiments will show us what to expect when we use these "
|
|
dongsheng@627
|
12818 "keywords; you can see the results below."
|
|
dongsheng@627
|
12819 msgstr ""
|
|
dongsheng@627
|
12820
|
|
dongsheng@627
|
12821 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12822 #: ../en/ch11-template.xml:196
|
|
dongsheng@627
|
12823 msgid ""
|
|
dongsheng@627
|
12824 "As we noted above, the date keyword does not produce human-readable output, "
|
|
dongsheng@627
|
12825 "so we must treat it specially. This involves using a <emphasis>filter</"
|
|
dongsheng@627
|
12826 "emphasis>, about which more in section <xref linkend=\"sec.template.filter\"/"
|
|
dongsheng@627
|
12827 ">."
|
|
dongsheng@627
|
12828 msgstr ""
|
|
dongsheng@627
|
12829
|
|
dongsheng@627
|
12830 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
12831 #: ../en/ch11-template.xml:206
|
|
dongsheng@627
|
12832 msgid "Escape sequences"
|
|
dongsheng@636
|
12833 msgstr "转义序列"
|
|
dongsheng@627
|
12834
|
|
dongsheng@627
|
12835 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12836 #: ../en/ch11-template.xml:208
|
|
dongsheng@627
|
12837 msgid ""
|
|
dongsheng@627
|
12838 "Mercurial's templating engine recognises the most commonly used escape "
|
|
dongsheng@627
|
12839 "sequences in strings. When it sees a backslash (<quote><literal>\\</"
|
|
dongsheng@627
|
12840 "literal></quote>) character, it looks at the following character and "
|
|
dongsheng@627
|
12841 "substitutes the two characters with a single replacement, as described below."
|
|
dongsheng@627
|
12842 msgstr ""
|
|
dongsheng@627
|
12843
|
|
dongsheng@627
|
12844 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12845 #: ../en/ch11-template.xml:215
|
|
dongsheng@627
|
12846 msgid ""
|
|
dongsheng@627
|
12847 "<literal>\\textbackslash\\textbackslash</literal>: Backslash, <quote><literal>"
|
|
dongsheng@627
|
12848 "\\</literal></quote>, ASCII 134."
|
|
dongsheng@627
|
12849 msgstr ""
|
|
dongsheng@627
|
12850
|
|
dongsheng@627
|
12851 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12852 #: ../en/ch11-template.xml:219
|
|
dongsheng@627
|
12853 msgid "<literal>\\textbackslash n</literal>: Newline, ASCII 12."
|
|
dongsheng@627
|
12854 msgstr ""
|
|
dongsheng@627
|
12855
|
|
dongsheng@627
|
12856 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12857 #: ../en/ch11-template.xml:222
|
|
dongsheng@627
|
12858 msgid "<literal>\\textbackslash r</literal>: Carriage return, ASCII 15."
|
|
dongsheng@627
|
12859 msgstr ""
|
|
dongsheng@627
|
12860
|
|
dongsheng@627
|
12861 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12862 #: ../en/ch11-template.xml:225
|
|
dongsheng@627
|
12863 msgid "<literal>\\textbackslash t</literal>: Tab, ASCII 11."
|
|
dongsheng@627
|
12864 msgstr ""
|
|
dongsheng@627
|
12865
|
|
dongsheng@627
|
12866 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12867 #: ../en/ch11-template.xml:228
|
|
dongsheng@627
|
12868 msgid "<literal>\\textbackslash v</literal>: Vertical tab, ASCII 13."
|
|
dongsheng@627
|
12869 msgstr ""
|
|
dongsheng@627
|
12870
|
|
dongsheng@627
|
12871 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12872 #: ../en/ch11-template.xml:231
|
|
dongsheng@627
|
12873 msgid ""
|
|
dongsheng@627
|
12874 "<literal>\\textbackslash {</literal>: Open curly brace, <quote><literal>{</"
|
|
dongsheng@627
|
12875 "literal></quote>, ASCII 173."
|
|
dongsheng@627
|
12876 msgstr ""
|
|
dongsheng@627
|
12877
|
|
dongsheng@627
|
12878 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12879 #: ../en/ch11-template.xml:235
|
|
dongsheng@627
|
12880 msgid ""
|
|
dongsheng@627
|
12881 "<literal>\\textbackslash }</literal>: Close curly brace, <quote><literal>}</"
|
|
dongsheng@627
|
12882 "literal></quote>, ASCII 175."
|
|
dongsheng@627
|
12883 msgstr ""
|
|
dongsheng@627
|
12884
|
|
dongsheng@627
|
12885 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12886 #: ../en/ch11-template.xml:240
|
|
dongsheng@627
|
12887 msgid ""
|
|
dongsheng@627
|
12888 "As indicated above, if you want the expansion of a template to contain a "
|
|
dongsheng@627
|
12889 "literal <quote><literal>\\</literal></quote>, <quote><literal>{</literal></"
|
|
dongsheng@627
|
12890 "quote>, or <quote><literal>{</literal></quote> character, you must escape it."
|
|
dongsheng@627
|
12891 msgstr ""
|
|
dongsheng@627
|
12892
|
|
dongsheng@627
|
12893 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
12894 #: ../en/ch11-template.xml:248
|
|
dongsheng@627
|
12895 msgid "Filtering keywords to change their results"
|
|
dongsheng@636
|
12896 msgstr "通过过滤关键字来修改输出结果"
|
|
dongsheng@627
|
12897
|
|
dongsheng@627
|
12898 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12899 #: ../en/ch11-template.xml:250
|
|
dongsheng@627
|
12900 msgid ""
|
|
dongsheng@627
|
12901 "Some of the results of template expansion are not immediately easy to use. "
|
|
dongsheng@627
|
12902 "Mercurial lets you specify an optional chain of <emphasis>filters</emphasis> "
|
|
dongsheng@627
|
12903 "to modify the result of expanding a keyword. You have already seen a common "
|
|
dongsheng@627
|
12904 "filter, <literal role=\"template-kw-filt-date\">isodate</literal>, in action "
|
|
dongsheng@627
|
12905 "above, to make a date readable."
|
|
dongsheng@627
|
12906 msgstr ""
|
|
dongsheng@627
|
12907
|
|
dongsheng@627
|
12908 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
12909 #: ../en/ch11-template.xml:257
|
|
dongsheng@627
|
12910 msgid ""
|
|
dongsheng@627
|
12911 "Below is a list of the most commonly used filters that Mercurial supports. "
|
|
dongsheng@627
|
12912 "While some filters can be applied to any text, others can only be used in "
|
|
dongsheng@627
|
12913 "specific circumstances. The name of each filter is followed first by an "
|
|
dongsheng@627
|
12914 "indication of where it can be used, then a description of its effect."
|
|
dongsheng@627
|
12915 msgstr ""
|
|
dongsheng@627
|
12916
|
|
dongsheng@627
|
12917 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12918 #: ../en/ch11-template.xml:264
|
|
dongsheng@627
|
12919 msgid ""
|
|
dongsheng@627
|
12920 "<literal role=\"template-filter\">addbreaks</literal>: Any text. Add an XHTML "
|
|
dongsheng@627
|
12921 "<quote><literal><br/></literal></quote> tag before the end of every "
|
|
dongsheng@627
|
12922 "line except the last. For example, <quote><literal>foo\\nbar</literal></"
|
|
dongsheng@627
|
12923 "quote> becomes <quote><literal>foo<br/>\\nbar</literal></quote>."
|
|
dongsheng@627
|
12924 msgstr ""
|
|
dongsheng@627
|
12925
|
|
dongsheng@627
|
12926 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12927 #: ../en/ch11-template.xml:271
|
|
dongsheng@627
|
12928 msgid ""
|
|
dongsheng@627
|
12929 "<literal role=\"template-kw-filt-date\">age</literal>: <literal role="
|
|
dongsheng@627
|
12930 "\"template-keyword\">date</literal> keyword. Render the age of the date, "
|
|
dongsheng@627
|
12931 "relative to the current time. Yields a string like <quote><literal>10 "
|
|
dongsheng@627
|
12932 "minutes</literal></quote>."
|
|
dongsheng@627
|
12933 msgstr ""
|
|
dongsheng@627
|
12934
|
|
dongsheng@627
|
12935 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12936 #: ../en/ch11-template.xml:278
|
|
dongsheng@627
|
12937 msgid ""
|
|
dongsheng@627
|
12938 "<literal role=\"template-filter\">basename</literal>: Any text, but most "
|
|
dongsheng@627
|
12939 "useful for the <literal role=\"template-keyword\">files</literal> keyword and "
|
|
dongsheng@627
|
12940 "its relatives. Treat the text as a path, and return the basename. For "
|
|
dongsheng@627
|
12941 "example, <quote><literal>foo/bar/baz</literal></quote> becomes "
|
|
dongsheng@627
|
12942 "<quote><literal>baz</literal></quote>."
|
|
dongsheng@627
|
12943 msgstr ""
|
|
dongsheng@627
|
12944
|
|
dongsheng@627
|
12945 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12946 #: ../en/ch11-template.xml:287
|
|
dongsheng@627
|
12947 msgid ""
|
|
dongsheng@627
|
12948 "<literal role=\"template-kw-filt-date\">date</literal>: <literal role="
|
|
dongsheng@627
|
12949 "\"template-keyword\">date</literal> keyword. Render a date in a similar "
|
|
dongsheng@627
|
12950 "format to the Unix <literal role=\"template-keyword\">date</literal> command, "
|
|
dongsheng@627
|
12951 "but with timezone included. Yields a string like <quote><literal>Mon Sep 04 "
|
|
dongsheng@627
|
12952 "15:13:13 2006 -0700</literal></quote>."
|
|
dongsheng@627
|
12953 msgstr ""
|
|
dongsheng@627
|
12954
|
|
dongsheng@627
|
12955 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12956 #: ../en/ch11-template.xml:295
|
|
dongsheng@627
|
12957 msgid ""
|
|
dongsheng@627
|
12958 "<literal role=\"template-kw-filt-author\">domain</literal>: Any text, but "
|
|
dongsheng@627
|
12959 "most useful for the <literal role=\"template-keyword\">author</literal> "
|
|
dongsheng@627
|
12960 "keyword. Finds the first string that looks like an email address, and "
|
|
dongsheng@627
|
12961 "extract just the domain component. For example, <quote><literal>Bryan "
|
|
dongsheng@627
|
12962 "O'Sullivan <bos@serpentine.com></literal></quote> becomes "
|
|
dongsheng@627
|
12963 "<quote><literal>serpentine.com</literal></quote>."
|
|
dongsheng@627
|
12964 msgstr ""
|
|
dongsheng@627
|
12965
|
|
dongsheng@627
|
12966 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12967 #: ../en/ch11-template.xml:305
|
|
dongsheng@627
|
12968 msgid ""
|
|
dongsheng@627
|
12969 "<literal role=\"template-kw-filt-author\">email</literal>: Any text, but most "
|
|
dongsheng@627
|
12970 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
|
|
dongsheng@627
|
12971 "Extract the first string that looks like an email address. For example, "
|
|
dongsheng@627
|
12972 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
|
|
dongsheng@627
|
12973 "becomes <quote><literal>bos@serpentine.com</literal></quote>."
|
|
dongsheng@627
|
12974 msgstr ""
|
|
dongsheng@627
|
12975
|
|
dongsheng@627
|
12976 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12977 #: ../en/ch11-template.xml:314
|
|
dongsheng@627
|
12978 msgid ""
|
|
dongsheng@627
|
12979 "<literal role=\"template-filter\">escape</literal>: Any text. Replace the "
|
|
dongsheng@627
|
12980 "special XML/XHTML characters <quote><literal>&</literal></quote>, "
|
|
dongsheng@627
|
12981 "<quote><literal><</literal></quote> and <quote><literal>></literal></"
|
|
dongsheng@627
|
12982 "quote> with XML entities."
|
|
dongsheng@627
|
12983 msgstr ""
|
|
dongsheng@627
|
12984
|
|
dongsheng@627
|
12985 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12986 #: ../en/ch11-template.xml:322
|
|
dongsheng@627
|
12987 msgid ""
|
|
dongsheng@627
|
12988 "<literal role=\"template-filter\">fill68</literal>: Any text. Wrap the text "
|
|
dongsheng@627
|
12989 "to fit in 68 columns. This is useful before you pass text through the "
|
|
dongsheng@627
|
12990 "<literal role=\"template-filter\">tabindent</literal> filter, and still want "
|
|
dongsheng@627
|
12991 "it to fit in an 80-column fixed-font window."
|
|
dongsheng@627
|
12992 msgstr ""
|
|
dongsheng@627
|
12993
|
|
dongsheng@627
|
12994 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
12995 #: ../en/ch11-template.xml:330
|
|
dongsheng@627
|
12996 msgid ""
|
|
dongsheng@627
|
12997 "<literal role=\"template-filter\">fill76</literal>: Any text. Wrap the text "
|
|
dongsheng@627
|
12998 "to fit in 76 columns."
|
|
dongsheng@627
|
12999 msgstr ""
|
|
dongsheng@627
|
13000
|
|
dongsheng@627
|
13001 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13002 #: ../en/ch11-template.xml:334
|
|
dongsheng@627
|
13003 msgid ""
|
|
dongsheng@627
|
13004 "<literal role=\"template-filter\">firstline</literal>: Any text. Yield the "
|
|
dongsheng@627
|
13005 "first line of text, without any trailing newlines."
|
|
dongsheng@627
|
13006 msgstr ""
|
|
dongsheng@627
|
13007
|
|
dongsheng@627
|
13008 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13009 #: ../en/ch11-template.xml:339
|
|
dongsheng@627
|
13010 msgid ""
|
|
dongsheng@627
|
13011 "<literal role=\"template-kw-filt-date\">hgdate</literal>: <literal role="
|
|
dongsheng@627
|
13012 "\"template-keyword\">date</literal> keyword. Render the date as a pair of "
|
|
dongsheng@627
|
13013 "readable numbers. Yields a string like <quote><literal>1157407993 25200</"
|
|
dongsheng@627
|
13014 "literal></quote>."
|
|
dongsheng@627
|
13015 msgstr ""
|
|
dongsheng@627
|
13016
|
|
dongsheng@627
|
13017 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13018 #: ../en/ch11-template.xml:346
|
|
dongsheng@627
|
13019 msgid ""
|
|
dongsheng@627
|
13020 "<literal role=\"template-kw-filt-date\">isodate</literal>: <literal role="
|
|
dongsheng@627
|
13021 "\"template-keyword\">date</literal> keyword. Render the date as a text "
|
|
dongsheng@627
|
13022 "string in ISO 8601 format. Yields a string like <quote><literal>2006-09-04 "
|
|
dongsheng@627
|
13023 "15:13:13 -0700</literal></quote>."
|
|
dongsheng@627
|
13024 msgstr ""
|
|
dongsheng@627
|
13025
|
|
dongsheng@627
|
13026 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13027 #: ../en/ch11-template.xml:353
|
|
dongsheng@627
|
13028 msgid ""
|
|
dongsheng@627
|
13029 "<literal role=\"template-filter\">obfuscate</literal>: Any text, but most "
|
|
dongsheng@627
|
13030 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
|
|
dongsheng@627
|
13031 "Yield the input text rendered as a sequence of XML entities. This helps to "
|
|
dongsheng@627
|
13032 "defeat some particularly stupid screen-scraping email harvesting spambots."
|
|
dongsheng@627
|
13033 msgstr ""
|
|
dongsheng@627
|
13034
|
|
dongsheng@627
|
13035 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13036 #: ../en/ch11-template.xml:361
|
|
dongsheng@627
|
13037 msgid ""
|
|
dongsheng@627
|
13038 "<literal role=\"template-kw-filt-author\">person</literal>: Any text, but "
|
|
dongsheng@627
|
13039 "most useful for the <literal role=\"template-keyword\">author</literal> "
|
|
dongsheng@627
|
13040 "keyword. Yield the text before an email address. For example, "
|
|
dongsheng@627
|
13041 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
|
|
dongsheng@627
|
13042 "becomes <quote><literal>Bryan O'Sullivan</literal></quote>."
|
|
dongsheng@627
|
13043 msgstr ""
|
|
dongsheng@627
|
13044
|
|
dongsheng@627
|
13045 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13046 #: ../en/ch11-template.xml:370
|
|
dongsheng@627
|
13047 msgid ""
|
|
dongsheng@627
|
13048 "<literal role=\"template-kw-filt-date\">rfc822date</literal>: <literal role="
|
|
dongsheng@627
|
13049 "\"template-keyword\">date</literal> keyword. Render a date using the same "
|
|
dongsheng@627
|
13050 "format used in email headers. Yields a string like <quote><literal>Mon, 04 "
|
|
dongsheng@627
|
13051 "Sep 2006 15:13:13 -0700</literal></quote>."
|
|
dongsheng@627
|
13052 msgstr ""
|
|
dongsheng@627
|
13053
|
|
dongsheng@627
|
13054 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13055 #: ../en/ch11-template.xml:377
|
|
dongsheng@627
|
13056 msgid ""
|
|
dongsheng@627
|
13057 "<literal role=\"template-kw-filt-node\">short</literal>: Changeset hash. "
|
|
dongsheng@627
|
13058 "Yield the short form of a changeset hash, i.e. a 12-character hexadecimal "
|
|
dongsheng@627
|
13059 "string."
|
|
dongsheng@627
|
13060 msgstr ""
|
|
dongsheng@627
|
13061
|
|
dongsheng@627
|
13062 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13063 #: ../en/ch11-template.xml:382
|
|
dongsheng@627
|
13064 msgid ""
|
|
dongsheng@627
|
13065 "<literal role=\"template-kw-filt-date\">shortdate</literal>: <literal role="
|
|
dongsheng@627
|
13066 "\"template-keyword\">date</literal> keyword. Render the year, month, and day "
|
|
dongsheng@627
|
13067 "of the date. Yields a string like <quote><literal>2006-09-04</literal></"
|
|
dongsheng@627
|
13068 "quote>."
|
|
dongsheng@627
|
13069 msgstr ""
|
|
dongsheng@627
|
13070
|
|
dongsheng@627
|
13071 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13072 #: ../en/ch11-template.xml:388
|
|
dongsheng@627
|
13073 msgid ""
|
|
dongsheng@627
|
13074 "<literal role=\"template-filter\">strip</literal>: Any text. Strip all "
|
|
dongsheng@627
|
13075 "leading and trailing whitespace from the string."
|
|
dongsheng@627
|
13076 msgstr ""
|
|
dongsheng@627
|
13077
|
|
dongsheng@627
|
13078 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13079 #: ../en/ch11-template.xml:392
|
|
dongsheng@627
|
13080 msgid ""
|
|
dongsheng@627
|
13081 "<literal role=\"template-filter\">tabindent</literal>: Any text. Yield the "
|
|
dongsheng@627
|
13082 "text, with every line except the first starting with a tab character."
|
|
dongsheng@627
|
13083 msgstr ""
|
|
dongsheng@627
|
13084
|
|
dongsheng@627
|
13085 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13086 #: ../en/ch11-template.xml:397
|
|
dongsheng@627
|
13087 msgid ""
|
|
dongsheng@627
|
13088 "<literal role=\"template-filter\">urlescape</literal>: Any text. Escape all "
|
|
dongsheng@627
|
13089 "characters that are considered <quote>special</quote> by URL parsers. For "
|
|
dongsheng@627
|
13090 "example, <literal>foo bar</literal> becomes <literal>foo%20bar</literal>."
|
|
dongsheng@627
|
13091 msgstr ""
|
|
dongsheng@627
|
13092
|
|
dongsheng@627
|
13093 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13094 #: ../en/ch11-template.xml:404
|
|
dongsheng@627
|
13095 msgid ""
|
|
dongsheng@627
|
13096 "<literal role=\"template-kw-filt-author\">user</literal>: Any text, but most "
|
|
dongsheng@627
|
13097 "useful for the <literal role=\"template-keyword\">author</literal> keyword. "
|
|
dongsheng@627
|
13098 "Return the <quote>user</quote> portion of an email address. For example, "
|
|
dongsheng@627
|
13099 "<quote><literal>Bryan O'Sullivan <bos@serpentine.com></literal></quote> "
|
|
dongsheng@627
|
13100 "becomes <quote><literal>bos</literal></quote>."
|
|
dongsheng@627
|
13101 msgstr ""
|
|
dongsheng@627
|
13102
|
|
dongsheng@627
|
13103 #. type: Content of: <book><chapter><sect1><note><para>
|
|
dongsheng@627
|
13104 #: ../en/ch11-template.xml:417
|
|
dongsheng@627
|
13105 msgid ""
|
|
dongsheng@627
|
13106 "If you try to apply a filter to a piece of data that it cannot process, "
|
|
dongsheng@627
|
13107 "Mercurial will fail and print a Python exception. For example, trying to run "
|
|
dongsheng@627
|
13108 "the output of the <literal role=\"template-keyword\">desc</literal> keyword "
|
|
dongsheng@627
|
13109 "into the <literal role=\"template-kw-filt-date\">isodate</literal> filter is "
|
|
dongsheng@627
|
13110 "not a good idea."
|
|
dongsheng@627
|
13111 msgstr ""
|
|
dongsheng@627
|
13112
|
|
dongsheng@627
|
13113 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13114 #: ../en/ch11-template.xml:426
|
|
dongsheng@627
|
13115 msgid "Combining filters"
|
|
dongsheng@636
|
13116 msgstr "组合过滤器"
|
|
dongsheng@627
|
13117
|
|
dongsheng@627
|
13118 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13119 #: ../en/ch11-template.xml:428
|
|
dongsheng@627
|
13120 msgid ""
|
|
dongsheng@627
|
13121 "It is easy to combine filters to yield output in the form you would like. "
|
|
dongsheng@627
|
13122 "The following chain of filters tidies up a description, then makes sure that "
|
|
dongsheng@627
|
13123 "it fits cleanly into 68 columns, then indents it by a further 8 characters "
|
|
dongsheng@627
|
13124 "(at least on Unix-like systems, where a tab is conventionally 8 characters "
|
|
dongsheng@627
|
13125 "wide)."
|
|
dongsheng@627
|
13126 msgstr ""
|
|
dongsheng@627
|
13127
|
|
dongsheng@627
|
13128 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13129 #: ../en/ch11-template.xml:437
|
|
dongsheng@627
|
13130 msgid ""
|
|
dongsheng@627
|
13131 "Note the use of <quote><literal>\\t</literal></quote> (a tab character) in "
|
|
dongsheng@627
|
13132 "the template to force the first line to be indented; this is necessary since "
|
|
dongsheng@627
|
13133 "<literal role=\"template-keyword\">tabindent</literal> indents all lines "
|
|
dongsheng@627
|
13134 "<emphasis>except</emphasis> the first."
|
|
dongsheng@627
|
13135 msgstr ""
|
|
dongsheng@627
|
13136
|
|
dongsheng@627
|
13137 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13138 #: ../en/ch11-template.xml:443
|
|
dongsheng@627
|
13139 msgid ""
|
|
dongsheng@627
|
13140 "Keep in mind that the order of filters in a chain is significant. The first "
|
|
dongsheng@627
|
13141 "filter is applied to the result of the keyword; the second to the result of "
|
|
dongsheng@627
|
13142 "the first filter; and so on. For example, using <literal>fill68|tabindent</"
|
|
dongsheng@627
|
13143 "literal> gives very different results from <literal>tabindent|fill68</"
|
|
dongsheng@627
|
13144 "literal>."
|
|
dongsheng@627
|
13145 msgstr ""
|
|
dongsheng@627
|
13146
|
|
dongsheng@627
|
13147 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
13148 #: ../en/ch11-template.xml:454
|
|
dongsheng@627
|
13149 msgid "From templates to styles"
|
|
dongsheng@636
|
13150 msgstr "从模版到样式"
|
|
dongsheng@627
|
13151
|
|
dongsheng@627
|
13152 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13153 #: ../en/ch11-template.xml:456
|
|
dongsheng@627
|
13154 msgid ""
|
|
dongsheng@627
|
13155 "A command line template provides a quick and simple way to format some "
|
|
dongsheng@627
|
13156 "output. Templates can become verbose, though, and it's useful to be able to "
|
|
dongsheng@627
|
13157 "give a template a name. A style file is a template with a name, stored in a "
|
|
dongsheng@627
|
13158 "file."
|
|
dongsheng@627
|
13159 msgstr ""
|
|
dongsheng@627
|
13160
|
|
dongsheng@627
|
13161 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13162 #: ../en/ch11-template.xml:461
|
|
dongsheng@627
|
13163 msgid ""
|
|
dongsheng@627
|
13164 "More than that, using a style file unlocks the power of Mercurial's "
|
|
dongsheng@627
|
13165 "templating engine in ways that are not possible using the command line "
|
|
dongsheng@627
|
13166 "<option role=\"hg-opt-log\">--template</option> option."
|
|
dongsheng@627
|
13167 msgstr ""
|
|
dongsheng@627
|
13168
|
|
dongsheng@627
|
13169 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13170 #: ../en/ch11-template.xml:467
|
|
dongsheng@627
|
13171 msgid "The simplest of style files"
|
|
dongsheng@636
|
13172 msgstr "最简单的样式文件"
|
|
dongsheng@627
|
13173
|
|
dongsheng@627
|
13174 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13175 #: ../en/ch11-template.xml:469
|
|
dongsheng@627
|
13176 msgid "Our simple style file contains just one line:"
|
|
dongsheng@627
|
13177 msgstr ""
|
|
dongsheng@627
|
13178
|
|
dongsheng@627
|
13179 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13180 #: ../en/ch11-template.xml:473
|
|
dongsheng@627
|
13181 msgid ""
|
|
dongsheng@627
|
13182 "This tells Mercurial, <quote>if you're printing a changeset, use the text on "
|
|
dongsheng@627
|
13183 "the right as the template</quote>."
|
|
dongsheng@627
|
13184 msgstr ""
|
|
dongsheng@627
|
13185
|
|
dongsheng@627
|
13186 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13187 #: ../en/ch11-template.xml:479
|
|
dongsheng@627
|
13188 msgid "Style file syntax"
|
|
dongsheng@636
|
13189 msgstr "样式文件语法"
|
|
dongsheng@627
|
13190
|
|
dongsheng@627
|
13191 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13192 #: ../en/ch11-template.xml:481
|
|
dongsheng@627
|
13193 msgid "The syntax rules for a style file are simple."
|
|
dongsheng@627
|
13194 msgstr ""
|
|
dongsheng@627
|
13195
|
|
dongsheng@627
|
13196 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13197 #: ../en/ch11-template.xml:484
|
|
dongsheng@627
|
13198 msgid "The file is processed one line at a time."
|
|
dongsheng@627
|
13199 msgstr ""
|
|
dongsheng@627
|
13200
|
|
dongsheng@627
|
13201 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13202 #: ../en/ch11-template.xml:487
|
|
dongsheng@627
|
13203 msgid "Leading and trailing white space are ignored."
|
|
dongsheng@627
|
13204 msgstr ""
|
|
dongsheng@627
|
13205
|
|
dongsheng@627
|
13206 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13207 #: ../en/ch11-template.xml:490
|
|
dongsheng@627
|
13208 msgid "Empty lines are skipped."
|
|
dongsheng@627
|
13209 msgstr ""
|
|
dongsheng@627
|
13210
|
|
dongsheng@627
|
13211 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13212 #: ../en/ch11-template.xml:492
|
|
dongsheng@627
|
13213 msgid ""
|
|
dongsheng@627
|
13214 "If a line starts with either of the characters <quote><literal>#</literal></"
|
|
dongsheng@627
|
13215 "quote> or <quote><literal>;</literal></quote>, the entire line is treated as "
|
|
dongsheng@627
|
13216 "a comment, and skipped as if empty."
|
|
dongsheng@627
|
13217 msgstr ""
|
|
dongsheng@627
|
13218
|
|
dongsheng@627
|
13219 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13220 #: ../en/ch11-template.xml:497
|
|
dongsheng@627
|
13221 msgid ""
|
|
dongsheng@627
|
13222 "A line starts with a keyword. This must start with an alphabetic character "
|
|
dongsheng@627
|
13223 "or underscore, and can subsequently contain any alphanumeric character or "
|
|
dongsheng@627
|
13224 "underscore. (In regexp notation, a keyword must match <literal>[A-Za-z_][A-"
|
|
dongsheng@627
|
13225 "Za-z0-9_]*</literal>.)"
|
|
dongsheng@627
|
13226 msgstr ""
|
|
dongsheng@627
|
13227
|
|
dongsheng@627
|
13228 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13229 #: ../en/ch11-template.xml:503
|
|
dongsheng@627
|
13230 msgid ""
|
|
dongsheng@627
|
13231 "The next element must be an <quote><literal>=</literal></quote> character, "
|
|
dongsheng@627
|
13232 "which can be preceded or followed by an arbitrary amount of white space."
|
|
dongsheng@627
|
13233 msgstr ""
|
|
dongsheng@627
|
13234
|
|
dongsheng@627
|
13235 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13236 #: ../en/ch11-template.xml:508
|
|
dongsheng@627
|
13237 msgid ""
|
|
dongsheng@627
|
13238 "If the rest of the line starts and ends with matching quote characters "
|
|
dongsheng@627
|
13239 "(either single or double quote), it is treated as a template body."
|
|
dongsheng@627
|
13240 msgstr ""
|
|
dongsheng@627
|
13241
|
|
dongsheng@627
|
13242 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13243 #: ../en/ch11-template.xml:512
|
|
dongsheng@627
|
13244 msgid ""
|
|
dongsheng@627
|
13245 "If the rest of the line <emphasis>does not</emphasis> start with a quote "
|
|
dongsheng@627
|
13246 "character, it is treated as the name of a file; the contents of this file "
|
|
dongsheng@627
|
13247 "will be read and used as a template body."
|
|
dongsheng@627
|
13248 msgstr ""
|
|
dongsheng@627
|
13249
|
|
dongsheng@627
|
13250 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
13251 #: ../en/ch11-template.xml:521
|
|
dongsheng@627
|
13252 msgid "Style files by example"
|
|
dongsheng@636
|
13253 msgstr "样式文件例子"
|
|
dongsheng@627
|
13254
|
|
dongsheng@627
|
13255 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13256 #: ../en/ch11-template.xml:523
|
|
dongsheng@627
|
13257 msgid ""
|
|
dongsheng@627
|
13258 "To illustrate how to write a style file, we will construct a few by example. "
|
|
dongsheng@627
|
13259 "Rather than provide a complete style file and walk through it, we'll mirror "
|
|
dongsheng@627
|
13260 "the usual process of developing a style file by starting with something very "
|
|
dongsheng@627
|
13261 "simple, and walking through a series of successively more complete examples."
|
|
dongsheng@627
|
13262 msgstr ""
|
|
dongsheng@627
|
13263
|
|
dongsheng@627
|
13264 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13265 #: ../en/ch11-template.xml:530
|
|
dongsheng@627
|
13266 msgid "Identifying mistakes in style files"
|
|
dongsheng@636
|
13267 msgstr "在样式文件中定位错误"
|
|
dongsheng@627
|
13268
|
|
dongsheng@627
|
13269 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13270 #: ../en/ch11-template.xml:532
|
|
dongsheng@627
|
13271 msgid ""
|
|
dongsheng@627
|
13272 "If Mercurial encounters a problem in a style file you are working on, it "
|
|
dongsheng@627
|
13273 "prints a terse error message that, once you figure out what it means, is "
|
|
dongsheng@627
|
13274 "actually quite useful."
|
|
dongsheng@627
|
13275 msgstr ""
|
|
dongsheng@627
|
13276
|
|
dongsheng@627
|
13277 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13278 #: ../en/ch11-template.xml:538
|
|
dongsheng@627
|
13279 msgid ""
|
|
dongsheng@627
|
13280 "Notice that <filename>broken.style</filename> attempts to define a "
|
|
dongsheng@627
|
13281 "<literal>changeset</literal> keyword, but forgets to give any content for it. "
|
|
dongsheng@627
|
13282 "When instructed to use this style file, Mercurial promptly complains."
|
|
dongsheng@627
|
13283 msgstr ""
|
|
dongsheng@627
|
13284
|
|
dongsheng@627
|
13285 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13286 #: ../en/ch11-template.xml:545
|
|
dongsheng@627
|
13287 msgid "This error message looks intimidating, but it is not too hard to follow."
|
|
dongsheng@627
|
13288 msgstr ""
|
|
dongsheng@627
|
13289
|
|
dongsheng@627
|
13290 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13291 #: ../en/ch11-template.xml:549
|
|
dongsheng@627
|
13292 msgid ""
|
|
dongsheng@627
|
13293 "The first component is simply Mercurial's way of saying <quote>I am giving "
|
|
dongsheng@627
|
13294 "up</quote>."
|
|
dongsheng@627
|
13295 msgstr ""
|
|
dongsheng@627
|
13296
|
|
dongsheng@627
|
13297 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13298 #: ../en/ch11-template.xml:554
|
|
dongsheng@627
|
13299 msgid "Next comes the name of the style file that contains the error."
|
|
dongsheng@627
|
13300 msgstr ""
|
|
dongsheng@627
|
13301
|
|
dongsheng@627
|
13302 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13303 #: ../en/ch11-template.xml:560
|
|
dongsheng@627
|
13304 msgid ""
|
|
dongsheng@627
|
13305 "Following the file name is the line number where the error was encountered."
|
|
dongsheng@627
|
13306 msgstr ""
|
|
dongsheng@627
|
13307
|
|
dongsheng@627
|
13308 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13309 #: ../en/ch11-template.xml:565
|
|
dongsheng@627
|
13310 msgid "Finally, a description of what went wrong."
|
|
dongsheng@627
|
13311 msgstr ""
|
|
dongsheng@627
|
13312
|
|
dongsheng@627
|
13313 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13314 #: ../en/ch11-template.xml:570
|
|
dongsheng@627
|
13315 msgid ""
|
|
dongsheng@627
|
13316 "The description of the problem is not always clear (as in this case), but "
|
|
dongsheng@627
|
13317 "even when it is cryptic, it is almost always trivial to visually inspect the "
|
|
dongsheng@627
|
13318 "offending line in the style file and see what is wrong."
|
|
dongsheng@627
|
13319 msgstr ""
|
|
dongsheng@627
|
13320
|
|
dongsheng@627
|
13321 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13322 #: ../en/ch11-template.xml:578
|
|
dongsheng@627
|
13323 msgid "Uniquely identifying a repository"
|
|
dongsheng@636
|
13324 msgstr "版本库的唯一标识"
|
|
dongsheng@627
|
13325
|
|
dongsheng@627
|
13326 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13327 #: ../en/ch11-template.xml:580
|
|
dongsheng@627
|
13328 msgid ""
|
|
dongsheng@627
|
13329 "If you would like to be able to identify a Mercurial repository <quote>fairly "
|
|
dongsheng@627
|
13330 "uniquely</quote> using a short string as an identifier, you can use the first "
|
|
dongsheng@627
|
13331 "revision in the repository."
|
|
dongsheng@627
|
13332 msgstr ""
|
|
dongsheng@627
|
13333
|
|
dongsheng@627
|
13334 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13335 #: ../en/ch11-template.xml:587
|
|
dongsheng@627
|
13336 msgid ""
|
|
dongsheng@627
|
13337 "This is not guaranteed to be unique, but it is nevertheless useful in many "
|
|
dongsheng@627
|
13338 "cases."
|
|
dongsheng@627
|
13339 msgstr ""
|
|
dongsheng@627
|
13340
|
|
dongsheng@627
|
13341 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13342 #: ../en/ch11-template.xml:590
|
|
dongsheng@627
|
13343 msgid ""
|
|
dongsheng@627
|
13344 "It will not work in a completely empty repository, because such a repository "
|
|
dongsheng@627
|
13345 "does not have a revision zero."
|
|
dongsheng@627
|
13346 msgstr ""
|
|
dongsheng@627
|
13347
|
|
dongsheng@627
|
13348 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13349 #: ../en/ch11-template.xml:594
|
|
dongsheng@627
|
13350 msgid ""
|
|
dongsheng@627
|
13351 "Neither will it work in the (extremely rare) case where a repository is a "
|
|
dongsheng@627
|
13352 "merge of two or more formerly independent repositories, and you still have "
|
|
dongsheng@627
|
13353 "those repositories around."
|
|
dongsheng@627
|
13354 msgstr ""
|
|
dongsheng@627
|
13355
|
|
dongsheng@627
|
13356 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13357 #: ../en/ch11-template.xml:599
|
|
dongsheng@627
|
13358 msgid "Here are some uses to which you could put this identifier:"
|
|
dongsheng@627
|
13359 msgstr ""
|
|
dongsheng@627
|
13360
|
|
dongsheng@627
|
13361 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13362 #: ../en/ch11-template.xml:602
|
|
dongsheng@627
|
13363 msgid ""
|
|
dongsheng@627
|
13364 "As a key into a table for a database that manages repositories on a server."
|
|
dongsheng@627
|
13365 msgstr ""
|
|
dongsheng@627
|
13366
|
|
dongsheng@627
|
13367 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13368 #: ../en/ch11-template.xml:605
|
|
dongsheng@627
|
13369 msgid ""
|
|
dongsheng@627
|
13370 "As half of a {<emphasis>repository ID</emphasis>, <emphasis>revision ID</"
|
|
dongsheng@627
|
13371 "emphasis>} tuple. Save this information away when you run an automated build "
|
|
dongsheng@627
|
13372 "or other activity, so that you can <quote>replay</quote> the build later if "
|
|
dongsheng@627
|
13373 "necessary."
|
|
dongsheng@627
|
13374 msgstr ""
|
|
dongsheng@627
|
13375
|
|
dongsheng@627
|
13376 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13377 #: ../en/ch11-template.xml:614
|
|
dongsheng@627
|
13378 msgid "Mimicking Subversion's output"
|
|
dongsheng@636
|
13379 msgstr "模仿 Subversion 的输出"
|
|
dongsheng@627
|
13380
|
|
dongsheng@627
|
13381 #
|
|
dongsheng@627
|
13382 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13383 #: ../en/ch11-template.xml:616
|
|
dongsheng@627
|
13384 msgid ""
|
|
dongsheng@627
|
13385 "Let's try to emulate the default output format used by another revision "
|
|
dongsheng@627
|
13386 "control tool, Subversion."
|
|
dongsheng@627
|
13387 msgstr ""
|
|
dongsheng@627
|
13388
|
|
dongsheng@627
|
13389 #
|
|
dongsheng@627
|
13390 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13391 #: ../en/ch11-template.xml:621
|
|
dongsheng@627
|
13392 msgid ""
|
|
dongsheng@627
|
13393 "Since Subversion's output style is fairly simple, it is easy to copy-and-"
|
|
dongsheng@627
|
13394 "paste a hunk of its output into a file, and replace the text produced above "
|
|
dongsheng@627
|
13395 "by Subversion with the template values we'd like to see expanded."
|
|
dongsheng@627
|
13396 msgstr ""
|
|
dongsheng@627
|
13397
|
|
dongsheng@627
|
13398 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13399 #: ../en/ch11-template.xml:628
|
|
dongsheng@627
|
13400 msgid ""
|
|
dongsheng@627
|
13401 "There are a few small ways in which this template deviates from the output "
|
|
dongsheng@627
|
13402 "produced by Subversion."
|
|
dongsheng@627
|
13403 msgstr ""
|
|
dongsheng@627
|
13404
|
|
dongsheng@627
|
13405 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13406 #: ../en/ch11-template.xml:631
|
|
dongsheng@627
|
13407 msgid ""
|
|
dongsheng@627
|
13408 "Subversion prints a <quote>readable</quote> date (the <quote><literal>Wed, 27 "
|
|
dongsheng@627
|
13409 "Sep 2006</literal></quote> in the example output above) in parentheses. "
|
|
dongsheng@627
|
13410 "Mercurial's templating engine does not provide a way to display a date in "
|
|
dongsheng@627
|
13411 "this format without also printing the time and time zone."
|
|
dongsheng@627
|
13412 msgstr ""
|
|
dongsheng@627
|
13413
|
|
dongsheng@627
|
13414 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13415 #: ../en/ch11-template.xml:638
|
|
dongsheng@627
|
13416 msgid ""
|
|
dongsheng@627
|
13417 "We emulate Subversion's printing of <quote>separator</quote> lines full of "
|
|
dongsheng@627
|
13418 "<quote><literal>-</literal></quote> characters by ending the template with "
|
|
dongsheng@627
|
13419 "such a line. We use the templating engine's <literal role=\"template-keyword"
|
|
dongsheng@627
|
13420 "\">header</literal> keyword to print a separator line as the first line of "
|
|
dongsheng@627
|
13421 "output (see below), thus achieving similar output to Subversion."
|
|
dongsheng@627
|
13422 msgstr ""
|
|
dongsheng@627
|
13423
|
|
dongsheng@627
|
13424 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13425 #: ../en/ch11-template.xml:647
|
|
dongsheng@627
|
13426 msgid ""
|
|
dongsheng@627
|
13427 "Subversion's output includes a count in the header of the number of lines in "
|
|
dongsheng@627
|
13428 "the commit message. We cannot replicate this in Mercurial; the templating "
|
|
dongsheng@627
|
13429 "engine does not currently provide a filter that counts the number of lines "
|
|
dongsheng@627
|
13430 "the template generates."
|
|
dongsheng@627
|
13431 msgstr ""
|
|
dongsheng@627
|
13432
|
|
dongsheng@627
|
13433 #
|
|
dongsheng@627
|
13434 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13435 #: ../en/ch11-template.xml:653
|
|
dongsheng@627
|
13436 msgid ""
|
|
dongsheng@627
|
13437 "It took me no more than a minute or two of work to replace literal text from "
|
|
dongsheng@627
|
13438 "an example of Subversion's output with some keywords and filters to give the "
|
|
dongsheng@627
|
13439 "template above. The style file simply refers to the template."
|
|
dongsheng@627
|
13440 msgstr ""
|
|
dongsheng@627
|
13441
|
|
dongsheng@627
|
13442 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13443 #: ../en/ch11-template.xml:660
|
|
dongsheng@627
|
13444 msgid ""
|
|
dongsheng@627
|
13445 "We could have included the text of the template file directly in the style "
|
|
dongsheng@627
|
13446 "file by enclosing it in quotes and replacing the newlines with "
|
|
dongsheng@627
|
13447 "<quote><literal>\\n</literal></quote> sequences, but it would have made the "
|
|
dongsheng@627
|
13448 "style file too difficult to read. Readability is a good guide when you're "
|
|
dongsheng@627
|
13449 "trying to decide whether some text belongs in a style file, or in a template "
|
|
dongsheng@627
|
13450 "file that the style file points to. If the style file will look too big or "
|
|
dongsheng@627
|
13451 "cluttered if you insert a literal piece of text, drop it into a template "
|
|
dongsheng@627
|
13452 "instead."
|
|
dongsheng@627
|
13453 msgstr ""
|
|
dongsheng@627
|
13454
|
|
dongsheng@627
|
13455 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
13456 #: ../en/ch12-mq.xml:5
|
|
dongsheng@627
|
13457 msgid "Managing change with Mercurial Queues"
|
|
dongsheng@627
|
13458 msgstr "使用 MQ 管理修改"
|
|
dongsheng@627
|
13459
|
|
dongsheng@627
|
13460 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
13461 #: ../en/ch12-mq.xml:8
|
|
dongsheng@627
|
13462 msgid "The patch management problem"
|
|
dongsheng@636
|
13463 msgstr "补丁的管理问题"
|
|
dongsheng@627
|
13464
|
|
dongsheng@627
|
13465 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13466 #: ../en/ch12-mq.xml:10
|
|
dongsheng@627
|
13467 msgid ""
|
|
dongsheng@627
|
13468 "Here is a common scenario: you need to install a software package from "
|
|
dongsheng@627
|
13469 "source, but you find a bug that you must fix in the source before you can "
|
|
dongsheng@627
|
13470 "start using the package. You make your changes, forget about the package for "
|
|
dongsheng@627
|
13471 "a while, and a few months later you need to upgrade to a newer version of the "
|
|
dongsheng@627
|
13472 "package. If the newer version of the package still has the bug, you must "
|
|
dongsheng@627
|
13473 "extract your fix from the older source tree and apply it against the newer "
|
|
dongsheng@627
|
13474 "version. This is a tedious task, and it's easy to make mistakes."
|
|
dongsheng@627
|
13475 msgstr ""
|
|
dongsheng@627
|
13476
|
|
dongsheng@627
|
13477 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13478 #: ../en/ch12-mq.xml:20
|
|
dongsheng@627
|
13479 msgid ""
|
|
dongsheng@627
|
13480 "This is a simple case of the <quote>patch management</quote> problem. You "
|
|
dongsheng@627
|
13481 "have an <quote>upstream</quote> source tree that you can't change; you need "
|
|
dongsheng@627
|
13482 "to make some local changes on top of the upstream tree; and you'd like to be "
|
|
dongsheng@627
|
13483 "able to keep those changes separate, so that you can apply them to newer "
|
|
dongsheng@627
|
13484 "versions of the upstream source."
|
|
dongsheng@627
|
13485 msgstr ""
|
|
dongsheng@627
|
13486
|
|
dongsheng@627
|
13487 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13488 #: ../en/ch12-mq.xml:27
|
|
dongsheng@627
|
13489 msgid ""
|
|
dongsheng@627
|
13490 "The patch management problem arises in many situations. Probably the most "
|
|
dongsheng@627
|
13491 "visible is that a user of an open source software project will contribute a "
|
|
dongsheng@627
|
13492 "bug fix or new feature to the project's maintainers in the form of a patch."
|
|
dongsheng@627
|
13493 msgstr ""
|
|
dongsheng@627
|
13494
|
|
dongsheng@627
|
13495 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13496 #: ../en/ch12-mq.xml:32
|
|
dongsheng@627
|
13497 msgid ""
|
|
dongsheng@627
|
13498 "Distributors of operating systems that include open source software often "
|
|
dongsheng@627
|
13499 "need to make changes to the packages they distribute so that they will build "
|
|
dongsheng@627
|
13500 "properly in their environments."
|
|
dongsheng@627
|
13501 msgstr ""
|
|
dongsheng@627
|
13502
|
|
dongsheng@627
|
13503 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13504 #: ../en/ch12-mq.xml:37
|
|
dongsheng@627
|
13505 msgid ""
|
|
dongsheng@627
|
13506 "When you have few changes to maintain, it is easy to manage a single patch "
|
|
dongsheng@627
|
13507 "using the standard <command>diff</command> and <command>patch</command> "
|
|
dongsheng@627
|
13508 "programs (see section <xref linkend=\"sec.mq.patch\"/> for a discussion of "
|
|
dongsheng@627
|
13509 "these tools). Once the number of changes grows, it starts to make sense to "
|
|
dongsheng@627
|
13510 "maintain patches as discrete <quote>chunks of work,</quote> so that for "
|
|
dongsheng@627
|
13511 "example a single patch will contain only one bug fix (the patch might modify "
|
|
dongsheng@627
|
13512 "several files, but it's doing <quote>only one thing</quote>), and you may "
|
|
dongsheng@627
|
13513 "have a number of such patches for different bugs you need fixed and local "
|
|
dongsheng@627
|
13514 "changes you require. In this situation, if you submit a bug fix patch to the "
|
|
dongsheng@627
|
13515 "upstream maintainers of a package and they include your fix in a subsequent "
|
|
dongsheng@627
|
13516 "release, you can simply drop that single patch when you're updating to the "
|
|
dongsheng@627
|
13517 "newer release."
|
|
dongsheng@627
|
13518 msgstr ""
|
|
dongsheng@627
|
13519
|
|
dongsheng@627
|
13520 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13521 #: ../en/ch12-mq.xml:52
|
|
dongsheng@627
|
13522 msgid ""
|
|
dongsheng@627
|
13523 "Maintaining a single patch against an upstream tree is a little tedious and "
|
|
dongsheng@627
|
13524 "error-prone, but not difficult. However, the complexity of the problem grows "
|
|
dongsheng@627
|
13525 "rapidly as the number of patches you have to maintain increases. With more "
|
|
dongsheng@627
|
13526 "than a tiny number of patches in hand, understanding which ones you have "
|
|
dongsheng@627
|
13527 "applied and maintaining them moves from messy to overwhelming."
|
|
dongsheng@627
|
13528 msgstr ""
|
|
dongsheng@627
|
13529
|
|
dongsheng@627
|
13530 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13531 #: ../en/ch12-mq.xml:59
|
|
dongsheng@627
|
13532 msgid ""
|
|
dongsheng@627
|
13533 "Fortunately, Mercurial includes a powerful extension, Mercurial Queues (or "
|
|
dongsheng@627
|
13534 "simply <quote>MQ</quote>), that massively simplifies the patch management "
|
|
dongsheng@627
|
13535 "problem."
|
|
dongsheng@627
|
13536 msgstr ""
|
|
dongsheng@627
|
13537
|
|
dongsheng@627
|
13538 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
13539 #: ../en/ch12-mq.xml:65
|
|
dongsheng@627
|
13540 msgid "The prehistory of Mercurial Queues"
|
|
dongsheng@636
|
13541 msgstr "MQ 的历史"
|
|
dongsheng@627
|
13542
|
|
dongsheng@627
|
13543 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13544 #: ../en/ch12-mq.xml:67
|
|
dongsheng@627
|
13545 msgid ""
|
|
dongsheng@627
|
13546 "During the late 1990s, several Linux kernel developers started to maintain "
|
|
dongsheng@627
|
13547 "<quote>patch series</quote> that modified the behaviour of the Linux kernel. "
|
|
dongsheng@627
|
13548 "Some of these series were focused on stability, some on feature coverage, and "
|
|
dongsheng@627
|
13549 "others were more speculative."
|
|
dongsheng@627
|
13550 msgstr ""
|
|
dongsheng@627
|
13551
|
|
dongsheng@627
|
13552 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13553 #: ../en/ch12-mq.xml:73
|
|
dongsheng@627
|
13554 msgid ""
|
|
dongsheng@627
|
13555 "The sizes of these patch series grew rapidly. In 2002, Andrew Morton "
|
|
dongsheng@627
|
13556 "published some shell scripts he had been using to automate the task of "
|
|
dongsheng@627
|
13557 "managing his patch queues. Andrew was successfully using these scripts to "
|
|
dongsheng@627
|
13558 "manage hundreds (sometimes thousands) of patches on top of the Linux kernel."
|
|
dongsheng@627
|
13559 msgstr ""
|
|
dongsheng@627
|
13560
|
|
dongsheng@627
|
13561 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13562 #: ../en/ch12-mq.xml:80
|
|
dongsheng@627
|
13563 msgid "A patchwork quilt"
|
|
dongsheng@627
|
13564 msgstr ""
|
|
dongsheng@627
|
13565
|
|
dongsheng@627
|
13566 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13567 #: ../en/ch12-mq.xml:82
|
|
dongsheng@627
|
13568 msgid ""
|
|
dongsheng@627
|
13569 "In early 2003, Andreas Gruenbacher and Martin Quinson borrowed the approach "
|
|
dongsheng@627
|
13570 "of Andrew's scripts and published a tool called <quote>patchwork quilt</"
|
|
dongsheng@627
|
13571 "quote> <citation>web:quilt</citation>, or simply <quote>quilt</quote> (see "
|
|
dongsheng@627
|
13572 "<citation>gruenbacher:2005</citation> for a paper describing it). Because "
|
|
dongsheng@627
|
13573 "quilt substantially automated patch management, it rapidly gained a large "
|
|
dongsheng@627
|
13574 "following among open source software developers."
|
|
dongsheng@627
|
13575 msgstr ""
|
|
dongsheng@627
|
13576
|
|
dongsheng@627
|
13577 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13578 #: ../en/ch12-mq.xml:91
|
|
dongsheng@627
|
13579 msgid ""
|
|
dongsheng@627
|
13580 "Quilt manages a <emphasis>stack of patches</emphasis> on top of a directory "
|
|
dongsheng@627
|
13581 "tree. To begin, you tell quilt to manage a directory tree, and tell it which "
|
|
dongsheng@627
|
13582 "files you want to manage; it stores away the names and contents of those "
|
|
dongsheng@627
|
13583 "files. To fix a bug, you create a new patch (using a single command), edit "
|
|
dongsheng@627
|
13584 "the files you need to fix, then <quote>refresh</quote> the patch."
|
|
dongsheng@627
|
13585 msgstr ""
|
|
dongsheng@627
|
13586
|
|
dongsheng@627
|
13587 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13588 #: ../en/ch12-mq.xml:99
|
|
dongsheng@627
|
13589 msgid ""
|
|
dongsheng@627
|
13590 "The refresh step causes quilt to scan the directory tree; it updates the "
|
|
dongsheng@627
|
13591 "patch with all of the changes you have made. You can create another patch on "
|
|
dongsheng@627
|
13592 "top of the first, which will track the changes required to modify the tree "
|
|
dongsheng@627
|
13593 "from <quote>tree with one patch applied</quote> to <quote>tree with two "
|
|
dongsheng@627
|
13594 "patches applied</quote>."
|
|
dongsheng@627
|
13595 msgstr ""
|
|
dongsheng@627
|
13596
|
|
dongsheng@627
|
13597 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13598 #: ../en/ch12-mq.xml:106
|
|
dongsheng@627
|
13599 msgid ""
|
|
dongsheng@627
|
13600 "You can <emphasis>change</emphasis> which patches are applied to the tree. "
|
|
dongsheng@627
|
13601 "If you <quote>pop</quote> a patch, the changes made by that patch will vanish "
|
|
dongsheng@627
|
13602 "from the directory tree. Quilt remembers which patches you have popped, "
|
|
dongsheng@627
|
13603 "though, so you can <quote>push</quote> a popped patch again, and the "
|
|
dongsheng@627
|
13604 "directory tree will be restored to contain the modifications in the patch. "
|
|
dongsheng@627
|
13605 "Most importantly, you can run the <quote>refresh</quote> command at any time, "
|
|
dongsheng@627
|
13606 "and the topmost applied patch will be updated. This means that you can, at "
|
|
dongsheng@627
|
13607 "any time, change both which patches are applied and what modifications those "
|
|
dongsheng@627
|
13608 "patches make."
|
|
dongsheng@627
|
13609 msgstr ""
|
|
dongsheng@627
|
13610
|
|
dongsheng@627
|
13611 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13612 #: ../en/ch12-mq.xml:118
|
|
dongsheng@627
|
13613 msgid ""
|
|
dongsheng@627
|
13614 "Quilt knows nothing about revision control tools, so it works equally well on "
|
|
dongsheng@627
|
13615 "top of an unpacked tarball or a Subversion working copy."
|
|
dongsheng@627
|
13616 msgstr ""
|
|
dongsheng@627
|
13617
|
|
dongsheng@627
|
13618 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13619 #: ../en/ch12-mq.xml:124
|
|
dongsheng@627
|
13620 msgid "From patchwork quilt to Mercurial Queues"
|
|
dongsheng@636
|
13621 msgstr "从 patchwork quilt 到 MQ"
|
|
dongsheng@627
|
13622
|
|
dongsheng@627
|
13623 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13624 #: ../en/ch12-mq.xml:126
|
|
dongsheng@627
|
13625 msgid ""
|
|
dongsheng@627
|
13626 "In mid-2005, Chris Mason took the features of quilt and wrote an extension "
|
|
dongsheng@627
|
13627 "that he called Mercurial Queues, which added quilt-like behaviour to "
|
|
dongsheng@627
|
13628 "Mercurial."
|
|
dongsheng@627
|
13629 msgstr ""
|
|
dongsheng@627
|
13630
|
|
dongsheng@627
|
13631 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13632 #: ../en/ch12-mq.xml:130
|
|
dongsheng@627
|
13633 msgid ""
|
|
dongsheng@627
|
13634 "The key difference between quilt and MQ is that quilt knows nothing about "
|
|
dongsheng@627
|
13635 "revision control systems, while MQ is <emphasis>integrated</emphasis> into "
|
|
dongsheng@627
|
13636 "Mercurial. Each patch that you push is represented as a Mercurial "
|
|
dongsheng@627
|
13637 "changeset. Pop a patch, and the changeset goes away."
|
|
dongsheng@627
|
13638 msgstr ""
|
|
dongsheng@627
|
13639
|
|
dongsheng@627
|
13640 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13641 #: ../en/ch12-mq.xml:136
|
|
dongsheng@627
|
13642 msgid ""
|
|
dongsheng@627
|
13643 "Because quilt does not care about revision control tools, it is still a "
|
|
dongsheng@627
|
13644 "tremendously useful piece of software to know about for situations where you "
|
|
dongsheng@627
|
13645 "cannot use Mercurial and MQ."
|
|
dongsheng@627
|
13646 msgstr ""
|
|
dongsheng@627
|
13647
|
|
dongsheng@627
|
13648 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
13649 #: ../en/ch12-mq.xml:144
|
|
dongsheng@627
|
13650 msgid "The huge advantage of MQ"
|
|
dongsheng@636
|
13651 msgstr "MQ 的巨大优势"
|
|
dongsheng@627
|
13652
|
|
dongsheng@627
|
13653 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13654 #: ../en/ch12-mq.xml:146
|
|
dongsheng@627
|
13655 msgid ""
|
|
dongsheng@627
|
13656 "I cannot overstate the value that MQ offers through the unification of "
|
|
dongsheng@627
|
13657 "patches and revision control."
|
|
dongsheng@627
|
13658 msgstr ""
|
|
dongsheng@627
|
13659
|
|
dongsheng@627
|
13660 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13661 #: ../en/ch12-mq.xml:149
|
|
dongsheng@627
|
13662 msgid ""
|
|
dongsheng@627
|
13663 "A major reason that patches have persisted in the free software and open "
|
|
dongsheng@627
|
13664 "source world&emdash;in spite of the availability of increasingly capable "
|
|
dongsheng@627
|
13665 "revision control tools over the years&emdash;is the <emphasis>agility</"
|
|
dongsheng@627
|
13666 "emphasis> they offer."
|
|
dongsheng@627
|
13667 msgstr ""
|
|
dongsheng@627
|
13668
|
|
dongsheng@627
|
13669 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13670 #: ../en/ch12-mq.xml:155
|
|
dongsheng@627
|
13671 msgid ""
|
|
dongsheng@627
|
13672 "Traditional revision control tools make a permanent, irreversible record of "
|
|
dongsheng@627
|
13673 "everything that you do. While this has great value, it's also somewhat "
|
|
dongsheng@627
|
13674 "stifling. If you want to perform a wild-eyed experiment, you have to be "
|
|
dongsheng@627
|
13675 "careful in how you go about it, or you risk leaving unneeded&emdash;or worse, "
|
|
dongsheng@627
|
13676 "misleading or destabilising&emdash;traces of your missteps and errors in the "
|
|
dongsheng@627
|
13677 "permanent revision record."
|
|
dongsheng@627
|
13678 msgstr ""
|
|
dongsheng@627
|
13679
|
|
dongsheng@627
|
13680 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13681 #: ../en/ch12-mq.xml:163
|
|
dongsheng@627
|
13682 msgid ""
|
|
dongsheng@627
|
13683 "By contrast, MQ's marriage of distributed revision control with patches makes "
|
|
dongsheng@627
|
13684 "it much easier to isolate your work. Your patches live on top of normal "
|
|
dongsheng@627
|
13685 "revision history, and you can make them disappear or reappear at will. If "
|
|
dongsheng@627
|
13686 "you don't like a patch, you can drop it. If a patch isn't quite as you want "
|
|
dongsheng@627
|
13687 "it to be, simply fix it&emdash;as many times as you need to, until you have "
|
|
dongsheng@627
|
13688 "refined it into the form you desire."
|
|
dongsheng@627
|
13689 msgstr ""
|
|
dongsheng@627
|
13690
|
|
dongsheng@627
|
13691 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13692 #: ../en/ch12-mq.xml:171
|
|
dongsheng@627
|
13693 msgid ""
|
|
dongsheng@627
|
13694 "As an example, the integration of patches with revision control makes "
|
|
dongsheng@627
|
13695 "understanding patches and debugging their effects&emdash;and their interplay "
|
|
dongsheng@627
|
13696 "with the code they're based on&emdash;<emphasis>enormously</emphasis> easier. "
|
|
dongsheng@627
|
13697 "Since every applied patch has an associated changeset, you can give <command "
|
|
dongsheng@627
|
13698 "role=\"hg-cmd\">hg log</command> a file name to see which changesets and "
|
|
dongsheng@627
|
13699 "patches affected the file. You can use the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
13700 "bisect</command> command to binary-search through all changesets and applied "
|
|
dongsheng@627
|
13701 "patches to see where a bug got introduced or fixed. You can use the <command "
|
|
dongsheng@627
|
13702 "role=\"hg-cmd\">hg annotate</command> command to see which changeset or patch "
|
|
dongsheng@627
|
13703 "modified a particular line of a source file. And so on."
|
|
dongsheng@627
|
13704 msgstr ""
|
|
dongsheng@627
|
13705
|
|
dongsheng@627
|
13706 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
13707 #: ../en/ch12-mq.xml:187
|
|
dongsheng@627
|
13708 msgid "Understanding patches"
|
|
dongsheng@636
|
13709 msgstr "理解补丁"
|
|
dongsheng@627
|
13710
|
|
dongsheng@627
|
13711 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13712 #: ../en/ch12-mq.xml:189
|
|
dongsheng@627
|
13713 msgid ""
|
|
dongsheng@627
|
13714 "Because MQ doesn't hide its patch-oriented nature, it is helpful to "
|
|
dongsheng@627
|
13715 "understand what patches are, and a little about the tools that work with them."
|
|
dongsheng@627
|
13716 msgstr ""
|
|
dongsheng@627
|
13717
|
|
dongsheng@627
|
13718 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13719 #: ../en/ch12-mq.xml:193
|
|
dongsheng@627
|
13720 msgid ""
|
|
dongsheng@627
|
13721 "The traditional Unix <command>diff</command> command compares two files, and "
|
|
dongsheng@627
|
13722 "prints a list of differences between them. The <command>patch</command> "
|
|
dongsheng@627
|
13723 "command understands these differences as <emphasis>modifications</emphasis> "
|
|
dongsheng@627
|
13724 "to make to a file. Take a look below for a simple example of these commands "
|
|
dongsheng@627
|
13725 "in action."
|
|
dongsheng@627
|
13726 msgstr ""
|
|
dongsheng@627
|
13727
|
|
dongsheng@627
|
13728 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13729 #: ../en/ch12-mq.xml:202
|
|
dongsheng@627
|
13730 msgid ""
|
|
dongsheng@627
|
13731 "The type of file that <command>diff</command> generates (and <command>patch</"
|
|
dongsheng@627
|
13732 "command> takes as input) is called a <quote>patch</quote> or a <quote>diff</"
|
|
dongsheng@627
|
13733 "quote>; there is no difference between a patch and a diff. (We'll use the "
|
|
dongsheng@627
|
13734 "term <quote>patch</quote>, since it's more commonly used.)"
|
|
dongsheng@627
|
13735 msgstr ""
|
|
dongsheng@627
|
13736
|
|
dongsheng@627
|
13737 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13738 #: ../en/ch12-mq.xml:208
|
|
dongsheng@627
|
13739 msgid ""
|
|
dongsheng@627
|
13740 "A patch file can start with arbitrary text; the <command>patch</command> "
|
|
dongsheng@627
|
13741 "command ignores this text, but MQ uses it as the commit message when creating "
|
|
dongsheng@627
|
13742 "changesets. To find the beginning of the patch content, <command>patch</"
|
|
dongsheng@627
|
13743 "command> searches for the first line that starts with the string "
|
|
dongsheng@627
|
13744 "<quote><literal>diff -</literal></quote>."
|
|
dongsheng@627
|
13745 msgstr ""
|
|
dongsheng@627
|
13746
|
|
dongsheng@627
|
13747 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13748 #: ../en/ch12-mq.xml:215
|
|
dongsheng@627
|
13749 msgid ""
|
|
dongsheng@627
|
13750 "MQ works with <emphasis>unified</emphasis> diffs (<command>patch</command> "
|
|
dongsheng@627
|
13751 "can accept several other diff formats, but MQ doesn't). A unified diff "
|
|
dongsheng@627
|
13752 "contains two kinds of header. The <emphasis>file header</emphasis> describes "
|
|
dongsheng@627
|
13753 "the file being modified; it contains the name of the file to modify. When "
|
|
dongsheng@627
|
13754 "<command>patch</command> sees a new file header, it looks for a file with "
|
|
dongsheng@627
|
13755 "that name to start modifying."
|
|
dongsheng@627
|
13756 msgstr ""
|
|
dongsheng@627
|
13757
|
|
dongsheng@627
|
13758 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13759 #: ../en/ch12-mq.xml:223
|
|
dongsheng@627
|
13760 msgid ""
|
|
dongsheng@627
|
13761 "After the file header comes a series of <emphasis>hunks</emphasis>. Each "
|
|
dongsheng@627
|
13762 "hunk starts with a header; this identifies the range of line numbers within "
|
|
dongsheng@627
|
13763 "the file that the hunk should modify. Following the header, a hunk starts "
|
|
dongsheng@627
|
13764 "and ends with a few (usually three) lines of text from the unmodified file; "
|
|
dongsheng@627
|
13765 "these are called the <emphasis>context</emphasis> for the hunk. If there's "
|
|
dongsheng@627
|
13766 "only a small amount of context between successive hunks, <command>diff</"
|
|
dongsheng@627
|
13767 "command> doesn't print a new hunk header; it just runs the hunks together, "
|
|
dongsheng@627
|
13768 "with a few lines of context between modifications."
|
|
dongsheng@627
|
13769 msgstr ""
|
|
dongsheng@627
|
13770
|
|
dongsheng@627
|
13771 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13772 #: ../en/ch12-mq.xml:235
|
|
dongsheng@627
|
13773 msgid ""
|
|
dongsheng@627
|
13774 "Each line of context begins with a space character. Within the hunk, a line "
|
|
dongsheng@627
|
13775 "that begins with <quote><literal>-</literal></quote> means <quote>remove this "
|
|
dongsheng@627
|
13776 "line,</quote> while a line that begins with <quote><literal>+</literal></"
|
|
dongsheng@627
|
13777 "quote> means <quote>insert this line.</quote> For example, a line that is "
|
|
dongsheng@627
|
13778 "modified is represented by one deletion and one insertion."
|
|
dongsheng@627
|
13779 msgstr ""
|
|
dongsheng@627
|
13780
|
|
dongsheng@627
|
13781 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13782 #: ../en/ch12-mq.xml:243
|
|
dongsheng@627
|
13783 msgid ""
|
|
dongsheng@627
|
13784 "We will return to some of the more subtle aspects of patches later (in "
|
|
dongsheng@627
|
13785 "section <xref linkend=\"sec.mq.adv-patch\"/>), but you should have enough "
|
|
dongsheng@627
|
13786 "information now to use MQ."
|
|
dongsheng@627
|
13787 msgstr ""
|
|
dongsheng@627
|
13788
|
|
dongsheng@627
|
13789 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
13790 #: ../en/ch12-mq.xml:250
|
|
dongsheng@627
|
13791 msgid "Getting started with Mercurial Queues"
|
|
dongsheng@636
|
13792 msgstr "开始使用 MQ"
|
|
dongsheng@627
|
13793
|
|
dongsheng@627
|
13794 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13795 #: ../en/ch12-mq.xml:252
|
|
dongsheng@627
|
13796 msgid ""
|
|
dongsheng@627
|
13797 "Because MQ is implemented as an extension, you must explicitly enable before "
|
|
dongsheng@627
|
13798 "you can use it. (You don't need to download anything; MQ ships with the "
|
|
dongsheng@627
|
13799 "standard Mercurial distribution.) To enable MQ, edit your <filename role="
|
|
dongsheng@627
|
13800 "\"home\">~/.hgrc</filename> file, and add the lines below."
|
|
dongsheng@627
|
13801 msgstr ""
|
|
dongsheng@627
|
13802
|
|
dongsheng@627
|
13803 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13804 #: ../en/ch12-mq.xml:261
|
|
dongsheng@627
|
13805 msgid ""
|
|
dongsheng@627
|
13806 "Once the extension is enabled, it will make a number of new commands "
|
|
dongsheng@627
|
13807 "available. To verify that the extension is working, you can use <command "
|
|
dongsheng@627
|
13808 "role=\"hg-cmd\">hg help</command> to see if the <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
13809 "\">qinit</command> command is now available."
|
|
dongsheng@627
|
13810 msgstr ""
|
|
dongsheng@627
|
13811
|
|
dongsheng@627
|
13812 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13813 #: ../en/ch12-mq.xml:269
|
|
dongsheng@627
|
13814 msgid ""
|
|
dongsheng@627
|
13815 "You can use MQ with <emphasis>any</emphasis> Mercurial repository, and its "
|
|
dongsheng@627
|
13816 "commands only operate within that repository. To get started, simply prepare "
|
|
dongsheng@627
|
13817 "the repository using the <command role=\"hg-ext-mq\">qinit</command> command."
|
|
dongsheng@627
|
13818 msgstr ""
|
|
dongsheng@627
|
13819
|
|
dongsheng@627
|
13820 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
13821 #: ../en/ch12-mq.xml:276
|
|
dongsheng@627
|
13822 msgid ""
|
|
dongsheng@627
|
13823 "This command creates an empty directory called <filename role=\"special\" "
|
|
dongsheng@627
|
13824 "class=\"directory\">.hg/patches</filename>, where MQ will keep its metadata. "
|
|
dongsheng@627
|
13825 "As with many Mercurial commands, the <command role=\"hg-ext-mq\">qinit</"
|
|
dongsheng@627
|
13826 "command> command prints nothing if it succeeds."
|
|
dongsheng@627
|
13827 msgstr ""
|
|
dongsheng@627
|
13828
|
|
dongsheng@627
|
13829 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13830 #: ../en/ch12-mq.xml:283
|
|
dongsheng@627
|
13831 msgid "Creating a new patch"
|
|
dongsheng@636
|
13832 msgstr "创建新补丁"
|
|
dongsheng@627
|
13833
|
|
dongsheng@627
|
13834 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13835 #: ../en/ch12-mq.xml:285
|
|
dongsheng@627
|
13836 msgid ""
|
|
dongsheng@627
|
13837 "To begin work on a new patch, use the <command role=\"hg-ext-mq\">qnew</"
|
|
dongsheng@627
|
13838 "command> command. This command takes one argument, the name of the patch to "
|
|
dongsheng@627
|
13839 "create."
|
|
dongsheng@627
|
13840 msgstr ""
|
|
dongsheng@627
|
13841
|
|
dongsheng@627
|
13842 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13843 #: ../en/ch12-mq.xml:289
|
|
dongsheng@627
|
13844 msgid ""
|
|
dongsheng@627
|
13845 "MQ will use this as the name of an actual file in the <filename role=\"special"
|
|
dongsheng@627
|
13846 "\" class=\"directory\">.hg/patches</filename> directory, as you can see below."
|
|
dongsheng@627
|
13847 msgstr ""
|
|
dongsheng@627
|
13848
|
|
dongsheng@627
|
13849 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13850 #: ../en/ch12-mq.xml:296
|
|
dongsheng@627
|
13851 msgid ""
|
|
dongsheng@627
|
13852 "Also newly present in the <filename role=\"special\" class=\"directory\">.hg/"
|
|
dongsheng@627
|
13853 "patches</filename> directory are two other files, <filename role=\"special"
|
|
dongsheng@627
|
13854 "\">series</filename> and <filename role=\"special\">status</filename>. The "
|
|
dongsheng@627
|
13855 "<filename role=\"special\">series</filename> file lists all of the patches "
|
|
dongsheng@627
|
13856 "that MQ knows about for this repository, with one patch per line. Mercurial "
|
|
dongsheng@627
|
13857 "uses the <filename role=\"special\">status</filename> file for internal book-"
|
|
dongsheng@627
|
13858 "keeping; it tracks all of the patches that MQ has <emphasis>applied</"
|
|
dongsheng@627
|
13859 "emphasis> in this repository."
|
|
dongsheng@627
|
13860 msgstr ""
|
|
dongsheng@627
|
13861
|
|
dongsheng@627
|
13862 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@627
|
13863 #: ../en/ch12-mq.xml:308
|
|
dongsheng@627
|
13864 msgid ""
|
|
dongsheng@627
|
13865 "You may sometimes want to edit the <filename role=\"special\">series</"
|
|
dongsheng@627
|
13866 "filename> file by hand; for example, to change the sequence in which some "
|
|
dongsheng@627
|
13867 "patches are applied. However, manually editing the <filename role=\"special"
|
|
dongsheng@627
|
13868 "\">status</filename> file is almost always a bad idea, as it's easy to "
|
|
dongsheng@627
|
13869 "corrupt MQ's idea of what is happening."
|
|
dongsheng@627
|
13870 msgstr ""
|
|
dongsheng@627
|
13871
|
|
dongsheng@627
|
13872 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13873 #: ../en/ch12-mq.xml:317
|
|
dongsheng@627
|
13874 msgid ""
|
|
dongsheng@627
|
13875 "Once you have created your new patch, you can edit files in the working "
|
|
dongsheng@627
|
13876 "directory as you usually would. All of the normal Mercurial commands, such "
|
|
dongsheng@627
|
13877 "as <command role=\"hg-cmd\">hg diff</command> and <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
13878 "annotate</command>, work exactly as they did before."
|
|
dongsheng@627
|
13879 msgstr ""
|
|
dongsheng@627
|
13880
|
|
dongsheng@627
|
13881 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13882 #: ../en/ch12-mq.xml:325
|
|
dongsheng@627
|
13883 msgid "Refreshing a patch"
|
|
dongsheng@636
|
13884 msgstr "刷新补丁"
|
|
dongsheng@627
|
13885
|
|
dongsheng@627
|
13886 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13887 #: ../en/ch12-mq.xml:327
|
|
dongsheng@627
|
13888 msgid ""
|
|
dongsheng@627
|
13889 "When you reach a point where you want to save your work, use the <command "
|
|
dongsheng@627
|
13890 "role=\"hg-ext-mq\">qrefresh</command> command to update the patch you are "
|
|
dongsheng@627
|
13891 "working on."
|
|
dongsheng@627
|
13892 msgstr ""
|
|
dongsheng@627
|
13893
|
|
dongsheng@627
|
13894 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13895 #: ../en/ch12-mq.xml:333
|
|
dongsheng@627
|
13896 msgid ""
|
|
dongsheng@627
|
13897 "This command folds the changes you have made in the working directory into "
|
|
dongsheng@627
|
13898 "your patch, and updates its corresponding changeset to contain those changes."
|
|
dongsheng@627
|
13899 msgstr ""
|
|
dongsheng@627
|
13900
|
|
dongsheng@627
|
13901 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13902 #: ../en/ch12-mq.xml:337
|
|
dongsheng@627
|
13903 msgid ""
|
|
dongsheng@627
|
13904 "You can run <command role=\"hg-ext-mq\">qrefresh</command> as often as you "
|
|
dongsheng@627
|
13905 "like, so it's a good way to <quote>checkpoint</quote> your work. Refresh "
|
|
dongsheng@627
|
13906 "your patch at an opportune time; try an experiment; and if the experiment "
|
|
dongsheng@627
|
13907 "doesn't work out, <command role=\"hg-cmd\">hg revert</command> your "
|
|
dongsheng@627
|
13908 "modifications back to the last time you refreshed."
|
|
dongsheng@627
|
13909 msgstr ""
|
|
dongsheng@627
|
13910
|
|
dongsheng@627
|
13911 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13912 #: ../en/ch12-mq.xml:348
|
|
dongsheng@627
|
13913 msgid "Stacking and tracking patches"
|
|
dongsheng@636
|
13914 msgstr "堆叠和跟踪补丁"
|
|
dongsheng@627
|
13915
|
|
dongsheng@627
|
13916 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13917 #: ../en/ch12-mq.xml:350
|
|
dongsheng@627
|
13918 msgid ""
|
|
dongsheng@627
|
13919 "Once you have finished working on a patch, or need to work on another, you "
|
|
dongsheng@627
|
13920 "can use the <command role=\"hg-ext-mq\">qnew</command> command again to "
|
|
dongsheng@627
|
13921 "create a new patch. Mercurial will apply this patch on top of your existing "
|
|
dongsheng@627
|
13922 "patch."
|
|
dongsheng@627
|
13923 msgstr ""
|
|
dongsheng@627
|
13924
|
|
dongsheng@627
|
13925 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13926 #: ../en/ch12-mq.xml:357
|
|
dongsheng@627
|
13927 msgid ""
|
|
dongsheng@627
|
13928 "Notice that the patch contains the changes in our prior patch as part of its "
|
|
dongsheng@627
|
13929 "context (you can see this more clearly in the output of <command role=\"hg-cmd"
|
|
dongsheng@627
|
13930 "\">hg annotate</command>)."
|
|
dongsheng@627
|
13931 msgstr ""
|
|
dongsheng@627
|
13932
|
|
dongsheng@627
|
13933 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13934 #: ../en/ch12-mq.xml:362
|
|
dongsheng@627
|
13935 msgid ""
|
|
dongsheng@627
|
13936 "So far, with the exception of <command role=\"hg-ext-mq\">qnew</command> and "
|
|
dongsheng@627
|
13937 "<command role=\"hg-ext-mq\">qrefresh</command>, we've been careful to only "
|
|
dongsheng@627
|
13938 "use regular Mercurial commands. However, MQ provides many commands that are "
|
|
dongsheng@627
|
13939 "easier to use when you are thinking about patches, as illustrated below."
|
|
dongsheng@627
|
13940 msgstr ""
|
|
dongsheng@627
|
13941
|
|
dongsheng@627
|
13942 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13943 #: ../en/ch12-mq.xml:372
|
|
dongsheng@627
|
13944 msgid ""
|
|
dongsheng@627
|
13945 "The <command role=\"hg-ext-mq\">qseries</command> command lists every patch "
|
|
dongsheng@627
|
13946 "that MQ knows about in this repository, from oldest to newest (most recently "
|
|
dongsheng@627
|
13947 "<emphasis>created</emphasis>)."
|
|
dongsheng@627
|
13948 msgstr ""
|
|
dongsheng@627
|
13949
|
|
dongsheng@627
|
13950 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
13951 #: ../en/ch12-mq.xml:378
|
|
dongsheng@627
|
13952 msgid ""
|
|
dongsheng@627
|
13953 "The <command role=\"hg-ext-mq\">qapplied</command> command lists every patch "
|
|
dongsheng@627
|
13954 "that MQ has <emphasis>applied</emphasis> in this repository, again from "
|
|
dongsheng@627
|
13955 "oldest to newest (most recently applied)."
|
|
dongsheng@627
|
13956 msgstr ""
|
|
dongsheng@627
|
13957
|
|
dongsheng@627
|
13958 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
13959 #: ../en/ch12-mq.xml:387
|
|
dongsheng@627
|
13960 msgid "Manipulating the patch stack"
|
|
dongsheng@636
|
13961 msgstr "操作补丁堆栈"
|
|
dongsheng@627
|
13962
|
|
dongsheng@627
|
13963 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13964 #: ../en/ch12-mq.xml:389
|
|
dongsheng@627
|
13965 msgid ""
|
|
dongsheng@627
|
13966 "The previous discussion implied that there must be a difference between "
|
|
dongsheng@627
|
13967 "<quote>known</quote> and <quote>applied</quote> patches, and there is. MQ "
|
|
dongsheng@627
|
13968 "can manage a patch without it being applied in the repository."
|
|
dongsheng@627
|
13969 msgstr ""
|
|
dongsheng@627
|
13970
|
|
dongsheng@627
|
13971 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
13972 #: ../en/ch12-mq.xml:394
|
|
dongsheng@627
|
13973 msgid ""
|
|
dongsheng@627
|
13974 "An <emphasis>applied</emphasis> patch has a corresponding changeset in the "
|
|
dongsheng@627
|
13975 "repository, and the effects of the patch and changeset are visible in the "
|
|
dongsheng@627
|
13976 "working directory. You can undo the application of a patch using the "
|
|
dongsheng@627
|
13977 "<command role=\"hg-ext-mq\">qpop</command> command. MQ still <emphasis>knows "
|
|
dongsheng@627
|
13978 "about</emphasis>, or manages, a popped patch, but the patch no longer has a "
|
|
dongsheng@627
|
13979 "corresponding changeset in the repository, and the working directory does not "
|
|
dongsheng@641
|
13980 "contain the changes made by the patch. Figure <xref endterm=\"fig.mq.stack."
|
|
dongsheng@641
|
13981 "caption\" linkend=\"fig.mq.stack\"/> illustrates the difference between "
|
|
dongsheng@641
|
13982 "applied and tracked patches."
|
|
dongsheng@627
|
13983 msgstr ""
|
|
dongsheng@627
|
13984
|
|
dongsheng@627
|
13985 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
|
|
dongsheng@641
|
13986 #: ../en/ch12-mq.xml:408
|
|
dongsheng@627
|
13987 msgid "<imageobject><imagedata fileref=\"images/mq-stack.png\"/></imageobject>"
|
|
dongsheng@627
|
13988 msgstr ""
|
|
dongsheng@627
|
13989
|
|
dongsheng@627
|
13990 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
|
|
dongsheng@641
|
13991 #: ../en/ch12-mq.xml:410
|
|
dongsheng@627
|
13992 msgid "Applied and unapplied patches in the MQ patch stack"
|
|
dongsheng@627
|
13993 msgstr ""
|
|
dongsheng@627
|
13994
|
|
dongsheng@627
|
13995 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
13996 #: ../en/ch12-mq.xml:415
|
|
dongsheng@627
|
13997 msgid ""
|
|
dongsheng@627
|
13998 "You can reapply an unapplied, or popped, patch using the <command role=\"hg-"
|
|
dongsheng@627
|
13999 "ext-mq\">qpush</command> command. This creates a new changeset to correspond "
|
|
dongsheng@627
|
14000 "to the patch, and the patch's changes once again become present in the "
|
|
dongsheng@627
|
14001 "working directory. See below for examples of <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
14002 "\">qpop</command> and <command role=\"hg-ext-mq\">qpush</command> in action."
|
|
dongsheng@627
|
14003 msgstr ""
|
|
dongsheng@627
|
14004
|
|
dongsheng@627
|
14005 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14006 #: ../en/ch12-mq.xml:424
|
|
dongsheng@627
|
14007 msgid ""
|
|
dongsheng@627
|
14008 "Notice that once we have popped a patch or two patches, the output of "
|
|
dongsheng@627
|
14009 "<command role=\"hg-ext-mq\">qseries</command> remains the same, while that of "
|
|
dongsheng@627
|
14010 "<command role=\"hg-ext-mq\">qapplied</command> has changed."
|
|
dongsheng@627
|
14011 msgstr ""
|
|
dongsheng@627
|
14012
|
|
dongsheng@627
|
14013 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14014 #: ../en/ch12-mq.xml:432
|
|
dongsheng@627
|
14015 msgid "Pushing and popping many patches"
|
|
dongsheng@636
|
14016 msgstr "压入或弹出多个补丁"
|
|
dongsheng@627
|
14017
|
|
dongsheng@627
|
14018 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14019 #: ../en/ch12-mq.xml:434
|
|
dongsheng@627
|
14020 msgid ""
|
|
dongsheng@627
|
14021 "While <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-"
|
|
dongsheng@627
|
14022 "mq\">qpop</command> each operate on a single patch at a time by default, you "
|
|
dongsheng@627
|
14023 "can push and pop many patches in one go. The <option role=\"hg-ext-mq-cmd-"
|
|
dongsheng@627
|
14024 "qpush-opt\">hg -a</option> option to <command role=\"hg-ext-mq\">qpush</"
|
|
dongsheng@627
|
14025 "command> causes it to push all unapplied patches, while the <option role=\"hg-"
|
|
dongsheng@627
|
14026 "ext-mq-cmd-qpop-opt\">-a</option> option to <command role=\"hg-ext-mq\">qpop</"
|
|
dongsheng@627
|
14027 "command> causes it to pop all applied patches. (For some more ways to push "
|
|
dongsheng@627
|
14028 "and pop many patches, see section <xref linkend=\"sec.mq.perf\"/> below.)"
|
|
dongsheng@627
|
14029 msgstr ""
|
|
dongsheng@627
|
14030
|
|
dongsheng@627
|
14031 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14032 #: ../en/ch12-mq.xml:451
|
|
dongsheng@627
|
14033 msgid "Safety checks, and overriding them"
|
|
dongsheng@636
|
14034 msgstr "安全的检查，然后覆盖它们"
|
|
dongsheng@627
|
14035
|
|
dongsheng@627
|
14036 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14037 #: ../en/ch12-mq.xml:453
|
|
dongsheng@627
|
14038 msgid ""
|
|
dongsheng@627
|
14039 "Several MQ commands check the working directory before they do anything, and "
|
|
dongsheng@627
|
14040 "fail if they find any modifications. They do this to ensure that you won't "
|
|
dongsheng@627
|
14041 "lose any changes that you have made, but not yet incorporated into a patch. "
|
|
dongsheng@627
|
14042 "The example below illustrates this; the <command role=\"hg-ext-mq\">qnew</"
|
|
dongsheng@627
|
14043 "command> command will not create a new patch if there are outstanding "
|
|
dongsheng@627
|
14044 "changes, caused in this case by the <command role=\"hg-cmd\">hg add</command> "
|
|
dongsheng@627
|
14045 "of <filename>file3</filename>."
|
|
dongsheng@627
|
14046 msgstr ""
|
|
dongsheng@627
|
14047
|
|
dongsheng@627
|
14048 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14049 #: ../en/ch12-mq.xml:465
|
|
dongsheng@627
|
14050 msgid ""
|
|
dongsheng@627
|
14051 "Commands that check the working directory all take an <quote>I know what I'm "
|
|
dongsheng@627
|
14052 "doing</quote> option, which is always named <option>-f</option>. The exact "
|
|
dongsheng@627
|
14053 "meaning of <option>-f</option> depends on the command. For example, <command "
|
|
dongsheng@627
|
14054 "role=\"hg-cmd\">hg qnew <option role=\"hg-ext-mq-cmd-qnew-opt\">hg -f</"
|
|
dongsheng@627
|
14055 "option></command> will incorporate any outstanding changes into the new patch "
|
|
dongsheng@627
|
14056 "it creates, but <command role=\"hg-cmd\">hg qpop <option role=\"hg-ext-mq-cmd-"
|
|
dongsheng@627
|
14057 "qpop-opt\">hg -f</option></command> will revert modifications to any files "
|
|
dongsheng@627
|
14058 "affected by the patch that it is popping. Be sure to read the documentation "
|
|
dongsheng@627
|
14059 "for a command's <option>-f</option> option before you use it!"
|
|
dongsheng@627
|
14060 msgstr ""
|
|
dongsheng@627
|
14061
|
|
dongsheng@627
|
14062 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14063 #: ../en/ch12-mq.xml:480
|
|
dongsheng@627
|
14064 msgid "Working on several patches at once"
|
|
dongsheng@636
|
14065 msgstr "同时处理多个补丁"
|
|
dongsheng@627
|
14066
|
|
dongsheng@627
|
14067 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14068 #: ../en/ch12-mq.xml:482
|
|
dongsheng@627
|
14069 msgid ""
|
|
dongsheng@627
|
14070 "The <command role=\"hg-ext-mq\">qrefresh</command> command always refreshes "
|
|
dongsheng@627
|
14071 "the <emphasis>topmost</emphasis> applied patch. This means that you can "
|
|
dongsheng@627
|
14072 "suspend work on one patch (by refreshing it), pop or push to make a different "
|
|
dongsheng@627
|
14073 "patch the top, and work on <emphasis>that</emphasis> patch for a while."
|
|
dongsheng@627
|
14074 msgstr ""
|
|
dongsheng@627
|
14075
|
|
dongsheng@627
|
14076 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14077 #: ../en/ch12-mq.xml:489
|
|
dongsheng@627
|
14078 msgid ""
|
|
dongsheng@627
|
14079 "Here's an example that illustrates how you can use this ability. Let's say "
|
|
dongsheng@627
|
14080 "you're developing a new feature as two patches. The first is a change to the "
|
|
dongsheng@627
|
14081 "core of your software, and the second&emdash;layered on top of the "
|
|
dongsheng@627
|
14082 "first&emdash;changes the user interface to use the code you just added to the "
|
|
dongsheng@627
|
14083 "core. If you notice a bug in the core while you're working on the UI patch, "
|
|
dongsheng@627
|
14084 "it's easy to fix the core. Simply <command role=\"hg-ext-mq\">qrefresh</"
|
|
dongsheng@627
|
14085 "command> the UI patch to save your in-progress changes, and <command role="
|
|
dongsheng@627
|
14086 "\"hg-ext-mq\">qpop</command> down to the core patch. Fix the core bug, "
|
|
dongsheng@627
|
14087 "<command role=\"hg-ext-mq\">qrefresh</command> the core patch, and <command "
|
|
dongsheng@627
|
14088 "role=\"hg-ext-mq\">qpush</command> back to the UI patch to continue where you "
|
|
dongsheng@627
|
14089 "left off."
|
|
dongsheng@627
|
14090 msgstr ""
|
|
dongsheng@627
|
14091
|
|
dongsheng@627
|
14092 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14093 #: ../en/ch12-mq.xml:506
|
|
dongsheng@627
|
14094 msgid "More about patches"
|
|
dongsheng@636
|
14095 msgstr "关于补丁的更多信息"
|
|
dongsheng@627
|
14096
|
|
dongsheng@627
|
14097 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14098 #: ../en/ch12-mq.xml:508
|
|
dongsheng@627
|
14099 msgid ""
|
|
dongsheng@627
|
14100 "MQ uses the GNU <command>patch</command> command to apply patches, so it's "
|
|
dongsheng@627
|
14101 "helpful to know a few more detailed aspects of how <command>patch</command> "
|
|
dongsheng@627
|
14102 "works, and about patches themselves."
|
|
dongsheng@627
|
14103 msgstr ""
|
|
dongsheng@627
|
14104
|
|
dongsheng@627
|
14105 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14106 #: ../en/ch12-mq.xml:514
|
|
dongsheng@627
|
14107 msgid "The strip count"
|
|
dongsheng@636
|
14108 msgstr "修剪计数"
|
|
dongsheng@627
|
14109
|
|
dongsheng@627
|
14110 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14111 #: ../en/ch12-mq.xml:516
|
|
dongsheng@627
|
14112 msgid ""
|
|
dongsheng@627
|
14113 "If you look at the file headers in a patch, you will notice that the "
|
|
dongsheng@627
|
14114 "pathnames usually have an extra component on the front that isn't present in "
|
|
dongsheng@627
|
14115 "the actual path name. This is a holdover from the way that people used to "
|
|
dongsheng@627
|
14116 "generate patches (people still do this, but it's somewhat rare with modern "
|
|
dongsheng@627
|
14117 "revision control tools)."
|
|
dongsheng@627
|
14118 msgstr ""
|
|
dongsheng@627
|
14119
|
|
dongsheng@627
|
14120 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14121 #: ../en/ch12-mq.xml:523
|
|
dongsheng@627
|
14122 msgid ""
|
|
dongsheng@627
|
14123 "Alice would unpack a tarball, edit her files, then decide that she wanted to "
|
|
dongsheng@627
|
14124 "create a patch. So she'd rename her working directory, unpack the tarball "
|
|
dongsheng@627
|
14125 "again (hence the need for the rename), and use the <option role=\"cmd-opt-diff"
|
|
dongsheng@627
|
14126 "\">-r</option> and <option role=\"cmd-opt-diff\">-N</option> options to "
|
|
dongsheng@627
|
14127 "<command>diff</command> to recursively generate a patch between the "
|
|
dongsheng@627
|
14128 "unmodified directory and the modified one. The result would be that the name "
|
|
dongsheng@627
|
14129 "of the unmodified directory would be at the front of the left-hand path in "
|
|
dongsheng@627
|
14130 "every file header, and the name of the modified directory would be at the "
|
|
dongsheng@627
|
14131 "front of the right-hand path."
|
|
dongsheng@627
|
14132 msgstr ""
|
|
dongsheng@627
|
14133
|
|
dongsheng@627
|
14134 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14135 #: ../en/ch12-mq.xml:536
|
|
dongsheng@627
|
14136 msgid ""
|
|
dongsheng@627
|
14137 "Since someone receiving a patch from the Alices of the net would be unlikely "
|
|
dongsheng@627
|
14138 "to have unmodified and modified directories with exactly the same names, the "
|
|
dongsheng@627
|
14139 "<command>patch</command> command has a <option role=\"cmd-opt-patch\">-p</"
|
|
dongsheng@627
|
14140 "option> option that indicates the number of leading path name components to "
|
|
dongsheng@627
|
14141 "strip when trying to apply a patch. This number is called the "
|
|
dongsheng@627
|
14142 "<emphasis>strip count</emphasis>."
|
|
dongsheng@627
|
14143 msgstr ""
|
|
dongsheng@627
|
14144
|
|
dongsheng@627
|
14145 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14146 #: ../en/ch12-mq.xml:544
|
|
dongsheng@627
|
14147 msgid ""
|
|
dongsheng@627
|
14148 "An option of <quote><literal>-p1</literal></quote> means <quote>use a strip "
|
|
dongsheng@627
|
14149 "count of one</quote>. If <command>patch</command> sees a file name "
|
|
dongsheng@627
|
14150 "<filename>foo/bar/baz</filename> in a file header, it will strip "
|
|
dongsheng@627
|
14151 "<filename>foo</filename> and try to patch a file named <filename>bar/baz</"
|
|
dongsheng@627
|
14152 "filename>. (Strictly speaking, the strip count refers to the number of "
|
|
dongsheng@627
|
14153 "<emphasis>path separators</emphasis> (and the components that go with them ) "
|
|
dongsheng@627
|
14154 "to strip. A strip count of one will turn <filename>foo/bar</filename> into "
|
|
dongsheng@627
|
14155 "<filename>bar</filename>, but <filename>/foo/bar</filename> (notice the extra "
|
|
dongsheng@627
|
14156 "leading slash) into <filename>foo/bar</filename>.)"
|
|
dongsheng@627
|
14157 msgstr ""
|
|
dongsheng@627
|
14158
|
|
dongsheng@627
|
14159 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14160 #: ../en/ch12-mq.xml:557
|
|
dongsheng@627
|
14161 msgid ""
|
|
dongsheng@627
|
14162 "The <quote>standard</quote> strip count for patches is one; almost all "
|
|
dongsheng@627
|
14163 "patches contain one leading path name component that needs to be stripped. "
|
|
dongsheng@627
|
14164 "Mercurial's <command role=\"hg-cmd\">hg diff</command> command generates path "
|
|
dongsheng@627
|
14165 "names in this form, and the <command role=\"hg-cmd\">hg import</command> "
|
|
dongsheng@627
|
14166 "command and MQ expect patches to have a strip count of one."
|
|
dongsheng@627
|
14167 msgstr ""
|
|
dongsheng@627
|
14168
|
|
dongsheng@627
|
14169 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14170 #: ../en/ch12-mq.xml:565
|
|
dongsheng@627
|
14171 msgid ""
|
|
dongsheng@627
|
14172 "If you receive a patch from someone that you want to add to your patch queue, "
|
|
dongsheng@627
|
14173 "and the patch needs a strip count other than one, you cannot just <command "
|
|
dongsheng@627
|
14174 "role=\"hg-ext-mq\">qimport</command> the patch, because <command role=\"hg-"
|
|
dongsheng@627
|
14175 "ext-mq\">qimport</command> does not yet have a <literal>-p</literal> option "
|
|
dongsheng@627
|
14176 "(see <ulink role=\"hg-bug\" url=\"http://www.selenic.com/mercurial/bts/"
|
|
dongsheng@627
|
14177 "issue311\">issue 311</ulink>). Your best bet is to <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
14178 "\">qnew</command> a patch of your own, then use <command>patch -pN</command> "
|
|
dongsheng@627
|
14179 "to apply their patch, followed by <command role=\"hg-cmd\">hg addremove</"
|
|
dongsheng@627
|
14180 "command> to pick up any files added or removed by the patch, followed by "
|
|
dongsheng@627
|
14181 "<command role=\"hg-ext-mq\">hg qrefresh</command>. This complexity may become "
|
|
dongsheng@627
|
14182 "unnecessary; see <ulink role=\"hg-bug\" url=\"http://www.selenic.com/"
|
|
dongsheng@627
|
14183 "mercurial/bts/issue311\">issue 311</ulink> for details."
|
|
dongsheng@627
|
14184 msgstr ""
|
|
dongsheng@627
|
14185
|
|
dongsheng@627
|
14186 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14187 #: ../en/ch12-mq.xml:584
|
|
dongsheng@627
|
14188 msgid "Strategies for applying a patch"
|
|
dongsheng@636
|
14189 msgstr "应用补丁的策略"
|
|
dongsheng@627
|
14190
|
|
dongsheng@627
|
14191 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14192 #: ../en/ch12-mq.xml:586
|
|
dongsheng@627
|
14193 msgid ""
|
|
dongsheng@627
|
14194 "When <command>patch</command> applies a hunk, it tries a handful of "
|
|
dongsheng@627
|
14195 "successively less accurate strategies to try to make the hunk apply. This "
|
|
dongsheng@627
|
14196 "falling-back technique often makes it possible to take a patch that was "
|
|
dongsheng@627
|
14197 "generated against an old version of a file, and apply it against a newer "
|
|
dongsheng@627
|
14198 "version of that file."
|
|
dongsheng@627
|
14199 msgstr ""
|
|
dongsheng@627
|
14200
|
|
dongsheng@627
|
14201 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14202 #: ../en/ch12-mq.xml:593
|
|
dongsheng@627
|
14203 msgid ""
|
|
dongsheng@627
|
14204 "First, <command>patch</command> tries an exact match, where the line numbers, "
|
|
dongsheng@627
|
14205 "the context, and the text to be modified must apply exactly. If it cannot "
|
|
dongsheng@627
|
14206 "make an exact match, it tries to find an exact match for the context, without "
|
|
dongsheng@627
|
14207 "honouring the line numbering information. If this succeeds, it prints a line "
|
|
dongsheng@627
|
14208 "of output saying that the hunk was applied, but at some <emphasis>offset</"
|
|
dongsheng@627
|
14209 "emphasis> from the original line number."
|
|
dongsheng@627
|
14210 msgstr ""
|
|
dongsheng@627
|
14211
|
|
dongsheng@627
|
14212 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14213 #: ../en/ch12-mq.xml:602
|
|
dongsheng@627
|
14214 msgid ""
|
|
dongsheng@627
|
14215 "If a context-only match fails, <command>patch</command> removes the first and "
|
|
dongsheng@627
|
14216 "last lines of the context, and tries a <emphasis>reduced</emphasis> context-"
|
|
dongsheng@627
|
14217 "only match. If the hunk with reduced context succeeds, it prints a message "
|
|
dongsheng@627
|
14218 "saying that it applied the hunk with a <emphasis>fuzz factor</emphasis> (the "
|
|
dongsheng@627
|
14219 "number after the fuzz factor indicates how many lines of context "
|
|
dongsheng@627
|
14220 "<command>patch</command> had to trim before the patch applied)."
|
|
dongsheng@627
|
14221 msgstr ""
|
|
dongsheng@627
|
14222
|
|
dongsheng@627
|
14223 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14224 #: ../en/ch12-mq.xml:611
|
|
dongsheng@627
|
14225 msgid ""
|
|
dongsheng@627
|
14226 "When neither of these techniques works, <command>patch</command> prints a "
|
|
dongsheng@627
|
14227 "message saying that the hunk in question was rejected. It saves rejected "
|
|
dongsheng@627
|
14228 "hunks (also simply called <quote>rejects</quote>) to a file with the same "
|
|
dongsheng@627
|
14229 "name, and an added <filename role=\"special\">.rej</filename> extension. It "
|
|
dongsheng@627
|
14230 "also saves an unmodified copy of the file with a <filename role=\"special\">."
|
|
dongsheng@627
|
14231 "orig</filename> extension; the copy of the file without any extensions will "
|
|
dongsheng@627
|
14232 "contain any changes made by hunks that <emphasis>did</emphasis> apply "
|
|
dongsheng@627
|
14233 "cleanly. If you have a patch that modifies <filename>foo</filename> with six "
|
|
dongsheng@627
|
14234 "hunks, and one of them fails to apply, you will have: an unmodified "
|
|
dongsheng@627
|
14235 "<filename>foo.orig</filename>, a <filename>foo.rej</filename> containing one "
|
|
dongsheng@627
|
14236 "hunk, and <filename>foo</filename>, containing the changes made by the five "
|
|
dongsheng@627
|
14237 "successful hunks."
|
|
dongsheng@627
|
14238 msgstr ""
|
|
dongsheng@627
|
14239
|
|
dongsheng@627
|
14240 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14241 #: ../en/ch12-mq.xml:629
|
|
dongsheng@627
|
14242 msgid "Some quirks of patch representation"
|
|
dongsheng@636
|
14243 msgstr "补丁的一些特性"
|
|
dongsheng@627
|
14244
|
|
dongsheng@627
|
14245 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14246 #: ../en/ch12-mq.xml:631
|
|
dongsheng@627
|
14247 msgid ""
|
|
dongsheng@627
|
14248 "There are a few useful things to know about how <command>patch</command> "
|
|
dongsheng@627
|
14249 "works with files."
|
|
dongsheng@627
|
14250 msgstr ""
|
|
dongsheng@627
|
14251
|
|
dongsheng@627
|
14252 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14253 #: ../en/ch12-mq.xml:634
|
|
dongsheng@627
|
14254 msgid ""
|
|
dongsheng@627
|
14255 "This should already be obvious, but <command>patch</command> cannot handle "
|
|
dongsheng@627
|
14256 "binary files."
|
|
dongsheng@627
|
14257 msgstr ""
|
|
dongsheng@627
|
14258
|
|
dongsheng@627
|
14259 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14260 #: ../en/ch12-mq.xml:638
|
|
dongsheng@627
|
14261 msgid ""
|
|
dongsheng@627
|
14262 "Neither does it care about the executable bit; it creates new files as "
|
|
dongsheng@627
|
14263 "readable, but not executable."
|
|
dongsheng@627
|
14264 msgstr ""
|
|
dongsheng@627
|
14265
|
|
dongsheng@627
|
14266 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14267 #: ../en/ch12-mq.xml:642
|
|
dongsheng@627
|
14268 msgid ""
|
|
dongsheng@627
|
14269 "<command>patch</command> treats the removal of a file as a diff between the "
|
|
dongsheng@627
|
14270 "file to be removed and the empty file. So your idea of <quote>I deleted this "
|
|
dongsheng@627
|
14271 "file</quote> looks like <quote>every line of this file was deleted</quote> in "
|
|
dongsheng@627
|
14272 "a patch."
|
|
dongsheng@627
|
14273 msgstr ""
|
|
dongsheng@627
|
14274
|
|
dongsheng@627
|
14275 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14276 #: ../en/ch12-mq.xml:648
|
|
dongsheng@627
|
14277 msgid ""
|
|
dongsheng@627
|
14278 "It treats the addition of a file as a diff between the empty file and the "
|
|
dongsheng@627
|
14279 "file to be added. So in a patch, your idea of <quote>I added this file</"
|
|
dongsheng@627
|
14280 "quote> looks like <quote>every line of this file was added</quote>."
|
|
dongsheng@627
|
14281 msgstr ""
|
|
dongsheng@627
|
14282
|
|
dongsheng@627
|
14283 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14284 #: ../en/ch12-mq.xml:654
|
|
dongsheng@627
|
14285 msgid ""
|
|
dongsheng@627
|
14286 "It treats a renamed file as the removal of the old name, and the addition of "
|
|
dongsheng@627
|
14287 "the new name. This means that renamed files have a big footprint in "
|
|
dongsheng@627
|
14288 "patches. (Note also that Mercurial does not currently try to infer when "
|
|
dongsheng@627
|
14289 "files have been renamed or copied in a patch.)"
|
|
dongsheng@627
|
14290 msgstr ""
|
|
dongsheng@627
|
14291
|
|
dongsheng@627
|
14292 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14293 #: ../en/ch12-mq.xml:660
|
|
dongsheng@627
|
14294 msgid ""
|
|
dongsheng@627
|
14295 "<command>patch</command> cannot represent empty files, so you cannot use a "
|
|
dongsheng@627
|
14296 "patch to represent the notion <quote>I added this empty file to the tree</"
|
|
dongsheng@627
|
14297 "quote>."
|
|
dongsheng@627
|
14298 msgstr ""
|
|
dongsheng@627
|
14299
|
|
dongsheng@627
|
14300 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14301 #: ../en/ch12-mq.xml:667
|
|
dongsheng@627
|
14302 msgid "Beware the fuzz"
|
|
dongsheng@636
|
14303 msgstr "当心毛刺"
|
|
dongsheng@627
|
14304
|
|
dongsheng@627
|
14305 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14306 #: ../en/ch12-mq.xml:669
|
|
dongsheng@627
|
14307 msgid ""
|
|
dongsheng@627
|
14308 "While applying a hunk at an offset, or with a fuzz factor, will often be "
|
|
dongsheng@627
|
14309 "completely successful, these inexact techniques naturally leave open the "
|
|
dongsheng@627
|
14310 "possibility of corrupting the patched file. The most common cases typically "
|
|
dongsheng@627
|
14311 "involve applying a patch twice, or at an incorrect location in the file. If "
|
|
dongsheng@627
|
14312 "<command>patch</command> or <command role=\"hg-ext-mq\">qpush</command> ever "
|
|
dongsheng@627
|
14313 "mentions an offset or fuzz factor, you should make sure that the modified "
|
|
dongsheng@627
|
14314 "files are correct afterwards."
|
|
dongsheng@627
|
14315 msgstr ""
|
|
dongsheng@627
|
14316
|
|
dongsheng@627
|
14317 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14318 #: ../en/ch12-mq.xml:679
|
|
dongsheng@627
|
14319 msgid ""
|
|
dongsheng@627
|
14320 "It's often a good idea to refresh a patch that has applied with an offset or "
|
|
dongsheng@627
|
14321 "fuzz factor; refreshing the patch generates new context information that will "
|
|
dongsheng@627
|
14322 "make it apply cleanly. I say <quote>often,</quote> not <quote>always,</"
|
|
dongsheng@627
|
14323 "quote> because sometimes refreshing a patch will make it fail to apply "
|
|
dongsheng@627
|
14324 "against a different revision of the underlying files. In some cases, such as "
|
|
dongsheng@627
|
14325 "when you're maintaining a patch that must sit on top of multiple versions of "
|
|
dongsheng@627
|
14326 "a source tree, it's acceptable to have a patch apply with some fuzz, provided "
|
|
dongsheng@627
|
14327 "you've verified the results of the patching process in such cases."
|
|
dongsheng@627
|
14328 msgstr ""
|
|
dongsheng@627
|
14329
|
|
dongsheng@627
|
14330 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14331 #: ../en/ch12-mq.xml:692
|
|
dongsheng@627
|
14332 msgid "Handling rejection"
|
|
dongsheng@636
|
14333 msgstr "处理拒绝"
|
|
dongsheng@627
|
14334
|
|
dongsheng@627
|
14335 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14336 #: ../en/ch12-mq.xml:694
|
|
dongsheng@627
|
14337 msgid ""
|
|
dongsheng@627
|
14338 "If <command role=\"hg-ext-mq\">qpush</command> fails to apply a patch, it "
|
|
dongsheng@627
|
14339 "will print an error message and exit. If it has left <filename role=\"special"
|
|
dongsheng@627
|
14340 "\">.rej</filename> files behind, it is usually best to fix up the rejected "
|
|
dongsheng@627
|
14341 "hunks before you push more patches or do any further work."
|
|
dongsheng@627
|
14342 msgstr ""
|
|
dongsheng@627
|
14343
|
|
dongsheng@627
|
14344 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14345 #: ../en/ch12-mq.xml:700
|
|
dongsheng@627
|
14346 msgid ""
|
|
dongsheng@627
|
14347 "If your patch <emphasis>used to</emphasis> apply cleanly, and no longer does "
|
|
dongsheng@627
|
14348 "because you've changed the underlying code that your patches are based on, "
|
|
dongsheng@627
|
14349 "Mercurial Queues can help; see section <xref linkend=\"sec.mq.merge\"/> for "
|
|
dongsheng@627
|
14350 "details."
|
|
dongsheng@627
|
14351 msgstr ""
|
|
dongsheng@627
|
14352
|
|
dongsheng@627
|
14353 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14354 #: ../en/ch12-mq.xml:706
|
|
dongsheng@627
|
14355 msgid ""
|
|
dongsheng@627
|
14356 "Unfortunately, there aren't any great techniques for dealing with rejected "
|
|
dongsheng@627
|
14357 "hunks. Most often, you'll need to view the <filename role=\"special\">.rej</"
|
|
dongsheng@627
|
14358 "filename> file and edit the target file, applying the rejected hunks by hand."
|
|
dongsheng@627
|
14359 msgstr ""
|
|
dongsheng@627
|
14360
|
|
dongsheng@627
|
14361 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14362 #: ../en/ch12-mq.xml:711
|
|
dongsheng@627
|
14363 msgid ""
|
|
dongsheng@627
|
14364 "If you're feeling adventurous, Neil Brown, a Linux kernel hacker, wrote a "
|
|
dongsheng@627
|
14365 "tool called <command>wiggle</command> <citation>web:wiggle</citation>, which "
|
|
dongsheng@627
|
14366 "is more vigorous than <command>patch</command> in its attempts to make a "
|
|
dongsheng@627
|
14367 "patch apply."
|
|
dongsheng@627
|
14368 msgstr ""
|
|
dongsheng@627
|
14369
|
|
dongsheng@627
|
14370 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14371 #: ../en/ch12-mq.xml:717
|
|
dongsheng@627
|
14372 msgid ""
|
|
dongsheng@627
|
14373 "Another Linux kernel hacker, Chris Mason (the author of Mercurial Queues), "
|
|
dongsheng@627
|
14374 "wrote a similar tool called <command>mpatch</command> <citation>web:mpatch</"
|
|
dongsheng@627
|
14375 "citation>, which takes a simple approach to automating the application of "
|
|
dongsheng@627
|
14376 "hunks rejected by <command>patch</command>. The <command>mpatch</command> "
|
|
dongsheng@627
|
14377 "command can help with four common reasons that a hunk may be rejected:"
|
|
dongsheng@627
|
14378 msgstr ""
|
|
dongsheng@627
|
14379
|
|
dongsheng@627
|
14380 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14381 #: ../en/ch12-mq.xml:726
|
|
dongsheng@627
|
14382 msgid "The context in the middle of a hunk has changed."
|
|
dongsheng@627
|
14383 msgstr ""
|
|
dongsheng@627
|
14384
|
|
dongsheng@627
|
14385 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14386 #: ../en/ch12-mq.xml:729
|
|
dongsheng@627
|
14387 msgid "A hunk is missing some context at the beginning or end."
|
|
dongsheng@627
|
14388 msgstr ""
|
|
dongsheng@627
|
14389
|
|
dongsheng@627
|
14390 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14391 #: ../en/ch12-mq.xml:732
|
|
dongsheng@627
|
14392 msgid ""
|
|
dongsheng@627
|
14393 "A large hunk might apply better&emdash;either entirely or in part&emdash;if "
|
|
dongsheng@627
|
14394 "it was broken up into smaller hunks."
|
|
dongsheng@627
|
14395 msgstr ""
|
|
dongsheng@627
|
14396
|
|
dongsheng@627
|
14397 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14398 #: ../en/ch12-mq.xml:736
|
|
dongsheng@627
|
14399 msgid ""
|
|
dongsheng@627
|
14400 "A hunk removes lines with slightly different content than those currently "
|
|
dongsheng@627
|
14401 "present in the file."
|
|
dongsheng@627
|
14402 msgstr ""
|
|
dongsheng@627
|
14403
|
|
dongsheng@627
|
14404 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14405 #: ../en/ch12-mq.xml:740
|
|
dongsheng@627
|
14406 msgid ""
|
|
dongsheng@627
|
14407 "If you use <command>wiggle</command> or <command>mpatch</command>, you should "
|
|
dongsheng@627
|
14408 "be doubly careful to check your results when you're done. In fact, "
|
|
dongsheng@627
|
14409 "<command>mpatch</command> enforces this method of double-checking the tool's "
|
|
dongsheng@627
|
14410 "output, by automatically dropping you into a merge program when it has done "
|
|
dongsheng@627
|
14411 "its job, so that you can verify its work and finish off any remaining merges."
|
|
dongsheng@627
|
14412 msgstr ""
|
|
dongsheng@627
|
14413
|
|
dongsheng@627
|
14414 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14415 #: ../en/ch12-mq.xml:752
|
|
dongsheng@627
|
14416 msgid "Getting the best performance out of MQ"
|
|
dongsheng@636
|
14417 msgstr "MQ 的性能"
|
|
dongsheng@627
|
14418
|
|
dongsheng@627
|
14419 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14420 #: ../en/ch12-mq.xml:754
|
|
dongsheng@627
|
14421 msgid ""
|
|
dongsheng@627
|
14422 "MQ is very efficient at handling a large number of patches. I ran some "
|
|
dongsheng@627
|
14423 "performance experiments in mid-2006 for a talk that I gave at the 2006 "
|
|
dongsheng@627
|
14424 "EuroPython conference <citation>web:europython</citation>. I used as my data "
|
|
dongsheng@627
|
14425 "set the Linux 2.6.17-mm1 patch series, which consists of 1,738 patches. I "
|
|
dongsheng@627
|
14426 "applied these on top of a Linux kernel repository containing all 27,472 "
|
|
dongsheng@627
|
14427 "revisions between Linux 2.6.12-rc2 and Linux 2.6.17."
|
|
dongsheng@627
|
14428 msgstr ""
|
|
dongsheng@627
|
14429
|
|
dongsheng@627
|
14430 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14431 #: ../en/ch12-mq.xml:763
|
|
dongsheng@627
|
14432 msgid ""
|
|
dongsheng@627
|
14433 "On my old, slow laptop, I was able to <command role=\"hg-cmd\">hg qpush "
|
|
dongsheng@627
|
14434 "<option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</option></command> all 1,738 "
|
|
dongsheng@627
|
14435 "patches in 3.5 minutes, and <command role=\"hg-cmd\">hg qpop <option role="
|
|
dongsheng@627
|
14436 "\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> them all in 30 seconds. "
|
|
dongsheng@627
|
14437 "(On a newer laptop, the time to push all patches dropped to two minutes.) I "
|
|
dongsheng@627
|
14438 "could <command role=\"hg-ext-mq\">qrefresh</command> one of the biggest "
|
|
dongsheng@627
|
14439 "patches (which made 22,779 lines of changes to 287 files) in 6.6 seconds."
|
|
dongsheng@627
|
14440 msgstr ""
|
|
dongsheng@627
|
14441
|
|
dongsheng@627
|
14442 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14443 #: ../en/ch12-mq.xml:774
|
|
dongsheng@627
|
14444 msgid ""
|
|
dongsheng@627
|
14445 "Clearly, MQ is well suited to working in large trees, but there are a few "
|
|
dongsheng@627
|
14446 "tricks you can use to get the best performance of it."
|
|
dongsheng@627
|
14447 msgstr ""
|
|
dongsheng@627
|
14448
|
|
dongsheng@627
|
14449 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14450 #: ../en/ch12-mq.xml:778
|
|
dongsheng@627
|
14451 msgid ""
|
|
dongsheng@627
|
14452 "First of all, try to <quote>batch</quote> operations together. Every time "
|
|
dongsheng@627
|
14453 "you run <command role=\"hg-ext-mq\">qpush</command> or <command role=\"hg-ext-"
|
|
dongsheng@627
|
14454 "mq\">qpop</command>, these commands scan the working directory once to make "
|
|
dongsheng@627
|
14455 "sure you haven't made some changes and then forgotten to run <command role="
|
|
dongsheng@627
|
14456 "\"hg-ext-mq\">qrefresh</command>. On a small tree, the time that this scan "
|
|
dongsheng@627
|
14457 "takes is unnoticeable. However, on a medium-sized tree (containing tens of "
|
|
dongsheng@627
|
14458 "thousands of files), it can take a second or more."
|
|
dongsheng@627
|
14459 msgstr ""
|
|
dongsheng@627
|
14460
|
|
dongsheng@627
|
14461 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14462 #: ../en/ch12-mq.xml:789
|
|
dongsheng@627
|
14463 msgid ""
|
|
dongsheng@627
|
14464 "The <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
14465 "\">qpop</command> commands allow you to push and pop multiple patches at a "
|
|
dongsheng@627
|
14466 "time. You can identify the <quote>destination patch</quote> that you want to "
|
|
dongsheng@627
|
14467 "end up at. When you <command role=\"hg-ext-mq\">qpush</command> with a "
|
|
dongsheng@627
|
14468 "destination specified, it will push patches until that patch is at the top of "
|
|
dongsheng@627
|
14469 "the applied stack. When you <command role=\"hg-ext-mq\">qpop</command> to a "
|
|
dongsheng@627
|
14470 "destination, MQ will pop patches until the destination patch is at the top."
|
|
dongsheng@627
|
14471 msgstr ""
|
|
dongsheng@627
|
14472
|
|
dongsheng@627
|
14473 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14474 #: ../en/ch12-mq.xml:799
|
|
dongsheng@627
|
14475 msgid ""
|
|
dongsheng@627
|
14476 "You can identify a destination patch using either the name of the patch, or "
|
|
dongsheng@627
|
14477 "by number. If you use numeric addressing, patches are counted from zero; "
|
|
dongsheng@627
|
14478 "this means that the first patch is zero, the second is one, and so on."
|
|
dongsheng@627
|
14479 msgstr ""
|
|
dongsheng@627
|
14480
|
|
dongsheng@627
|
14481 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14482 #: ../en/ch12-mq.xml:806
|
|
dongsheng@627
|
14483 msgid "Updating your patches when the underlying code changes"
|
|
dongsheng@636
|
14484 msgstr "当基础代码改变时，更新补丁的方法"
|
|
dongsheng@627
|
14485
|
|
dongsheng@627
|
14486 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14487 #: ../en/ch12-mq.xml:809
|
|
dongsheng@627
|
14488 msgid ""
|
|
dongsheng@627
|
14489 "It's common to have a stack of patches on top of an underlying repository "
|
|
dongsheng@627
|
14490 "that you don't modify directly. If you're working on changes to third-party "
|
|
dongsheng@627
|
14491 "code, or on a feature that is taking longer to develop than the rate of "
|
|
dongsheng@627
|
14492 "change of the code beneath, you will often need to sync up with the "
|
|
dongsheng@627
|
14493 "underlying code, and fix up any hunks in your patches that no longer apply. "
|
|
dongsheng@627
|
14494 "This is called <emphasis>rebasing</emphasis> your patch series."
|
|
dongsheng@627
|
14495 msgstr ""
|
|
dongsheng@627
|
14496
|
|
dongsheng@627
|
14497 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14498 #: ../en/ch12-mq.xml:818
|
|
dongsheng@627
|
14499 msgid ""
|
|
dongsheng@627
|
14500 "The simplest way to do this is to <command role=\"hg-cmd\">hg qpop <option "
|
|
dongsheng@627
|
14501 "role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches, then "
|
|
dongsheng@627
|
14502 "<command role=\"hg-cmd\">hg pull</command> changes into the underlying "
|
|
dongsheng@627
|
14503 "repository, and finally <command role=\"hg-cmd\">hg qpush <option role=\"hg-"
|
|
dongsheng@627
|
14504 "ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches again. MQ will "
|
|
dongsheng@627
|
14505 "stop pushing any time it runs across a patch that fails to apply during "
|
|
dongsheng@627
|
14506 "conflicts, allowing you to fix your conflicts, <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
14507 "\">qrefresh</command> the affected patch, and continue pushing until you have "
|
|
dongsheng@627
|
14508 "fixed your entire stack."
|
|
dongsheng@627
|
14509 msgstr ""
|
|
dongsheng@627
|
14510
|
|
dongsheng@627
|
14511 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14512 #: ../en/ch12-mq.xml:830
|
|
dongsheng@627
|
14513 msgid ""
|
|
dongsheng@627
|
14514 "This approach is easy to use and works well if you don't expect changes to "
|
|
dongsheng@627
|
14515 "the underlying code to affect how well your patches apply. If your patch "
|
|
dongsheng@627
|
14516 "stack touches code that is modified frequently or invasively in the "
|
|
dongsheng@627
|
14517 "underlying repository, however, fixing up rejected hunks by hand quickly "
|
|
dongsheng@627
|
14518 "becomes tiresome."
|
|
dongsheng@627
|
14519 msgstr ""
|
|
dongsheng@627
|
14520
|
|
dongsheng@627
|
14521 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14522 #: ../en/ch12-mq.xml:837
|
|
dongsheng@627
|
14523 msgid ""
|
|
dongsheng@627
|
14524 "It's possible to partially automate the rebasing process. If your patches "
|
|
dongsheng@627
|
14525 "apply cleanly against some revision of the underlying repo, MQ can use this "
|
|
dongsheng@627
|
14526 "information to help you to resolve conflicts between your patches and a "
|
|
dongsheng@627
|
14527 "different revision."
|
|
dongsheng@627
|
14528 msgstr ""
|
|
dongsheng@627
|
14529
|
|
dongsheng@627
|
14530 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14531 #: ../en/ch12-mq.xml:843
|
|
dongsheng@627
|
14532 msgid "The process is a little involved."
|
|
dongsheng@627
|
14533 msgstr ""
|
|
dongsheng@627
|
14534
|
|
dongsheng@627
|
14535 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@641
|
14536 #: ../en/ch12-mq.xml:845
|
|
dongsheng@627
|
14537 msgid ""
|
|
dongsheng@627
|
14538 "To begin, <command role=\"hg-cmd\">hg qpush -a</command> all of your patches "
|
|
dongsheng@627
|
14539 "on top of the revision where you know that they apply cleanly."
|
|
dongsheng@627
|
14540 msgstr ""
|
|
dongsheng@627
|
14541
|
|
dongsheng@627
|
14542 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@641
|
14543 #: ../en/ch12-mq.xml:849
|
|
dongsheng@627
|
14544 msgid ""
|
|
dongsheng@627
|
14545 "Save a backup copy of your patch directory using <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
14546 "qsave <option role=\"hg-ext-mq-cmd-qsave-opt\">hg -e</option> <option role="
|
|
dongsheng@627
|
14547 "\"hg-ext-mq-cmd-qsave-opt\">hg -c</option></command>. This prints the name "
|
|
dongsheng@627
|
14548 "of the directory that it has saved the patches in. It will save the patches "
|
|
dongsheng@627
|
14549 "to a directory called <filename role=\"special\" class=\"directory\">.hg/"
|
|
dongsheng@627
|
14550 "patches.N</filename>, where <literal>N</literal> is a small integer. It also "
|
|
dongsheng@627
|
14551 "commits a <quote>save changeset</quote> on top of your applied patches; this "
|
|
dongsheng@627
|
14552 "is for internal book-keeping, and records the states of the <filename role="
|
|
dongsheng@627
|
14553 "\"special\">series</filename> and <filename role=\"special\">status</"
|
|
dongsheng@627
|
14554 "filename> files."
|
|
dongsheng@627
|
14555 msgstr ""
|
|
dongsheng@627
|
14556
|
|
dongsheng@627
|
14557 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@641
|
14558 #: ../en/ch12-mq.xml:863
|
|
dongsheng@627
|
14559 msgid ""
|
|
dongsheng@627
|
14560 "Use <command role=\"hg-cmd\">hg pull</command> to bring new changes into the "
|
|
dongsheng@627
|
14561 "underlying repository. (Don't run <command role=\"hg-cmd\">hg pull -u</"
|
|
dongsheng@627
|
14562 "command>; see below for why.)"
|
|
dongsheng@627
|
14563 msgstr ""
|
|
dongsheng@627
|
14564
|
|
dongsheng@627
|
14565 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@641
|
14566 #: ../en/ch12-mq.xml:868
|
|
dongsheng@627
|
14567 msgid ""
|
|
dongsheng@627
|
14568 "Update to the new tip revision, using <command role=\"hg-cmd\">hg update "
|
|
dongsheng@627
|
14569 "<option role=\"hg-opt-update\">-C</option></command> to override the patches "
|
|
dongsheng@627
|
14570 "you have pushed."
|
|
dongsheng@627
|
14571 msgstr ""
|
|
dongsheng@627
|
14572
|
|
dongsheng@627
|
14573 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@641
|
14574 #: ../en/ch12-mq.xml:873
|
|
dongsheng@627
|
14575 msgid ""
|
|
dongsheng@627
|
14576 "Merge all patches using \\hgcmdargs{qpush}{<option role=\"hg-ext-mq-cmd-qpush-"
|
|
dongsheng@627
|
14577 "opt\">hg -m</option> <option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</"
|
|
dongsheng@627
|
14578 "option>}. The <option role=\"hg-ext-mq-cmd-qpush-opt\">hg -m</option> option "
|
|
dongsheng@627
|
14579 "to <command role=\"hg-ext-mq\">qpush</command> tells MQ to perform a three-"
|
|
dongsheng@627
|
14580 "way merge if the patch fails to apply."
|
|
dongsheng@627
|
14581 msgstr ""
|
|
dongsheng@627
|
14582
|
|
dongsheng@627
|
14583 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14584 #: ../en/ch12-mq.xml:883
|
|
dongsheng@627
|
14585 msgid ""
|
|
dongsheng@627
|
14586 "During the <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-"
|
|
dongsheng@627
|
14587 "qpush-opt\">hg -m</option></command>, each patch in the <filename role="
|
|
dongsheng@627
|
14588 "\"special\">series</filename> file is applied normally. If a patch applies "
|
|
dongsheng@627
|
14589 "with fuzz or rejects, MQ looks at the queue you <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
14590 "\">qsave</command>d, and performs a three-way merge with the corresponding "
|
|
dongsheng@627
|
14591 "changeset. This merge uses Mercurial's normal merge machinery, so it may pop "
|
|
dongsheng@627
|
14592 "up a GUI merge tool to help you to resolve problems."
|
|
dongsheng@627
|
14593 msgstr ""
|
|
dongsheng@627
|
14594
|
|
dongsheng@627
|
14595 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14596 #: ../en/ch12-mq.xml:893
|
|
dongsheng@627
|
14597 msgid ""
|
|
dongsheng@627
|
14598 "When you finish resolving the effects of a patch, MQ refreshes your patch "
|
|
dongsheng@627
|
14599 "based on the result of the merge."
|
|
dongsheng@627
|
14600 msgstr ""
|
|
dongsheng@627
|
14601
|
|
dongsheng@627
|
14602 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14603 #: ../en/ch12-mq.xml:896
|
|
dongsheng@627
|
14604 msgid ""
|
|
dongsheng@627
|
14605 "At the end of this process, your repository will have one extra head from the "
|
|
dongsheng@627
|
14606 "old patch queue, and a copy of the old patch queue will be in <filename role="
|
|
dongsheng@627
|
14607 "\"special\" class=\"directory\">.hg/patches.N</filename>. You can remove the "
|
|
dongsheng@627
|
14608 "extra head using <command role=\"hg-cmd\">hg qpop -a -n patches.N</command> "
|
|
dongsheng@627
|
14609 "or <command role=\"hg-cmd\">hg strip</command>. You can delete <filename "
|
|
dongsheng@627
|
14610 "role=\"special\" class=\"directory\">.hg/patches.N</filename> once you are "
|
|
dongsheng@627
|
14611 "sure that you no longer need it as a backup."
|
|
dongsheng@627
|
14612 msgstr ""
|
|
dongsheng@627
|
14613
|
|
dongsheng@627
|
14614 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14615 #: ../en/ch12-mq.xml:908
|
|
dongsheng@627
|
14616 msgid "Identifying patches"
|
|
dongsheng@636
|
14617 msgstr "标识补丁"
|
|
dongsheng@627
|
14618
|
|
dongsheng@627
|
14619 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14620 #: ../en/ch12-mq.xml:910
|
|
dongsheng@627
|
14621 msgid ""
|
|
dongsheng@627
|
14622 "MQ commands that work with patches let you refer to a patch either by using "
|
|
dongsheng@627
|
14623 "its name or by a number. By name is obvious enough; pass the name "
|
|
dongsheng@627
|
14624 "<filename>foo.patch</filename> to <command role=\"hg-ext-mq\">qpush</"
|
|
dongsheng@627
|
14625 "command>, for example, and it will push patches until <filename>foo.patch</"
|
|
dongsheng@627
|
14626 "filename> is applied."
|
|
dongsheng@627
|
14627 msgstr ""
|
|
dongsheng@627
|
14628
|
|
dongsheng@627
|
14629 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14630 #: ../en/ch12-mq.xml:917
|
|
dongsheng@627
|
14631 msgid ""
|
|
dongsheng@627
|
14632 "As a shortcut, you can refer to a patch using both a name and a numeric "
|
|
dongsheng@627
|
14633 "offset; <literal>foo.patch-2</literal> means <quote>two patches before "
|
|
dongsheng@627
|
14634 "<literal>foo.patch</literal></quote>, while <literal>bar.patch+4</literal> "
|
|
dongsheng@627
|
14635 "means <quote>four patches after <literal>bar.patch</literal></quote>."
|
|
dongsheng@627
|
14636 msgstr ""
|
|
dongsheng@627
|
14637
|
|
dongsheng@627
|
14638 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14639 #: ../en/ch12-mq.xml:923
|
|
dongsheng@627
|
14640 msgid ""
|
|
dongsheng@627
|
14641 "Referring to a patch by index isn't much different. The first patch printed "
|
|
dongsheng@627
|
14642 "in the output of <command role=\"hg-ext-mq\">qseries</command> is patch zero "
|
|
dongsheng@627
|
14643 "(yes, it's one of those start-at-zero counting systems); the second is patch "
|
|
dongsheng@627
|
14644 "one; and so on."
|
|
dongsheng@627
|
14645 msgstr ""
|
|
dongsheng@627
|
14646
|
|
dongsheng@627
|
14647 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14648 #: ../en/ch12-mq.xml:929
|
|
dongsheng@627
|
14649 msgid ""
|
|
dongsheng@627
|
14650 "MQ also makes it easy to work with patches when you are using normal "
|
|
dongsheng@627
|
14651 "Mercurial commands. Every command that accepts a changeset ID will also "
|
|
dongsheng@627
|
14652 "accept the name of an applied patch. MQ augments the tags normally in the "
|
|
dongsheng@627
|
14653 "repository with an eponymous one for each applied patch. In addition, the "
|
|
dongsheng@627
|
14654 "special tags \\index{tags!special tag names!<literal>qbase</literal>}"
|
|
dongsheng@627
|
14655 "<literal>qbase</literal> and \\index{tags!special tag names!<literal>qtip</"
|
|
dongsheng@627
|
14656 "literal>}<literal>qtip</literal> identify the <quote>bottom-most</quote> and "
|
|
dongsheng@627
|
14657 "topmost applied patches, respectively."
|
|
dongsheng@627
|
14658 msgstr ""
|
|
dongsheng@627
|
14659
|
|
dongsheng@627
|
14660 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14661 #: ../en/ch12-mq.xml:941
|
|
dongsheng@627
|
14662 msgid ""
|
|
dongsheng@627
|
14663 "These additions to Mercurial's normal tagging capabilities make dealing with "
|
|
dongsheng@627
|
14664 "patches even more of a breeze."
|
|
dongsheng@627
|
14665 msgstr ""
|
|
dongsheng@627
|
14666
|
|
dongsheng@627
|
14667 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14668 #: ../en/ch12-mq.xml:944
|
|
dongsheng@627
|
14669 msgid "Want to patchbomb a mailing list with your latest series of changes?"
|
|
dongsheng@627
|
14670 msgstr ""
|
|
dongsheng@627
|
14671
|
|
dongsheng@627
|
14672 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14673 #: ../en/ch12-mq.xml:948
|
|
dongsheng@627
|
14674 msgid ""
|
|
dongsheng@627
|
14675 "(Don't know what <quote>patchbombing</quote> is? See section <xref linkend="
|
|
dongsheng@627
|
14676 "\"sec.hgext.patchbomb\"/>.)"
|
|
dongsheng@627
|
14677 msgstr ""
|
|
dongsheng@627
|
14678
|
|
dongsheng@627
|
14679 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14680 #: ../en/ch12-mq.xml:951
|
|
dongsheng@627
|
14681 msgid ""
|
|
dongsheng@627
|
14682 "Need to see all of the patches since <literal>foo.patch</literal> that have "
|
|
dongsheng@627
|
14683 "touched files in a subdirectory of your tree?"
|
|
dongsheng@627
|
14684 msgstr ""
|
|
dongsheng@627
|
14685
|
|
dongsheng@627
|
14686 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><programlisting><emphasis>
|
|
dongsheng@641
|
14687 #: ../en/ch12-mq.xml:955
|
|
dongsheng@627
|
14688 msgid "subdir"
|
|
dongsheng@627
|
14689 msgstr ""
|
|
dongsheng@627
|
14690
|
|
dongsheng@627
|
14691 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14692 #: ../en/ch12-mq.xml:960
|
|
dongsheng@627
|
14693 msgid ""
|
|
dongsheng@627
|
14694 "Because MQ makes the names of patches available to the rest of Mercurial "
|
|
dongsheng@627
|
14695 "through its normal internal tag machinery, you don't need to type in the "
|
|
dongsheng@627
|
14696 "entire name of a patch when you want to identify it by name."
|
|
dongsheng@627
|
14697 msgstr ""
|
|
dongsheng@627
|
14698
|
|
dongsheng@627
|
14699 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14700 #: ../en/ch12-mq.xml:965
|
|
dongsheng@627
|
14701 msgid ""
|
|
dongsheng@627
|
14702 "Another nice consequence of representing patch names as tags is that when you "
|
|
dongsheng@627
|
14703 "run the <command role=\"hg-cmd\">hg log</command> command, it will display a "
|
|
dongsheng@627
|
14704 "patch's name as a tag, simply as part of its normal output. This makes it "
|
|
dongsheng@627
|
14705 "easy to visually distinguish applied patches from underlying <quote>normal</"
|
|
dongsheng@627
|
14706 "quote> revisions. The following example shows a few normal Mercurial "
|
|
dongsheng@627
|
14707 "commands in use with applied patches."
|
|
dongsheng@627
|
14708 msgstr ""
|
|
dongsheng@627
|
14709
|
|
dongsheng@627
|
14710 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14711 #: ../en/ch12-mq.xml:978
|
|
dongsheng@627
|
14712 msgid "Useful things to know about"
|
|
dongsheng@636
|
14713 msgstr "其它需要了解的东西"
|
|
dongsheng@627
|
14714
|
|
dongsheng@627
|
14715 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14716 #: ../en/ch12-mq.xml:980
|
|
dongsheng@627
|
14717 msgid ""
|
|
dongsheng@627
|
14718 "There are a number of aspects of MQ usage that don't fit tidily into sections "
|
|
dongsheng@627
|
14719 "of their own, but that are good to know. Here they are, in one place."
|
|
dongsheng@627
|
14720 msgstr ""
|
|
dongsheng@627
|
14721
|
|
dongsheng@627
|
14722 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14723 #: ../en/ch12-mq.xml:985
|
|
dongsheng@627
|
14724 msgid ""
|
|
dongsheng@627
|
14725 "Normally, when you <command role=\"hg-ext-mq\">qpop</command> a patch and "
|
|
dongsheng@627
|
14726 "<command role=\"hg-ext-mq\">qpush</command> it again, the changeset that "
|
|
dongsheng@627
|
14727 "represents the patch after the pop/push will have a <emphasis>different "
|
|
dongsheng@627
|
14728 "identity</emphasis> than the changeset that represented the hash beforehand. "
|
|
dongsheng@627
|
14729 "See section <xref linkend=\"sec.mqref.cmd.qpush\"/> for information as to why "
|
|
dongsheng@627
|
14730 "this is."
|
|
dongsheng@627
|
14731 msgstr ""
|
|
dongsheng@627
|
14732
|
|
dongsheng@627
|
14733 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@641
|
14734 #: ../en/ch12-mq.xml:994
|
|
dongsheng@627
|
14735 msgid ""
|
|
dongsheng@627
|
14736 "It's not a good idea to <command role=\"hg-cmd\">hg merge</command> changes "
|
|
dongsheng@627
|
14737 "from another branch with a patch changeset, at least if you want to maintain "
|
|
dongsheng@627
|
14738 "the <quote>patchiness</quote> of that changeset and changesets below it on "
|
|
dongsheng@627
|
14739 "the patch stack. If you try to do this, it will appear to succeed, but MQ "
|
|
dongsheng@627
|
14740 "will become confused."
|
|
dongsheng@627
|
14741 msgstr ""
|
|
dongsheng@627
|
14742
|
|
dongsheng@627
|
14743 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14744 #: ../en/ch12-mq.xml:1005
|
|
dongsheng@627
|
14745 msgid "Managing patches in a repository"
|
|
dongsheng@636
|
14746 msgstr "在版本库管理补丁"
|
|
dongsheng@627
|
14747
|
|
dongsheng@627
|
14748 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14749 #: ../en/ch12-mq.xml:1007
|
|
dongsheng@627
|
14750 msgid ""
|
|
dongsheng@627
|
14751 "Because MQ's <filename role=\"special\" class=\"directory\">.hg/patches</"
|
|
dongsheng@627
|
14752 "filename> directory resides outside a Mercurial repository's working "
|
|
dongsheng@627
|
14753 "directory, the <quote>underlying</quote> Mercurial repository knows nothing "
|
|
dongsheng@627
|
14754 "about the management or presence of patches."
|
|
dongsheng@627
|
14755 msgstr ""
|
|
dongsheng@627
|
14756
|
|
dongsheng@627
|
14757 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14758 #: ../en/ch12-mq.xml:1013
|
|
dongsheng@627
|
14759 msgid ""
|
|
dongsheng@627
|
14760 "This presents the interesting possibility of managing the contents of the "
|
|
dongsheng@627
|
14761 "patch directory as a Mercurial repository in its own right. This can be a "
|
|
dongsheng@627
|
14762 "useful way to work. For example, you can work on a patch for a while, "
|
|
dongsheng@627
|
14763 "<command role=\"hg-ext-mq\">qrefresh</command> it, then <command role=\"hg-cmd"
|
|
dongsheng@627
|
14764 "\">hg commit</command> the current state of the patch. This lets you "
|
|
dongsheng@627
|
14765 "<quote>roll back</quote> to that version of the patch later on."
|
|
dongsheng@627
|
14766 msgstr ""
|
|
dongsheng@627
|
14767
|
|
dongsheng@627
|
14768 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14769 #: ../en/ch12-mq.xml:1022
|
|
dongsheng@627
|
14770 msgid ""
|
|
dongsheng@627
|
14771 "You can then share different versions of the same patch stack among multiple "
|
|
dongsheng@627
|
14772 "underlying repositories. I use this when I am developing a Linux kernel "
|
|
dongsheng@627
|
14773 "feature. I have a pristine copy of my kernel sources for each of several CPU "
|
|
dongsheng@627
|
14774 "architectures, and a cloned repository under each that contains the patches I "
|
|
dongsheng@627
|
14775 "am working on. When I want to test a change on a different architecture, I "
|
|
dongsheng@627
|
14776 "push my current patches to the patch repository associated with that kernel "
|
|
dongsheng@627
|
14777 "tree, pop and push all of my patches, and build and test that kernel."
|
|
dongsheng@627
|
14778 msgstr ""
|
|
dongsheng@627
|
14779
|
|
dongsheng@627
|
14780 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14781 #: ../en/ch12-mq.xml:1032
|
|
dongsheng@627
|
14782 msgid ""
|
|
dongsheng@627
|
14783 "Managing patches in a repository makes it possible for multiple developers to "
|
|
dongsheng@627
|
14784 "work on the same patch series without colliding with each other, all on top "
|
|
dongsheng@627
|
14785 "of an underlying source base that they may or may not control."
|
|
dongsheng@627
|
14786 msgstr ""
|
|
dongsheng@627
|
14787
|
|
dongsheng@627
|
14788 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14789 #: ../en/ch12-mq.xml:1038
|
|
dongsheng@627
|
14790 msgid "MQ support for patch repositories"
|
|
dongsheng@636
|
14791 msgstr "MQ 支持补丁版本库"
|
|
dongsheng@627
|
14792
|
|
dongsheng@627
|
14793 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14794 #: ../en/ch12-mq.xml:1040
|
|
dongsheng@627
|
14795 msgid ""
|
|
dongsheng@627
|
14796 "MQ helps you to work with the <filename role=\"special\" class=\"directory\">."
|
|
dongsheng@627
|
14797 "hg/patches</filename> directory as a repository; when you prepare a "
|
|
dongsheng@627
|
14798 "repository for working with patches using <command role=\"hg-ext-mq\">qinit</"
|
|
dongsheng@627
|
14799 "command>, you can pass the <option role=\"hg-ext-mq-cmd-qinit-opt\">hg -c</"
|
|
dongsheng@627
|
14800 "option> option to create the <filename role=\"special\" class=\"directory\">."
|
|
dongsheng@627
|
14801 "hg/patches</filename> directory as a Mercurial repository."
|
|
dongsheng@627
|
14802 msgstr ""
|
|
dongsheng@627
|
14803
|
|
dongsheng@627
|
14804 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@641
|
14805 #: ../en/ch12-mq.xml:1050
|
|
dongsheng@627
|
14806 msgid ""
|
|
dongsheng@627
|
14807 "If you forget to use the <option role=\"hg-ext-mq-cmd-qinit-opt\">hg -c</"
|
|
dongsheng@627
|
14808 "option> option, you can simply go into the <filename role=\"special\" class="
|
|
dongsheng@627
|
14809 "\"directory\">.hg/patches</filename> directory at any time and run <command "
|
|
dongsheng@627
|
14810 "role=\"hg-cmd\">hg init</command>. Don't forget to add an entry for the "
|
|
dongsheng@627
|
14811 "<filename role=\"special\">status</filename> file to the <filename role="
|
|
dongsheng@627
|
14812 "\"special\">.hgignore</filename> file, though"
|
|
dongsheng@627
|
14813 msgstr ""
|
|
dongsheng@627
|
14814
|
|
dongsheng@627
|
14815 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@641
|
14816 #: ../en/ch12-mq.xml:1059
|
|
dongsheng@627
|
14817 msgid ""
|
|
dongsheng@627
|
14818 "(<command role=\"hg-cmd\">hg qinit <option role=\"hg-ext-mq-cmd-qinit-opt"
|
|
dongsheng@627
|
14819 "\">hg -c</option></command> does this for you automatically); you "
|
|
dongsheng@627
|
14820 "<emphasis>really</emphasis> don't want to manage the <filename role=\"special"
|
|
dongsheng@627
|
14821 "\">status</filename> file."
|
|
dongsheng@627
|
14822 msgstr ""
|
|
dongsheng@627
|
14823
|
|
dongsheng@627
|
14824 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14825 #: ../en/ch12-mq.xml:1066
|
|
dongsheng@627
|
14826 msgid ""
|
|
dongsheng@627
|
14827 "As a convenience, if MQ notices that the <filename class=\"directory\">.hg/"
|
|
dongsheng@627
|
14828 "patches</filename> directory is a repository, it will automatically <command "
|
|
dongsheng@627
|
14829 "role=\"hg-cmd\">hg add</command> every patch that you create and import."
|
|
dongsheng@627
|
14830 msgstr ""
|
|
dongsheng@627
|
14831
|
|
dongsheng@627
|
14832 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14833 #: ../en/ch12-mq.xml:1071
|
|
dongsheng@627
|
14834 msgid ""
|
|
dongsheng@627
|
14835 "MQ provides a shortcut command, <command role=\"hg-ext-mq\">qcommit</"
|
|
dongsheng@627
|
14836 "command>, that runs <command role=\"hg-cmd\">hg commit</command> in the "
|
|
dongsheng@627
|
14837 "<filename role=\"special\" class=\"directory\">.hg/patches</filename> "
|
|
dongsheng@627
|
14838 "directory. This saves some bothersome typing."
|
|
dongsheng@627
|
14839 msgstr ""
|
|
dongsheng@627
|
14840
|
|
dongsheng@627
|
14841 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14842 #: ../en/ch12-mq.xml:1077
|
|
dongsheng@627
|
14843 msgid ""
|
|
dongsheng@627
|
14844 "Finally, as a convenience to manage the patch directory, you can define the "
|
|
dongsheng@627
|
14845 "alias <command>mq</command> on Unix systems. For example, on Linux systems "
|
|
dongsheng@627
|
14846 "using the <command>bash</command> shell, you can include the following "
|
|
dongsheng@627
|
14847 "snippet in your <filename role=\"home\">~/.bashrc</filename>."
|
|
dongsheng@627
|
14848 msgstr ""
|
|
dongsheng@627
|
14849
|
|
dongsheng@627
|
14850 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14851 #: ../en/ch12-mq.xml:1087
|
|
dongsheng@627
|
14852 msgid ""
|
|
dongsheng@627
|
14853 "You can then issue commands of the form <command>mq pull</command> from the "
|
|
dongsheng@627
|
14854 "main repository."
|
|
dongsheng@627
|
14855 msgstr ""
|
|
dongsheng@627
|
14856
|
|
dongsheng@627
|
14857 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14858 #: ../en/ch12-mq.xml:1092
|
|
dongsheng@627
|
14859 msgid "A few things to watch out for"
|
|
dongsheng@636
|
14860 msgstr "需要注意的事情"
|
|
dongsheng@627
|
14861
|
|
dongsheng@627
|
14862 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14863 #: ../en/ch12-mq.xml:1094
|
|
dongsheng@627
|
14864 msgid ""
|
|
dongsheng@627
|
14865 "MQ's support for working with a repository full of patches is limited in a "
|
|
dongsheng@627
|
14866 "few small respects."
|
|
dongsheng@627
|
14867 msgstr ""
|
|
dongsheng@627
|
14868
|
|
dongsheng@627
|
14869 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14870 #: ../en/ch12-mq.xml:1097
|
|
dongsheng@627
|
14871 msgid ""
|
|
dongsheng@627
|
14872 "MQ cannot automatically detect changes that you make to the patch directory. "
|
|
dongsheng@627
|
14873 "If you <command role=\"hg-cmd\">hg pull</command>, manually edit, or <command "
|
|
dongsheng@627
|
14874 "role=\"hg-cmd\">hg update</command> changes to patches or the <filename role="
|
|
dongsheng@627
|
14875 "\"special\">series</filename> file, you will have to <command role=\"hg-cmd"
|
|
dongsheng@627
|
14876 "\">hg qpop <option role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> "
|
|
dongsheng@627
|
14877 "and then <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-qpush-"
|
|
dongsheng@627
|
14878 "opt\">hg -a</option></command> in the underlying repository to see those "
|
|
dongsheng@627
|
14879 "changes show up there. If you forget to do this, you can confuse MQ's idea "
|
|
dongsheng@627
|
14880 "of which patches are applied."
|
|
dongsheng@627
|
14881 msgstr ""
|
|
dongsheng@627
|
14882
|
|
dongsheng@627
|
14883 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14884 #: ../en/ch12-mq.xml:1113
|
|
dongsheng@627
|
14885 msgid "Third party tools for working with patches"
|
|
dongsheng@636
|
14886 msgstr "操作补丁的第三方工具"
|
|
dongsheng@627
|
14887
|
|
dongsheng@627
|
14888 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14889 #: ../en/ch12-mq.xml:1115
|
|
dongsheng@627
|
14890 msgid ""
|
|
dongsheng@627
|
14891 "Once you've been working with patches for a while, you'll find yourself "
|
|
dongsheng@627
|
14892 "hungry for tools that will help you to understand and manipulate the patches "
|
|
dongsheng@627
|
14893 "you're dealing with."
|
|
dongsheng@627
|
14894 msgstr ""
|
|
dongsheng@627
|
14895
|
|
dongsheng@627
|
14896 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14897 #: ../en/ch12-mq.xml:1119
|
|
dongsheng@627
|
14898 msgid ""
|
|
dongsheng@627
|
14899 "The <command>diffstat</command> command <citation>web:diffstat</citation> "
|
|
dongsheng@627
|
14900 "generates a histogram of the modifications made to each file in a patch. It "
|
|
dongsheng@627
|
14901 "provides a good way to <quote>get a sense of</quote> a patch&emdash;which "
|
|
dongsheng@627
|
14902 "files it affects, and how much change it introduces to each file and as a "
|
|
dongsheng@627
|
14903 "whole. (I find that it's a good idea to use <command>diffstat</command>'s "
|
|
dongsheng@627
|
14904 "<option role=\"cmd-opt-diffstat\">-p</option> option as a matter of course, "
|
|
dongsheng@627
|
14905 "as otherwise it will try to do clever things with prefixes of file names that "
|
|
dongsheng@627
|
14906 "inevitably confuse at least me.)"
|
|
dongsheng@627
|
14907 msgstr ""
|
|
dongsheng@627
|
14908
|
|
dongsheng@627
|
14909 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14910 #: ../en/ch12-mq.xml:1133
|
|
dongsheng@627
|
14911 msgid ""
|
|
dongsheng@627
|
14912 "The <literal role=\"package\">patchutils</literal> package <citation>web:"
|
|
dongsheng@627
|
14913 "patchutils</citation> is invaluable. It provides a set of small utilities "
|
|
dongsheng@627
|
14914 "that follow the <quote>Unix philosophy;</quote> each does one useful thing "
|
|
dongsheng@627
|
14915 "with a patch. The <literal role=\"package\">patchutils</literal> command I "
|
|
dongsheng@627
|
14916 "use most is <command>filterdiff</command>, which extracts subsets from a "
|
|
dongsheng@627
|
14917 "patch file. For example, given a patch that modifies hundreds of files "
|
|
dongsheng@627
|
14918 "across dozens of directories, a single invocation of <command>filterdiff</"
|
|
dongsheng@627
|
14919 "command> can generate a smaller patch that only touches files whose names "
|
|
dongsheng@627
|
14920 "match a particular glob pattern. See section <xref linkend=\"mq-collab.tips."
|
|
dongsheng@627
|
14921 "interdiff\"/> for another example."
|
|
dongsheng@627
|
14922 msgstr ""
|
|
dongsheng@627
|
14923
|
|
dongsheng@627
|
14924 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14925 #: ../en/ch12-mq.xml:1149
|
|
dongsheng@627
|
14926 msgid "Good ways to work with patches"
|
|
dongsheng@636
|
14927 msgstr "操作补丁的好习惯"
|
|
dongsheng@627
|
14928
|
|
dongsheng@627
|
14929 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14930 #: ../en/ch12-mq.xml:1151
|
|
dongsheng@627
|
14931 msgid ""
|
|
dongsheng@627
|
14932 "Whether you are working on a patch series to submit to a free software or "
|
|
dongsheng@627
|
14933 "open source project, or a series that you intend to treat as a sequence of "
|
|
dongsheng@627
|
14934 "regular changesets when you're done, you can use some simple techniques to "
|
|
dongsheng@627
|
14935 "keep your work well organised."
|
|
dongsheng@627
|
14936 msgstr ""
|
|
dongsheng@627
|
14937
|
|
dongsheng@627
|
14938 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14939 #: ../en/ch12-mq.xml:1157
|
|
dongsheng@627
|
14940 msgid ""
|
|
dongsheng@627
|
14941 "Give your patches descriptive names. A good name for a patch might be "
|
|
dongsheng@627
|
14942 "<filename>rework-device-alloc.patch</filename>, because it will immediately "
|
|
dongsheng@627
|
14943 "give you a hint what the purpose of the patch is. Long names shouldn't be a "
|
|
dongsheng@627
|
14944 "problem; you won't be typing the names often, but you <emphasis>will</"
|
|
dongsheng@627
|
14945 "emphasis> be running commands like <command role=\"hg-ext-mq\">qapplied</"
|
|
dongsheng@627
|
14946 "command> and <command role=\"hg-ext-mq\">qtop</command> over and over. Good "
|
|
dongsheng@627
|
14947 "naming becomes especially important when you have a number of patches to work "
|
|
dongsheng@627
|
14948 "with, or if you are juggling a number of different tasks and your patches "
|
|
dongsheng@627
|
14949 "only get a fraction of your attention."
|
|
dongsheng@627
|
14950 msgstr ""
|
|
dongsheng@627
|
14951
|
|
dongsheng@627
|
14952 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14953 #: ../en/ch12-mq.xml:1169
|
|
dongsheng@627
|
14954 msgid ""
|
|
dongsheng@627
|
14955 "Be aware of what patch you're working on. Use the <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
14956 "\">qtop</command> command and skim over the text of your patches "
|
|
dongsheng@627
|
14957 "frequently&emdash;for example, using <command role=\"hg-cmd\">hg tip <option "
|
|
dongsheng@627
|
14958 "role=\"hg-opt-tip\">-p</option></command>)&emdash;to be sure of where you "
|
|
dongsheng@627
|
14959 "stand. I have several times worked on and <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
14960 "\">qrefresh</command>ed a patch other than the one I intended, and it's often "
|
|
dongsheng@627
|
14961 "tricky to migrate changes into the right patch after making them in the wrong "
|
|
dongsheng@627
|
14962 "one."
|
|
dongsheng@627
|
14963 msgstr ""
|
|
dongsheng@627
|
14964
|
|
dongsheng@627
|
14965 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
14966 #: ../en/ch12-mq.xml:1179
|
|
dongsheng@627
|
14967 msgid ""
|
|
dongsheng@627
|
14968 "For this reason, it is very much worth investing a little time to learn how "
|
|
dongsheng@627
|
14969 "to use some of the third-party tools I described in section <xref linkend="
|
|
dongsheng@627
|
14970 "\"sec.mq.tools\"/>, particularly <command>diffstat</command> and "
|
|
dongsheng@627
|
14971 "<command>filterdiff</command>. The former will give you a quick idea of what "
|
|
dongsheng@627
|
14972 "changes your patch is making, while the latter makes it easy to splice hunks "
|
|
dongsheng@627
|
14973 "selectively out of one patch and into another."
|
|
dongsheng@627
|
14974 msgstr ""
|
|
dongsheng@627
|
14975
|
|
dongsheng@627
|
14976 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
14977 #: ../en/ch12-mq.xml:1190
|
|
dongsheng@627
|
14978 msgid "MQ cookbook"
|
|
dongsheng@636
|
14979 msgstr "MQ 手册"
|
|
dongsheng@627
|
14980
|
|
dongsheng@627
|
14981 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
14982 #: ../en/ch12-mq.xml:1193
|
|
dongsheng@627
|
14983 msgid "Manage <quote>trivial</quote> patches"
|
|
dongsheng@636
|
14984 msgstr "管理<quote>琐碎的</quote>补丁"
|
|
dongsheng@627
|
14985
|
|
dongsheng@627
|
14986 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14987 #: ../en/ch12-mq.xml:1195
|
|
dongsheng@627
|
14988 msgid ""
|
|
dongsheng@627
|
14989 "Because the overhead of dropping files into a new Mercurial repository is so "
|
|
dongsheng@627
|
14990 "low, it makes a lot of sense to manage patches this way even if you simply "
|
|
dongsheng@627
|
14991 "want to make a few changes to a source tarball that you downloaded."
|
|
dongsheng@627
|
14992 msgstr ""
|
|
dongsheng@627
|
14993
|
|
dongsheng@627
|
14994 #
|
|
dongsheng@627
|
14995 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
14996 #: ../en/ch12-mq.xml:1200
|
|
dongsheng@627
|
14997 msgid ""
|
|
dongsheng@627
|
14998 "Begin by downloading and unpacking the source tarball, and turning it into a "
|
|
dongsheng@627
|
14999 "Mercurial repository."
|
|
dongsheng@627
|
15000 msgstr ""
|
|
dongsheng@627
|
15001
|
|
dongsheng@627
|
15002 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15003 #: ../en/ch12-mq.xml:1205
|
|
dongsheng@627
|
15004 msgid "Continue by creating a patch stack and making your changes."
|
|
dongsheng@627
|
15005 msgstr ""
|
|
dongsheng@627
|
15006
|
|
dongsheng@627
|
15007 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15008 #: ../en/ch12-mq.xml:1210
|
|
dongsheng@627
|
15009 msgid ""
|
|
dongsheng@627
|
15010 "Let's say a few weeks or months pass, and your package author releases a new "
|
|
dongsheng@627
|
15011 "version. First, bring their changes into the repository."
|
|
dongsheng@627
|
15012 msgstr ""
|
|
dongsheng@627
|
15013
|
|
dongsheng@627
|
15014 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15015 #: ../en/ch12-mq.xml:1216
|
|
dongsheng@627
|
15016 msgid ""
|
|
dongsheng@627
|
15017 "The pipeline starting with <command role=\"hg-cmd\">hg locate</command> above "
|
|
dongsheng@627
|
15018 "deletes all files in the working directory, so that <command role=\"hg-cmd"
|
|
dongsheng@627
|
15019 "\">hg commit</command>'s <option role=\"hg-opt-commit\">--addremove</option> "
|
|
dongsheng@627
|
15020 "option can actually tell which files have really been removed in the newer "
|
|
dongsheng@627
|
15021 "version of the source."
|
|
dongsheng@627
|
15022 msgstr ""
|
|
dongsheng@627
|
15023
|
|
dongsheng@627
|
15024 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15025 #: ../en/ch12-mq.xml:1224
|
|
dongsheng@627
|
15026 msgid "Finally, you can apply your patches on top of the new tree."
|
|
dongsheng@627
|
15027 msgstr ""
|
|
dongsheng@627
|
15028
|
|
dongsheng@627
|
15029 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
15030 #: ../en/ch12-mq.xml:1231
|
|
dongsheng@627
|
15031 msgid "Combining entire patches"
|
|
dongsheng@636
|
15032 msgstr "组合全部的补丁"
|
|
dongsheng@627
|
15033
|
|
dongsheng@627
|
15034 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15035 #: ../en/ch12-mq.xml:1233
|
|
dongsheng@627
|
15036 msgid ""
|
|
dongsheng@627
|
15037 "MQ provides a command, <command role=\"hg-ext-mq\">qfold</command> that lets "
|
|
dongsheng@627
|
15038 "you combine entire patches. This <quote>folds</quote> the patches you name, "
|
|
dongsheng@627
|
15039 "in the order you name them, into the topmost applied patch, and concatenates "
|
|
dongsheng@627
|
15040 "their descriptions onto the end of its description. The patches that you "
|
|
dongsheng@627
|
15041 "fold must be unapplied before you fold them."
|
|
dongsheng@627
|
15042 msgstr ""
|
|
dongsheng@627
|
15043
|
|
dongsheng@627
|
15044 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15045 #: ../en/ch12-mq.xml:1241
|
|
dongsheng@627
|
15046 msgid ""
|
|
dongsheng@627
|
15047 "The order in which you fold patches matters. If your topmost applied patch "
|
|
dongsheng@627
|
15048 "is <literal>foo</literal>, and you <command role=\"hg-ext-mq\">qfold</"
|
|
dongsheng@627
|
15049 "command> <literal>bar</literal> and <literal>quux</literal> into it, you will "
|
|
dongsheng@627
|
15050 "end up with a patch that has the same effect as if you applied first "
|
|
dongsheng@627
|
15051 "<literal>foo</literal>, then <literal>bar</literal>, followed by "
|
|
dongsheng@627
|
15052 "<literal>quux</literal>."
|
|
dongsheng@627
|
15053 msgstr ""
|
|
dongsheng@627
|
15054
|
|
dongsheng@627
|
15055 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@641
|
15056 #: ../en/ch12-mq.xml:1252
|
|
dongsheng@627
|
15057 msgid "Merging part of one patch into another"
|
|
dongsheng@636
|
15058 msgstr "合并补丁的部分内容到其它补丁"
|
|
dongsheng@627
|
15059
|
|
dongsheng@627
|
15060 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15061 #: ../en/ch12-mq.xml:1254
|
|
dongsheng@627
|
15062 msgid ""
|
|
dongsheng@627
|
15063 "Merging <emphasis>part</emphasis> of one patch into another is more difficult "
|
|
dongsheng@627
|
15064 "than combining entire patches."
|
|
dongsheng@627
|
15065 msgstr ""
|
|
dongsheng@627
|
15066
|
|
dongsheng@627
|
15067 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15068 #: ../en/ch12-mq.xml:1258
|
|
dongsheng@627
|
15069 msgid ""
|
|
dongsheng@627
|
15070 "If you want to move changes to entire files, you can use <command>filterdiff</"
|
|
dongsheng@627
|
15071 "command>'s <option role=\"cmd-opt-filterdiff\">-i</option> and <option role="
|
|
dongsheng@627
|
15072 "\"cmd-opt-filterdiff\">-x</option> options to choose the modifications to "
|
|
dongsheng@627
|
15073 "snip out of one patch, concatenating its output onto the end of the patch you "
|
|
dongsheng@627
|
15074 "want to merge into. You usually won't need to modify the patch you've merged "
|
|
dongsheng@627
|
15075 "the changes from. Instead, MQ will report some rejected hunks when you "
|
|
dongsheng@627
|
15076 "<command role=\"hg-ext-mq\">qpush</command> it (from the hunks you moved into "
|
|
dongsheng@627
|
15077 "the other patch), and you can simply <command role=\"hg-ext-mq\">qrefresh</"
|
|
dongsheng@627
|
15078 "command> the patch to drop the duplicate hunks."
|
|
dongsheng@627
|
15079 msgstr ""
|
|
dongsheng@627
|
15080
|
|
dongsheng@627
|
15081 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15082 #: ../en/ch12-mq.xml:1271
|
|
dongsheng@627
|
15083 msgid ""
|
|
dongsheng@627
|
15084 "If you have a patch that has multiple hunks modifying a file, and you only "
|
|
dongsheng@627
|
15085 "want to move a few of those hunks, the job becomes more messy, but you can "
|
|
dongsheng@627
|
15086 "still partly automate it. Use <command>lsdiff -nvv</command> to print some "
|
|
dongsheng@627
|
15087 "metadata about the patch."
|
|
dongsheng@627
|
15088 msgstr ""
|
|
dongsheng@627
|
15089
|
|
dongsheng@627
|
15090 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15091 #: ../en/ch12-mq.xml:1279
|
|
dongsheng@627
|
15092 msgid "This command prints three different kinds of number:"
|
|
dongsheng@627
|
15093 msgstr ""
|
|
dongsheng@627
|
15094
|
|
dongsheng@627
|
15095 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
15096 #: ../en/ch12-mq.xml:1282
|
|
dongsheng@627
|
15097 msgid ""
|
|
dongsheng@627
|
15098 "(in the first column) a <emphasis>file number</emphasis> to identify each "
|
|
dongsheng@627
|
15099 "file modified in the patch;"
|
|
dongsheng@627
|
15100 msgstr ""
|
|
dongsheng@627
|
15101
|
|
dongsheng@627
|
15102 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
15103 #: ../en/ch12-mq.xml:1286
|
|
dongsheng@627
|
15104 msgid ""
|
|
dongsheng@627
|
15105 "(on the next line, indented) the line number within a modified file where a "
|
|
dongsheng@627
|
15106 "hunk starts; and"
|
|
dongsheng@627
|
15107 msgstr ""
|
|
dongsheng@627
|
15108
|
|
dongsheng@627
|
15109 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@641
|
15110 #: ../en/ch12-mq.xml:1289
|
|
dongsheng@627
|
15111 msgid ""
|
|
dongsheng@627
|
15112 "(on the same line) a <emphasis>hunk number</emphasis> to identify that hunk."
|
|
dongsheng@627
|
15113 msgstr ""
|
|
dongsheng@627
|
15114
|
|
dongsheng@627
|
15115 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15116 #: ../en/ch12-mq.xml:1293
|
|
dongsheng@627
|
15117 msgid ""
|
|
dongsheng@627
|
15118 "You'll have to use some visual inspection, and reading of the patch, to "
|
|
dongsheng@627
|
15119 "identify the file and hunk numbers you'll want, but you can then pass them to "
|
|
dongsheng@627
|
15120 "to <command>filterdiff</command>'s <option role=\"cmd-opt-filterdiff\">--"
|
|
dongsheng@627
|
15121 "files</option> and <option role=\"cmd-opt-filterdiff\">--hunks</option> "
|
|
dongsheng@627
|
15122 "options, to select exactly the file and hunk you want to extract."
|
|
dongsheng@627
|
15123 msgstr ""
|
|
dongsheng@627
|
15124
|
|
dongsheng@627
|
15125 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@641
|
15126 #: ../en/ch12-mq.xml:1301
|
|
dongsheng@627
|
15127 msgid ""
|
|
dongsheng@627
|
15128 "Once you have this hunk, you can concatenate it onto the end of your "
|
|
dongsheng@627
|
15129 "destination patch and continue with the remainder of section <xref linkend="
|
|
dongsheng@627
|
15130 "\"sec.mq.combine\"/>."
|
|
dongsheng@627
|
15131 msgstr ""
|
|
dongsheng@627
|
15132
|
|
dongsheng@627
|
15133 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@641
|
15134 #: ../en/ch12-mq.xml:1308
|
|
dongsheng@627
|
15135 msgid "Differences between quilt and MQ"
|
|
dongsheng@636
|
15136 msgstr "MQ 与 quilt 的区别"
|
|
dongsheng@627
|
15137
|
|
dongsheng@627
|
15138 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
15139 #: ../en/ch12-mq.xml:1310
|
|
dongsheng@627
|
15140 msgid ""
|
|
dongsheng@627
|
15141 "If you are already familiar with quilt, MQ provides a similar command set. "
|
|
dongsheng@627
|
15142 "There are a few differences in the way that it works."
|
|
dongsheng@627
|
15143 msgstr ""
|
|
dongsheng@627
|
15144
|
|
dongsheng@627
|
15145 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@641
|
15146 #: ../en/ch12-mq.xml:1314
|
|
dongsheng@627
|
15147 msgid ""
|
|
dongsheng@627
|
15148 "You will already have noticed that most quilt commands have MQ counterparts "
|
|
dongsheng@627
|
15149 "that simply begin with a <quote><literal>q</literal></quote>. The exceptions "
|
|
dongsheng@627
|
15150 "are quilt's <literal>add</literal> and <literal>remove</literal> commands, "
|
|
dongsheng@627
|
15151 "the counterparts for which are the normal Mercurial <command role=\"hg-cmd"
|
|
dongsheng@627
|
15152 "\">hg add</command> and <command role=\"hg-cmd\">hg remove</command> "
|
|
dongsheng@627
|
15153 "commands. There is no MQ equivalent of the quilt <literal>edit</literal> "
|
|
dongsheng@627
|
15154 "command."
|
|
dongsheng@627
|
15155 msgstr ""
|
|
dongsheng@627
|
15156
|
|
dongsheng@627
|
15157 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
15158 #: ../en/ch13-mq-collab.xml:5
|
|
dongsheng@627
|
15159 msgid "Advanced uses of Mercurial Queues"
|
|
dongsheng@627
|
15160 msgstr "MQ 的高级用法"
|
|
dongsheng@627
|
15161
|
|
dongsheng@627
|
15162 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
15163 #: ../en/ch13-mq-collab.xml:7
|
|
dongsheng@627
|
15164 msgid ""
|
|
dongsheng@627
|
15165 "While it's easy to pick up straightforward uses of Mercurial Queues, use of a "
|
|
dongsheng@627
|
15166 "little discipline and some of MQ's less frequently used capabilities makes it "
|
|
dongsheng@627
|
15167 "possible to work in complicated development environments."
|
|
dongsheng@627
|
15168 msgstr ""
|
|
dongsheng@627
|
15169
|
|
dongsheng@627
|
15170 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
15171 #: ../en/ch13-mq-collab.xml:12
|
|
dongsheng@627
|
15172 msgid ""
|
|
dongsheng@627
|
15173 "In this chapter, I will use as an example a technique I have used to manage "
|
|
dongsheng@627
|
15174 "the development of an Infiniband device driver for the Linux kernel. The "
|
|
dongsheng@627
|
15175 "driver in question is large (at least as drivers go), with 25,000 lines of "
|
|
dongsheng@627
|
15176 "code spread across 35 source files. It is maintained by a small team of "
|
|
dongsheng@627
|
15177 "developers."
|
|
dongsheng@627
|
15178 msgstr ""
|
|
dongsheng@627
|
15179
|
|
dongsheng@627
|
15180 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
15181 #: ../en/ch13-mq-collab.xml:18
|
|
dongsheng@627
|
15182 msgid ""
|
|
dongsheng@627
|
15183 "While much of the material in this chapter is specific to Linux, the same "
|
|
dongsheng@627
|
15184 "principles apply to any code base for which you're not the primary owner, and "
|
|
dongsheng@627
|
15185 "upon which you need to do a lot of development."
|
|
dongsheng@627
|
15186 msgstr ""
|
|
dongsheng@627
|
15187
|
|
dongsheng@627
|
15188 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15189 #: ../en/ch13-mq-collab.xml:24
|
|
dongsheng@627
|
15190 msgid "The problem of many targets"
|
|
dongsheng@636
|
15191 msgstr "多个目标的问题"
|
|
dongsheng@627
|
15192
|
|
dongsheng@627
|
15193 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15194 #: ../en/ch13-mq-collab.xml:26
|
|
dongsheng@627
|
15195 msgid ""
|
|
dongsheng@627
|
15196 "The Linux kernel changes rapidly, and has never been internally stable; "
|
|
dongsheng@627
|
15197 "developers frequently make drastic changes between releases. This means that "
|
|
dongsheng@627
|
15198 "a version of the driver that works well with a particular released version of "
|
|
dongsheng@627
|
15199 "the kernel will not even <emphasis>compile</emphasis> correctly against, "
|
|
dongsheng@627
|
15200 "typically, any other version."
|
|
dongsheng@627
|
15201 msgstr ""
|
|
dongsheng@627
|
15202
|
|
dongsheng@627
|
15203 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15204 #: ../en/ch13-mq-collab.xml:33
|
|
dongsheng@627
|
15205 msgid ""
|
|
dongsheng@627
|
15206 "To maintain a driver, we have to keep a number of distinct versions of Linux "
|
|
dongsheng@627
|
15207 "in mind."
|
|
dongsheng@627
|
15208 msgstr ""
|
|
dongsheng@627
|
15209
|
|
dongsheng@627
|
15210 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15211 #: ../en/ch13-mq-collab.xml:36
|
|
dongsheng@627
|
15212 msgid ""
|
|
dongsheng@627
|
15213 "One target is the main Linux kernel development tree. Maintenance of the code "
|
|
dongsheng@627
|
15214 "is in this case partly shared by other developers in the kernel community, "
|
|
dongsheng@627
|
15215 "who make <quote>drive-by</quote> modifications to the driver as they develop "
|
|
dongsheng@627
|
15216 "and refine kernel subsystems."
|
|
dongsheng@627
|
15217 msgstr ""
|
|
dongsheng@627
|
15218
|
|
dongsheng@627
|
15219 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15220 #: ../en/ch13-mq-collab.xml:42
|
|
dongsheng@627
|
15221 msgid ""
|
|
dongsheng@627
|
15222 "We also maintain a number of <quote>backports</quote> to older versions of "
|
|
dongsheng@627
|
15223 "the Linux kernel, to support the needs of customers who are running older "
|
|
dongsheng@627
|
15224 "Linux distributions that do not incorporate our drivers. (To "
|
|
dongsheng@627
|
15225 "<emphasis>backport</emphasis> a piece of code is to modify it to work in an "
|
|
dongsheng@627
|
15226 "older version of its target environment than the version it was developed "
|
|
dongsheng@627
|
15227 "for.)"
|
|
dongsheng@627
|
15228 msgstr ""
|
|
dongsheng@627
|
15229
|
|
dongsheng@627
|
15230 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15231 #: ../en/ch13-mq-collab.xml:50
|
|
dongsheng@627
|
15232 msgid ""
|
|
dongsheng@627
|
15233 "Finally, we make software releases on a schedule that is necessarily not "
|
|
dongsheng@627
|
15234 "aligned with those used by Linux distributors and kernel developers, so that "
|
|
dongsheng@627
|
15235 "we can deliver new features to customers without forcing them to upgrade "
|
|
dongsheng@627
|
15236 "their entire kernels or distributions."
|
|
dongsheng@627
|
15237 msgstr ""
|
|
dongsheng@627
|
15238
|
|
dongsheng@627
|
15239 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
15240 #: ../en/ch13-mq-collab.xml:58
|
|
dongsheng@627
|
15241 msgid "Tempting approaches that don't work well"
|
|
dongsheng@636
|
15242 msgstr "工作不好的诱人方法"
|
|
dongsheng@627
|
15243
|
|
dongsheng@627
|
15244 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15245 #: ../en/ch13-mq-collab.xml:60
|
|
dongsheng@627
|
15246 msgid ""
|
|
dongsheng@627
|
15247 "There are two <quote>standard</quote> ways to maintain a piece of software "
|
|
dongsheng@627
|
15248 "that has to target many different environments."
|
|
dongsheng@627
|
15249 msgstr ""
|
|
dongsheng@627
|
15250
|
|
dongsheng@627
|
15251 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15252 #: ../en/ch13-mq-collab.xml:64
|
|
dongsheng@627
|
15253 msgid ""
|
|
dongsheng@627
|
15254 "The first is to maintain a number of branches, each intended for a single "
|
|
dongsheng@627
|
15255 "target. The trouble with this approach is that you must maintain iron "
|
|
dongsheng@627
|
15256 "discipline in the flow of changes between repositories. A new feature or bug "
|
|
dongsheng@627
|
15257 "fix must start life in a <quote>pristine</quote> repository, then percolate "
|
|
dongsheng@627
|
15258 "out to every backport repository. Backport changes are more limited in the "
|
|
dongsheng@627
|
15259 "branches they should propagate to; a backport change that is applied to a "
|
|
dongsheng@627
|
15260 "branch where it doesn't belong will probably stop the driver from compiling."
|
|
dongsheng@627
|
15261 msgstr ""
|
|
dongsheng@627
|
15262
|
|
dongsheng@627
|
15263 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15264 #: ../en/ch13-mq-collab.xml:74
|
|
dongsheng@627
|
15265 msgid ""
|
|
dongsheng@627
|
15266 "The second is to maintain a single source tree filled with conditional "
|
|
dongsheng@627
|
15267 "statements that turn chunks of code on or off depending on the intended "
|
|
dongsheng@627
|
15268 "target. Because these <quote>ifdefs</quote> are not allowed in the Linux "
|
|
dongsheng@627
|
15269 "kernel tree, a manual or automatic process must be followed to strip them out "
|
|
dongsheng@627
|
15270 "and yield a clean tree. A code base maintained in this fashion rapidly "
|
|
dongsheng@627
|
15271 "becomes a rat's nest of conditional blocks that are difficult to understand "
|
|
dongsheng@627
|
15272 "and maintain."
|
|
dongsheng@627
|
15273 msgstr ""
|
|
dongsheng@627
|
15274
|
|
dongsheng@627
|
15275 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15276 #: ../en/ch13-mq-collab.xml:83
|
|
dongsheng@627
|
15277 msgid ""
|
|
dongsheng@627
|
15278 "Neither of these approaches is well suited to a situation where you don't "
|
|
dongsheng@627
|
15279 "<quote>own</quote> the canonical copy of a source tree. In the case of a "
|
|
dongsheng@627
|
15280 "Linux driver that is distributed with the standard kernel, Linus's tree "
|
|
dongsheng@627
|
15281 "contains the copy of the code that will be treated by the world as "
|
|
dongsheng@627
|
15282 "canonical. The upstream version of <quote>my</quote> driver can be modified "
|
|
dongsheng@627
|
15283 "by people I don't know, without me even finding out about it until after the "
|
|
dongsheng@627
|
15284 "changes show up in Linus's tree."
|
|
dongsheng@627
|
15285 msgstr ""
|
|
dongsheng@627
|
15286
|
|
dongsheng@627
|
15287 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15288 #: ../en/ch13-mq-collab.xml:93
|
|
dongsheng@627
|
15289 msgid ""
|
|
dongsheng@627
|
15290 "These approaches have the added weakness of making it difficult to generate "
|
|
dongsheng@627
|
15291 "well-formed patches to submit upstream."
|
|
dongsheng@627
|
15292 msgstr ""
|
|
dongsheng@627
|
15293
|
|
dongsheng@627
|
15294 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15295 #: ../en/ch13-mq-collab.xml:97
|
|
dongsheng@627
|
15296 msgid ""
|
|
dongsheng@627
|
15297 "In principle, Mercurial Queues seems like a good candidate to manage a "
|
|
dongsheng@627
|
15298 "development scenario such as the above. While this is indeed the case, MQ "
|
|
dongsheng@627
|
15299 "contains a few added features that make the job more pleasant."
|
|
dongsheng@627
|
15300 msgstr ""
|
|
dongsheng@627
|
15301
|
|
dongsheng@627
|
15302 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15303 #: ../en/ch13-mq-collab.xml:105
|
|
dongsheng@627
|
15304 msgid "Conditionally applying patches with guards"
|
|
dongsheng@636
|
15305 msgstr "有条件的应用补丁"
|
|
dongsheng@627
|
15306
|
|
dongsheng@627
|
15307 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15308 #: ../en/ch13-mq-collab.xml:107
|
|
dongsheng@627
|
15309 msgid ""
|
|
dongsheng@627
|
15310 "Perhaps the best way to maintain sanity with so many targets is to be able to "
|
|
dongsheng@627
|
15311 "choose specific patches to apply for a given situation. MQ provides a "
|
|
dongsheng@627
|
15312 "feature called <quote>guards</quote> (which originates with quilt's "
|
|
dongsheng@627
|
15313 "<literal>guards</literal> command) that does just this. To start off, let's "
|
|
dongsheng@627
|
15314 "create a simple repository for experimenting in."
|
|
dongsheng@627
|
15315 msgstr ""
|
|
dongsheng@627
|
15316
|
|
dongsheng@627
|
15317 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15318 #: ../en/ch13-mq-collab.xml:116
|
|
dongsheng@627
|
15319 msgid ""
|
|
dongsheng@627
|
15320 "This gives us a tiny repository that contains two patches that don't have any "
|
|
dongsheng@627
|
15321 "dependencies on each other, because they touch different files."
|
|
dongsheng@627
|
15322 msgstr ""
|
|
dongsheng@627
|
15323
|
|
dongsheng@627
|
15324 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15325 #: ../en/ch13-mq-collab.xml:120
|
|
dongsheng@627
|
15326 msgid ""
|
|
dongsheng@627
|
15327 "The idea behind conditional application is that you can <quote>tag</quote> a "
|
|
dongsheng@627
|
15328 "patch with a <emphasis>guard</emphasis>, which is simply a text string of "
|
|
dongsheng@627
|
15329 "your choosing, then tell MQ to select specific guards to use when applying "
|
|
dongsheng@627
|
15330 "patches. MQ will then either apply, or skip over, a guarded patch, depending "
|
|
dongsheng@627
|
15331 "on the guards that you have selected."
|
|
dongsheng@627
|
15332 msgstr ""
|
|
dongsheng@627
|
15333
|
|
dongsheng@627
|
15334 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15335 #: ../en/ch13-mq-collab.xml:127
|
|
dongsheng@627
|
15336 msgid ""
|
|
dongsheng@627
|
15337 "A patch can have an arbitrary number of guards; each one is "
|
|
dongsheng@627
|
15338 "<emphasis>positive</emphasis> (<quote>apply this patch if this guard is "
|
|
dongsheng@627
|
15339 "selected</quote>) or <emphasis>negative</emphasis> (<quote>skip this patch if "
|
|
dongsheng@627
|
15340 "this guard is selected</quote>). A patch with no guards is always applied."
|
|
dongsheng@627
|
15341 msgstr ""
|
|
dongsheng@627
|
15342
|
|
dongsheng@627
|
15343 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15344 #: ../en/ch13-mq-collab.xml:135
|
|
dongsheng@627
|
15345 msgid "Controlling the guards on a patch"
|
|
dongsheng@636
|
15346 msgstr "控制补丁的应用条件"
|
|
dongsheng@627
|
15347
|
|
dongsheng@627
|
15348 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15349 #: ../en/ch13-mq-collab.xml:137
|
|
dongsheng@627
|
15350 msgid ""
|
|
dongsheng@627
|
15351 "The <command role=\"hg-ext-mq\">qguard</command> command lets you determine "
|
|
dongsheng@627
|
15352 "which guards should apply to a patch, or display the guards that are already "
|
|
dongsheng@627
|
15353 "in effect. Without any arguments, it displays the guards on the current "
|
|
dongsheng@627
|
15354 "topmost patch."
|
|
dongsheng@627
|
15355 msgstr ""
|
|
dongsheng@627
|
15356
|
|
dongsheng@627
|
15357 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15358 #: ../en/ch13-mq-collab.xml:144
|
|
dongsheng@627
|
15359 msgid ""
|
|
dongsheng@627
|
15360 "To set a positive guard on a patch, prefix the name of the guard with a "
|
|
dongsheng@627
|
15361 "<quote><literal>+</literal></quote>."
|
|
dongsheng@627
|
15362 msgstr ""
|
|
dongsheng@627
|
15363
|
|
dongsheng@627
|
15364 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15365 #: ../en/ch13-mq-collab.xml:149
|
|
dongsheng@627
|
15366 msgid ""
|
|
dongsheng@627
|
15367 "To set a negative guard on a patch, prefix the name of the guard with a "
|
|
dongsheng@627
|
15368 "<quote><literal>-</literal></quote>."
|
|
dongsheng@627
|
15369 msgstr ""
|
|
dongsheng@627
|
15370
|
|
dongsheng@627
|
15371 #. type: Content of: <book><chapter><sect1><note><para>
|
|
dongsheng@627
|
15372 #: ../en/ch13-mq-collab.xml:156
|
|
dongsheng@627
|
15373 msgid ""
|
|
dongsheng@627
|
15374 "The <command role=\"hg-ext-mq\">qguard</command> command <emphasis>sets</"
|
|
dongsheng@627
|
15375 "emphasis> the guards on a patch; it doesn't <emphasis>modify</emphasis> "
|
|
dongsheng@627
|
15376 "them. What this means is that if you run <command role=\"hg-cmd\">hg qguard "
|
|
dongsheng@627
|
15377 "+a +b</command> on a patch, then <command role=\"hg-cmd\">hg qguard +c</"
|
|
dongsheng@627
|
15378 "command> on the same patch, the <emphasis>only</emphasis> guard that will be "
|
|
dongsheng@627
|
15379 "set on it afterwards is <literal>+c</literal>."
|
|
dongsheng@627
|
15380 msgstr ""
|
|
dongsheng@627
|
15381
|
|
dongsheng@627
|
15382 #
|
|
dongsheng@627
|
15383 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15384 #: ../en/ch13-mq-collab.xml:165
|
|
dongsheng@627
|
15385 msgid ""
|
|
dongsheng@627
|
15386 "Mercurial stores guards in the <filename role=\"special\">series</filename> "
|
|
dongsheng@627
|
15387 "file; the form in which they are stored is easy both to understand and to "
|
|
dongsheng@627
|
15388 "edit by hand. (In other words, you don't have to use the <command role=\"hg-"
|
|
dongsheng@627
|
15389 "ext-mq\">qguard</command> command if you don't want to; it's okay to simply "
|
|
dongsheng@627
|
15390 "edit the <filename role=\"special\">series</filename> file.)"
|
|
dongsheng@627
|
15391 msgstr ""
|
|
dongsheng@627
|
15392
|
|
dongsheng@627
|
15393 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15394 #: ../en/ch13-mq-collab.xml:177
|
|
dongsheng@627
|
15395 msgid "Selecting the guards to use"
|
|
dongsheng@636
|
15396 msgstr "选择使用的条件"
|
|
dongsheng@627
|
15397
|
|
dongsheng@627
|
15398 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15399 #: ../en/ch13-mq-collab.xml:179
|
|
dongsheng@627
|
15400 msgid ""
|
|
dongsheng@627
|
15401 "The <command role=\"hg-ext-mq\">qselect</command> command determines which "
|
|
dongsheng@627
|
15402 "guards are active at a given time. The effect of this is to determine which "
|
|
dongsheng@627
|
15403 "patches MQ will apply the next time you run <command role=\"hg-ext-mq"
|
|
dongsheng@627
|
15404 "\">qpush</command>. It has no other effect; in particular, it doesn't do "
|
|
dongsheng@627
|
15405 "anything to patches that are already applied."
|
|
dongsheng@627
|
15406 msgstr ""
|
|
dongsheng@627
|
15407
|
|
dongsheng@627
|
15408 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15409 #: ../en/ch13-mq-collab.xml:186
|
|
dongsheng@627
|
15410 msgid ""
|
|
dongsheng@627
|
15411 "With no arguments, the <command role=\"hg-ext-mq\">qselect</command> command "
|
|
dongsheng@627
|
15412 "lists the guards currently in effect, one per line of output. Each argument "
|
|
dongsheng@627
|
15413 "is treated as the name of a guard to apply."
|
|
dongsheng@627
|
15414 msgstr ""
|
|
dongsheng@627
|
15415
|
|
dongsheng@627
|
15416 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15417 #: ../en/ch13-mq-collab.xml:193
|
|
dongsheng@627
|
15418 msgid ""
|
|
dongsheng@627
|
15419 "In case you're interested, the currently selected guards are stored in the "
|
|
dongsheng@627
|
15420 "<filename role=\"special\">guards</filename> file."
|
|
dongsheng@627
|
15421 msgstr ""
|
|
dongsheng@627
|
15422
|
|
dongsheng@627
|
15423 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15424 #: ../en/ch13-mq-collab.xml:198
|
|
dongsheng@627
|
15425 msgid ""
|
|
dongsheng@627
|
15426 "We can see the effect the selected guards have when we run <command role=\"hg-"
|
|
dongsheng@627
|
15427 "ext-mq\">qpush</command>."
|
|
dongsheng@627
|
15428 msgstr ""
|
|
dongsheng@627
|
15429
|
|
dongsheng@627
|
15430 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15431 #: ../en/ch13-mq-collab.xml:203
|
|
dongsheng@627
|
15432 msgid ""
|
|
dongsheng@627
|
15433 "A guard cannot start with a <quote><literal>+</literal></quote> or "
|
|
dongsheng@627
|
15434 "<quote><literal>-</literal></quote> character. The name of a guard must not "
|
|
dongsheng@627
|
15435 "contain white space, but most other characters are acceptable. If you try to "
|
|
dongsheng@627
|
15436 "use a guard with an invalid name, MQ will complain:"
|
|
dongsheng@627
|
15437 msgstr ""
|
|
dongsheng@627
|
15438
|
|
dongsheng@627
|
15439 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15440 #: ../en/ch13-mq-collab.xml:212
|
|
dongsheng@627
|
15441 msgid "Changing the selected guards changes the patches that are applied."
|
|
dongsheng@627
|
15442 msgstr ""
|
|
dongsheng@627
|
15443
|
|
dongsheng@627
|
15444 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15445 #: ../en/ch13-mq-collab.xml:217
|
|
dongsheng@627
|
15446 msgid ""
|
|
dongsheng@627
|
15447 "You can see in the example below that negative guards take precedence over "
|
|
dongsheng@627
|
15448 "positive guards."
|
|
dongsheng@627
|
15449 msgstr ""
|
|
dongsheng@627
|
15450
|
|
dongsheng@627
|
15451 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15452 #: ../en/ch13-mq-collab.xml:224
|
|
dongsheng@627
|
15453 msgid "MQ's rules for applying patches"
|
|
dongsheng@636
|
15454 msgstr "MQ 应用补丁的规则"
|
|
dongsheng@627
|
15455
|
|
dongsheng@627
|
15456 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15457 #: ../en/ch13-mq-collab.xml:226
|
|
dongsheng@627
|
15458 msgid ""
|
|
dongsheng@627
|
15459 "The rules that MQ uses when deciding whether to apply a patch are as follows."
|
|
dongsheng@627
|
15460 msgstr ""
|
|
dongsheng@627
|
15461
|
|
dongsheng@627
|
15462 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15463 #: ../en/ch13-mq-collab.xml:229
|
|
dongsheng@627
|
15464 msgid "A patch that has no guards is always applied."
|
|
dongsheng@627
|
15465 msgstr ""
|
|
dongsheng@627
|
15466
|
|
dongsheng@627
|
15467 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15468 #: ../en/ch13-mq-collab.xml:232
|
|
dongsheng@627
|
15469 msgid ""
|
|
dongsheng@627
|
15470 "If the patch has any negative guard that matches any currently selected "
|
|
dongsheng@627
|
15471 "guard, the patch is skipped."
|
|
dongsheng@627
|
15472 msgstr ""
|
|
dongsheng@627
|
15473
|
|
dongsheng@627
|
15474 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15475 #: ../en/ch13-mq-collab.xml:235
|
|
dongsheng@627
|
15476 msgid ""
|
|
dongsheng@627
|
15477 "If the patch has any positive guard that matches any currently selected "
|
|
dongsheng@627
|
15478 "guard, the patch is applied."
|
|
dongsheng@627
|
15479 msgstr ""
|
|
dongsheng@627
|
15480
|
|
dongsheng@627
|
15481 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15482 #: ../en/ch13-mq-collab.xml:238
|
|
dongsheng@627
|
15483 msgid ""
|
|
dongsheng@627
|
15484 "If the patch has positive or negative guards, but none matches any currently "
|
|
dongsheng@627
|
15485 "selected guard, the patch is skipped."
|
|
dongsheng@627
|
15486 msgstr ""
|
|
dongsheng@627
|
15487
|
|
dongsheng@627
|
15488 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15489 #: ../en/ch13-mq-collab.xml:245
|
|
dongsheng@627
|
15490 msgid "Trimming the work environment"
|
|
dongsheng@636
|
15491 msgstr "修剪工作环境"
|
|
dongsheng@627
|
15492
|
|
dongsheng@627
|
15493 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15494 #: ../en/ch13-mq-collab.xml:247
|
|
dongsheng@627
|
15495 msgid ""
|
|
dongsheng@627
|
15496 "In working on the device driver I mentioned earlier, I don't apply the "
|
|
dongsheng@627
|
15497 "patches to a normal Linux kernel tree. Instead, I use a repository that "
|
|
dongsheng@627
|
15498 "contains only a snapshot of the source files and headers that are relevant to "
|
|
dongsheng@627
|
15499 "Infiniband development. This repository is 1% the size of a kernel "
|
|
dongsheng@627
|
15500 "repository, so it's easier to work with."
|
|
dongsheng@627
|
15501 msgstr ""
|
|
dongsheng@627
|
15502
|
|
dongsheng@627
|
15503 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15504 #: ../en/ch13-mq-collab.xml:254
|
|
dongsheng@627
|
15505 msgid ""
|
|
dongsheng@627
|
15506 "I then choose a <quote>base</quote> version on top of which the patches are "
|
|
dongsheng@627
|
15507 "applied. This is a snapshot of the Linux kernel tree as of a revision of my "
|
|
dongsheng@627
|
15508 "choosing. When I take the snapshot, I record the changeset ID from the "
|
|
dongsheng@627
|
15509 "kernel repository in the commit message. Since the snapshot preserves the "
|
|
dongsheng@627
|
15510 "<quote>shape</quote> and content of the relevant parts of the kernel tree, I "
|
|
dongsheng@627
|
15511 "can apply my patches on top of either my tiny repository or a normal kernel "
|
|
dongsheng@627
|
15512 "tree."
|
|
dongsheng@627
|
15513 msgstr ""
|
|
dongsheng@627
|
15514
|
|
dongsheng@627
|
15515 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15516 #: ../en/ch13-mq-collab.xml:263
|
|
dongsheng@627
|
15517 msgid ""
|
|
dongsheng@627
|
15518 "Normally, the base tree atop which the patches apply should be a snapshot of "
|
|
dongsheng@627
|
15519 "a very recent upstream tree. This best facilitates the development of "
|
|
dongsheng@627
|
15520 "patches that can easily be submitted upstream with few or no modifications."
|
|
dongsheng@627
|
15521 msgstr ""
|
|
dongsheng@627
|
15522
|
|
dongsheng@627
|
15523 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15524 #: ../en/ch13-mq-collab.xml:270
|
|
dongsheng@627
|
15525 msgid "Dividing up the <filename role=\"special\">series</filename> file"
|
|
dongsheng@636
|
15526 msgstr "分类补丁<filename role=\"special\">系列</filename>"
|
|
dongsheng@627
|
15527
|
|
dongsheng@627
|
15528 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15529 #: ../en/ch13-mq-collab.xml:273
|
|
dongsheng@627
|
15530 msgid ""
|
|
dongsheng@627
|
15531 "I categorise the patches in the <filename role=\"special\">series</filename> "
|
|
dongsheng@627
|
15532 "file into a number of logical groups. Each section of like patches begins "
|
|
dongsheng@627
|
15533 "with a block of comments that describes the purpose of the patches that "
|
|
dongsheng@627
|
15534 "follow."
|
|
dongsheng@627
|
15535 msgstr ""
|
|
dongsheng@627
|
15536
|
|
dongsheng@627
|
15537 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15538 #: ../en/ch13-mq-collab.xml:279
|
|
dongsheng@627
|
15539 msgid ""
|
|
dongsheng@627
|
15540 "The sequence of patch groups that I maintain follows. The ordering of these "
|
|
dongsheng@627
|
15541 "groups is important; I'll describe why after I introduce the groups."
|
|
dongsheng@627
|
15542 msgstr ""
|
|
dongsheng@627
|
15543
|
|
dongsheng@627
|
15544 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15545 #: ../en/ch13-mq-collab.xml:283
|
|
dongsheng@627
|
15546 msgid ""
|
|
dongsheng@627
|
15547 "The <quote>accepted</quote> group. Patches that the development team has "
|
|
dongsheng@627
|
15548 "submitted to the maintainer of the Infiniband subsystem, and which he has "
|
|
dongsheng@627
|
15549 "accepted, but which are not present in the snapshot that the tiny repository "
|
|
dongsheng@627
|
15550 "is based on. These are <quote>read only</quote> patches, present only to "
|
|
dongsheng@627
|
15551 "transform the tree into a similar state as it is in the upstream maintainer's "
|
|
dongsheng@627
|
15552 "repository."
|
|
dongsheng@627
|
15553 msgstr ""
|
|
dongsheng@627
|
15554
|
|
dongsheng@627
|
15555 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15556 #: ../en/ch13-mq-collab.xml:291
|
|
dongsheng@627
|
15557 msgid ""
|
|
dongsheng@627
|
15558 "The <quote>rework</quote> group. Patches that I have submitted, but that the "
|
|
dongsheng@627
|
15559 "upstream maintainer has requested modifications to before he will accept them."
|
|
dongsheng@627
|
15560 msgstr ""
|
|
dongsheng@627
|
15561
|
|
dongsheng@627
|
15562 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15563 #: ../en/ch13-mq-collab.xml:296
|
|
dongsheng@627
|
15564 msgid ""
|
|
dongsheng@627
|
15565 "The <quote>pending</quote> group. Patches that I have not yet submitted to "
|
|
dongsheng@627
|
15566 "the upstream maintainer, but which we have finished working on. These will be "
|
|
dongsheng@627
|
15567 "<quote>read only</quote> for a while. If the upstream maintainer accepts "
|
|
dongsheng@627
|
15568 "them upon submission, I'll move them to the end of the <quote>accepted</"
|
|
dongsheng@627
|
15569 "quote> group. If he requests that I modify any, I'll move them to the "
|
|
dongsheng@627
|
15570 "beginning of the <quote>rework</quote> group."
|
|
dongsheng@627
|
15571 msgstr ""
|
|
dongsheng@627
|
15572
|
|
dongsheng@627
|
15573 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15574 #: ../en/ch13-mq-collab.xml:305
|
|
dongsheng@627
|
15575 msgid ""
|
|
dongsheng@627
|
15576 "The <quote>in progress</quote> group. Patches that are actively being "
|
|
dongsheng@627
|
15577 "developed, and should not be submitted anywhere yet."
|
|
dongsheng@627
|
15578 msgstr ""
|
|
dongsheng@627
|
15579
|
|
dongsheng@627
|
15580 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15581 #: ../en/ch13-mq-collab.xml:309
|
|
dongsheng@627
|
15582 msgid ""
|
|
dongsheng@627
|
15583 "The <quote>backport</quote> group. Patches that adapt the source tree to "
|
|
dongsheng@627
|
15584 "older versions of the kernel tree."
|
|
dongsheng@627
|
15585 msgstr ""
|
|
dongsheng@627
|
15586
|
|
dongsheng@627
|
15587 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15588 #: ../en/ch13-mq-collab.xml:313
|
|
dongsheng@627
|
15589 msgid ""
|
|
dongsheng@627
|
15590 "The <quote>do not ship</quote> group. Patches that for some reason should "
|
|
dongsheng@627
|
15591 "never be submitted upstream. For example, one such patch might change "
|
|
dongsheng@627
|
15592 "embedded driver identification strings to make it easier to distinguish, in "
|
|
dongsheng@627
|
15593 "the field, between an out-of-tree version of the driver and a version shipped "
|
|
dongsheng@627
|
15594 "by a distribution vendor."
|
|
dongsheng@627
|
15595 msgstr ""
|
|
dongsheng@627
|
15596
|
|
dongsheng@627
|
15597 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15598 #: ../en/ch13-mq-collab.xml:321
|
|
dongsheng@627
|
15599 msgid ""
|
|
dongsheng@627
|
15600 "Now to return to the reasons for ordering groups of patches in this way. We "
|
|
dongsheng@627
|
15601 "would like the lowest patches in the stack to be as stable as possible, so "
|
|
dongsheng@627
|
15602 "that we will not need to rework higher patches due to changes in context. "
|
|
dongsheng@627
|
15603 "Putting patches that will never be changed first in the <filename role="
|
|
dongsheng@627
|
15604 "\"special\">series</filename> file serves this purpose."
|
|
dongsheng@627
|
15605 msgstr ""
|
|
dongsheng@627
|
15606
|
|
dongsheng@627
|
15607 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15608 #: ../en/ch13-mq-collab.xml:329
|
|
dongsheng@627
|
15609 msgid ""
|
|
dongsheng@627
|
15610 "We would also like the patches that we know we'll need to modify to be "
|
|
dongsheng@627
|
15611 "applied on top of a source tree that resembles the upstream tree as closely "
|
|
dongsheng@627
|
15612 "as possible. This is why we keep accepted patches around for a while."
|
|
dongsheng@627
|
15613 msgstr ""
|
|
dongsheng@627
|
15614
|
|
dongsheng@627
|
15615 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15616 #: ../en/ch13-mq-collab.xml:334
|
|
dongsheng@627
|
15617 msgid ""
|
|
dongsheng@627
|
15618 "The <quote>backport</quote> and <quote>do not ship</quote> patches float at "
|
|
dongsheng@627
|
15619 "the end of the <filename role=\"special\">series</filename> file. The "
|
|
dongsheng@627
|
15620 "backport patches must be applied on top of all other patches, and the "
|
|
dongsheng@627
|
15621 "<quote>do not ship</quote> patches might as well stay out of harm's way."
|
|
dongsheng@627
|
15622 msgstr ""
|
|
dongsheng@627
|
15623
|
|
dongsheng@627
|
15624 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15625 #: ../en/ch13-mq-collab.xml:343
|
|
dongsheng@627
|
15626 msgid "Maintaining the patch series"
|
|
dongsheng@636
|
15627 msgstr "维护补丁系列"
|
|
dongsheng@627
|
15628
|
|
dongsheng@627
|
15629 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15630 #: ../en/ch13-mq-collab.xml:345
|
|
dongsheng@627
|
15631 msgid ""
|
|
dongsheng@627
|
15632 "In my work, I use a number of guards to control which patches are to be "
|
|
dongsheng@627
|
15633 "applied."
|
|
dongsheng@627
|
15634 msgstr ""
|
|
dongsheng@627
|
15635
|
|
dongsheng@627
|
15636 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15637 #: ../en/ch13-mq-collab.xml:349
|
|
dongsheng@627
|
15638 msgid ""
|
|
dongsheng@627
|
15639 "<quote>Accepted</quote> patches are guarded with <literal>accepted</"
|
|
dongsheng@627
|
15640 "literal>. I enable this guard most of the time. When I'm applying the "
|
|
dongsheng@627
|
15641 "patches on top of a tree where the patches are already present, I can turn "
|
|
dongsheng@627
|
15642 "this patch off, and the patches that follow it will apply cleanly."
|
|
dongsheng@627
|
15643 msgstr ""
|
|
dongsheng@627
|
15644
|
|
dongsheng@627
|
15645 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15646 #: ../en/ch13-mq-collab.xml:356
|
|
dongsheng@627
|
15647 msgid ""
|
|
dongsheng@627
|
15648 "Patches that are <quote>finished</quote>, but not yet submitted, have no "
|
|
dongsheng@627
|
15649 "guards. If I'm applying the patch stack to a copy of the upstream tree, I "
|
|
dongsheng@627
|
15650 "don't need to enable any guards in order to get a reasonably safe source tree."
|
|
dongsheng@627
|
15651 msgstr ""
|
|
dongsheng@627
|
15652
|
|
dongsheng@627
|
15653 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15654 #: ../en/ch13-mq-collab.xml:362
|
|
dongsheng@627
|
15655 msgid ""
|
|
dongsheng@627
|
15656 "Those patches that need reworking before being resubmitted are guarded with "
|
|
dongsheng@627
|
15657 "<literal>rework</literal>."
|
|
dongsheng@627
|
15658 msgstr ""
|
|
dongsheng@627
|
15659
|
|
dongsheng@627
|
15660 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15661 #: ../en/ch13-mq-collab.xml:366
|
|
dongsheng@627
|
15662 msgid ""
|
|
dongsheng@627
|
15663 "For those patches that are still under development, I use <literal>devel</"
|
|
dongsheng@627
|
15664 "literal>."
|
|
dongsheng@627
|
15665 msgstr ""
|
|
dongsheng@627
|
15666
|
|
dongsheng@627
|
15667 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15668 #: ../en/ch13-mq-collab.xml:369
|
|
dongsheng@627
|
15669 msgid ""
|
|
dongsheng@627
|
15670 "A backport patch may have several guards, one for each version of the kernel "
|
|
dongsheng@627
|
15671 "to which it applies. For example, a patch that backports a piece of code to "
|
|
dongsheng@627
|
15672 "2.6.9 will have a <literal>2.6.9</literal> guard."
|
|
dongsheng@627
|
15673 msgstr ""
|
|
dongsheng@627
|
15674
|
|
dongsheng@627
|
15675 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15676 #: ../en/ch13-mq-collab.xml:374
|
|
dongsheng@627
|
15677 msgid ""
|
|
dongsheng@627
|
15678 "This variety of guards gives me considerable flexibility in determining what "
|
|
dongsheng@627
|
15679 "kind of source tree I want to end up with. For most situations, the "
|
|
dongsheng@627
|
15680 "selection of appropriate guards is automated during the build process, but I "
|
|
dongsheng@627
|
15681 "can manually tune the guards to use for less common circumstances."
|
|
dongsheng@627
|
15682 msgstr ""
|
|
dongsheng@627
|
15683
|
|
dongsheng@627
|
15684 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
15685 #: ../en/ch13-mq-collab.xml:381
|
|
dongsheng@627
|
15686 msgid "The art of writing backport patches"
|
|
dongsheng@636
|
15687 msgstr "编写向后移植补丁的艺术"
|
|
dongsheng@627
|
15688
|
|
dongsheng@627
|
15689 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15690 #: ../en/ch13-mq-collab.xml:383
|
|
dongsheng@627
|
15691 msgid ""
|
|
dongsheng@627
|
15692 "Using MQ, writing a backport patch is a simple process. All such a patch has "
|
|
dongsheng@627
|
15693 "to do is modify a piece of code that uses a kernel feature not present in the "
|
|
dongsheng@627
|
15694 "older version of the kernel, so that the driver continues to work correctly "
|
|
dongsheng@627
|
15695 "under that older version."
|
|
dongsheng@627
|
15696 msgstr ""
|
|
dongsheng@627
|
15697
|
|
dongsheng@627
|
15698 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15699 #: ../en/ch13-mq-collab.xml:389
|
|
dongsheng@627
|
15700 msgid ""
|
|
dongsheng@627
|
15701 "A useful goal when writing a good backport patch is to make your code look as "
|
|
dongsheng@627
|
15702 "if it was written for the older version of the kernel you're targeting. The "
|
|
dongsheng@627
|
15703 "less obtrusive the patch, the easier it will be to understand and maintain. "
|
|
dongsheng@627
|
15704 "If you're writing a collection of backport patches to avoid the <quote>rat's "
|
|
dongsheng@627
|
15705 "nest</quote> effect of lots of <literal>#ifdef</literal>s (hunks of source "
|
|
dongsheng@627
|
15706 "code that are only used conditionally) in your code, don't introduce version-"
|
|
dongsheng@627
|
15707 "dependent <literal>#ifdef</literal>s into the patches. Instead, write "
|
|
dongsheng@627
|
15708 "several patches, each of which makes unconditional changes, and control their "
|
|
dongsheng@627
|
15709 "application using guards."
|
|
dongsheng@627
|
15710 msgstr ""
|
|
dongsheng@627
|
15711
|
|
dongsheng@627
|
15712 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15713 #: ../en/ch13-mq-collab.xml:402
|
|
dongsheng@627
|
15714 msgid ""
|
|
dongsheng@627
|
15715 "There are two reasons to divide backport patches into a distinct group, away "
|
|
dongsheng@627
|
15716 "from the <quote>regular</quote> patches whose effects they modify. The first "
|
|
dongsheng@627
|
15717 "is that intermingling the two makes it more difficult to use a tool like the "
|
|
dongsheng@627
|
15718 "<literal role=\"hg-ext\">patchbomb</literal> extension to automate the "
|
|
dongsheng@627
|
15719 "process of submitting the patches to an upstream maintainer. The second is "
|
|
dongsheng@627
|
15720 "that a backport patch could perturb the context in which a subsequent regular "
|
|
dongsheng@627
|
15721 "patch is applied, making it impossible to apply the regular patch cleanly "
|
|
dongsheng@627
|
15722 "<emphasis>without</emphasis> the earlier backport patch already being applied."
|
|
dongsheng@627
|
15723 msgstr ""
|
|
dongsheng@627
|
15724
|
|
dongsheng@627
|
15725 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15726 #: ../en/ch13-mq-collab.xml:417
|
|
dongsheng@627
|
15727 msgid "Useful tips for developing with MQ"
|
|
dongsheng@636
|
15728 msgstr "使用 MQ 开发的技巧"
|
|
dongsheng@627
|
15729
|
|
dongsheng@627
|
15730 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
15731 #: ../en/ch13-mq-collab.xml:420
|
|
dongsheng@627
|
15732 msgid "Organising patches in directories"
|
|
dongsheng@636
|
15733 msgstr "将补丁放到几个目录中"
|
|
dongsheng@627
|
15734
|
|
dongsheng@627
|
15735 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15736 #: ../en/ch13-mq-collab.xml:422
|
|
dongsheng@627
|
15737 msgid ""
|
|
dongsheng@627
|
15738 "If you're working on a substantial project with MQ, it's not difficult to "
|
|
dongsheng@627
|
15739 "accumulate a large number of patches. For example, I have one patch "
|
|
dongsheng@627
|
15740 "repository that contains over 250 patches."
|
|
dongsheng@627
|
15741 msgstr ""
|
|
dongsheng@627
|
15742
|
|
dongsheng@627
|
15743 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15744 #: ../en/ch13-mq-collab.xml:427
|
|
dongsheng@627
|
15745 msgid ""
|
|
dongsheng@627
|
15746 "If you can group these patches into separate logical categories, you can if "
|
|
dongsheng@627
|
15747 "you like store them in different directories; MQ has no problems with patch "
|
|
dongsheng@627
|
15748 "names that contain path separators."
|
|
dongsheng@627
|
15749 msgstr ""
|
|
dongsheng@627
|
15750
|
|
dongsheng@627
|
15751 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
15752 #: ../en/ch13-mq-collab.xml:434
|
|
dongsheng@627
|
15753 msgid "Viewing the history of a patch"
|
|
dongsheng@636
|
15754 msgstr "察看补丁的历史"
|
|
dongsheng@627
|
15755
|
|
dongsheng@627
|
15756 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15757 #: ../en/ch13-mq-collab.xml:436
|
|
dongsheng@627
|
15758 msgid ""
|
|
dongsheng@627
|
15759 "If you're developing a set of patches over a long time, it's a good idea to "
|
|
dongsheng@627
|
15760 "maintain them in a repository, as discussed in section <xref linkend=\"sec.mq."
|
|
dongsheng@627
|
15761 "repo\"/>. If you do so, you'll quickly discover that using the <command role="
|
|
dongsheng@627
|
15762 "\"hg-cmd\">hg diff</command> command to look at the history of changes to a "
|
|
dongsheng@627
|
15763 "patch is unworkable. This is in part because you're looking at the second "
|
|
dongsheng@627
|
15764 "derivative of the real code (a diff of a diff), but also because MQ adds "
|
|
dongsheng@627
|
15765 "noise to the process by modifying time stamps and directory names when it "
|
|
dongsheng@627
|
15766 "updates a patch."
|
|
dongsheng@627
|
15767 msgstr ""
|
|
dongsheng@627
|
15768
|
|
dongsheng@627
|
15769 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15770 #: ../en/ch13-mq-collab.xml:448
|
|
dongsheng@627
|
15771 msgid ""
|
|
dongsheng@627
|
15772 "However, you can use the <literal role=\"hg-ext\">extdiff</literal> "
|
|
dongsheng@627
|
15773 "extension, which is bundled with Mercurial, to turn a diff of two versions of "
|
|
dongsheng@627
|
15774 "a patch into something readable. To do this, you will need a third-party "
|
|
dongsheng@627
|
15775 "package called <literal role=\"package\">patchutils</literal> <citation>web:"
|
|
dongsheng@627
|
15776 "patchutils</citation>. This provides a command named <command>interdiff</"
|
|
dongsheng@627
|
15777 "command>, which shows the differences between two diffs as a diff. Used on "
|
|
dongsheng@627
|
15778 "two versions of the same diff, it generates a diff that represents the diff "
|
|
dongsheng@627
|
15779 "from the first to the second version."
|
|
dongsheng@627
|
15780 msgstr ""
|
|
dongsheng@627
|
15781
|
|
dongsheng@627
|
15782 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15783 #: ../en/ch13-mq-collab.xml:459
|
|
dongsheng@627
|
15784 msgid ""
|
|
dongsheng@627
|
15785 "You can enable the <literal role=\"hg-ext\">extdiff</literal> extension in "
|
|
dongsheng@627
|
15786 "the usual way, by adding a line to the <literal role=\"rc-extensions"
|
|
dongsheng@627
|
15787 "\">extensions</literal> section of your <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
15788 "filename>."
|
|
dongsheng@627
|
15789 msgstr ""
|
|
dongsheng@627
|
15790
|
|
dongsheng@627
|
15791 #
|
|
dongsheng@643
|
15792 #. &example.hg-interdiff;
|
|
dongsheng@627
|
15793 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15794 #: ../en/ch13-mq-collab.xml:465
|
|
dongsheng@627
|
15795 msgid ""
|
|
dongsheng@627
|
15796 "The <command>interdiff</command> command expects to be passed the names of "
|
|
dongsheng@627
|
15797 "two files, but the <literal role=\"hg-ext\">extdiff</literal> extension "
|
|
dongsheng@627
|
15798 "passes the program it runs a pair of directories, each of which can contain "
|
|
dongsheng@627
|
15799 "an arbitrary number of files. We thus need a small program that will run "
|
|
dongsheng@627
|
15800 "<command>interdiff</command> on each pair of files in these two directories. "
|
|
dongsheng@627
|
15801 "This program is available as <filename role=\"special\">hg-interdiff</"
|
|
dongsheng@627
|
15802 "filename> in the <filename class=\"directory\">examples</filename> directory "
|
|
dongsheng@627
|
15803 "of the source code repository that accompanies this book."
|
|
dongsheng@627
|
15804 msgstr ""
|
|
dongsheng@627
|
15805
|
|
dongsheng@627
|
15806 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15807 #: ../en/ch13-mq-collab.xml:477
|
|
dongsheng@627
|
15808 msgid ""
|
|
dongsheng@627
|
15809 "With the <filename role=\"special\">hg-interdiff</filename> program in your "
|
|
dongsheng@627
|
15810 "shell's search path, you can run it as follows, from inside an MQ patch "
|
|
dongsheng@627
|
15811 "directory:"
|
|
dongsheng@627
|
15812 msgstr ""
|
|
dongsheng@627
|
15813
|
|
dongsheng@627
|
15814 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15815 #: ../en/ch13-mq-collab.xml:482
|
|
dongsheng@627
|
15816 msgid ""
|
|
dongsheng@627
|
15817 "Since you'll probably want to use this long-winded command a lot, you can get "
|
|
dongsheng@627
|
15818 "<literal role=\"hg-ext\">hgext</literal> to make it available as a normal "
|
|
dongsheng@627
|
15819 "Mercurial command, again by editing your <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
15820 "filename>."
|
|
dongsheng@627
|
15821 msgstr ""
|
|
dongsheng@627
|
15822
|
|
dongsheng@627
|
15823 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15824 #: ../en/ch13-mq-collab.xml:489
|
|
dongsheng@627
|
15825 msgid ""
|
|
dongsheng@627
|
15826 "This directs <literal role=\"hg-ext\">hgext</literal> to make an "
|
|
dongsheng@627
|
15827 "<literal>interdiff</literal> command available, so you can now shorten the "
|
|
dongsheng@627
|
15828 "previous invocation of <command role=\"hg-ext-extdiff\">extdiff</command> to "
|
|
dongsheng@627
|
15829 "something a little more wieldy."
|
|
dongsheng@627
|
15830 msgstr ""
|
|
dongsheng@627
|
15831
|
|
dongsheng@627
|
15832 #. type: Content of: <book><chapter><sect1><sect2><note><para>
|
|
dongsheng@627
|
15833 #: ../en/ch13-mq-collab.xml:498
|
|
dongsheng@627
|
15834 msgid ""
|
|
dongsheng@627
|
15835 "The <command>interdiff</command> command works well only if the underlying "
|
|
dongsheng@627
|
15836 "files against which versions of a patch are generated remain the same. If "
|
|
dongsheng@627
|
15837 "you create a patch, modify the underlying files, and then regenerate the "
|
|
dongsheng@627
|
15838 "patch, <command>interdiff</command> may not produce useful output."
|
|
dongsheng@627
|
15839 msgstr ""
|
|
dongsheng@627
|
15840
|
|
dongsheng@627
|
15841 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
15842 #: ../en/ch13-mq-collab.xml:506
|
|
dongsheng@627
|
15843 msgid ""
|
|
dongsheng@627
|
15844 "The <literal role=\"hg-ext\">extdiff</literal> extension is useful for more "
|
|
dongsheng@627
|
15845 "than merely improving the presentation of MQ patches. To read more about it, "
|
|
dongsheng@627
|
15846 "go to section <xref linkend=\"sec.hgext.extdiff\"/>."
|
|
dongsheng@627
|
15847 msgstr ""
|
|
dongsheng@627
|
15848
|
|
dongsheng@627
|
15849 #. type: Content of: <book><chapter><title>
|
|
dongsheng@627
|
15850 #: ../en/ch14-hgext.xml:5
|
|
dongsheng@627
|
15851 msgid "Adding functionality with extensions"
|
|
dongsheng@627
|
15852 msgstr "使用扩展增加功能"
|
|
dongsheng@627
|
15853
|
|
dongsheng@627
|
15854 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
15855 #: ../en/ch14-hgext.xml:7
|
|
dongsheng@627
|
15856 msgid ""
|
|
dongsheng@627
|
15857 "While the core of Mercurial is quite complete from a functionality "
|
|
dongsheng@627
|
15858 "standpoint, it's deliberately shorn of fancy features. This approach of "
|
|
dongsheng@627
|
15859 "preserving simplicity keeps the software easy to deal with for both "
|
|
dongsheng@627
|
15860 "maintainers and users."
|
|
dongsheng@627
|
15861 msgstr ""
|
|
dongsheng@627
|
15862
|
|
dongsheng@627
|
15863 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
15864 #: ../en/ch14-hgext.xml:12
|
|
dongsheng@627
|
15865 msgid ""
|
|
dongsheng@627
|
15866 "However, Mercurial doesn't box you in with an inflexible command set: you can "
|
|
dongsheng@627
|
15867 "add features to it as <emphasis>extensions</emphasis> (sometimes known as "
|
|
dongsheng@627
|
15868 "<emphasis>plugins</emphasis>). We've already discussed a few of these "
|
|
dongsheng@627
|
15869 "extensions in earlier chapters."
|
|
dongsheng@627
|
15870 msgstr ""
|
|
dongsheng@627
|
15871
|
|
dongsheng@627
|
15872 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15873 #: ../en/ch14-hgext.xml:18
|
|
dongsheng@627
|
15874 msgid ""
|
|
dongsheng@627
|
15875 "Section <xref linkend=\"sec.tour-merge.fetch\"/> covers the <literal role="
|
|
dongsheng@627
|
15876 "\"hg-ext\">fetch</literal> extension; this combines pulling new changes and "
|
|
dongsheng@627
|
15877 "merging them with local changes into a single command, <command role=\"hg-ext-"
|
|
dongsheng@627
|
15878 "fetch\">fetch</command>."
|
|
dongsheng@627
|
15879 msgstr ""
|
|
dongsheng@627
|
15880
|
|
dongsheng@627
|
15881 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15882 #: ../en/ch14-hgext.xml:24
|
|
dongsheng@627
|
15883 msgid ""
|
|
dongsheng@627
|
15884 "In chapter <xref linkend=\"chap.hook\"/>, we covered several extensions that "
|
|
dongsheng@627
|
15885 "are useful for hook-related functionality: <literal role=\"hg-ext\">acl</"
|
|
dongsheng@627
|
15886 "literal> adds access control lists; <literal role=\"hg-ext\">bugzilla</"
|
|
dongsheng@627
|
15887 "literal> adds integration with the Bugzilla bug tracking system; and <literal "
|
|
dongsheng@627
|
15888 "role=\"hg-ext\">notify</literal> sends notification emails on new changes."
|
|
dongsheng@627
|
15889 msgstr ""
|
|
dongsheng@627
|
15890
|
|
dongsheng@627
|
15891 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15892 #: ../en/ch14-hgext.xml:33
|
|
dongsheng@627
|
15893 msgid ""
|
|
dongsheng@627
|
15894 "The Mercurial Queues patch management extension is so invaluable that it "
|
|
dongsheng@627
|
15895 "merits two chapters and an appendix all to itself. Chapter <xref linkend="
|
|
dongsheng@627
|
15896 "\"chap.mq\"/> covers the basics; chapter <xref linkend=\"chap.mq-collab\"/> "
|
|
dongsheng@627
|
15897 "discusses advanced topics; and appendix <xref linkend=\"chap.mqref\"/> goes "
|
|
dongsheng@627
|
15898 "into detail on each command."
|
|
dongsheng@627
|
15899 msgstr ""
|
|
dongsheng@627
|
15900
|
|
dongsheng@627
|
15901 #. type: Content of: <book><chapter><para>
|
|
dongsheng@627
|
15902 #: ../en/ch14-hgext.xml:43
|
|
dongsheng@627
|
15903 msgid ""
|
|
dongsheng@627
|
15904 "In this chapter, we'll cover some of the other extensions that are available "
|
|
dongsheng@627
|
15905 "for Mercurial, and briefly touch on some of the machinery you'll need to know "
|
|
dongsheng@627
|
15906 "about if you want to write an extension of your own."
|
|
dongsheng@627
|
15907 msgstr ""
|
|
dongsheng@627
|
15908
|
|
dongsheng@627
|
15909 #. type: Content of: <book><chapter><itemizedlist><listitem><para>
|
|
dongsheng@627
|
15910 #: ../en/ch14-hgext.xml:48
|
|
dongsheng@627
|
15911 msgid ""
|
|
dongsheng@627
|
15912 "In section <xref linkend=\"sec.hgext.inotify\"/>, we'll discuss the "
|
|
dongsheng@627
|
15913 "possibility of <emphasis>huge</emphasis> performance improvements using the "
|
|
dongsheng@627
|
15914 "<literal role=\"hg-ext\">inotify</literal> extension."
|
|
dongsheng@627
|
15915 msgstr ""
|
|
dongsheng@627
|
15916
|
|
dongsheng@627
|
15917 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
15918 #: ../en/ch14-hgext.xml:55
|
|
dongsheng@627
|
15919 msgid ""
|
|
dongsheng@627
|
15920 "Improve performance with the <literal role=\"hg-ext\">inotify</literal> "
|
|
dongsheng@627
|
15921 "extension"
|
|
dongsheng@636
|
15922 msgstr "使用扩展 <literal role=\"hg-ext\">inotify</literal> 以提高性能"
|
|
dongsheng@627
|
15923
|
|
dongsheng@627
|
15924 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15925 #: ../en/ch14-hgext.xml:58
|
|
dongsheng@627
|
15926 msgid ""
|
|
dongsheng@627
|
15927 "Are you interested in having some of the most common Mercurial operations run "
|
|
dongsheng@627
|
15928 "as much as a hundred times faster? Read on!"
|
|
dongsheng@627
|
15929 msgstr ""
|
|
dongsheng@627
|
15930
|
|
dongsheng@627
|
15931 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15932 #: ../en/ch14-hgext.xml:62
|
|
dongsheng@627
|
15933 msgid ""
|
|
dongsheng@627
|
15934 "Mercurial has great performance under normal circumstances. For example, "
|
|
dongsheng@627
|
15935 "when you run the <command role=\"hg-cmd\">hg status</command> command, "
|
|
dongsheng@627
|
15936 "Mercurial has to scan almost every directory and file in your repository so "
|
|
dongsheng@627
|
15937 "that it can display file status. Many other Mercurial commands need to do "
|
|
dongsheng@627
|
15938 "the same work behind the scenes; for example, the <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
15939 "diff</command> command uses the status machinery to avoid doing an expensive "
|
|
dongsheng@627
|
15940 "comparison operation on files that obviously haven't changed."
|
|
dongsheng@627
|
15941 msgstr ""
|
|
dongsheng@627
|
15942
|
|
dongsheng@627
|
15943 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15944 #: ../en/ch14-hgext.xml:72
|
|
dongsheng@627
|
15945 msgid ""
|
|
dongsheng@627
|
15946 "Because obtaining file status is crucial to good performance, the authors of "
|
|
dongsheng@627
|
15947 "Mercurial have optimised this code to within an inch of its life. However, "
|
|
dongsheng@627
|
15948 "there's no avoiding the fact that when you run <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
15949 "status</command>, Mercurial is going to have to perform at least one "
|
|
dongsheng@627
|
15950 "expensive system call for each managed file to determine whether it's changed "
|
|
dongsheng@627
|
15951 "since the last time Mercurial checked. For a sufficiently large repository, "
|
|
dongsheng@627
|
15952 "this can take a long time."
|
|
dongsheng@627
|
15953 msgstr ""
|
|
dongsheng@627
|
15954
|
|
dongsheng@627
|
15955 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15956 #: ../en/ch14-hgext.xml:82
|
|
dongsheng@627
|
15957 msgid ""
|
|
dongsheng@627
|
15958 "To put a number on the magnitude of this effect, I created a repository "
|
|
dongsheng@627
|
15959 "containing 150,000 managed files. I timed <command role=\"hg-cmd\">hg "
|
|
dongsheng@627
|
15960 "status</command> as taking ten seconds to run, even when <emphasis>none</"
|
|
dongsheng@627
|
15961 "emphasis> of those files had been modified."
|
|
dongsheng@627
|
15962 msgstr ""
|
|
dongsheng@627
|
15963
|
|
dongsheng@627
|
15964 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15965 #: ../en/ch14-hgext.xml:88
|
|
dongsheng@627
|
15966 msgid ""
|
|
dongsheng@627
|
15967 "Many modern operating systems contain a file notification facility. If a "
|
|
dongsheng@627
|
15968 "program signs up to an appropriate service, the operating system will notify "
|
|
dongsheng@627
|
15969 "it every time a file of interest is created, modified, or deleted. On Linux "
|
|
dongsheng@627
|
15970 "systems, the kernel component that does this is called <literal>inotify</"
|
|
dongsheng@627
|
15971 "literal>."
|
|
dongsheng@627
|
15972 msgstr ""
|
|
dongsheng@627
|
15973
|
|
dongsheng@627
|
15974 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15975 #: ../en/ch14-hgext.xml:95
|
|
dongsheng@627
|
15976 msgid ""
|
|
dongsheng@627
|
15977 "Mercurial's <literal role=\"hg-ext\">inotify</literal> extension talks to the "
|
|
dongsheng@627
|
15978 "kernel's <literal>inotify</literal> component to optimise <command role=\"hg-"
|
|
dongsheng@627
|
15979 "cmd\">hg status</command> commands. The extension has two components. A "
|
|
dongsheng@627
|
15980 "daemon sits in the background and receives notifications from the "
|
|
dongsheng@627
|
15981 "<literal>inotify</literal> subsystem. It also listens for connections from a "
|
|
dongsheng@627
|
15982 "regular Mercurial command. The extension modifies Mercurial's behaviour so "
|
|
dongsheng@627
|
15983 "that instead of scanning the filesystem, it queries the daemon. Since the "
|
|
dongsheng@627
|
15984 "daemon has perfect information about the state of the repository, it can "
|
|
dongsheng@627
|
15985 "respond with a result instantaneously, avoiding the need to scan every "
|
|
dongsheng@627
|
15986 "directory and file in the repository."
|
|
dongsheng@627
|
15987 msgstr ""
|
|
dongsheng@627
|
15988
|
|
dongsheng@627
|
15989 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
15990 #: ../en/ch14-hgext.xml:108
|
|
dongsheng@627
|
15991 msgid ""
|
|
dongsheng@627
|
15992 "Recall the ten seconds that I measured plain Mercurial as taking to run "
|
|
dongsheng@627
|
15993 "<command role=\"hg-cmd\">hg status</command> on a 150,000 file repository. "
|
|
dongsheng@627
|
15994 "With the <literal role=\"hg-ext\">inotify</literal> extension enabled, the "
|
|
dongsheng@627
|
15995 "time dropped to 0.1 seconds, a factor of <emphasis>one hundred</emphasis> "
|
|
dongsheng@627
|
15996 "faster."
|
|
dongsheng@627
|
15997 msgstr ""
|
|
dongsheng@627
|
15998
|
|
dongsheng@627
|
15999 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16000 #: ../en/ch14-hgext.xml:115
|
|
dongsheng@627
|
16001 msgid "Before we continue, please pay attention to some caveats."
|
|
dongsheng@627
|
16002 msgstr ""
|
|
dongsheng@627
|
16003
|
|
dongsheng@627
|
16004 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16005 #: ../en/ch14-hgext.xml:118
|
|
dongsheng@627
|
16006 msgid ""
|
|
dongsheng@627
|
16007 "The <literal role=\"hg-ext\">inotify</literal> extension is Linux-specific. "
|
|
dongsheng@627
|
16008 "Because it interfaces directly to the Linux kernel's <literal>inotify</"
|
|
dongsheng@627
|
16009 "literal> subsystem, it does not work on other operating systems."
|
|
dongsheng@627
|
16010 msgstr ""
|
|
dongsheng@627
|
16011
|
|
dongsheng@627
|
16012 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16013 #: ../en/ch14-hgext.xml:123
|
|
dongsheng@627
|
16014 msgid ""
|
|
dongsheng@627
|
16015 "It should work on any Linux distribution that was released after early 2005. "
|
|
dongsheng@627
|
16016 "Older distributions are likely to have a kernel that lacks <literal>inotify</"
|
|
dongsheng@627
|
16017 "literal>, or a version of <literal>glibc</literal> that does not have the "
|
|
dongsheng@627
|
16018 "necessary interfacing support."
|
|
dongsheng@627
|
16019 msgstr ""
|
|
dongsheng@627
|
16020
|
|
dongsheng@627
|
16021 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16022 #: ../en/ch14-hgext.xml:130
|
|
dongsheng@627
|
16023 msgid ""
|
|
dongsheng@627
|
16024 "Not all filesystems are suitable for use with the <literal role=\"hg-ext"
|
|
dongsheng@627
|
16025 "\">inotify</literal> extension. Network filesystems such as NFS are a non-"
|
|
dongsheng@627
|
16026 "starter, for example, particularly if you're running Mercurial on several "
|
|
dongsheng@627
|
16027 "systems, all mounting the same network filesystem. The kernel's "
|
|
dongsheng@627
|
16028 "<literal>inotify</literal> system has no way of knowing about changes made on "
|
|
dongsheng@627
|
16029 "another system. Most local filesystems (e.g. ext3, XFS, ReiserFS) should "
|
|
dongsheng@627
|
16030 "work fine."
|
|
dongsheng@627
|
16031 msgstr ""
|
|
dongsheng@627
|
16032
|
|
dongsheng@627
|
16033 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16034 #: ../en/ch14-hgext.xml:141
|
|
dongsheng@627
|
16035 msgid ""
|
|
dongsheng@627
|
16036 "The <literal role=\"hg-ext\">inotify</literal> extension is not yet shipped "
|
|
dongsheng@627
|
16037 "with Mercurial as of May 2007, so it's a little more involved to set up than "
|
|
dongsheng@627
|
16038 "other extensions. But the performance improvement is worth it!"
|
|
dongsheng@627
|
16039 msgstr ""
|
|
dongsheng@627
|
16040
|
|
dongsheng@627
|
16041 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16042 #: ../en/ch14-hgext.xml:146
|
|
dongsheng@627
|
16043 msgid ""
|
|
dongsheng@627
|
16044 "The extension currently comes in two parts: a set of patches to the Mercurial "
|
|
dongsheng@627
|
16045 "source code, and a library of Python bindings to the <literal>inotify</"
|
|
dongsheng@627
|
16046 "literal> subsystem."
|
|
dongsheng@627
|
16047 msgstr ""
|
|
dongsheng@627
|
16048
|
|
dongsheng@627
|
16049 #. type: Content of: <book><chapter><sect1><note><para>
|
|
dongsheng@627
|
16050 #: ../en/ch14-hgext.xml:150
|
|
dongsheng@627
|
16051 msgid ""
|
|
dongsheng@627
|
16052 "There are <emphasis>two</emphasis> Python <literal>inotify</literal> binding "
|
|
dongsheng@627
|
16053 "libraries. One of them is called <literal>pyinotify</literal>, and is "
|
|
dongsheng@627
|
16054 "packaged by some Linux distributions as <literal>python-inotify</literal>. "
|
|
dongsheng@627
|
16055 "This is <emphasis>not</emphasis> the one you'll need, as it is too buggy and "
|
|
dongsheng@627
|
16056 "inefficient to be practical."
|
|
dongsheng@627
|
16057 msgstr ""
|
|
dongsheng@627
|
16058
|
|
dongsheng@627
|
16059 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16060 #: ../en/ch14-hgext.xml:157
|
|
dongsheng@627
|
16061 msgid ""
|
|
dongsheng@627
|
16062 "To get going, it's best to already have a functioning copy of Mercurial "
|
|
dongsheng@627
|
16063 "installed."
|
|
dongsheng@627
|
16064 msgstr ""
|
|
dongsheng@627
|
16065
|
|
dongsheng@627
|
16066 #. type: Content of: <book><chapter><sect1><note><para>
|
|
dongsheng@627
|
16067 #: ../en/ch14-hgext.xml:160
|
|
dongsheng@627
|
16068 msgid ""
|
|
dongsheng@627
|
16069 "If you follow the instructions below, you'll be <emphasis>replacing</"
|
|
dongsheng@627
|
16070 "emphasis> and overwriting any existing installation of Mercurial that you "
|
|
dongsheng@627
|
16071 "might already have, using the latest <quote>bleeding edge</quote> Mercurial "
|
|
dongsheng@627
|
16072 "code. Don't say you weren't warned!"
|
|
dongsheng@627
|
16073 msgstr ""
|
|
dongsheng@627
|
16074
|
|
dongsheng@627
|
16075 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
16076 #: ../en/ch14-hgext.xml:167
|
|
dongsheng@627
|
16077 msgid ""
|
|
dongsheng@627
|
16078 "Clone the Python <literal>inotify</literal> binding repository. Build and "
|
|
dongsheng@627
|
16079 "install it."
|
|
dongsheng@627
|
16080 msgstr ""
|
|
dongsheng@627
|
16081
|
|
dongsheng@627
|
16082 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
16083 #: ../en/ch14-hgext.xml:175
|
|
dongsheng@627
|
16084 msgid ""
|
|
dongsheng@627
|
16085 "Clone the <filename class=\"directory\">crew</filename> Mercurial "
|
|
dongsheng@627
|
16086 "repository. Clone the <literal role=\"hg-ext\">inotify</literal> patch "
|
|
dongsheng@627
|
16087 "repository so that Mercurial Queues will be able to apply patches to your "
|
|
dongsheng@627
|
16088 "cope of the <filename class=\"directory\">crew</filename> repository."
|
|
dongsheng@627
|
16089 msgstr ""
|
|
dongsheng@627
|
16090
|
|
dongsheng@627
|
16091 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
16092 #: ../en/ch14-hgext.xml:188
|
|
dongsheng@627
|
16093 msgid ""
|
|
dongsheng@627
|
16094 "Make sure that you have the Mercurial Queues extension, <literal role=\"hg-ext"
|
|
dongsheng@627
|
16095 "\">mq</literal>, enabled. If you've never used MQ, read section <xref "
|
|
dongsheng@627
|
16096 "linkend=\"sec.mq.start\"/> to get started quickly."
|
|
dongsheng@627
|
16097 msgstr ""
|
|
dongsheng@627
|
16098
|
|
dongsheng@627
|
16099 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
16100 #: ../en/ch14-hgext.xml:194
|
|
dongsheng@627
|
16101 msgid ""
|
|
dongsheng@627
|
16102 "Go into the <filename class=\"directory\">inotify</filename> repo, and apply "
|
|
dongsheng@627
|
16103 "all of the <literal role=\"hg-ext\">inotify</literal> patches using the "
|
|
dongsheng@627
|
16104 "<option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</option> option to the "
|
|
dongsheng@627
|
16105 "<command role=\"hg-ext-mq\">qpush</command> command."
|
|
dongsheng@627
|
16106 msgstr ""
|
|
dongsheng@627
|
16107
|
|
dongsheng@627
|
16108 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
16109 #: ../en/ch14-hgext.xml:204
|
|
dongsheng@627
|
16110 msgid ""
|
|
dongsheng@627
|
16111 "If you get an error message from <command role=\"hg-ext-mq\">qpush</command>, "
|
|
dongsheng@627
|
16112 "you should not continue. Instead, ask for help."
|
|
dongsheng@627
|
16113 msgstr ""
|
|
dongsheng@627
|
16114
|
|
dongsheng@627
|
16115 #. type: Content of: <book><chapter><sect1><orderedlist><listitem><para>
|
|
dongsheng@627
|
16116 #: ../en/ch14-hgext.xml:208
|
|
dongsheng@627
|
16117 msgid "Build and install the patched version of Mercurial."
|
|
dongsheng@627
|
16118 msgstr ""
|
|
dongsheng@627
|
16119
|
|
dongsheng@627
|
16120 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16121 #: ../en/ch14-hgext.xml:216
|
|
dongsheng@627
|
16122 msgid ""
|
|
dongsheng@627
|
16123 "Once you've build a suitably patched version of Mercurial, all you need to do "
|
|
dongsheng@627
|
16124 "to enable the <literal role=\"hg-ext\">inotify</literal> extension is add an "
|
|
dongsheng@627
|
16125 "entry to your <filename role=\"special\"> /.hgrc</filename>."
|
|
dongsheng@627
|
16126 msgstr ""
|
|
dongsheng@627
|
16127
|
|
dongsheng@627
|
16128 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16129 #: ../en/ch14-hgext.xml:221
|
|
dongsheng@627
|
16130 msgid ""
|
|
dongsheng@627
|
16131 "When the <literal role=\"hg-ext\">inotify</literal> extension is enabled, "
|
|
dongsheng@627
|
16132 "Mercurial will automatically and transparently start the status daemon the "
|
|
dongsheng@627
|
16133 "first time you run a command that needs status in a repository. It runs one "
|
|
dongsheng@627
|
16134 "status daemon per repository."
|
|
dongsheng@627
|
16135 msgstr ""
|
|
dongsheng@627
|
16136
|
|
dongsheng@627
|
16137 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16138 #: ../en/ch14-hgext.xml:227
|
|
dongsheng@627
|
16139 msgid ""
|
|
dongsheng@627
|
16140 "The status daemon is started silently, and runs in the background. If you "
|
|
dongsheng@627
|
16141 "look at a list of running processes after you've enabled the <literal role="
|
|
dongsheng@627
|
16142 "\"hg-ext\">inotify</literal> extension and run a few commands in different "
|
|
dongsheng@627
|
16143 "repositories, you'll thus see a few <literal>hg</literal> processes sitting "
|
|
dongsheng@627
|
16144 "around, waiting for updates from the kernel and queries from Mercurial."
|
|
dongsheng@627
|
16145 msgstr ""
|
|
dongsheng@627
|
16146
|
|
dongsheng@627
|
16147 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16148 #: ../en/ch14-hgext.xml:235
|
|
dongsheng@627
|
16149 msgid ""
|
|
dongsheng@627
|
16150 "The first time you run a Mercurial command in a repository when you have the "
|
|
dongsheng@627
|
16151 "<literal role=\"hg-ext\">inotify</literal> extension enabled, it will run "
|
|
dongsheng@627
|
16152 "with about the same performance as a normal Mercurial command. This is "
|
|
dongsheng@627
|
16153 "because the status daemon needs to perform a normal status scan so that it "
|
|
dongsheng@627
|
16154 "has a baseline against which to apply later updates from the kernel. "
|
|
dongsheng@627
|
16155 "However, <emphasis>every</emphasis> subsequent command that does any kind of "
|
|
dongsheng@627
|
16156 "status check should be noticeably faster on repositories of even fairly "
|
|
dongsheng@627
|
16157 "modest size. Better yet, the bigger your repository is, the greater a "
|
|
dongsheng@627
|
16158 "performance advantage you'll see. The <literal role=\"hg-ext\">inotify</"
|
|
dongsheng@627
|
16159 "literal> daemon makes status operations almost instantaneous on repositories "
|
|
dongsheng@627
|
16160 "of all sizes!"
|
|
dongsheng@627
|
16161 msgstr ""
|
|
dongsheng@627
|
16162
|
|
dongsheng@627
|
16163 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16164 #: ../en/ch14-hgext.xml:249
|
|
dongsheng@627
|
16165 msgid ""
|
|
dongsheng@627
|
16166 "If you like, you can manually start a status daemon using the <command role="
|
|
dongsheng@627
|
16167 "\"hg-ext-inotify\">inserve</command> command. This gives you slightly finer "
|
|
dongsheng@627
|
16168 "control over how the daemon ought to run. This command will of course only "
|
|
dongsheng@627
|
16169 "be available when the <literal role=\"hg-ext\">inotify</literal> extension is "
|
|
dongsheng@627
|
16170 "enabled."
|
|
dongsheng@627
|
16171 msgstr ""
|
|
dongsheng@627
|
16172
|
|
dongsheng@627
|
16173 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16174 #: ../en/ch14-hgext.xml:256
|
|
dongsheng@627
|
16175 msgid ""
|
|
dongsheng@627
|
16176 "When you're using the <literal role=\"hg-ext\">inotify</literal> extension, "
|
|
dongsheng@627
|
16177 "you should notice <emphasis>no difference at all</emphasis> in Mercurial's "
|
|
dongsheng@627
|
16178 "behaviour, with the sole exception of status-related commands running a whole "
|
|
dongsheng@627
|
16179 "lot faster than they used to. You should specifically expect that commands "
|
|
dongsheng@627
|
16180 "will not print different output; neither should they give different results. "
|
|
dongsheng@627
|
16181 "If either of these situations occurs, please report a bug."
|
|
dongsheng@627
|
16182 msgstr ""
|
|
dongsheng@627
|
16183
|
|
dongsheng@627
|
16184 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
16185 #: ../en/ch14-hgext.xml:267
|
|
dongsheng@627
|
16186 msgid ""
|
|
dongsheng@627
|
16187 "Flexible diff support with the <literal role=\"hg-ext\">extdiff</literal> "
|
|
dongsheng@627
|
16188 "extension"
|
|
dongsheng@636
|
16189 msgstr "使用扩展 <literal role=\"hg-ext\">extdiff</literal> 以扩展差异支持"
|
|
dongsheng@627
|
16190
|
|
dongsheng@627
|
16191 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16192 #: ../en/ch14-hgext.xml:270
|
|
dongsheng@627
|
16193 msgid ""
|
|
dongsheng@627
|
16194 "Mercurial's built-in <command role=\"hg-cmd\">hg diff</command> command "
|
|
dongsheng@627
|
16195 "outputs plaintext unified diffs."
|
|
dongsheng@627
|
16196 msgstr ""
|
|
dongsheng@627
|
16197 "Mercurial 内置命令 <command role=\"hg-cmd\">hg diff</command> 的输出与统一差异"
|
|
dongsheng@627
|
16198 "不同。"
|
|
dongsheng@627
|
16199
|
|
dongsheng@627
|
16200 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16201 #: ../en/ch14-hgext.xml:275
|
|
dongsheng@627
|
16202 msgid ""
|
|
dongsheng@627
|
16203 "If you would like to use an external tool to display modifications, you'll "
|
|
dongsheng@627
|
16204 "want to use the <literal role=\"hg-ext\">extdiff</literal> extension. This "
|
|
dongsheng@627
|
16205 "will let you use, for example, a graphical diff tool."
|
|
dongsheng@627
|
16206 msgstr ""
|
|
dongsheng@627
|
16207
|
|
dongsheng@627
|
16208 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16209 #: ../en/ch14-hgext.xml:280
|
|
dongsheng@627
|
16210 msgid ""
|
|
dongsheng@627
|
16211 "The <literal role=\"hg-ext\">extdiff</literal> extension is bundled with "
|
|
dongsheng@627
|
16212 "Mercurial, so it's easy to set up. In the <literal role=\"rc-extensions"
|
|
dongsheng@627
|
16213 "\">extensions</literal> section of your <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
16214 "filename>, simply add a one-line entry to enable the extension."
|
|
dongsheng@627
|
16215 msgstr ""
|
|
dongsheng@627
|
16216
|
|
dongsheng@627
|
16217 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16218 #: ../en/ch14-hgext.xml:286
|
|
dongsheng@627
|
16219 msgid ""
|
|
dongsheng@627
|
16220 "This introduces a command named <command role=\"hg-ext-extdiff\">extdiff</"
|
|
dongsheng@627
|
16221 "command>, which by default uses your system's <command>diff</command> command "
|
|
dongsheng@627
|
16222 "to generate a unified diff in the same form as the built-in <command role="
|
|
dongsheng@627
|
16223 "\"hg-cmd\">hg diff</command> command."
|
|
dongsheng@627
|
16224 msgstr ""
|
|
dongsheng@627
|
16225
|
|
dongsheng@627
|
16226 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16227 #: ../en/ch14-hgext.xml:294
|
|
dongsheng@627
|
16228 msgid ""
|
|
dongsheng@627
|
16229 "The result won't be exactly the same as with the built-in <command role=\"hg-"
|
|
dongsheng@627
|
16230 "cmd\">hg diff</command> variations, because the output of <command>diff</"
|
|
dongsheng@627
|
16231 "command> varies from one system to another, even when passed the same options."
|
|
dongsheng@627
|
16232 msgstr ""
|
|
dongsheng@627
|
16233
|
|
dongsheng@627
|
16234 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16235 #: ../en/ch14-hgext.xml:299
|
|
dongsheng@627
|
16236 msgid ""
|
|
dongsheng@627
|
16237 "As the <quote><literal>making snapshot</literal></quote> lines of output "
|
|
dongsheng@627
|
16238 "above imply, the <command role=\"hg-ext-extdiff\">extdiff</command> command "
|
|
dongsheng@627
|
16239 "works by creating two snapshots of your source tree. The first snapshot is "
|
|
dongsheng@627
|
16240 "of the source revision; the second, of the target revision or working "
|
|
dongsheng@627
|
16241 "directory. The <command role=\"hg-ext-extdiff\">extdiff</command> command "
|
|
dongsheng@627
|
16242 "generates these snapshots in a temporary directory, passes the name of each "
|
|
dongsheng@627
|
16243 "directory to an external diff viewer, then deletes the temporary directory. "
|
|
dongsheng@627
|
16244 "For efficiency, it only snapshots the directories and files that have changed "
|
|
dongsheng@627
|
16245 "between the two revisions."
|
|
dongsheng@627
|
16246 msgstr ""
|
|
dongsheng@627
|
16247
|
|
dongsheng@627
|
16248 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16249 #: ../en/ch14-hgext.xml:312
|
|
dongsheng@627
|
16250 msgid ""
|
|
dongsheng@627
|
16251 "Snapshot directory names have the same base name as your repository. If your "
|
|
dongsheng@627
|
16252 "repository path is <filename class=\"directory\">/quux/bar/foo</filename>, "
|
|
dongsheng@627
|
16253 "then <filename class=\"directory\">foo</filename> will be the name of each "
|
|
dongsheng@627
|
16254 "snapshot directory. Each snapshot directory name has its changeset ID "
|
|
dongsheng@627
|
16255 "appended, if appropriate. If a snapshot is of revision "
|
|
dongsheng@627
|
16256 "<literal>a631aca1083f</literal>, the directory will be named <filename class="
|
|
dongsheng@627
|
16257 "\"directory\">foo.a631aca1083f</filename>. A snapshot of the working "
|
|
dongsheng@627
|
16258 "directory won't have a changeset ID appended, so it would just be <filename "
|
|
dongsheng@627
|
16259 "class=\"directory\">foo</filename> in this example. To see what this looks "
|
|
dongsheng@627
|
16260 "like in practice, look again at the <command role=\"hg-ext-extdiff\">extdiff</"
|
|
dongsheng@627
|
16261 "command> example above. Notice that the diff has the snapshot directory "
|
|
dongsheng@627
|
16262 "names embedded in its header."
|
|
dongsheng@627
|
16263 msgstr ""
|
|
dongsheng@627
|
16264
|
|
dongsheng@627
|
16265 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16266 #: ../en/ch14-hgext.xml:328
|
|
dongsheng@627
|
16267 msgid ""
|
|
dongsheng@627
|
16268 "The <command role=\"hg-ext-extdiff\">extdiff</command> command accepts two "
|
|
dongsheng@627
|
16269 "important options. The <option role=\"hg-ext-extdiff-cmd-extdiff-opt\">hg -p</"
|
|
dongsheng@627
|
16270 "option> option lets you choose a program to view differences with, instead of "
|
|
dongsheng@627
|
16271 "<command>diff</command>. With the <option role=\"hg-ext-extdiff-cmd-extdiff-"
|
|
dongsheng@627
|
16272 "opt\">hg -o</option> option, you can change the options that <command role="
|
|
dongsheng@627
|
16273 "\"hg-ext-extdiff\">extdiff</command> passes to the program (by default, these "
|
|
dongsheng@627
|
16274 "options are <quote><literal>-Npru</literal></quote>, which only make sense if "
|
|
dongsheng@627
|
16275 "you're running <command>diff</command>). In other respects, the <command "
|
|
dongsheng@627
|
16276 "role=\"hg-ext-extdiff\">extdiff</command> command acts similarly to the built-"
|
|
dongsheng@627
|
16277 "in <command role=\"hg-cmd\">hg diff</command> command: you use the same "
|
|
dongsheng@627
|
16278 "option names, syntax, and arguments to specify the revisions you want, the "
|
|
dongsheng@627
|
16279 "files you want, and so on."
|
|
dongsheng@627
|
16280 msgstr ""
|
|
dongsheng@627
|
16281
|
|
dongsheng@627
|
16282 #
|
|
dongsheng@627
|
16283 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16284 #: ../en/ch14-hgext.xml:345
|
|
dongsheng@627
|
16285 msgid ""
|
|
dongsheng@627
|
16286 "As an example, here's how to run the normal system <command>diff</command> "
|
|
dongsheng@627
|
16287 "command, getting it to generate context diffs (using the <option role=\"cmd-"
|
|
dongsheng@627
|
16288 "opt-diff\">-c</option> option) instead of unified diffs, and five lines of "
|
|
dongsheng@627
|
16289 "context instead of the default three (passing <literal>5</literal> as the "
|
|
dongsheng@627
|
16290 "argument to the <option role=\"cmd-opt-diff\">-C</option> option)."
|
|
dongsheng@627
|
16291 msgstr ""
|
|
dongsheng@627
|
16292
|
|
dongsheng@627
|
16293 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16294 #: ../en/ch14-hgext.xml:354
|
|
dongsheng@627
|
16295 msgid ""
|
|
dongsheng@627
|
16296 "Launching a visual diff tool is just as easy. Here's how to launch the "
|
|
dongsheng@627
|
16297 "<command>kdiff3</command> viewer."
|
|
dongsheng@627
|
16298 msgstr ""
|
|
dongsheng@627
|
16299
|
|
dongsheng@627
|
16300 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16301 #: ../en/ch14-hgext.xml:358
|
|
dongsheng@627
|
16302 msgid ""
|
|
dongsheng@627
|
16303 "If your diff viewing command can't deal with directories, you can easily work "
|
|
dongsheng@627
|
16304 "around this with a little scripting. For an example of such scripting in "
|
|
dongsheng@627
|
16305 "action with the <literal role=\"hg-ext\">mq</literal> extension and the "
|
|
dongsheng@627
|
16306 "<command>interdiff</command> command, see section <xref linkend=\"mq-collab."
|
|
dongsheng@627
|
16307 "tips.interdiff\"/>."
|
|
dongsheng@627
|
16308 msgstr ""
|
|
dongsheng@627
|
16309
|
|
dongsheng@627
|
16310 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
16311 #: ../en/ch14-hgext.xml:366
|
|
dongsheng@627
|
16312 msgid "Defining command aliases"
|
|
dongsheng@636
|
16313 msgstr "定义命令的别名"
|
|
dongsheng@627
|
16314
|
|
dongsheng@627
|
16315 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
16316 #: ../en/ch14-hgext.xml:368
|
|
dongsheng@627
|
16317 msgid ""
|
|
dongsheng@627
|
16318 "It can be cumbersome to remember the options to both the <command role=\"hg-"
|
|
dongsheng@627
|
16319 "ext-extdiff\">extdiff</command> command and the diff viewer you want to use, "
|
|
dongsheng@627
|
16320 "so the <literal role=\"hg-ext\">extdiff</literal> extension lets you define "
|
|
dongsheng@627
|
16321 "<emphasis>new</emphasis> commands that will invoke your diff viewer with "
|
|
dongsheng@627
|
16322 "exactly the right options."
|
|
dongsheng@627
|
16323 msgstr ""
|
|
dongsheng@627
|
16324
|
|
dongsheng@627
|
16325 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
16326 #: ../en/ch14-hgext.xml:375
|
|
dongsheng@627
|
16327 msgid ""
|
|
dongsheng@627
|
16328 "All you need to do is edit your <filename role=\"special\"> /.hgrc</"
|
|
dongsheng@627
|
16329 "filename>, and add a section named <literal role=\"rc-extdiff\">extdiff</"
|
|
dongsheng@627
|
16330 "literal>. Inside this section, you can define multiple commands. Here's how "
|
|
dongsheng@627
|
16331 "to add a <literal>kdiff3</literal> command. Once you've defined this, you "
|
|
dongsheng@627
|
16332 "can type <quote><literal>hg kdiff3</literal></quote> and the <literal role="
|
|
dongsheng@627
|
16333 "\"hg-ext\">extdiff</literal> extension will run <command>kdiff3</command> for "
|
|
dongsheng@627
|
16334 "you."
|
|
dongsheng@627
|
16335 msgstr ""
|
|
dongsheng@627
|
16336
|
|
dongsheng@627
|
16337 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
16338 #: ../en/ch14-hgext.xml:384
|
|
dongsheng@627
|
16339 msgid ""
|
|
dongsheng@627
|
16340 "If you leave the right hand side of the definition empty, as above, the "
|
|
dongsheng@627
|
16341 "<literal role=\"hg-ext\">extdiff</literal> extension uses the name of the "
|
|
dongsheng@627
|
16342 "command you defined as the name of the external program to run. But these "
|
|
dongsheng@627
|
16343 "names don't have to be the same. Here, we define a command named "
|
|
dongsheng@627
|
16344 "<quote><literal>hg wibble</literal></quote>, which runs <command>kdiff3</"
|
|
dongsheng@627
|
16345 "command>."
|
|
dongsheng@627
|
16346 msgstr ""
|
|
dongsheng@627
|
16347
|
|
dongsheng@627
|
16348 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
16349 #: ../en/ch14-hgext.xml:393
|
|
dongsheng@627
|
16350 msgid ""
|
|
dongsheng@627
|
16351 "You can also specify the default options that you want to invoke your diff "
|
|
dongsheng@627
|
16352 "viewing program with. The prefix to use is <quote><literal>opts.</literal></"
|
|
dongsheng@627
|
16353 "quote>, followed by the name of the command to which the options apply. This "
|
|
dongsheng@627
|
16354 "example defines a <quote><literal>hg vimdiff</literal></quote> command that "
|
|
dongsheng@627
|
16355 "runs the <command>vim</command> editor's <literal>DirDiff</literal> extension."
|
|
dongsheng@627
|
16356 msgstr ""
|
|
dongsheng@627
|
16357
|
|
dongsheng@627
|
16358 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
16359 #: ../en/ch14-hgext.xml:406
|
|
dongsheng@627
|
16360 msgid ""
|
|
dongsheng@627
|
16361 "Cherrypicking changes with the <literal role=\"hg-ext\">transplant</literal> "
|
|
dongsheng@627
|
16362 "extension"
|
|
dongsheng@636
|
16363 msgstr "使用扩展 <literal role=\"hg-ext\">transplant</literal> 以挑选修改"
|
|
dongsheng@627
|
16364
|
|
dongsheng@627
|
16365 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16366 #: ../en/ch14-hgext.xml:409
|
|
dongsheng@627
|
16367 msgid "Need to have a long chat with Brendan about this."
|
|
dongsheng@627
|
16368 msgstr ""
|
|
dongsheng@627
|
16369
|
|
dongsheng@627
|
16370 #. type: Content of: <book><chapter><sect1><title>
|
|
dongsheng@627
|
16371 #: ../en/ch14-hgext.xml:413
|
|
dongsheng@627
|
16372 msgid ""
|
|
dongsheng@627
|
16373 "Send changes via email with the <literal role=\"hg-ext\">patchbomb</literal> "
|
|
dongsheng@627
|
16374 "extension"
|
|
dongsheng@627
|
16375 msgstr ""
|
|
dongsheng@636
|
16376 "使用扩展 <literal role=\"hg-ext\">patchbomb</literal> 通过 email 发送修改"
|
|
dongsheng@627
|
16377
|
|
dongsheng@627
|
16378 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16379 #: ../en/ch14-hgext.xml:416
|
|
dongsheng@627
|
16380 msgid ""
|
|
dongsheng@627
|
16381 "Many projects have a culture of <quote>change review</quote>, in which people "
|
|
dongsheng@627
|
16382 "send their modifications to a mailing list for others to read and comment on "
|
|
dongsheng@627
|
16383 "before they commit the final version to a shared repository. Some projects "
|
|
dongsheng@627
|
16384 "have people who act as gatekeepers; they apply changes from other people to a "
|
|
dongsheng@627
|
16385 "repository to which those others don't have access."
|
|
dongsheng@627
|
16386 msgstr ""
|
|
dongsheng@627
|
16387
|
|
dongsheng@627
|
16388 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16389 #: ../en/ch14-hgext.xml:424
|
|
dongsheng@627
|
16390 msgid ""
|
|
dongsheng@627
|
16391 "Mercurial makes it easy to send changes over email for review or application, "
|
|
dongsheng@627
|
16392 "via its <literal role=\"hg-ext\">patchbomb</literal> extension. The "
|
|
dongsheng@627
|
16393 "extension is so named because changes are formatted as patches, and it's "
|
|
dongsheng@627
|
16394 "usual to send one changeset per email message. Sending a long series of "
|
|
dongsheng@627
|
16395 "changes by email is thus much like <quote>bombing</quote> the recipient's "
|
|
dongsheng@627
|
16396 "inbox, hence <quote>patchbomb</quote>."
|
|
dongsheng@627
|
16397 msgstr ""
|
|
dongsheng@627
|
16398
|
|
dongsheng@627
|
16399 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16400 #: ../en/ch14-hgext.xml:432
|
|
dongsheng@627
|
16401 msgid ""
|
|
dongsheng@627
|
16402 "As usual, the basic configuration of the <literal role=\"hg-ext\">patchbomb</"
|
|
dongsheng@627
|
16403 "literal> extension takes just one or two lines in your <filename role="
|
|
dongsheng@627
|
16404 "\"special\"> /.hgrc</filename>."
|
|
dongsheng@627
|
16405 msgstr ""
|
|
dongsheng@627
|
16406
|
|
dongsheng@627
|
16407 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16408 #: ../en/ch14-hgext.xml:437
|
|
dongsheng@627
|
16409 msgid ""
|
|
dongsheng@627
|
16410 "Once you've enabled the extension, you will have a new command available, "
|
|
dongsheng@627
|
16411 "named <command role=\"hg-ext-patchbomb\">email</command>."
|
|
dongsheng@627
|
16412 msgstr ""
|
|
dongsheng@627
|
16413
|
|
dongsheng@627
|
16414 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16415 #: ../en/ch14-hgext.xml:441
|
|
dongsheng@627
|
16416 msgid ""
|
|
dongsheng@627
|
16417 "The safest and best way to invoke the <command role=\"hg-ext-patchbomb"
|
|
dongsheng@627
|
16418 "\">email</command> command is to <emphasis>always</emphasis> run it first "
|
|
dongsheng@627
|
16419 "with the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -n</option> "
|
|
dongsheng@627
|
16420 "option. This will show you what the command <emphasis>would</emphasis> send, "
|
|
dongsheng@627
|
16421 "without actually sending anything. Once you've had a quick glance over the "
|
|
dongsheng@627
|
16422 "changes and verified that you are sending the right ones, you can rerun the "
|
|
dongsheng@627
|
16423 "same command, with the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -n</"
|
|
dongsheng@627
|
16424 "option> option removed."
|
|
dongsheng@627
|
16425 msgstr ""
|
|
dongsheng@627
|
16426
|
|
dongsheng@627
|
16427 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16428 #: ../en/ch14-hgext.xml:452
|
|
dongsheng@627
|
16429 msgid ""
|
|
dongsheng@627
|
16430 "The <command role=\"hg-ext-patchbomb\">email</command> command accepts the "
|
|
dongsheng@627
|
16431 "same kind of revision syntax as every other Mercurial command. For example, "
|
|
dongsheng@627
|
16432 "this command will send every revision between 7 and <literal>tip</literal>, "
|
|
dongsheng@627
|
16433 "inclusive."
|
|
dongsheng@627
|
16434 msgstr ""
|
|
dongsheng@627
|
16435
|
|
dongsheng@627
|
16436 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16437 #: ../en/ch14-hgext.xml:457
|
|
dongsheng@627
|
16438 msgid ""
|
|
dongsheng@627
|
16439 "You can also specify a <emphasis>repository</emphasis> to compare with. If "
|
|
dongsheng@627
|
16440 "you provide a repository but no revisions, the <command role=\"hg-ext-"
|
|
dongsheng@627
|
16441 "patchbomb\">email</command> command will send all revisions in the local "
|
|
dongsheng@627
|
16442 "repository that are not present in the remote repository. If you "
|
|
dongsheng@627
|
16443 "additionally specify revisions or a branch name (the latter using the <option "
|
|
dongsheng@627
|
16444 "role=\"hg-ext-patchbomb-cmd-email-opt\">hg -b</option> option), this will "
|
|
dongsheng@627
|
16445 "constrain the revisions sent."
|
|
dongsheng@627
|
16446 msgstr ""
|
|
dongsheng@627
|
16447
|
|
dongsheng@627
|
16448 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16449 #: ../en/ch14-hgext.xml:466
|
|
dongsheng@627
|
16450 msgid ""
|
|
dongsheng@627
|
16451 "It's perfectly safe to run the <command role=\"hg-ext-patchbomb\">email</"
|
|
dongsheng@627
|
16452 "command> command without the names of the people you want to send to: if you "
|
|
dongsheng@627
|
16453 "do this, it will just prompt you for those values interactively. (If you're "
|
|
dongsheng@627
|
16454 "using a Linux or Unix-like system, you should have enhanced "
|
|
dongsheng@627
|
16455 "<literal>readline</literal>-style editing capabilities when entering those "
|
|
dongsheng@627
|
16456 "headers, too, which is useful.)"
|
|
dongsheng@627
|
16457 msgstr ""
|
|
dongsheng@627
|
16458
|
|
dongsheng@627
|
16459 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16460 #: ../en/ch14-hgext.xml:474
|
|
dongsheng@627
|
16461 msgid ""
|
|
dongsheng@627
|
16462 "When you are sending just one revision, the <command role=\"hg-ext-patchbomb"
|
|
dongsheng@627
|
16463 "\">email</command> command will by default use the first line of the "
|
|
dongsheng@627
|
16464 "changeset description as the subject of the single email message it sends."
|
|
dongsheng@627
|
16465 msgstr ""
|
|
dongsheng@627
|
16466
|
|
dongsheng@627
|
16467 #. type: Content of: <book><chapter><sect1><para>
|
|
dongsheng@627
|
16468 #: ../en/ch14-hgext.xml:479
|
|
dongsheng@627
|
16469 msgid ""
|
|
dongsheng@627
|
16470 "If you send multiple revisions, the <command role=\"hg-ext-patchbomb\">email</"
|
|
dongsheng@627
|
16471 "command> command will usually send one message per changeset. It will "
|
|
dongsheng@627
|
16472 "preface the series with an introductory message, in which you should describe "
|
|
dongsheng@627
|
16473 "the purpose of the series of changes you're sending."
|
|
dongsheng@627
|
16474 msgstr ""
|
|
dongsheng@627
|
16475
|
|
dongsheng@627
|
16476 #. type: Content of: <book><chapter><sect1><sect2><title>
|
|
dongsheng@627
|
16477 #: ../en/ch14-hgext.xml:486
|
|
dongsheng@627
|
16478 msgid "Changing the behaviour of patchbombs"
|
|
dongsheng@636
|
16479 msgstr "修改 patchbomb 的行为"
|
|
dongsheng@627
|
16480
|
|
dongsheng@627
|
16481 #. type: Content of: <book><chapter><sect1><sect2><para>
|
|
dongsheng@627
|
16482 #: ../en/ch14-hgext.xml:488
|
|
dongsheng@627
|
16483 msgid ""
|
|
dongsheng@627
|
16484 "Not every project has exactly the same conventions for sending changes in "
|
|
dongsheng@627
|
16485 "email; the <literal role=\"hg-ext\">patchbomb</literal> extension tries to "
|
|
dongsheng@627
|
16486 "accommodate a number of variations through command line options."
|
|
dongsheng@627
|
16487 msgstr ""
|
|
dongsheng@627
|
16488
|
|
dongsheng@627
|
16489 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16490 #: ../en/ch14-hgext.xml:494
|
|
dongsheng@627
|
16491 msgid ""
|
|
dongsheng@627
|
16492 "You can write a subject for the introductory message on the command line "
|
|
dongsheng@627
|
16493 "using the <option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -s</option> "
|
|
dongsheng@627
|
16494 "option. This takes one argument, the text of the subject to use."
|
|
dongsheng@627
|
16495 msgstr ""
|
|
dongsheng@627
|
16496
|
|
dongsheng@627
|
16497 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16498 #: ../en/ch14-hgext.xml:500
|
|
dongsheng@627
|
16499 msgid ""
|
|
dongsheng@627
|
16500 "To change the email address from which the messages originate, use the "
|
|
dongsheng@627
|
16501 "<option role=\"hg-ext-patchbomb-cmd-email-opt\">hg -f</option> option. This "
|
|
dongsheng@627
|
16502 "takes one argument, the email address to use."
|
|
dongsheng@627
|
16503 msgstr ""
|
|
dongsheng@627
|
16504
|
|
dongsheng@627
|
16505 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16506 #: ../en/ch14-hgext.xml:506
|
|
dongsheng@627
|
16507 msgid ""
|
|
dongsheng@627
|
16508 "The default behaviour is to send unified diffs (see section <xref linkend="
|
|
dongsheng@627
|
16509 "\"sec.mq.patch\"/> for a description of the format), one per message. You "
|
|
dongsheng@627
|
16510 "can send a binary bundle instead with the <option role=\"hg-ext-patchbomb-cmd-"
|
|
dongsheng@627
|
16511 "email-opt\">hg -b</option> option."
|
|
dongsheng@627
|
16512 msgstr ""
|
|
dongsheng@627
|
16513
|
|
dongsheng@627
|
16514 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16515 #: ../en/ch14-hgext.xml:514
|
|
dongsheng@627
|
16516 msgid ""
|
|
dongsheng@627
|
16517 "Unified diffs are normally prefaced with a metadata header. You can omit "
|
|
dongsheng@627
|
16518 "this, and send unadorned diffs, with the <option role=\"hg-ext-patchbomb-cmd-"
|
|
dongsheng@627
|
16519 "email-opt\">hg --plain</option> option."
|
|
dongsheng@627
|
16520 msgstr ""
|
|
dongsheng@627
|
16521
|
|
dongsheng@627
|
16522 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16523 #: ../en/ch14-hgext.xml:520
|
|
dongsheng@627
|
16524 msgid ""
|
|
dongsheng@627
|
16525 "Diffs are normally sent <quote>inline</quote>, in the same body part as the "
|
|
dongsheng@627
|
16526 "description of a patch. This makes it easiest for the largest number of "
|
|
dongsheng@627
|
16527 "readers to quote and respond to parts of a diff, as some mail clients will "
|
|
dongsheng@627
|
16528 "only quote the first MIME body part in a message. If you'd prefer to send the "
|
|
dongsheng@627
|
16529 "description and the diff in separate body parts, use the <option role=\"hg-"
|
|
dongsheng@627
|
16530 "ext-patchbomb-cmd-email-opt\">hg -a</option> option."
|
|
dongsheng@627
|
16531 msgstr ""
|
|
dongsheng@627
|
16532
|
|
dongsheng@627
|
16533 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16534 #: ../en/ch14-hgext.xml:530
|
|
dongsheng@627
|
16535 msgid ""
|
|
dongsheng@627
|
16536 "Instead of sending mail messages, you can write them to an <literal>mbox</"
|
|
dongsheng@627
|
16537 "literal>-format mail folder using the <option role=\"hg-ext-patchbomb-cmd-"
|
|
dongsheng@627
|
16538 "email-opt\">hg -m</option> option. That option takes one argument, the name "
|
|
dongsheng@627
|
16539 "of the file to write to."
|
|
dongsheng@627
|
16540 msgstr ""
|
|
dongsheng@627
|
16541
|
|
dongsheng@627
|
16542 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
|
|
dongsheng@627
|
16543 #: ../en/ch14-hgext.xml:537
|
|
dongsheng@627
|
16544 msgid ""
|
|
dongsheng@627
|
16545 "If you would like to add a <command>diffstat</command>-format summary to each "
|
|
dongsheng@627
|
16546 "patch, and one to the introductory message, use the <option role=\"hg-ext-"
|
|
dongsheng@627
|
16547 "patchbomb-cmd-email-opt\">hg -d</option> option. The <command>diffstat</"
|
|
dongsheng@627
|
16548 "command> command displays a table containing the name of each file patched, "
|
|
dongsheng@627
|
16549 "the number of lines affected, and a histogram showing how much each file is "
|
|
dongsheng@627
|
16550 "modified. This gives readers a qualitative glance at how complex a patch is."
|
|
dongsheng@627
|
16551 msgstr ""
|
