##// END OF EJS Templates
Fix test output for updated gitdiffs help and web template cleanups
Thomas Arendsen Hein -
r7330:781af9bb default
parent child Browse files
Show More
@@ -1,274 +1,274 b''
1 adding a
1 adding a
2 adding b
2 adding b
3 updating working directory
3 updating working directory
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 pulling from ../b
5 pulling from ../b
6 searching for changes
6 searching for changes
7 warning: repository is unrelated
7 warning: repository is unrelated
8 adding changesets
8 adding changesets
9 adding manifests
9 adding manifests
10 adding file changes
10 adding file changes
11 added 1 changesets with 1 changes to 1 files (+1 heads)
11 added 1 changesets with 1 changes to 1 files (+1 heads)
12 (run 'hg heads' to see heads, 'hg merge' to merge)
12 (run 'hg heads' to see heads, 'hg merge' to merge)
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
14 (branch merge, don't forget to commit)
14 (branch merge, don't forget to commit)
15 %% -R/--repository
15 %% -R/--repository
16 changeset: 0:8580ff50825a
16 changeset: 0:8580ff50825a
17 tag: tip
17 tag: tip
18 user: test
18 user: test
19 date: Thu Jan 01 00:00:01 1970 +0000
19 date: Thu Jan 01 00:00:01 1970 +0000
20 summary: a
20 summary: a
21
21
22 changeset: 0:b6c483daf290
22 changeset: 0:b6c483daf290
23 tag: tip
23 tag: tip
24 user: test
24 user: test
25 date: Thu Jan 01 00:00:01 1970 +0000
25 date: Thu Jan 01 00:00:01 1970 +0000
26 summary: b
26 summary: b
27
27
28 %% implicit -R
28 %% implicit -R
29 0: a
29 0: a
30 0: a
30 0: a
31 abort: There is no Mercurial repository here (.hg not found)!
31 abort: There is no Mercurial repository here (.hg not found)!
32 abort: a/a not under root
32 abort: a/a not under root
33 abort: There is no Mercurial repository here (.hg not found)!
33 abort: There is no Mercurial repository here (.hg not found)!
34 %% abbrev of long option
34 %% abbrev of long option
35 changeset: 1:b6c483daf290
35 changeset: 1:b6c483daf290
36 tag: tip
36 tag: tip
37 parent: -1:000000000000
37 parent: -1:000000000000
38 user: test
38 user: test
39 date: Thu Jan 01 00:00:01 1970 +0000
39 date: Thu Jan 01 00:00:01 1970 +0000
40 summary: b
40 summary: b
41
41
42 %% earlygetopt with duplicate options (36d23de02da1)
42 %% earlygetopt with duplicate options (36d23de02da1)
43 changeset: 1:b6c483daf290
43 changeset: 1:b6c483daf290
44 tag: tip
44 tag: tip
45 parent: -1:000000000000
45 parent: -1:000000000000
46 user: test
46 user: test
47 date: Thu Jan 01 00:00:01 1970 +0000
47 date: Thu Jan 01 00:00:01 1970 +0000
48 summary: b
48 summary: b
49
49
50 changeset: 0:8580ff50825a
50 changeset: 0:8580ff50825a
51 tag: tip
51 tag: tip
52 user: test
52 user: test
53 date: Thu Jan 01 00:00:01 1970 +0000
53 date: Thu Jan 01 00:00:01 1970 +0000
54 summary: a
54 summary: a
55
55
56 %% earlygetopt short option without following space
56 %% earlygetopt short option without following space
57 0:b6c483daf290
57 0:b6c483daf290
58 %% earlygetopt with illegal abbreviations
58 %% earlygetopt with illegal abbreviations
59 abort: Option --config may not be abbreviated!
59 abort: Option --config may not be abbreviated!
60 abort: Option --cwd may not be abbreviated!
60 abort: Option --cwd may not be abbreviated!
61 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
61 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
62 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
62 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
63 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
63 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
64 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
64 abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
65 %% --cwd
65 %% --cwd
66 changeset: 0:8580ff50825a
66 changeset: 0:8580ff50825a
67 tag: tip
67 tag: tip
68 user: test
68 user: test
69 date: Thu Jan 01 00:00:01 1970 +0000
69 date: Thu Jan 01 00:00:01 1970 +0000
70 summary: a
70 summary: a
71
71
72 %% -y/--noninteractive - just be sure it is parsed
72 %% -y/--noninteractive - just be sure it is parsed
73 0:8580ff50825a
73 0:8580ff50825a
74 0:8580ff50825a
74 0:8580ff50825a
75 %% -q/--quiet
75 %% -q/--quiet
76 0:8580ff50825a
76 0:8580ff50825a
77 0:b6c483daf290
77 0:b6c483daf290
78 0:8580ff50825a
78 0:8580ff50825a
79 1:b6c483daf290
79 1:b6c483daf290
80 %% -v/--verbose
80 %% -v/--verbose
81 changeset: 1:b6c483daf290
81 changeset: 1:b6c483daf290
82 tag: tip
82 tag: tip
83 parent: -1:000000000000
83 parent: -1:000000000000
84 user: test
84 user: test
85 date: Thu Jan 01 00:00:01 1970 +0000
85 date: Thu Jan 01 00:00:01 1970 +0000
86 files: b
86 files: b
87 description:
87 description:
88 b
88 b
89
89
90
90
91 changeset: 0:8580ff50825a
91 changeset: 0:8580ff50825a
92 user: test
92 user: test
93 date: Thu Jan 01 00:00:01 1970 +0000
93 date: Thu Jan 01 00:00:01 1970 +0000
94 files: a
94 files: a
95 description:
95 description:
96 a
96 a
97
97
98
98
99 changeset: 0:b6c483daf290
99 changeset: 0:b6c483daf290
100 tag: tip
100 tag: tip
101 user: test
101 user: test
102 date: Thu Jan 01 00:00:01 1970 +0000
102 date: Thu Jan 01 00:00:01 1970 +0000
103 files: b
103 files: b
104 description:
104 description:
105 b
105 b
106
106
107
107
108 %% --config
108 %% --config
109 quuxfoo
109 quuxfoo
110 abort: malformed --config option:
110 abort: malformed --config option:
111 abort: malformed --config option: a.b
111 abort: malformed --config option: a.b
112 abort: malformed --config option: a
112 abort: malformed --config option: a
113 abort: malformed --config option: a.=
113 abort: malformed --config option: a.=
114 abort: malformed --config option: .b=
114 abort: malformed --config option: .b=
115 %% --debug
115 %% --debug
116 changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
116 changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
117 tag: tip
117 tag: tip
118 parent: -1:0000000000000000000000000000000000000000
118 parent: -1:0000000000000000000000000000000000000000
119 parent: -1:0000000000000000000000000000000000000000
119 parent: -1:0000000000000000000000000000000000000000
120 manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49
120 manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49
121 user: test
121 user: test
122 date: Thu Jan 01 00:00:01 1970 +0000
122 date: Thu Jan 01 00:00:01 1970 +0000
123 files+: b
123 files+: b
124 extra: branch=default
124 extra: branch=default
125 description:
125 description:
126 b
126 b
127
127
128
128
129 changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab
129 changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab
130 parent: -1:0000000000000000000000000000000000000000
130 parent: -1:0000000000000000000000000000000000000000
131 parent: -1:0000000000000000000000000000000000000000
131 parent: -1:0000000000000000000000000000000000000000
132 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
132 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
133 user: test
133 user: test
134 date: Thu Jan 01 00:00:01 1970 +0000
134 date: Thu Jan 01 00:00:01 1970 +0000
135 files+: a
135 files+: a
136 extra: branch=default
136 extra: branch=default
137 description:
137 description:
138 a
138 a
139
139
140
140
141 %% --traceback
141 %% --traceback
142 Traceback (most recent call last):
142 Traceback (most recent call last):
143 %% --time
143 %% --time
144 Time: real x.x secs (user x.x+x.x sys x.x+x.x)
144 Time: real x.x secs (user x.x+x.x sys x.x+x.x)
145 %% --version
145 %% --version
146 Mercurial Distributed SCM (version xxx)
146 Mercurial Distributed SCM (version xxx)
147 %% -h/--help
147 %% -h/--help
148 Mercurial Distributed SCM
148 Mercurial Distributed SCM
149
149
150 list of commands:
150 list of commands:
151
151
152 add add the specified files on the next commit
152 add add the specified files on the next commit
153 addremove add all new files, delete all missing files
153 addremove add all new files, delete all missing files
154 annotate show changeset information per file line
154 annotate show changeset information per file line
155 archive create unversioned archive of a repository revision
155 archive create unversioned archive of a repository revision
156 backout reverse effect of earlier changeset
156 backout reverse effect of earlier changeset
157 bisect subdivision search of changesets
157 bisect subdivision search of changesets
158 branch set or show the current branch name
158 branch set or show the current branch name
159 branches list repository named branches
159 branches list repository named branches
160 bundle create a changegroup file
160 bundle create a changegroup file
161 cat output the current or given revision of files
161 cat output the current or given revision of files
162 clone make a copy of an existing repository
162 clone make a copy of an existing repository
163 commit commit the specified files or all outstanding changes
163 commit commit the specified files or all outstanding changes
164 copy mark files as copied for the next commit
164 copy mark files as copied for the next commit
165 diff diff repository (or selected files)
165 diff diff repository (or selected files)
166 export dump the header and diffs for one or more changesets
166 export dump the header and diffs for one or more changesets
167 grep search for a pattern in specified files and revisions
167 grep search for a pattern in specified files and revisions
168 heads show current repository heads or show branch heads
168 heads show current repository heads or show branch heads
169 help show help for a given topic or a help overview
169 help show help for a given topic or a help overview
170 identify identify the working copy or specified revision
170 identify identify the working copy or specified revision
171 import import an ordered set of patches
171 import import an ordered set of patches
172 incoming show new changesets found in source
172 incoming show new changesets found in source
173 init create a new repository in the given directory
173 init create a new repository in the given directory
174 locate locate files matching specific patterns
174 locate locate files matching specific patterns
175 log show revision history of entire repository or files
175 log show revision history of entire repository or files
176 manifest output the current or given revision of the project manifest
176 manifest output the current or given revision of the project manifest
177 merge merge working directory with another revision
177 merge merge working directory with another revision
178 outgoing show changesets not found in destination
178 outgoing show changesets not found in destination
179 parents show the parents of the working dir or revision
179 parents show the parents of the working dir or revision
180 paths show definition of symbolic path names
180 paths show definition of symbolic path names
181 pull pull changes from the specified source
181 pull pull changes from the specified source
182 push push changes to the specified destination
182 push push changes to the specified destination
183 recover roll back an interrupted transaction
183 recover roll back an interrupted transaction
184 remove remove the specified files on the next commit
184 remove remove the specified files on the next commit
185 rename rename files; equivalent of copy + remove
185 rename rename files; equivalent of copy + remove
186 resolve resolve file merges from a branch merge or update
186 resolve resolve file merges from a branch merge or update
187 revert restore individual files or dirs to an earlier state
187 revert restore individual files or dirs to an earlier state
188 rollback roll back the last transaction
188 rollback roll back the last transaction
189 root print the root (top) of the current working dir
189 root print the root (top) of the current working dir
190 serve export the repository via HTTP
190 serve export the repository via HTTP
191 showconfig show combined config settings from all hgrc files
191 showconfig show combined config settings from all hgrc files
192 status show changed files in the working directory
192 status show changed files in the working directory
193 tag add one or more tags for the current or given revision
193 tag add one or more tags for the current or given revision
194 tags list repository tags
194 tags list repository tags
195 tip show the tip revision
195 tip show the tip revision
196 unbundle apply one or more changegroup files
196 unbundle apply one or more changegroup files
197 update update working directory
197 update update working directory
198 verify verify the integrity of the repository
198 verify verify the integrity of the repository
199 version output version and copyright information
199 version output version and copyright information
200
200
201 additional help topics:
201 additional help topics:
202
202
203 dates Date Formats
203 dates Date Formats
204 patterns File Name Patterns
204 patterns File Name Patterns
205 environment Environment Variables
205 environment Environment Variables
206 revisions Specifying Single Revisions
206 revisions Specifying Single Revisions
207 multirevs Specifying Multiple Revisions
207 multirevs Specifying Multiple Revisions
208 gitdiffs Using git Diffs
208 gitdiffs Git Extended Diff Format
209
209
210 use "hg -v help" to show aliases and global options
210 use "hg -v help" to show aliases and global options
211 Mercurial Distributed SCM
211 Mercurial Distributed SCM
212
212
213 list of commands:
213 list of commands:
214
214
215 add add the specified files on the next commit
215 add add the specified files on the next commit
216 addremove add all new files, delete all missing files
216 addremove add all new files, delete all missing files
217 annotate show changeset information per file line
217 annotate show changeset information per file line
218 archive create unversioned archive of a repository revision
218 archive create unversioned archive of a repository revision
219 backout reverse effect of earlier changeset
219 backout reverse effect of earlier changeset
220 bisect subdivision search of changesets
220 bisect subdivision search of changesets
221 branch set or show the current branch name
221 branch set or show the current branch name
222 branches list repository named branches
222 branches list repository named branches
223 bundle create a changegroup file
223 bundle create a changegroup file
224 cat output the current or given revision of files
224 cat output the current or given revision of files
225 clone make a copy of an existing repository
225 clone make a copy of an existing repository
226 commit commit the specified files or all outstanding changes
226 commit commit the specified files or all outstanding changes
227 copy mark files as copied for the next commit
227 copy mark files as copied for the next commit
228 diff diff repository (or selected files)
228 diff diff repository (or selected files)
229 export dump the header and diffs for one or more changesets
229 export dump the header and diffs for one or more changesets
230 grep search for a pattern in specified files and revisions
230 grep search for a pattern in specified files and revisions
231 heads show current repository heads or show branch heads
231 heads show current repository heads or show branch heads
232 help show help for a given topic or a help overview
232 help show help for a given topic or a help overview
233 identify identify the working copy or specified revision
233 identify identify the working copy or specified revision
234 import import an ordered set of patches
234 import import an ordered set of patches
235 incoming show new changesets found in source
235 incoming show new changesets found in source
236 init create a new repository in the given directory
236 init create a new repository in the given directory
237 locate locate files matching specific patterns
237 locate locate files matching specific patterns
238 log show revision history of entire repository or files
238 log show revision history of entire repository or files
239 manifest output the current or given revision of the project manifest
239 manifest output the current or given revision of the project manifest
240 merge merge working directory with another revision
240 merge merge working directory with another revision
241 outgoing show changesets not found in destination
241 outgoing show changesets not found in destination
242 parents show the parents of the working dir or revision
242 parents show the parents of the working dir or revision
243 paths show definition of symbolic path names
243 paths show definition of symbolic path names
244 pull pull changes from the specified source
244 pull pull changes from the specified source
245 push push changes to the specified destination
245 push push changes to the specified destination
246 recover roll back an interrupted transaction
246 recover roll back an interrupted transaction
247 remove remove the specified files on the next commit
247 remove remove the specified files on the next commit
248 rename rename files; equivalent of copy + remove
248 rename rename files; equivalent of copy + remove
249 resolve resolve file merges from a branch merge or update
249 resolve resolve file merges from a branch merge or update
250 revert restore individual files or dirs to an earlier state
250 revert restore individual files or dirs to an earlier state
251 rollback roll back the last transaction
251 rollback roll back the last transaction
252 root print the root (top) of the current working dir
252 root print the root (top) of the current working dir
253 serve export the repository via HTTP
253 serve export the repository via HTTP
254 showconfig show combined config settings from all hgrc files
254 showconfig show combined config settings from all hgrc files
255 status show changed files in the working directory
255 status show changed files in the working directory
256 tag add one or more tags for the current or given revision
256 tag add one or more tags for the current or given revision
257 tags list repository tags
257 tags list repository tags
258 tip show the tip revision
258 tip show the tip revision
259 unbundle apply one or more changegroup files
259 unbundle apply one or more changegroup files
260 update update working directory
260 update update working directory
261 verify verify the integrity of the repository
261 verify verify the integrity of the repository
262 version output version and copyright information
262 version output version and copyright information
263
263
264 additional help topics:
264 additional help topics:
265
265
266 dates Date Formats
266 dates Date Formats
267 patterns File Name Patterns
267 patterns File Name Patterns
268 environment Environment Variables
268 environment Environment Variables
269 revisions Specifying Single Revisions
269 revisions Specifying Single Revisions
270 multirevs Specifying Multiple Revisions
270 multirevs Specifying Multiple Revisions
271 gitdiffs Using git Diffs
271 gitdiffs Git Extended Diff Format
272
272
273 use "hg -v help" to show aliases and global options
273 use "hg -v help" to show aliases and global options
274 %% not tested: --debugger
274 %% not tested: --debugger
@@ -1,335 +1,335 b''
1 Mercurial Distributed SCM
1 Mercurial Distributed SCM
2
2
3 basic commands:
3 basic commands:
4
4
5 add add the specified files on the next commit
5 add add the specified files on the next commit
6 annotate show changeset information per file line
6 annotate show changeset information per file line
7 clone make a copy of an existing repository
7 clone make a copy of an existing repository
8 commit commit the specified files or all outstanding changes
8 commit commit the specified files or all outstanding changes
9 diff diff repository (or selected files)
9 diff diff repository (or selected files)
10 export dump the header and diffs for one or more changesets
10 export dump the header and diffs for one or more changesets
11 init create a new repository in the given directory
11 init create a new repository in the given directory
12 log show revision history of entire repository or files
12 log show revision history of entire repository or files
13 merge merge working directory with another revision
13 merge merge working directory with another revision
14 parents show the parents of the working dir or revision
14 parents show the parents of the working dir or revision
15 pull pull changes from the specified source
15 pull pull changes from the specified source
16 push push changes to the specified destination
16 push push changes to the specified destination
17 remove remove the specified files on the next commit
17 remove remove the specified files on the next commit
18 serve export the repository via HTTP
18 serve export the repository via HTTP
19 status show changed files in the working directory
19 status show changed files in the working directory
20 update update working directory
20 update update working directory
21
21
22 use "hg help" for the full list of commands or "hg -v" for details
22 use "hg help" for the full list of commands or "hg -v" for details
23 add add the specified files on the next commit
23 add add the specified files on the next commit
24 annotate show changeset information per file line
24 annotate show changeset information per file line
25 clone make a copy of an existing repository
25 clone make a copy of an existing repository
26 commit commit the specified files or all outstanding changes
26 commit commit the specified files or all outstanding changes
27 diff diff repository (or selected files)
27 diff diff repository (or selected files)
28 export dump the header and diffs for one or more changesets
28 export dump the header and diffs for one or more changesets
29 init create a new repository in the given directory
29 init create a new repository in the given directory
30 log show revision history of entire repository or files
30 log show revision history of entire repository or files
31 merge merge working directory with another revision
31 merge merge working directory with another revision
32 parents show the parents of the working dir or revision
32 parents show the parents of the working dir or revision
33 pull pull changes from the specified source
33 pull pull changes from the specified source
34 push push changes to the specified destination
34 push push changes to the specified destination
35 remove remove the specified files on the next commit
35 remove remove the specified files on the next commit
36 serve export the repository via HTTP
36 serve export the repository via HTTP
37 status show changed files in the working directory
37 status show changed files in the working directory
38 update update working directory
38 update update working directory
39 Mercurial Distributed SCM
39 Mercurial Distributed SCM
40
40
41 list of commands:
41 list of commands:
42
42
43 add add the specified files on the next commit
43 add add the specified files on the next commit
44 addremove add all new files, delete all missing files
44 addremove add all new files, delete all missing files
45 annotate show changeset information per file line
45 annotate show changeset information per file line
46 archive create unversioned archive of a repository revision
46 archive create unversioned archive of a repository revision
47 backout reverse effect of earlier changeset
47 backout reverse effect of earlier changeset
48 bisect subdivision search of changesets
48 bisect subdivision search of changesets
49 branch set or show the current branch name
49 branch set or show the current branch name
50 branches list repository named branches
50 branches list repository named branches
51 bundle create a changegroup file
51 bundle create a changegroup file
52 cat output the current or given revision of files
52 cat output the current or given revision of files
53 clone make a copy of an existing repository
53 clone make a copy of an existing repository
54 commit commit the specified files or all outstanding changes
54 commit commit the specified files or all outstanding changes
55 copy mark files as copied for the next commit
55 copy mark files as copied for the next commit
56 diff diff repository (or selected files)
56 diff diff repository (or selected files)
57 export dump the header and diffs for one or more changesets
57 export dump the header and diffs for one or more changesets
58 grep search for a pattern in specified files and revisions
58 grep search for a pattern in specified files and revisions
59 heads show current repository heads or show branch heads
59 heads show current repository heads or show branch heads
60 help show help for a given topic or a help overview
60 help show help for a given topic or a help overview
61 identify identify the working copy or specified revision
61 identify identify the working copy or specified revision
62 import import an ordered set of patches
62 import import an ordered set of patches
63 incoming show new changesets found in source
63 incoming show new changesets found in source
64 init create a new repository in the given directory
64 init create a new repository in the given directory
65 locate locate files matching specific patterns
65 locate locate files matching specific patterns
66 log show revision history of entire repository or files
66 log show revision history of entire repository or files
67 manifest output the current or given revision of the project manifest
67 manifest output the current or given revision of the project manifest
68 merge merge working directory with another revision
68 merge merge working directory with another revision
69 outgoing show changesets not found in destination
69 outgoing show changesets not found in destination
70 parents show the parents of the working dir or revision
70 parents show the parents of the working dir or revision
71 paths show definition of symbolic path names
71 paths show definition of symbolic path names
72 pull pull changes from the specified source
72 pull pull changes from the specified source
73 push push changes to the specified destination
73 push push changes to the specified destination
74 recover roll back an interrupted transaction
74 recover roll back an interrupted transaction
75 remove remove the specified files on the next commit
75 remove remove the specified files on the next commit
76 rename rename files; equivalent of copy + remove
76 rename rename files; equivalent of copy + remove
77 resolve resolve file merges from a branch merge or update
77 resolve resolve file merges from a branch merge or update
78 revert restore individual files or dirs to an earlier state
78 revert restore individual files or dirs to an earlier state
79 rollback roll back the last transaction
79 rollback roll back the last transaction
80 root print the root (top) of the current working dir
80 root print the root (top) of the current working dir
81 serve export the repository via HTTP
81 serve export the repository via HTTP
82 showconfig show combined config settings from all hgrc files
82 showconfig show combined config settings from all hgrc files
83 status show changed files in the working directory
83 status show changed files in the working directory
84 tag add one or more tags for the current or given revision
84 tag add one or more tags for the current or given revision
85 tags list repository tags
85 tags list repository tags
86 tip show the tip revision
86 tip show the tip revision
87 unbundle apply one or more changegroup files
87 unbundle apply one or more changegroup files
88 update update working directory
88 update update working directory
89 verify verify the integrity of the repository
89 verify verify the integrity of the repository
90 version output version and copyright information
90 version output version and copyright information
91
91
92 additional help topics:
92 additional help topics:
93
93
94 dates Date Formats
94 dates Date Formats
95 patterns File Name Patterns
95 patterns File Name Patterns
96 environment Environment Variables
96 environment Environment Variables
97 revisions Specifying Single Revisions
97 revisions Specifying Single Revisions
98 multirevs Specifying Multiple Revisions
98 multirevs Specifying Multiple Revisions
99 gitdiffs Using git Diffs
99 gitdiffs Git Extended Diff Format
100
100
101 use "hg -v help" to show aliases and global options
101 use "hg -v help" to show aliases and global options
102 add add the specified files on the next commit
102 add add the specified files on the next commit
103 addremove add all new files, delete all missing files
103 addremove add all new files, delete all missing files
104 annotate show changeset information per file line
104 annotate show changeset information per file line
105 archive create unversioned archive of a repository revision
105 archive create unversioned archive of a repository revision
106 backout reverse effect of earlier changeset
106 backout reverse effect of earlier changeset
107 bisect subdivision search of changesets
107 bisect subdivision search of changesets
108 branch set or show the current branch name
108 branch set or show the current branch name
109 branches list repository named branches
109 branches list repository named branches
110 bundle create a changegroup file
110 bundle create a changegroup file
111 cat output the current or given revision of files
111 cat output the current or given revision of files
112 clone make a copy of an existing repository
112 clone make a copy of an existing repository
113 commit commit the specified files or all outstanding changes
113 commit commit the specified files or all outstanding changes
114 copy mark files as copied for the next commit
114 copy mark files as copied for the next commit
115 diff diff repository (or selected files)
115 diff diff repository (or selected files)
116 export dump the header and diffs for one or more changesets
116 export dump the header and diffs for one or more changesets
117 grep search for a pattern in specified files and revisions
117 grep search for a pattern in specified files and revisions
118 heads show current repository heads or show branch heads
118 heads show current repository heads or show branch heads
119 help show help for a given topic or a help overview
119 help show help for a given topic or a help overview
120 identify identify the working copy or specified revision
120 identify identify the working copy or specified revision
121 import import an ordered set of patches
121 import import an ordered set of patches
122 incoming show new changesets found in source
122 incoming show new changesets found in source
123 init create a new repository in the given directory
123 init create a new repository in the given directory
124 locate locate files matching specific patterns
124 locate locate files matching specific patterns
125 log show revision history of entire repository or files
125 log show revision history of entire repository or files
126 manifest output the current or given revision of the project manifest
126 manifest output the current or given revision of the project manifest
127 merge merge working directory with another revision
127 merge merge working directory with another revision
128 outgoing show changesets not found in destination
128 outgoing show changesets not found in destination
129 parents show the parents of the working dir or revision
129 parents show the parents of the working dir or revision
130 paths show definition of symbolic path names
130 paths show definition of symbolic path names
131 pull pull changes from the specified source
131 pull pull changes from the specified source
132 push push changes to the specified destination
132 push push changes to the specified destination
133 recover roll back an interrupted transaction
133 recover roll back an interrupted transaction
134 remove remove the specified files on the next commit
134 remove remove the specified files on the next commit
135 rename rename files; equivalent of copy + remove
135 rename rename files; equivalent of copy + remove
136 resolve resolve file merges from a branch merge or update
136 resolve resolve file merges from a branch merge or update
137 revert restore individual files or dirs to an earlier state
137 revert restore individual files or dirs to an earlier state
138 rollback roll back the last transaction
138 rollback roll back the last transaction
139 root print the root (top) of the current working dir
139 root print the root (top) of the current working dir
140 serve export the repository via HTTP
140 serve export the repository via HTTP
141 showconfig show combined config settings from all hgrc files
141 showconfig show combined config settings from all hgrc files
142 status show changed files in the working directory
142 status show changed files in the working directory
143 tag add one or more tags for the current or given revision
143 tag add one or more tags for the current or given revision
144 tags list repository tags
144 tags list repository tags
145 tip show the tip revision
145 tip show the tip revision
146 unbundle apply one or more changegroup files
146 unbundle apply one or more changegroup files
147 update update working directory
147 update update working directory
148 verify verify the integrity of the repository
148 verify verify the integrity of the repository
149 version output version and copyright information
149 version output version and copyright information
150
150
151 additional help topics:
151 additional help topics:
152
152
153 dates Date Formats
153 dates Date Formats
154 patterns File Name Patterns
154 patterns File Name Patterns
155 environment Environment Variables
155 environment Environment Variables
156 revisions Specifying Single Revisions
156 revisions Specifying Single Revisions
157 multirevs Specifying Multiple Revisions
157 multirevs Specifying Multiple Revisions
158 gitdiffs Using git Diffs
158 gitdiffs Git Extended Diff Format
159 hg add [OPTION]... [FILE]...
159 hg add [OPTION]... [FILE]...
160
160
161 add the specified files on the next commit
161 add the specified files on the next commit
162
162
163 Schedule files to be version controlled and added to the repository.
163 Schedule files to be version controlled and added to the repository.
164
164
165 The files will be added to the repository at the next commit. To
165 The files will be added to the repository at the next commit. To
166 undo an add before that, see hg revert.
166 undo an add before that, see hg revert.
167
167
168 If no names are given, add all files in the repository.
168 If no names are given, add all files in the repository.
169
169
170 options:
170 options:
171
171
172 -I --include include names matching the given patterns
172 -I --include include names matching the given patterns
173 -X --exclude exclude names matching the given patterns
173 -X --exclude exclude names matching the given patterns
174 -n --dry-run do not perform actions, just print output
174 -n --dry-run do not perform actions, just print output
175
175
176 use "hg -v help add" to show global options
176 use "hg -v help add" to show global options
177 hg add: option --skjdfks not recognized
177 hg add: option --skjdfks not recognized
178 hg add [OPTION]... [FILE]...
178 hg add [OPTION]... [FILE]...
179
179
180 add the specified files on the next commit
180 add the specified files on the next commit
181
181
182 Schedule files to be version controlled and added to the repository.
182 Schedule files to be version controlled and added to the repository.
183
183
184 The files will be added to the repository at the next commit. To
184 The files will be added to the repository at the next commit. To
185 undo an add before that, see hg revert.
185 undo an add before that, see hg revert.
186
186
187 If no names are given, add all files in the repository.
187 If no names are given, add all files in the repository.
188
188
189 options:
189 options:
190
190
191 -I --include include names matching the given patterns
191 -I --include include names matching the given patterns
192 -X --exclude exclude names matching the given patterns
192 -X --exclude exclude names matching the given patterns
193 -n --dry-run do not perform actions, just print output
193 -n --dry-run do not perform actions, just print output
194
194
195 use "hg -v help add" to show global options
195 use "hg -v help add" to show global options
196 hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...
196 hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...
197
197
198 diff repository (or selected files)
198 diff repository (or selected files)
199
199
200 Show differences between revisions for the specified files.
200 Show differences between revisions for the specified files.
201
201
202 Differences between files are shown using the unified diff format.
202 Differences between files are shown using the unified diff format.
203
203
204 NOTE: diff may generate unexpected results for merges, as it will
204 NOTE: diff may generate unexpected results for merges, as it will
205 default to comparing against the working directory's first parent
205 default to comparing against the working directory's first parent
206 changeset if no revisions are specified.
206 changeset if no revisions are specified.
207
207
208 When two revision arguments are given, then changes are shown
208 When two revision arguments are given, then changes are shown
209 between those revisions. If only one revision is specified then
209 between those revisions. If only one revision is specified then
210 that revision is compared to the working directory, and, when no
210 that revision is compared to the working directory, and, when no
211 revisions are specified, the working directory files are compared
211 revisions are specified, the working directory files are compared
212 to its parent.
212 to its parent.
213
213
214 Without the -a option, diff will avoid generating diffs of files
214 Without the -a option, diff will avoid generating diffs of files
215 it detects as binary. With -a, diff will generate a diff anyway,
215 it detects as binary. With -a, diff will generate a diff anyway,
216 probably with undesirable results.
216 probably with undesirable results.
217
217
218 Use the --git option to generate diffs in the git extended diff
218 Use the --git option to generate diffs in the git extended diff
219 format. Read the gitdiffs help topic for more information.
219 format. Read the gitdiffs help topic for more information.
220
220
221 options:
221 options:
222
222
223 -r --rev revision
223 -r --rev revision
224 -a --text treat all files as text
224 -a --text treat all files as text
225 -g --git use git extended diff format
225 -g --git use git extended diff format
226 --nodates don't include dates in diff headers
226 --nodates don't include dates in diff headers
227 -p --show-function show which function each change is in
227 -p --show-function show which function each change is in
228 -w --ignore-all-space ignore white space when comparing lines
228 -w --ignore-all-space ignore white space when comparing lines
229 -b --ignore-space-change ignore changes in the amount of white space
229 -b --ignore-space-change ignore changes in the amount of white space
230 -B --ignore-blank-lines ignore changes whose lines are all blank
230 -B --ignore-blank-lines ignore changes whose lines are all blank
231 -U --unified number of lines of context to show
231 -U --unified number of lines of context to show
232 -I --include include names matching the given patterns
232 -I --include include names matching the given patterns
233 -X --exclude exclude names matching the given patterns
233 -X --exclude exclude names matching the given patterns
234
234
235 use "hg -v help diff" to show global options
235 use "hg -v help diff" to show global options
236 hg status [OPTION]... [FILE]...
236 hg status [OPTION]... [FILE]...
237
237
238 aliases: st
238 aliases: st
239
239
240 show changed files in the working directory
240 show changed files in the working directory
241
241
242 Show status of files in the repository. If names are given, only
242 Show status of files in the repository. If names are given, only
243 files that match are shown. Files that are clean or ignored or
243 files that match are shown. Files that are clean or ignored or
244 source of a copy/move operation, are not listed unless -c (clean),
244 source of a copy/move operation, are not listed unless -c (clean),
245 -i (ignored), -C (copies) or -A is given. Unless options described
245 -i (ignored), -C (copies) or -A is given. Unless options described
246 with "show only ..." are given, the options -mardu are used.
246 with "show only ..." are given, the options -mardu are used.
247
247
248 Option -q/--quiet hides untracked (unknown and ignored) files
248 Option -q/--quiet hides untracked (unknown and ignored) files
249 unless explicitly requested with -u/--unknown or -i/-ignored.
249 unless explicitly requested with -u/--unknown or -i/-ignored.
250
250
251 NOTE: status may appear to disagree with diff if permissions have
251 NOTE: status may appear to disagree with diff if permissions have
252 changed or a merge has occurred. The standard diff format does not
252 changed or a merge has occurred. The standard diff format does not
253 report permission changes and diff only reports changes relative
253 report permission changes and diff only reports changes relative
254 to one merge parent.
254 to one merge parent.
255
255
256 If one revision is given, it is used as the base revision.
256 If one revision is given, it is used as the base revision.
257 If two revisions are given, the difference between them is shown.
257 If two revisions are given, the difference between them is shown.
258
258
259 The codes used to show the status of files are:
259 The codes used to show the status of files are:
260 M = modified
260 M = modified
261 A = added
261 A = added
262 R = removed
262 R = removed
263 C = clean
263 C = clean
264 ! = deleted, but still tracked
264 ! = deleted, but still tracked
265 ? = not tracked
265 ? = not tracked
266 I = ignored
266 I = ignored
267 = the previous added file was copied from here
267 = the previous added file was copied from here
268
268
269 options:
269 options:
270
270
271 -A --all show status of all files
271 -A --all show status of all files
272 -m --modified show only modified files
272 -m --modified show only modified files
273 -a --added show only added files
273 -a --added show only added files
274 -r --removed show only removed files
274 -r --removed show only removed files
275 -d --deleted show only deleted (but tracked) files
275 -d --deleted show only deleted (but tracked) files
276 -c --clean show only files without changes
276 -c --clean show only files without changes
277 -u --unknown show only unknown (not tracked) files
277 -u --unknown show only unknown (not tracked) files
278 -i --ignored show only ignored files
278 -i --ignored show only ignored files
279 -n --no-status hide status prefix
279 -n --no-status hide status prefix
280 -C --copies show source of copied files
280 -C --copies show source of copied files
281 -0 --print0 end filenames with NUL, for use with xargs
281 -0 --print0 end filenames with NUL, for use with xargs
282 --rev show difference from revision
282 --rev show difference from revision
283 -I --include include names matching the given patterns
283 -I --include include names matching the given patterns
284 -X --exclude exclude names matching the given patterns
284 -X --exclude exclude names matching the given patterns
285
285
286 use "hg -v help status" to show global options
286 use "hg -v help status" to show global options
287 hg status [OPTION]... [FILE]...
287 hg status [OPTION]... [FILE]...
288
288
289 show changed files in the working directory
289 show changed files in the working directory
290 hg: unknown command 'foo'
290 hg: unknown command 'foo'
291 Mercurial Distributed SCM
291 Mercurial Distributed SCM
292
292
293 basic commands:
293 basic commands:
294
294
295 add add the specified files on the next commit
295 add add the specified files on the next commit
296 annotate show changeset information per file line
296 annotate show changeset information per file line
297 clone make a copy of an existing repository
297 clone make a copy of an existing repository
298 commit commit the specified files or all outstanding changes
298 commit commit the specified files or all outstanding changes
299 diff diff repository (or selected files)
299 diff diff repository (or selected files)
300 export dump the header and diffs for one or more changesets
300 export dump the header and diffs for one or more changesets
301 init create a new repository in the given directory
301 init create a new repository in the given directory
302 log show revision history of entire repository or files
302 log show revision history of entire repository or files
303 merge merge working directory with another revision
303 merge merge working directory with another revision
304 parents show the parents of the working dir or revision
304 parents show the parents of the working dir or revision
305 pull pull changes from the specified source
305 pull pull changes from the specified source
306 push push changes to the specified destination
306 push push changes to the specified destination
307 remove remove the specified files on the next commit
307 remove remove the specified files on the next commit
308 serve export the repository via HTTP
308 serve export the repository via HTTP
309 status show changed files in the working directory
309 status show changed files in the working directory
310 update update working directory
310 update update working directory
311
311
312 use "hg help" for the full list of commands or "hg -v" for details
312 use "hg help" for the full list of commands or "hg -v" for details
313 hg: unknown command 'skjdfks'
313 hg: unknown command 'skjdfks'
314 Mercurial Distributed SCM
314 Mercurial Distributed SCM
315
315
316 basic commands:
316 basic commands:
317
317
318 add add the specified files on the next commit
318 add add the specified files on the next commit
319 annotate show changeset information per file line
319 annotate show changeset information per file line
320 clone make a copy of an existing repository
320 clone make a copy of an existing repository
321 commit commit the specified files or all outstanding changes
321 commit commit the specified files or all outstanding changes
322 diff diff repository (or selected files)
322 diff diff repository (or selected files)
323 export dump the header and diffs for one or more changesets
323 export dump the header and diffs for one or more changesets
324 init create a new repository in the given directory
324 init create a new repository in the given directory
325 log show revision history of entire repository or files
325 log show revision history of entire repository or files
326 merge merge working directory with another revision
326 merge merge working directory with another revision
327 parents show the parents of the working dir or revision
327 parents show the parents of the working dir or revision
328 pull pull changes from the specified source
328 pull pull changes from the specified source
329 push push changes to the specified destination
329 push push changes to the specified destination
330 remove remove the specified files on the next commit
330 remove remove the specified files on the next commit
331 serve export the repository via HTTP
331 serve export the repository via HTTP
332 status show changed files in the working directory
332 status show changed files in the working directory
333 update update working directory
333 update update working directory
334
334
335 use "hg help" for the full list of commands or "hg -v" for details
335 use "hg help" for the full list of commands or "hg -v" for details
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -1,231 +1,231 b''
1 adding da/foo
1 adding da/foo
2 adding foo
2 adding foo
3 % manifest
3 % manifest
4 200 Script output follows
4 200 Script output follows
5
5
6
6
7 drwxr-xr-x da
7 drwxr-xr-x da
8 -rw-r--r-- 4 foo
8 -rw-r--r-- 4 foo
9
9
10
10
11 200 Script output follows
11 200 Script output follows
12
12
13
13
14 -rw-r--r-- 4 foo
14 -rw-r--r-- 4 foo
15
15
16
16
17 % plain file
17 % plain file
18 200 Script output follows
18 200 Script output follows
19
19
20 foo
20 foo
21 % should give a 404 - static file that does not exist
21 % should give a 404 - static file that does not exist
22 404 Not Found
22 404 Not Found
23
23
24 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
24 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
25 <html>
25 <html>
26 <head>
26 <head>
27 <link rel="icon" href="/static/hgicon.png" type="image/png">
27 <link rel="icon" href="/static/hgicon.png" type="image/png">
28 <meta name="robots" content="index, nofollow" />
28 <meta name="robots" content="index, nofollow" />
29 <link rel="stylesheet" href="/static/style.css" type="text/css" />
29 <link rel="stylesheet" href="/static/style.css" type="text/css" />
30
30
31 <title>Mercurial Error</title>
31 <title>Mercurial Error</title>
32 </head>
32 </head>
33 <body>
33 <body>
34
34
35 <h2>Mercurial Error</h2>
35 <h2>Mercurial Error</h2>
36
36
37 <p>
37 <p>
38 An error occurred while processing your request:
38 An error occurred while processing your request:
39 </p>
39 </p>
40 <p>
40 <p>
41 Not Found
41 Not Found
42 </p>
42 </p>
43
43
44
44
45 <div class="logo">
45 <div class="logo">
46 <a href="http://www.selenic.com/mercurial/">
46 <a href="http://www.selenic.com/mercurial/">
47 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
47 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
48 </div>
48 </div>
49
49
50 </body>
50 </body>
51 </html>
51 </html>
52
52
53 % should give a 404 - bad revision
53 % should give a 404 - bad revision
54 404 Not Found
54 404 Not Found
55
55
56
56
57 error: revision not found: spam
57 error: revision not found: spam
58 % should give a 400 - bad command
58 % should give a 400 - bad command
59 400
59 400
60
60
61
61
62 error: no such method: spam
62 error: no such method: spam
63 % should give a 404 - file does not exist
63 % should give a 404 - file does not exist
64 404 Not Found
64 404 Not Found
65
65
66
66
67 error: bork@2ef0ac749a14: not found in manifest
67 error: bork@2ef0ac749a14: not found in manifest
68 404 Not Found
68 404 Not Found
69
69
70 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
70 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
71 <html>
71 <html>
72 <head>
72 <head>
73 <link rel="icon" href="/static/hgicon.png" type="image/png">
73 <link rel="icon" href="/static/hgicon.png" type="image/png">
74 <meta name="robots" content="index, nofollow" />
74 <meta name="robots" content="index, nofollow" />
75 <link rel="stylesheet" href="/static/style.css" type="text/css" />
75 <link rel="stylesheet" href="/static/style.css" type="text/css" />
76
76
77 <title>Mercurial Error</title>
77 <title>Mercurial Error</title>
78 </head>
78 </head>
79 <body>
79 <body>
80
80
81 <h2>Mercurial Error</h2>
81 <h2>Mercurial Error</h2>
82
82
83 <p>
83 <p>
84 An error occurred while processing your request:
84 An error occurred while processing your request:
85 </p>
85 </p>
86 <p>
86 <p>
87 bork@2ef0ac749a14: not found in manifest
87 bork@2ef0ac749a14: not found in manifest
88 </p>
88 </p>
89
89
90
90
91 <div class="logo">
91 <div class="logo">
92 <a href="http://www.selenic.com/mercurial/">
92 <a href="http://www.selenic.com/mercurial/">
93 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
93 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
94 </div>
94 </div>
95
95
96 </body>
96 </body>
97 </html>
97 </html>
98
98
99 404 Not Found
99 404 Not Found
100
100
101
101
102 error: bork@2ef0ac749a14: not found in manifest
102 error: bork@2ef0ac749a14: not found in manifest
103 % stop and restart
103 % stop and restart
104 9 log lines written
104 9 log lines written
105 % static file
105 % static file
106 200 Script output follows
106 200 Script output follows
107
107
108 body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
108 body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
109 a { color:#0000cc; }
109 a { color:#0000cc; }
110 a:hover, a:visited, a:active { color:#880000; }
110 a:hover, a:visited, a:active { color:#880000; }
111 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
111 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
112 div.page_header a:visited { color:#0000cc; }
112 div.page_header a:visited { color:#0000cc; }
113 div.page_header a:hover { color:#880000; }
113 div.page_header a:hover { color:#880000; }
114 div.page_nav { padding:8px; }
114 div.page_nav { padding:8px; }
115 div.page_nav a:visited { color:#0000cc; }
115 div.page_nav a:visited { color:#0000cc; }
116 div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
116 div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
117 div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
117 div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
118 div.page_footer_text { float:left; color:#555555; font-style:italic; }
118 div.page_footer_text { float:left; color:#555555; font-style:italic; }
119 div.page_body { padding:8px; }
119 div.page_body { padding:8px; }
120 div.title, a.title {
120 div.title, a.title {
121 display:block; padding:6px 8px;
121 display:block; padding:6px 8px;
122 font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
122 font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
123 }
123 }
124 a.title:hover { background-color: #d9d8d1; }
124 a.title:hover { background-color: #d9d8d1; }
125 div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
125 div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
126 div.log_body { padding:8px 8px 8px 150px; }
126 div.log_body { padding:8px 8px 8px 150px; }
127 .age { white-space:nowrap; }
127 .age { white-space:nowrap; }
128 span.age { position:relative; float:left; width:142px; font-style:italic; }
128 span.age { position:relative; float:left; width:142px; font-style:italic; }
129 div.log_link {
129 div.log_link {
130 padding:0px 8px;
130 padding:0px 8px;
131 font-size:10px; font-family:sans-serif; font-style:normal;
131 font-size:10px; font-family:sans-serif; font-style:normal;
132 position:relative; float:left; width:136px;
132 position:relative; float:left; width:136px;
133 }
133 }
134 div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
134 div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
135 a.list { text-decoration:none; color:#000000; }
135 a.list { text-decoration:none; color:#000000; }
136 a.list:hover { text-decoration:underline; color:#880000; }
136 a.list:hover { text-decoration:underline; color:#880000; }
137 table { padding:8px 4px; }
137 table { padding:8px 4px; }
138 th { padding:2px 5px; font-size:12px; text-align:left; }
138 th { padding:2px 5px; font-size:12px; text-align:left; }
139 tr.light:hover, .parity0:hover { background-color:#edece6; }
139 tr.light:hover, .parity0:hover { background-color:#edece6; }
140 tr.dark, .parity1 { background-color:#f6f6f0; }
140 tr.dark, .parity1 { background-color:#f6f6f0; }
141 tr.dark:hover, .parity1:hover { background-color:#edece6; }
141 tr.dark:hover, .parity1:hover { background-color:#edece6; }
142 td { padding:2px 5px; font-size:12px; vertical-align:top; }
142 td { padding:2px 5px; font-size:12px; vertical-align:top; }
143 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
143 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
144 td.indexlinks { white-space: nowrap; }
144 td.indexlinks { white-space: nowrap; }
145 td.indexlinks a {
145 td.indexlinks a {
146 padding: 2px 5px; line-height: 10px;
146 padding: 2px 5px; line-height: 10px;
147 border: 1px solid;
147 border: 1px solid;
148 color: #ffffff; background-color: #7777bb;
148 color: #ffffff; background-color: #7777bb;
149 border-color: #aaaadd #333366 #333366 #aaaadd;
149 border-color: #aaaadd #333366 #333366 #aaaadd;
150 font-weight: bold; text-align: center; text-decoration: none;
150 font-weight: bold; text-align: center; text-decoration: none;
151 font-size: 10px;
151 font-size: 10px;
152 }
152 }
153 td.indexlinks a:hover { background-color: #6666aa; }
153 td.indexlinks a:hover { background-color: #6666aa; }
154 div.pre { font-family:monospace; font-size:12px; white-space:pre; }
154 div.pre { font-family:monospace; font-size:12px; white-space:pre; }
155 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
155 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
156 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
156 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
157 div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
157 div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
158 .linenr { color:#999999; text-decoration:none }
158 .linenr { color:#999999; text-decoration:none }
159 div.rss_logo { float: right; white-space: nowrap; }
159 div.rss_logo { float: right; white-space: nowrap; }
160 div.rss_logo a {
160 div.rss_logo a {
161 padding:3px 6px; line-height:10px;
161 padding:3px 6px; line-height:10px;
162 border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
162 border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
163 color:#ffffff; background-color:#ff6600;
163 color:#ffffff; background-color:#ff6600;
164 font-weight:bold; font-family:sans-serif; font-size:10px;
164 font-weight:bold; font-family:sans-serif; font-size:10px;
165 text-align:center; text-decoration:none;
165 text-align:center; text-decoration:none;
166 }
166 }
167 div.rss_logo a:hover { background-color:#ee5500; }
167 div.rss_logo a:hover { background-color:#ee5500; }
168 pre { margin: 0; }
168 pre { margin: 0; }
169 span.logtags span {
169 span.logtags span {
170 padding: 0px 4px;
170 padding: 0px 4px;
171 font-size: 10px;
171 font-size: 10px;
172 font-weight: normal;
172 font-weight: normal;
173 border: 1px solid;
173 border: 1px solid;
174 background-color: #ffaaff;
174 background-color: #ffaaff;
175 border-color: #ffccff #ff00ee #ff00ee #ffccff;
175 border-color: #ffccff #ff00ee #ff00ee #ffccff;
176 }
176 }
177 span.logtags span.tagtag {
177 span.logtags span.tagtag {
178 background-color: #ffffaa;
178 background-color: #ffffaa;
179 border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
179 border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
180 }
180 }
181 span.logtags span.branchtag {
181 span.logtags span.branchtag {
182 background-color: #aaffaa;
182 background-color: #aaffaa;
183 border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
183 border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
184 }
184 }
185 span.logtags span.inbranchtag {
185 span.logtags span.inbranchtag {
186 background-color: #d5dde6;
186 background-color: #d5dde6;
187 border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
187 border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
188 }
188 }
189
189
190 /* Graph */
190 /* Graph */
191 div#wrapper {
191 div#wrapper {
192 position: relative;
192 position: relative;
193 margin: 0;
193 margin: 0;
194 padding: 0;
194 padding: 0;
195 margin-top: 3px;
195 margin-top: 3px;
196 }
196 }
197
197
198 canvas {
198 canvas {
199 position: absolute;
199 position: absolute;
200 z-index: 5;
200 z-index: 5;
201 top: -0.9em;
201 top: -0.9em;
202 margin: 0;
202 margin: 0;
203 }
203 }
204
204
205 ul#nodebgs {
205 ul#nodebgs {
206 list-style: none inside none;
206 list-style: none inside none;
207 padding: 0;
207 padding: 0;
208 margin: 0;
208 margin: 0;
209 top: -0.7em;
209 top: -0.7em;
210 }
210 }
211
211
212 ul#graphnodes li, ul#nodebgs li {
212 ul#graphnodes li, ul#nodebgs li {
213 height: 39px;
213 height: 39px;
214 }
214 }
215
215
216 ul#graphnodes {
216 ul#graphnodes {
217 position: absolute;
217 position: absolute;
218 z-index: 10;
218 z-index: 10;
219 top: -0.8em;
219 top: -0.8em;
220 list-style: none inside none;
220 list-style: none inside none;
221 padding: 0;
221 padding: 0;
222 }
222 }
223
223
224 ul#graphnodes li .info {
224 ul#graphnodes li .info {
225 display: block;
225 display: block;
226 font-size: 100%;
226 font-size: 100%;
227 position: relative;
227 position: relative;
228 top: -3px;
228 top: -3px;
229 font-style: italic;
229 font-style: italic;
230 }
230 }
231 % errors
231 % errors
General Comments 0
You need to be logged in to leave comments. Login now