comparison mercurial/commands.py @ 24364:135b23868f45

commands: replace "working copy" with "working directory" in help/messages "working directory" is the standard term, we should use it consistently. But I didn't touch the hint, "run 'hg update' to get a working copy", because "get a working directory" sounds a bit odd.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 17 Mar 2015 22:47:08 +0900
parents 521fe8287dd5
children f1eaf03dd608
comparison
equal deleted inserted replaced
24363:852801178a63 24364:135b23868f45
1261 m = scmutil.match(ctx, (file1,) + pats, opts) 1261 m = scmutil.match(ctx, (file1,) + pats, opts)
1262 1262
1263 return cmdutil.cat(ui, repo, ctx, m, '', **opts) 1263 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1264 1264
1265 @command('^clone', 1265 @command('^clone',
1266 [('U', 'noupdate', None, 1266 [('U', 'noupdate', None, _('the clone will include an empty working '
1267 _('the clone will include an empty working copy (only a repository)')), 1267 'directory (only a repository)')),
1268 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), 1268 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1269 ('r', 'rev', [], _('include the specified changeset'), _('REV')), 1269 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1270 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), 1270 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1271 ('', 'pull', None, _('use pull protocol to copy metadata')), 1271 ('', 'pull', None, _('use pull protocol to copy metadata')),
1272 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), 1272 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
2904 @command('debugsetparents', [], _('REV1 [REV2]')) 2904 @command('debugsetparents', [], _('REV1 [REV2]'))
2905 def debugsetparents(ui, repo, rev1, rev2=None): 2905 def debugsetparents(ui, repo, rev1, rev2=None):
2906 """manually set the parents of the current working directory 2906 """manually set the parents of the current working directory
2907 2907
2908 This is useful for writing repository conversion tools, but should 2908 This is useful for writing repository conversion tools, but should
2909 be used with care. For example, neither the working copy nor the dirstate 2909 be used with care. For example, neither the working directory nor the
2910 is updated, so file status may be incorrect after running this command. 2910 dirstate is updated, so file status may be incorrect after running this
2911 command.
2911 2912
2912 Returns 0 on success. 2913 Returns 0 on success.
2913 """ 2914 """
2914 2915
2915 r1 = scmutil.revsingle(repo, rev1).node() 2916 r1 = scmutil.revsingle(repo, rev1).node()
3232 Print files under Mercurial control in the working directory or 3233 Print files under Mercurial control in the working directory or
3233 specified revision whose names match the given patterns (excluding 3234 specified revision whose names match the given patterns (excluding
3234 removed files). 3235 removed files).
3235 3236
3236 If no patterns are given to match, this command prints the names 3237 If no patterns are given to match, this command prints the names
3237 of all files under Mercurial control in the working copy. 3238 of all files under Mercurial control in the working directory.
3238 3239
3239 .. container:: verbose 3240 .. container:: verbose
3240 3241
3241 Examples: 3242 Examples:
3242 3243
3918 ] + remoteopts, 3919 ] + remoteopts,
3919 _('[-nibtB] [-r REV] [SOURCE]'), 3920 _('[-nibtB] [-r REV] [SOURCE]'),
3920 optionalrepo=True) 3921 optionalrepo=True)
3921 def identify(ui, repo, source=None, rev=None, 3922 def identify(ui, repo, source=None, rev=None,
3922 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): 3923 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3923 """identify the working copy or specified revision 3924 """identify the working directory or specified revision
3924 3925
3925 Print a summary identifying the repository state at REV using one or 3926 Print a summary identifying the repository state at REV using one or
3926 two parent hash identifiers, followed by a "+" if the working 3927 two parent hash identifiers, followed by a "+" if the working
3927 directory has uncommitted changes, the branch name (if not default), 3928 directory has uncommitted changes, the branch name (if not default),
3928 a list of tags, and a list of bookmarks. 3929 a list of tags, and a list of bookmarks.