##// END OF EJS Templates
help: show results of all date filters
Martin Geisler -
r9360:f4f17d56 default
parent child Browse files
Show More
@@ -1,514 +1,516 b''
1 1 # help.py - help data for mercurial
2 2 #
3 3 # Copyright 2006 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2, incorporated herein by reference.
7 7
8 8 from i18n import _
9 9 import extensions, util
10 10
11 11
12 12 def moduledoc(file):
13 13 '''return the top-level python documentation for the given file
14 14
15 15 Loosely inspired by pydoc.source_synopsis(), but rewritten to handle \'''
16 16 as well as """ and to return the whole text instead of just the synopsis'''
17 17 result = []
18 18
19 19 line = file.readline()
20 20 while line[:1] == '#' or not line.strip():
21 21 line = file.readline()
22 22 if not line: break
23 23
24 24 start = line[:3]
25 25 if start == '"""' or start == "'''":
26 26 line = line[3:]
27 27 while line:
28 28 if line.rstrip().endswith(start):
29 29 line = line.split(start)[0]
30 30 if line:
31 31 result.append(line)
32 32 break
33 33 elif not line:
34 34 return None # unmatched delimiter
35 35 result.append(line)
36 36 line = file.readline()
37 37 else:
38 38 return None
39 39
40 40 return ''.join(result)
41 41
42 42 def listexts(header, exts, maxlength):
43 43 '''return a text listing of the given extensions'''
44 44 if not exts:
45 45 return ''
46 46 result = '\n%s\n\n' % header
47 47 for name, desc in sorted(exts.iteritems()):
48 48 desc = util.wrap(desc, maxlength + 4)
49 49 result += ' %s %s\n' % (name.ljust(maxlength), desc)
50 50 return result
51 51
52 52 def extshelp():
53 53 doc = _(r'''
54 54 Mercurial has the ability to add new features through the use of
55 55 extensions. Extensions may add new commands, add options to
56 56 existing commands, change the default behavior of commands, or
57 57 implement hooks.
58 58
59 59 Extensions are not loaded by default for a variety of reasons:
60 60 they can increase startup overhead; they may be meant for
61 61 advanced usage only; they may provide potentially dangerous
62 62 abilities (such as letting you destroy or modify history); they
63 63 might not be ready for prime time; or they may alter some
64 64 usual behaviors of stock Mercurial. It is thus up to the user to
65 65 activate extensions as needed.
66 66
67 67 To enable the "foo" extension, either shipped with Mercurial
68 68 or in the Python search path, create an entry for it in your
69 69 hgrc, like this:
70 70
71 71 [extensions]
72 72 foo =
73 73
74 74 You may also specify the full path to an extension:
75 75
76 76 [extensions]
77 77 myfeature = ~/.hgext/myfeature.py
78 78
79 79 To explicitly disable an extension enabled in an hgrc of broader
80 80 scope, prepend its path with !:
81 81
82 82 [extensions]
83 83 # disabling extension bar residing in /path/to/extension/bar.py
84 84 hgext.bar = !/path/to/extension/bar.py
85 85 # ditto, but no path was supplied for extension baz
86 86 hgext.baz = !
87 87 ''')
88 88
89 89 exts, maxlength = extensions.enabled()
90 90 doc += listexts(_('enabled extensions:'), exts, maxlength)
91 91
92 92 exts, maxlength = extensions.disabled()
93 93 doc += listexts(_('disabled extensions:'), exts, maxlength)
94 94
95 95 return doc
96 96
97 97 helptable = (
98 98 (["dates"], _("Date Formats"),
99 99 _(r'''
100 100 Some commands allow the user to specify a date, e.g.:
101 101 * backout, commit, import, tag: Specify the commit date.
102 102 * log, revert, update: Select revision(s) by date.
103 103
104 104 Many date formats are valid. Here are some examples:
105 105
106 106 "Wed Dec 6 13:18:29 2006" (local timezone assumed)
107 107 "Dec 6 13:18 -0600" (year assumed, time offset provided)
108 108 "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
109 109 "Dec 6" (midnight)
110 110 "13:18" (today assumed)
111 111 "3:39" (3:39AM assumed)
112 112 "3:39pm" (15:39)
113 113 "2006-12-06 13:18:29" (ISO 8601 format)
114 114 "2006-12-6 13:18"
115 115 "2006-12-6"
116 116 "12-6"
117 117 "12/6"
118 118 "12/6/6" (Dec 6 2006)
119 119
120 120 Lastly, there is Mercurial's internal format:
121 121
122 122 "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
123 123
124 124 This is the internal representation format for dates. unixtime is
125 125 the number of seconds since the epoch (1970-01-01 00:00 UTC).
126 126 offset is the offset of the local timezone, in seconds west of UTC
127 127 (negative if the timezone is east of UTC).
128 128
129 129 The log command also accepts date ranges:
130 130
131 131 "<{datetime}" - at or before a given date/time
132 132 ">{datetime}" - on or after a given date/time
133 133 "{datetime} to {datetime}" - a date range, inclusive
134 134 "-{days}" - within a given number of days of today
135 135 ''')),
136 136
137 137 (["patterns"], _("File Name Patterns"),
138 138 _(r'''
139 139 Mercurial accepts several notations for identifying one or more
140 140 files at a time.
141 141
142 142 By default, Mercurial treats filenames as shell-style extended
143 143 glob patterns.
144 144
145 145 Alternate pattern notations must be specified explicitly.
146 146
147 147 To use a plain path name without any pattern matching, start it
148 148 with "path:". These path names must completely match starting at
149 149 the current repository root.
150 150
151 151 To use an extended glob, start a name with "glob:". Globs are
152 152 rooted at the current directory; a glob such as "*.c" will only
153 153 match files in the current directory ending with ".c".
154 154
155 155 The supported glob syntax extensions are "**" to match any string
156 156 across path separators and "{a,b}" to mean "a or b".
157 157
158 158 To use a Perl/Python regular expression, start a name with "re:".
159 159 Regexp pattern matching is anchored at the root of the repository.
160 160
161 161 Plain examples:
162 162
163 163 path:foo/bar a name bar in a directory named foo in the root of
164 164 the repository
165 165 path:path:name a file or directory named "path:name"
166 166
167 167 Glob examples:
168 168
169 169 glob:*.c any name ending in ".c" in the current directory
170 170 *.c any name ending in ".c" in the current directory
171 171 **.c any name ending in ".c" in any subdirectory of the
172 172 current directory including itself.
173 173 foo/*.c any name ending in ".c" in the directory foo
174 174 foo/**.c any name ending in ".c" in any subdirectory of foo
175 175 including itself.
176 176
177 177 Regexp examples:
178 178
179 179 re:.*\.c$ any name ending in ".c", anywhere in the repository
180 180
181 181 ''')),
182 182
183 183 (['environment', 'env'], _('Environment Variables'),
184 184 _(r'''
185 185 HG::
186 186 Path to the 'hg' executable, automatically passed when running
187 187 hooks, extensions or external tools. If unset or empty, this is
188 188 the hg executable's name if it's frozen, or an executable named
189 189 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
190 190 Windows) is searched.
191 191
192 192 HGEDITOR::
193 193 This is the name of the editor to run when committing. See EDITOR.
194 194
195 195 (deprecated, use .hgrc)
196 196
197 197 HGENCODING::
198 198 This overrides the default locale setting detected by Mercurial.
199 199 This setting is used to convert data including usernames,
200 200 changeset descriptions, tag names, and branches. This setting can
201 201 be overridden with the --encoding command-line option.
202 202
203 203 HGENCODINGMODE::
204 204 This sets Mercurial's behavior for handling unknown characters
205 205 while transcoding user input. The default is "strict", which
206 206 causes Mercurial to abort if it can't map a character. Other
207 207 settings include "replace", which replaces unknown characters, and
208 208 "ignore", which drops them. This setting can be overridden with
209 209 the --encodingmode command-line option.
210 210
211 211 HGMERGE::
212 212 An executable to use for resolving merge conflicts. The program
213 213 will be executed with three arguments: local file, remote file,
214 214 ancestor file.
215 215
216 216 (deprecated, use .hgrc)
217 217
218 218 HGRCPATH::
219 219 A list of files or directories to search for hgrc files. Item
220 220 separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
221 221 platform default search path is used. If empty, only the .hg/hgrc
222 222 from the current repository is read.
223 223
224 224 For each element in HGRCPATH:
225 225 * if it's a directory, all files ending with .rc are added
226 226 * otherwise, the file itself will be added
227 227
228 228 HGUSER::
229 229 This is the string used as the author of a commit. If not set,
230 230 available values will be considered in this order:
231 231
232 232 * HGUSER (deprecated)
233 233 * hgrc files from the HGRCPATH
234 234 * EMAIL
235 235 * interactive prompt
236 236 * LOGNAME (with '@hostname' appended)
237 237
238 238 (deprecated, use .hgrc)
239 239
240 240 EMAIL::
241 241 May be used as the author of a commit; see HGUSER.
242 242
243 243 LOGNAME::
244 244 May be used as the author of a commit; see HGUSER.
245 245
246 246 VISUAL::
247 247 This is the name of the editor to use when committing. See EDITOR.
248 248
249 249 EDITOR::
250 250 Sometimes Mercurial needs to open a text file in an editor for a
251 251 user to modify, for example when writing commit messages. The
252 252 editor it uses is determined by looking at the environment
253 253 variables HGEDITOR, VISUAL and EDITOR, in that order. The first
254 254 non-empty one is chosen. If all of them are empty, the editor
255 255 defaults to 'vi'.
256 256
257 257 PYTHONPATH::
258 258 This is used by Python to find imported modules and may need to be
259 259 set appropriately if this Mercurial is not installed system-wide.
260 260 ''')),
261 261
262 262 (['revs', 'revisions'], _('Specifying Single Revisions'),
263 263 _(r'''
264 264 Mercurial supports several ways to specify individual revisions.
265 265
266 266 A plain integer is treated as a revision number. Negative integers
267 267 are treated as sequential offsets from the tip, with -1 denoting
268 268 the tip, -2 denoting the revision prior to the tip, and so forth.
269 269
270 270 A 40-digit hexadecimal string is treated as a unique revision
271 271 identifier.
272 272
273 273 A hexadecimal string less than 40 characters long is treated as a
274 274 unique revision identifier and is referred to as a short-form
275 275 identifier. A short-form identifier is only valid if it is the
276 276 prefix of exactly one full-length identifier.
277 277
278 278 Any other string is treated as a tag or branch name. A tag name is
279 279 a symbolic name associated with a revision identifier. A branch
280 280 name denotes the tipmost revision of that branch. Tag and branch
281 281 names must not contain the ":" character.
282 282
283 283 The reserved name "tip" is a special tag that always identifies
284 284 the most recent revision.
285 285
286 286 The reserved name "null" indicates the null revision. This is the
287 287 revision of an empty repository, and the parent of revision 0.
288 288
289 289 The reserved name "." indicates the working directory parent. If
290 290 no working directory is checked out, it is equivalent to null. If
291 291 an uncommitted merge is in progress, "." is the revision of the
292 292 first parent.
293 293 ''')),
294 294
295 295 (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
296 296 _(r'''
297 297 When Mercurial accepts more than one revision, they may be
298 298 specified individually, or provided as a topologically continuous
299 299 range, separated by the ":" character.
300 300
301 301 The syntax of range notation is [BEGIN]:[END], where BEGIN and END
302 302 are revision identifiers. Both BEGIN and END are optional. If
303 303 BEGIN is not specified, it defaults to revision number 0. If END
304 304 is not specified, it defaults to the tip. The range ":" thus means
305 305 "all revisions".
306 306
307 307 If BEGIN is greater than END, revisions are treated in reverse
308 308 order.
309 309
310 310 A range acts as a closed interval. This means that a range of 3:5
311 311 gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
312 312 ''')),
313 313
314 314 (['diffs'], _('Diff Formats'),
315 315 _(r'''
316 316 Mercurial's default format for showing changes between two
317 317 versions of a file is compatible with the unified format of GNU
318 318 diff, which can be used by GNU patch and many other standard
319 319 tools.
320 320
321 321 While this standard format is often enough, it does not encode the
322 322 following information:
323 323
324 324 - executable status and other permission bits
325 325 - copy or rename information
326 326 - changes in binary files
327 327 - creation or deletion of empty files
328 328
329 329 Mercurial also supports the extended diff format from the git VCS
330 330 which addresses these limitations. The git diff format is not
331 331 produced by default because a few widespread tools still do not
332 332 understand this format.
333 333
334 334 This means that when generating diffs from a Mercurial repository
335 335 (e.g. with "hg export"), you should be careful about things like
336 336 file copies and renames or other things mentioned above, because
337 337 when applying a standard diff to a different repository, this
338 338 extra information is lost. Mercurial's internal operations (like
339 339 push and pull) are not affected by this, because they use an
340 340 internal binary format for communicating changes.
341 341
342 342 To make Mercurial produce the git extended diff format, use the
343 343 --git option available for many commands, or set 'git = True' in
344 344 the [diff] section of your hgrc. You do not need to set this
345 345 option when importing diffs in this format or using them in the mq
346 346 extension.
347 347 ''')),
348 348 (['templating'], _('Template Usage'),
349 349 _(r'''
350 350 Mercurial allows you to customize output of commands through
351 351 templates. You can either pass in a template from the command
352 352 line, via the --template option, or select an existing
353 353 template-style (--style).
354 354
355 355 You can customize output for any "log-like" command: log,
356 356 outgoing, incoming, tip, parents, heads and glog.
357 357
358 358 Three styles are packaged with Mercurial: default (the style used
359 359 when no explicit preference is passed), compact and changelog.
360 360 Usage:
361 361
362 362 $ hg log -r1 --style changelog
363 363
364 364 A template is a piece of text, with markup to invoke variable
365 365 expansion:
366 366
367 367 $ hg log -r1 --template "{node}\n"
368 368 b56ce7b07c52de7d5fd79fb89701ea538af65746
369 369
370 370 Strings in curly braces are called keywords. The availability of
371 371 keywords depends on the exact context of the templater. These
372 372 keywords are usually available for templating a log-like command:
373 373
374 374 - author: String. The unmodified author of the changeset.
375 375 - branches: String. The name of the branch on which the changeset
376 376 was committed. Will be empty if the branch name was default.
377 377 - date: Date information. The date when the changeset was committed.
378 378 - desc: String. The text of the changeset description.
379 379 - diffstat: String. Statistics of changes with the following
380 380 format: "modified files: +added/-removed lines"
381 381 - files: List of strings. All files modified, added, or removed by
382 382 this changeset.
383 383 - file_adds: List of strings. Files added by this changeset.
384 384 - file_mods: List of strings. Files modified by this changeset.
385 385 - file_dels: List of strings. Files removed by this changeset.
386 386 - node: String. The changeset identification hash, as a
387 387 40-character hexadecimal string.
388 388 - parents: List of strings. The parents of the changeset.
389 389 - rev: Integer. The repository-local changeset revision number.
390 390 - tags: List of strings. Any tags associated with the changeset.
391 391
392 392 The "date" keyword does not produce human-readable output. If you
393 393 want to use a date in your output, you can use a filter to process
394 394 it. Filters are functions which return a string based on the input
395 395 variable. You can also use a chain of filters to get the desired
396 396 output:
397 397
398 398 $ hg tip --template "{date|isodate}\n"
399 399 2008-08-21 18:22 +0000
400 400
401 401 List of filters:
402 402
403 403 - addbreaks: Any text. Add an XHTML "<br />" tag before the end of
404 404 every line except the last.
405 405 - age: Date. Returns a human-readable date/time difference between
406 406 the given date/time and the current date/time.
407 407 - basename: Any text. Treats the text as a path, and returns the
408 408 last component of the path after splitting by the path
409 409 separator (ignoring trailing separators). For example,
410 410 "foo/bar/baz" becomes "baz" and "foo/bar//" becomes "bar".
411 411 - stripdir: Treat the text as path and strip a directory level, if
412 412 possible. For example, "foo" and "foo/bar" becomes "foo".
413 413 - date: Date. Returns a date in a Unix date format, including
414 414 the timezone: "Mon Sep 04 15:13:13 2006 0700".
415 415 - domain: Any text. Finds the first string that looks like an
416 416 email address, and extracts just the domain component.
417 417 Example: 'User <user@example.com>' becomes 'example.com'.
418 418 - email: Any text. Extracts the first string that looks like an
419 419 email address. Example: 'User <user@example.com>' becomes
420 420 'user@example.com'.
421 421 - escape: Any text. Replaces the special XML/XHTML characters "&",
422 422 "<" and ">" with XML entities.
423 423 - fill68: Any text. Wraps the text to fit in 68 columns.
424 424 - fill76: Any text. Wraps the text to fit in 76 columns.
425 425 - firstline: Any text. Returns the first line of text.
426 426 - nonempty: Any text. Returns '(none)' if the string is empty.
427 427 - hgdate: Date. Returns the date as a pair of numbers:
428 428 "1157407993 25200" (Unix timestamp, timezone offset).
429 - isodate: Date. Returns the date in ISO 8601 format.
429 - isodate: Date. Returns the date in ISO 8601 format: "2009-08-18
430 13:00 +0200".
430 431 - isodatesec: Date. Returns the date in ISO 8601 format, including
431 seconds. See also the rfc3339date filter.
432 seconds: "2009-08-18 13:00:13 +0200". See also the
433 rfc3339date filter.
432 434 - localdate: Date. Converts a date to local date.
433 435 - obfuscate: Any text. Returns the input text rendered as a
434 436 sequence of XML entities.
435 437 - person: Any text. Returns the text before an email address.
436 438 - rfc822date: Date. Returns a date using the same format used
437 in email headers.
439 in email headers: "Tue, 18 Aug 2009 13:00:13 +0200".
438 440 - rfc3339date: Date. Returns a date using the Internet date format
439 specified in RFC 3339.
441 specified in RFC 3339: "2009-08-18T13:00:13+02:00".
440 442 - short: Changeset hash. Returns the short form of a changeset
441 443 hash, i.e. a 12-byte hexadecimal string.
442 444 - shortdate: Date. Returns a date like "2006-09-18".
443 445 - strip: Any text. Strips all leading and trailing whitespace.
444 446 - tabindent: Any text. Returns the text, with every line except
445 447 the first starting with a tab character.
446 448 - urlescape: Any text. Escapes all "special" characters. For
447 449 example, "foo bar" becomes "foo%20bar".
448 450 - user: Any text. Returns the user portion of an email address.
449 451 ''')),
450 452
451 453 (['urls'], _('URL Paths'),
452 454 _(r'''
453 455 Valid URLs are of the form:
454 456
455 457 local/filesystem/path[#revision]
456 458 file://local/filesystem/path[#revision]
457 459 http://[user[:pass]@]host[:port]/[path][#revision]
458 460 https://[user[:pass]@]host[:port]/[path][#revision]
459 461 ssh://[user[:pass]@]host[:port]/[path][#revision]
460 462
461 463 Paths in the local filesystem can either point to Mercurial
462 464 repositories or to bundle files (as created by 'hg bundle' or
463 465 'hg incoming --bundle').
464 466
465 467 An optional identifier after # indicates a particular branch, tag,
466 468 or changeset to use from the remote repository. See also 'hg help
467 469 revisions'.
468 470
469 471 Some features, such as pushing to http:// and https:// URLs are
470 472 only possible if the feature is explicitly enabled on the remote
471 473 Mercurial server.
472 474
473 475 Some notes about using SSH with Mercurial:
474 476 - SSH requires an accessible shell account on the destination
475 477 machine and a copy of hg in the remote path or specified with as
476 478 remotecmd.
477 479 - path is relative to the remote user's home directory by default.
478 480 Use an extra slash at the start of a path to specify an absolute path:
479 481 ssh://example.com//tmp/repository
480 482 - Mercurial doesn't use its own compression via SSH; the right
481 483 thing to do is to configure it in your ~/.ssh/config, e.g.:
482 484 Host *.mylocalnetwork.example.com
483 485 Compression no
484 486 Host *
485 487 Compression yes
486 488 Alternatively specify "ssh -C" as your ssh command in your hgrc
487 489 or with the --ssh command line option.
488 490
489 491 These URLs can all be stored in your hgrc with path aliases under
490 492 the [paths] section like so:
491 493 [paths]
492 494 alias1 = URL1
493 495 alias2 = URL2
494 496 ...
495 497
496 498 You can then use the alias for any command that uses a URL (for
497 499 example 'hg pull alias1' would pull from the 'alias1' path).
498 500
499 501 Two path aliases are special because they are used as defaults
500 502 when you do not provide the URL to a command:
501 503
502 504 default:
503 505 When you create a repository with hg clone, the clone command
504 506 saves the location of the source repository as the new
505 507 repository's 'default' path. This is then used when you omit
506 508 path from push- and pull-like commands (including incoming and
507 509 outgoing).
508 510
509 511 default-push:
510 512 The push command will look for a path named 'default-push', and
511 513 prefer it over 'default' if both are defined.
512 514 ''')),
513 515 (["extensions"], _("Using additional features"), extshelp),
514 516 )
General Comments 0
You need to be logged in to leave comments. Login now