Show More
@@ -7,7 +7,7 b' are versioned within the Mercurial sourc' | |||||
7 | must kept up to date with distribution changes within their branch. In |
|
7 | must kept up to date with distribution changes within their branch. In | |
8 | other words, the default branch WXS files are expected to diverge from |
|
8 | other words, the default branch WXS files are expected to diverge from | |
9 | the stable branch WXS files. Storing them within the same repository is |
|
9 | the stable branch WXS files. Storing them within the same repository is | |
10 |
the only sane way to keep the |
|
10 | the only sane way to keep the source tree and the installer in sync. | |
11 |
|
11 | |||
12 | The MSI installer builder uses only the mercurial.ini file from the |
|
12 | The MSI installer builder uses only the mercurial.ini file from the | |
13 | contrib/win32 folder, the contents of which have been historically used |
|
13 | contrib/win32 folder, the contents of which have been historically used |
@@ -197,7 +197,7 b' def convert(ui, src, dest=None, revmapfi' | |||||
197 | delete them. |
|
197 | delete them. | |
198 |
|
198 | |||
199 | :hook.cvschangesets: Specify a Python function to be called after |
|
199 | :hook.cvschangesets: Specify a Python function to be called after | |
200 |
the changesets are calculated from the |
|
200 | the changesets are calculated from the CVS log. The | |
201 | function is passed a list with the changeset entries, and can |
|
201 | function is passed a list with the changeset entries, and can | |
202 | modify the changesets in-place, or add or delete them. |
|
202 | modify the changesets in-place, or add or delete them. | |
203 |
|
203 |
@@ -95,7 +95,7 b' def findcommonoutgoing(repo, other, only' | |||||
95 | (inclusive) are included. If you already know the local repo's heads, |
|
95 | (inclusive) are included. If you already know the local repo's heads, | |
96 | passing them in onlyheads is faster than letting them be recomputed here. |
|
96 | passing them in onlyheads is faster than letting them be recomputed here. | |
97 |
|
97 | |||
98 |
If commoninc is given, it must |
|
98 | If commoninc is given, it must be the result of a prior call to | |
99 | findcommonincoming(repo, other, force) to avoid recomputing it here. |
|
99 | findcommonincoming(repo, other, force) to avoid recomputing it here. | |
100 |
|
100 | |||
101 | If portable is given, compute more conservative common and missingheads, |
|
101 | If portable is given, compute more conservative common and missingheads, |
@@ -1065,7 +1065,7 b' rewrite it. Groups can be matched in ``p' | |||||
1065 |
|
1065 | |||
1066 | rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. |
|
1066 | rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. | |
1067 |
|
1067 | |||
1068 |
Relative subrepository paths are first made absolute, and the |
|
1068 | Relative subrepository paths are first made absolute, and the | |
1069 | rewrite rules are then applied on the full (absolute) path. The rules |
|
1069 | rewrite rules are then applied on the full (absolute) path. The rules | |
1070 | are applied in definition order. |
|
1070 | are applied in definition order. | |
1071 |
|
1071 |
@@ -66,7 +66,7 b' def _pythonhook(ui, repo, name, hname, f' | |||||
66 | (hname, funcname)) |
|
66 | (hname, funcname)) | |
67 | try: |
|
67 | try: | |
68 | try: |
|
68 | try: | |
69 |
# redirect IO descriptors t |
|
69 | # redirect IO descriptors to the ui descriptors so hooks | |
70 | # that write directly to these don't mess up the command |
|
70 | # that write directly to these don't mess up the command | |
71 | # protocol when running through the command server |
|
71 | # protocol when running through the command server | |
72 | old = sys.stdout, sys.stderr, sys.stdin |
|
72 | old = sys.stdout, sys.stderr, sys.stdin |
@@ -211,7 +211,7 b' class KeepAliveHandler(object):' | |||||
211 | h.close() |
|
211 | h.close() | |
212 |
|
212 | |||
213 | def _request_closed(self, request, host, connection): |
|
213 | def _request_closed(self, request, host, connection): | |
214 |
"""tells us that this request is now closed and th |
|
214 | """tells us that this request is now closed and that the | |
215 | connection is ready for another request""" |
|
215 | connection is ready for another request""" | |
216 | self._cm.set_ready(connection, 1) |
|
216 | self._cm.set_ready(connection, 1) | |
217 |
|
217 |
@@ -178,8 +178,8 b'' | |||||
178 | or delete them. |
|
178 | or delete them. | |
179 | hook.cvschangesets |
|
179 | hook.cvschangesets | |
180 | Specify a Python function to be called after the changesets |
|
180 | Specify a Python function to be called after the changesets | |
181 |
are calculated from |
|
181 | are calculated from the CVS log. The function is passed a | |
182 |
|
|
182 | list with the changeset entries, and can modify the | |
183 | changesets in-place, or add or delete them. |
|
183 | changesets in-place, or add or delete them. | |
184 |
|
184 | |||
185 | An additional "debugcvsps" Mercurial command allows the builtin changeset |
|
185 | An additional "debugcvsps" Mercurial command allows the builtin changeset |
General Comments 0
You need to be logged in to leave comments.
Login now