Show More
@@ -243,7 +243,10 b' def formatblock(block, width):' | |||
|
243 | 243 | indent = ' ' * block['indent'] |
|
244 | 244 | if block['type'] == 'margin': |
|
245 | 245 | return '' |
|
246 |
elif block['type'] |
|
|
246 | elif block['type'] == 'literal': | |
|
247 | indent += ' ' | |
|
248 | return indent + ('\n' + indent).join(block['lines']) | |
|
249 | elif block['type'] == 'section': | |
|
247 | 250 | return indent + ('\n' + indent).join(block['lines']) |
|
248 | 251 | elif block['type'] == 'definition': |
|
249 | 252 | term = indent + block['lines'][0] |
@@ -45,7 +45,7 b' convert a foreign SCM repository to a Me' | |||
|
45 | 45 | maps each source commit ID to the destination ID for that revision, like |
|
46 | 46 | so: |
|
47 | 47 | |
|
48 | <source ID> <destination ID> | |
|
48 | <source ID> <destination ID> | |
|
49 | 49 | |
|
50 | 50 | If the file doesn't exist, it's automatically created. It's updated on |
|
51 | 51 | each commit copied, so convert-repo can be interrupted and can be run |
@@ -60,11 +60,11 b' convert a foreign SCM repository to a Me' | |||
|
60 | 60 | directories. Comment lines start with '#'. Each line can contain one of |
|
61 | 61 | the following directives: |
|
62 | 62 | |
|
63 | include path/to/file | |
|
63 | include path/to/file | |
|
64 | 64 | |
|
65 | exclude path/to/file | |
|
65 | exclude path/to/file | |
|
66 | 66 | |
|
67 | rename from/file to/file | |
|
67 | rename from/file to/file | |
|
68 | 68 | |
|
69 | 69 | The 'include' directive causes a file, or all files under a directory, to |
|
70 | 70 | be included in the destination repository, and the exclusion of all other |
@@ -122,7 +122,7 b' convert a foreign SCM repository to a Me' | |||
|
122 | 122 | its internal changeset merging code by default but can be configured to |
|
123 | 123 | call the external 'cvsps' program by setting: |
|
124 | 124 | |
|
125 | --config convert.cvsps='cvsps -A -u --cvs-direct -q' | |
|
125 | --config convert.cvsps='cvsps -A -u --cvs-direct -q' | |
|
126 | 126 | |
|
127 | 127 | This option is deprecated and will be removed in Mercurial 1.4. |
|
128 | 128 | |
@@ -130,7 +130,7 b' convert a foreign SCM repository to a Me' | |||
|
130 | 130 | |
|
131 | 131 | Internal cvsps is selected by setting |
|
132 | 132 | |
|
133 | --config convert.cvsps=builtin | |
|
133 | --config convert.cvsps=builtin | |
|
134 | 134 | |
|
135 | 135 | and has a few more configurable options: |
|
136 | 136 |
@@ -13,9 +13,9 b' output the current or given revision of ' | |||
|
13 | 13 | a format string. The formatting rules are the same as for the export |
|
14 | 14 | command, with the following additions: |
|
15 | 15 | |
|
16 | %s basename of file being printed | |
|
17 | %d dirname of file being printed, or '.' if in repository root | |
|
18 | %p root-relative path name of file being printed | |
|
16 | %s basename of file being printed | |
|
17 | %d dirname of file being printed, or '.' if in repository root | |
|
18 | %p root-relative path name of file being printed | |
|
19 | 19 | |
|
20 | 20 | options: |
|
21 | 21 |
@@ -33,7 +33,7 b' list of commands:' | |||
|
33 | 33 | |
|
34 | 34 | enabled extensions: |
|
35 | 35 | |
|
36 | debugextension only debugcommands | |
|
36 | debugextension only debugcommands | |
|
37 | 37 | |
|
38 | 38 | global options: |
|
39 | 39 | -R --repository repository root directory or symbolic path name |
@@ -63,7 +63,7 b' list of commands:' | |||
|
63 | 63 | |
|
64 | 64 | enabled extensions: |
|
65 | 65 | |
|
66 | debugextension only debugcommands | |
|
66 | debugextension only debugcommands | |
|
67 | 67 | |
|
68 | 68 | global options: |
|
69 | 69 | -R --repository repository root directory or symbolic path name |
@@ -268,14 +268,14 b' show changed files in the working direct' | |||
|
268 | 268 | |
|
269 | 269 | The codes used to show the status of files are: |
|
270 | 270 | |
|
271 | M = modified | |
|
272 | A = added | |
|
273 | R = removed | |
|
274 | C = clean | |
|
275 | ! = missing (deleted by non-hg command, but still tracked) | |
|
276 | ? = not tracked | |
|
277 | I = ignored | |
|
278 | = origin of the previous file listed as A (added) | |
|
271 | M = modified | |
|
272 | A = added | |
|
273 | R = removed | |
|
274 | C = clean | |
|
275 | ! = missing (deleted by non-hg command, but still tracked) | |
|
276 | ? = not tracked | |
|
277 | I = ignored | |
|
278 | = origin of the previous file listed as A (added) | |
|
279 | 279 | |
|
280 | 280 | options: |
|
281 | 281 |
@@ -13,10 +13,10 b' files.' | |||
|
13 | 13 | |
|
14 | 14 | Example: |
|
15 | 15 | |
|
16 | [keyword] | |
|
17 | # expand keywords in every python file except those matching "x*" | |
|
18 | **.py = | |
|
19 | x* = ignore | |
|
16 | [keyword] | |
|
17 | # expand keywords in every python file except those matching "x*" | |
|
18 | **.py = | |
|
19 | x* = ignore | |
|
20 | 20 | |
|
21 | 21 | NOTE: the more specific you are in your filename patterns the less you lose |
|
22 | 22 | speed in huge repositories. |
@@ -54,9 +54,9 b' list of commands:' | |||
|
54 | 54 | |
|
55 | 55 | enabled extensions: |
|
56 | 56 | |
|
57 | keyword expand keywords in tracked files | |
|
58 | mq manage a stack of patches | |
|
59 | notify hooks for sending email notifications at commit/push time | |
|
57 | keyword expand keywords in tracked files | |
|
58 | mq manage a stack of patches | |
|
59 | notify hooks for sending email notifications at commit/push time | |
|
60 | 60 | |
|
61 | 61 | use "hg -v help keyword" to show aliases and global options |
|
62 | 62 | % hg kwdemo |
@@ -106,7 +106,8 b' We can have indented lists:' | |||
|
106 | 106 | |
|
107 | 107 | :: |
|
108 | 108 | |
|
109 |
Literal block with no indentation |
|
|
109 | Literal block with no indentation (apart from | |
|
110 | the two spaces added to all literal blocks). | |
|
110 | 111 | """ |
|
111 | 112 | |
|
112 | 113 | debugformat('lists', lists, 60) |
@@ -66,20 +66,20 b' literals formatted to fit within 60 char' | |||
|
66 | 66 | ---------------------------------------------------------------------- |
|
67 | 67 | The fully minimized form is the most convenient form: |
|
68 | 68 | |
|
69 | Hello | |
|
70 | literal | |
|
71 | world | |
|
69 | Hello | |
|
70 | literal | |
|
71 | world | |
|
72 | 72 | |
|
73 | 73 | In the partially minimized form a paragraph simply ends with |
|
74 | 74 | space-double-colon. |
|
75 | 75 | |
|
76 | //////////////////////////////////////// | |
|
77 | long un-wrapped line in a literal block | |
|
78 | \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ | |
|
76 | //////////////////////////////////////// | |
|
77 | long un-wrapped line in a literal block | |
|
78 | \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ | |
|
79 | 79 | |
|
80 | This literal block is started with '::', | |
|
81 | the so-called expanded form. The paragraph | |
|
82 | with '::' disappears in the final output. | |
|
80 | This literal block is started with '::', | |
|
81 | the so-called expanded form. The paragraph | |
|
82 | with '::' disappears in the final output. | |
|
83 | 83 | ---------------------------------------------------------------------- |
|
84 | 84 | |
|
85 | 85 | literals formatted to fit within 30 characters: |
@@ -87,21 +87,21 b' literals formatted to fit within 30 char' | |||
|
87 | 87 | The fully minimized form is |
|
88 | 88 | the most convenient form: |
|
89 | 89 | |
|
90 | Hello | |
|
91 | literal | |
|
92 | world | |
|
90 | Hello | |
|
91 | literal | |
|
92 | world | |
|
93 | 93 | |
|
94 | 94 | In the partially minimized |
|
95 | 95 | form a paragraph simply ends |
|
96 | 96 | with space-double-colon. |
|
97 | 97 | |
|
98 | //////////////////////////////////////// | |
|
99 | long un-wrapped line in a literal block | |
|
100 | \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ | |
|
98 | //////////////////////////////////////// | |
|
99 | long un-wrapped line in a literal block | |
|
100 | \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ | |
|
101 | 101 | |
|
102 | This literal block is started with '::', | |
|
103 | the so-called expanded form. The paragraph | |
|
104 | with '::' disappears in the final output. | |
|
102 | This literal block is started with '::', | |
|
103 | the so-called expanded form. The paragraph | |
|
104 | with '::' disappears in the final output. | |
|
105 | 105 | ---------------------------------------------------------------------- |
|
106 | 106 | |
|
107 | 107 | lists formatted to fit within 60 characters: |
@@ -118,12 +118,13 b' We can have indented lists:' | |||
|
118 | 118 | - This is an indented list item |
|
119 | 119 | - Another indented list item: |
|
120 | 120 | |
|
121 | - A literal block in the middle | |
|
122 | of an indented list. | |
|
121 | - A literal block in the middle | |
|
122 | of an indented list. | |
|
123 | 123 | |
|
124 | (The above is not a list item since we are in the literal block.) | |
|
124 | (The above is not a list item since we are in the literal block.) | |
|
125 | 125 | |
|
126 |
Literal block with no indentation |
|
|
126 | Literal block with no indentation (apart from | |
|
127 | the two spaces added to all literal blocks). | |
|
127 | 128 | ---------------------------------------------------------------------- |
|
128 | 129 | |
|
129 | 130 | lists formatted to fit within 30 characters: |
@@ -145,12 +146,13 b' We can have indented lists:' | |||
|
145 | 146 | - Another indented list |
|
146 | 147 | item: |
|
147 | 148 | |
|
148 | - A literal block in the middle | |
|
149 | of an indented list. | |
|
149 | - A literal block in the middle | |
|
150 | of an indented list. | |
|
150 | 151 | |
|
151 | (The above is not a list item since we are in the literal block.) | |
|
152 | (The above is not a list item since we are in the literal block.) | |
|
152 | 153 | |
|
153 |
Literal block with no indentation |
|
|
154 | Literal block with no indentation (apart from | |
|
155 | the two spaces added to all literal blocks). | |
|
154 | 156 | ---------------------------------------------------------------------- |
|
155 | 157 | |
|
156 | 158 | options formatted to fit within 60 characters: |
@@ -10,17 +10,17 b' Applied patches are both patch files and' | |||
|
10 | 10 | |
|
11 | 11 | Common tasks (use "hg help command" for more details): |
|
12 | 12 | |
|
13 | prepare repository to work with patches qinit | |
|
14 | create new patch qnew | |
|
15 | import existing patch qimport | |
|
13 | prepare repository to work with patches qinit | |
|
14 | create new patch qnew | |
|
15 | import existing patch qimport | |
|
16 | 16 | |
|
17 | print patch series qseries | |
|
18 | print applied patches qapplied | |
|
19 | print name of top applied patch qtop | |
|
17 | print patch series qseries | |
|
18 | print applied patches qapplied | |
|
19 | print name of top applied patch qtop | |
|
20 | 20 | |
|
21 | add known patch to applied stack qpush | |
|
22 | remove patch from applied stack qpop | |
|
23 | refresh contents of top applied patch qrefresh | |
|
21 | add known patch to applied stack qpush | |
|
22 | remove patch from applied stack qpop | |
|
23 | refresh contents of top applied patch qrefresh | |
|
24 | 24 | |
|
25 | 25 | list of commands: |
|
26 | 26 | |
@@ -53,7 +53,7 b' list of commands:' | |||
|
53 | 53 | |
|
54 | 54 | enabled extensions: |
|
55 | 55 | |
|
56 | mq manage a stack of patches | |
|
56 | mq manage a stack of patches | |
|
57 | 57 | |
|
58 | 58 | use "hg -v help mq" to show aliases and global options |
|
59 | 59 | adding a |
@@ -5,51 +5,51 b' messages to stdout, for testing and conf' | |||
|
5 | 5 | |
|
6 | 6 | To use, configure the notify extension and enable it in hgrc like this: |
|
7 | 7 | |
|
8 | [extensions] | |
|
9 | hgext.notify = | |
|
8 | [extensions] | |
|
9 | hgext.notify = | |
|
10 | 10 | |
|
11 | [hooks] | |
|
12 | # one email for each incoming changeset | |
|
13 | incoming.notify = python:hgext.notify.hook | |
|
14 | # batch emails when many changesets incoming at one time | |
|
15 | changegroup.notify = python:hgext.notify.hook | |
|
11 | [hooks] | |
|
12 | # one email for each incoming changeset | |
|
13 | incoming.notify = python:hgext.notify.hook | |
|
14 | # batch emails when many changesets incoming at one time | |
|
15 | changegroup.notify = python:hgext.notify.hook | |
|
16 | 16 | |
|
17 | [notify] | |
|
18 | # config items go here | |
|
17 | [notify] | |
|
18 | # config items go here | |
|
19 | 19 | |
|
20 | 20 | Required configuration items: |
|
21 | 21 | |
|
22 | config = /path/to/file # file containing subscriptions | |
|
22 | config = /path/to/file # file containing subscriptions | |
|
23 | 23 | |
|
24 | 24 | Optional configuration items: |
|
25 | 25 | |
|
26 | test = True # print messages to stdout for testing | |
|
27 | strip = 3 # number of slashes to strip for url paths | |
|
28 | domain = example.com # domain to use if committer missing domain | |
|
29 | style = ... # style file to use when formatting email | |
|
30 | template = ... # template to use when formatting email | |
|
31 | incoming = ... # template to use when run as incoming hook | |
|
32 | changegroup = ... # template when run as changegroup hook | |
|
33 | maxdiff = 300 # max lines of diffs to include (0=none, -1=all) | |
|
34 | maxsubject = 67 # truncate subject line longer than this | |
|
35 | diffstat = True # add a diffstat before the diff content | |
|
36 | sources = serve # notify if source of incoming changes in this list | |
|
37 | # (serve == ssh or http, push, pull, bundle) | |
|
38 | [email] | |
|
39 | from = user@host.com # email address to send as if none given | |
|
40 | [web] | |
|
41 | baseurl = http://hgserver/... # root of hg web site for browsing commits | |
|
26 | test = True # print messages to stdout for testing | |
|
27 | strip = 3 # number of slashes to strip for url paths | |
|
28 | domain = example.com # domain to use if committer missing domain | |
|
29 | style = ... # style file to use when formatting email | |
|
30 | template = ... # template to use when formatting email | |
|
31 | incoming = ... # template to use when run as incoming hook | |
|
32 | changegroup = ... # template when run as changegroup hook | |
|
33 | maxdiff = 300 # max lines of diffs to include (0=none, -1=all) | |
|
34 | maxsubject = 67 # truncate subject line longer than this | |
|
35 | diffstat = True # add a diffstat before the diff content | |
|
36 | sources = serve # notify if source of incoming changes in this list | |
|
37 | # (serve == ssh or http, push, pull, bundle) | |
|
38 | [email] | |
|
39 | from = user@host.com # email address to send as if none given | |
|
40 | [web] | |
|
41 | baseurl = http://hgserver/... # root of hg web site for browsing commits | |
|
42 | 42 | |
|
43 | 43 | The notify config file has same format as a regular hgrc file. It has two |
|
44 | 44 | sections so you can express subscriptions in whatever way is handier for you. |
|
45 | 45 | |
|
46 | [usersubs] | |
|
47 | # key is subscriber email, value is ","-separated list of glob patterns | |
|
48 | user@host = pattern | |
|
46 | [usersubs] | |
|
47 | # key is subscriber email, value is ","-separated list of glob patterns | |
|
48 | user@host = pattern | |
|
49 | 49 | |
|
50 | [reposubs] | |
|
51 | # key is glob pattern, value is ","-separated list of subscriber emails | |
|
52 | pattern = user@host | |
|
50 | [reposubs] | |
|
51 | # key is glob pattern, value is ","-separated list of subscriber emails | |
|
52 | pattern = user@host | |
|
53 | 53 | |
|
54 | 54 | Glob patterns are matched against path to repository root. |
|
55 | 55 |
@@ -12,17 +12,17 b' interactively select changes to commit' | |||
|
12 | 12 | and for files with multiple changes, for each change to use. For each |
|
13 | 13 | query, the following responses are possible: |
|
14 | 14 | |
|
15 | y - record this change | |
|
16 | n - skip this change | |
|
15 | y - record this change | |
|
16 | n - skip this change | |
|
17 | 17 | |
|
18 | s - skip remaining changes to this file | |
|
19 | f - record remaining changes to this file | |
|
18 | s - skip remaining changes to this file | |
|
19 | f - record remaining changes to this file | |
|
20 | 20 | |
|
21 | d - done, skip remaining changes and files | |
|
22 | a - record all changes to all remaining files | |
|
23 | q - quit, recording no changes | |
|
21 | d - done, skip remaining changes and files | |
|
22 | a - record all changes to all remaining files | |
|
23 | q - quit, recording no changes | |
|
24 | 24 | |
|
25 | ? - display help | |
|
25 | ? - display help | |
|
26 | 26 | |
|
27 | 27 | options: |
|
28 | 28 |
General Comments 0
You need to be logged in to leave comments.
Login now