comparison mercurial/commands.py @ 8027:9c7ca86fc658

expand "repo" to "repository" in help texts
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Apr 2009 22:58:05 +0200
parents 683d8ebcf434
children 3aaca5901ade
comparison
equal deleted inserted replaced
8026:683d8ebcf434 8027:9c7ca86fc658
540 Output may be to a file, in which case the name of the file is 540 Output may be to a file, in which case the name of the file is
541 given using a format string. The formatting rules are the same as 541 given using a format string. The formatting rules are the same as
542 for the export command, with the following additions: 542 for the export command, with the following additions:
543 543
544 %s basename of file being printed 544 %s basename of file being printed
545 %d dirname of file being printed, or '.' if in repo root 545 %d dirname of file being printed, or '.' if in repository root
546 %p root-relative path name of file being printed 546 %p root-relative path name of file being printed
547 """ 547 """
548 ctx = repo[opts.get('rev')] 548 ctx = repo[opts.get('rev')]
549 err = 1 549 err = 1
550 m = cmdutil.match(repo, (file1,) + pats, opts) 550 m = cmdutil.match(repo, (file1,) + pats, opts)
1536 def identify(ui, repo, source=None, 1536 def identify(ui, repo, source=None,
1537 rev=None, num=None, id=None, branch=None, tags=None): 1537 rev=None, num=None, id=None, branch=None, tags=None):
1538 """identify the working copy or specified revision 1538 """identify the working copy or specified revision
1539 1539
1540 With no revision, print a summary of the current state of the 1540 With no revision, print a summary of the current state of the
1541 repo. 1541 repository.
1542 1542
1543 With a path, do a lookup in another repository. 1543 With a path, do a lookup in another repository.
1544 1544
1545 This summary identifies the repository state using one or two 1545 This summary identifies the repository state using one or two
1546 parent hash identifiers, followed by a "+" if there are 1546 parent hash identifiers, followed by a "+" if there are
2923 revision, or the tip of the current branch if none is specified. 2923 revision, or the tip of the current branch if none is specified.
2924 Use null as the revision to remove the working copy (like 'hg 2924 Use null as the revision to remove the working copy (like 'hg
2925 clone -U'). 2925 clone -U').
2926 2926
2927 When the working directory contains no uncommitted changes, it will be 2927 When the working directory contains no uncommitted changes, it will be
2928 replaced by the state of the requested revision from the repo. 2928 replaced by the state of the requested revision from the repository.
2929 When the requested revision is on a different branch, the working 2929 When the requested revision is on a different branch, the working
2930 directory will additionally be switched to that branch. 2930 directory will additionally be switched to that branch.
2931 2931
2932 When there are uncommitted changes, use option -C to discard them, 2932 When there are uncommitted changes, use option -C to discard them,
2933 forcibly replacing the state of the working directory with the requested 2933 forcibly replacing the state of the working directory with the requested
3385 ('a', 'address', '', _('address to listen on (default: all interfaces)')), 3385 ('a', 'address', '', _('address to listen on (default: all interfaces)')),
3386 ('', 'prefix', '', _('prefix path to serve from (default: server root)')), 3386 ('', 'prefix', '', _('prefix path to serve from (default: server root)')),
3387 ('n', 'name', '', 3387 ('n', 'name', '',
3388 _('name to show in web pages (default: working directory)')), 3388 _('name to show in web pages (default: working directory)')),
3389 ('', 'webdir-conf', '', _('name of the webdir config file' 3389 ('', 'webdir-conf', '', _('name of the webdir config file'
3390 ' (serve more than one repo)')), 3390 ' (serve more than one repository)')),
3391 ('', 'pid-file', '', _('name of file to write process ID to')), 3391 ('', 'pid-file', '', _('name of file to write process ID to')),
3392 ('', 'stdio', None, _('for remote clients')), 3392 ('', 'stdio', None, _('for remote clients')),
3393 ('t', 'templates', '', _('web templates to use')), 3393 ('t', 'templates', '', _('web templates to use')),
3394 ('', 'style', '', _('template style to use')), 3394 ('', 'style', '', _('template style to use')),
3395 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), 3395 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),