[PATCH 1 of 5 wc] commands: replace "working copy" with "working directory" in help/messages
Yuya Nishihara
yuya at tcha.org
Tue Mar 17 15:09:22 UTC 2015
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1426600028 -32400
# Tue Mar 17 22:47:08 2015 +0900
# Node ID c750fbabda7e0b4defccb13eb2abe6204d4cc89f
# Parent b7f936f47f2b104a60840bae571e009742126afc
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.
diff --git a/hgext/share.py b/hgext/share.py
--- a/hgext/share.py
+++ b/hgext/share.py
@@ -15,7 +15,7 @@ command = cmdutil.command(cmdtable)
testedwith = 'internal'
@command('share',
- [('U', 'noupdate', None, _('do not create a working copy')),
+ [('U', 'noupdate', None, _('do not create a working directory')),
('B', 'bookmarks', None, _('also share bookmarks'))],
_('[-U] [-B] SOURCE [DEST]'),
norepo=True)
diff --git a/hgext/strip.py b/hgext/strip.py
--- a/hgext/strip.py
+++ b/hgext/strip.py
@@ -81,7 +81,8 @@ def strip(ui, repo, revs, update=True, b
('', 'no-backup', None, _('no backups')),
('', 'nobackup', None, _('no backups (DEPRECATED)')),
('n', '', None, _('ignored (DEPRECATED)')),
- ('k', 'keep', None, _("do not modify working copy during strip")),
+ ('k', 'keep', None, _("do not modify working directory during "
+ "strip")),
('B', 'bookmark', '', _("remove revs only reachable from given"
" bookmark"))],
_('hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV...'))
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -582,7 +582,7 @@ def copy(ui, repo, pats, opts, rename=Fa
srcexists = True
except IOError, inst:
if inst.errno == errno.ENOENT:
- ui.warn(_('%s: deleted in working copy\n') % relsrc)
+ ui.warn(_('%s: deleted in working directory\n') % relsrc)
srcexists = False
else:
ui.warn(_('%s: cannot copy - %s\n') %
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1263,8 +1263,8 @@ def cat(ui, repo, file1, *pats, **opts):
return cmdutil.cat(ui, repo, ctx, m, '', **opts)
@command('^clone',
- [('U', 'noupdate', None,
- _('the clone will include an empty working copy (only a repository)')),
+ [('U', 'noupdate', None, _('the clone will include an empty working '
+ 'directory (only a repository)')),
('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
('r', 'rev', [], _('include the specified changeset'), _('REV')),
('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
@@ -2906,8 +2906,9 @@ def debugsetparents(ui, repo, rev1, rev2
"""manually set the parents of the current working directory
This is useful for writing repository conversion tools, but should
- be used with care. For example, neither the working copy nor the dirstate
- is updated, so file status may be incorrect after running this command.
+ be used with care. For example, neither the working directory nor the
+ dirstate is updated, so file status may be incorrect after running this
+ command.
Returns 0 on success.
"""
@@ -3234,7 +3235,7 @@ def files(ui, repo, *pats, **opts):
removed files).
If no patterns are given to match, this command prints the names
- of all files under Mercurial control in the working copy.
+ of all files under Mercurial control in the working directory.
.. container:: verbose
@@ -3920,7 +3921,7 @@ def help_(ui, name=None, **opts):
optionalrepo=True)
def identify(ui, repo, source=None, rev=None,
num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
- """identify the working copy or specified revision
+ """identify the working directory or specified revision
Print a summary identifying the repository state at REV using one or
two parent hash identifiers, followed by a "+" if the working
diff --git a/tests/test-copy.t b/tests/test-copy.t
--- a/tests/test-copy.t
+++ b/tests/test-copy.t
@@ -138,7 +138,7 @@ should print a warning that this is not
moving a missing file
$ rm foo
$ hg mv foo foo3
- foo: deleted in working copy
+ foo: deleted in working directory
foo3 does not exist!
$ hg up -qC .
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -309,7 +309,7 @@ Testing -h/--help:
grep search for a pattern in specified files and revisions
heads show branch heads
help show help for a given topic or a help overview
- identify identify the working copy or specified revision
+ identify identify the working directory or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
@@ -390,7 +390,7 @@ Testing -h/--help:
grep search for a pattern in specified files and revisions
heads show branch heads
help show help for a given topic or a help overview
- identify identify the working copy or specified revision
+ identify identify the working directory or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -72,7 +72,7 @@ Short help:
grep search for a pattern in specified files and revisions
heads show branch heads
help show help for a given topic or a help overview
- identify identify the working copy or specified revision
+ identify identify the working directory or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
@@ -147,7 +147,7 @@ Short help:
grep search for a pattern in specified files and revisions
heads show branch heads
help show help for a given topic or a help overview
- identify identify the working copy or specified revision
+ identify identify the working directory or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
@@ -690,7 +690,7 @@ Test that default list of commands omits
grep search for a pattern in specified files and revisions
heads show branch heads
help show help for a given topic or a help overview
- identify identify the working copy or specified revision
+ identify identify the working directory or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
@@ -1656,7 +1656,7 @@ Dish up an empty repo; serve it cold.
identify
</a>
</td><td>
- identify the working copy or specified revision
+ identify the working directory or specified revision
</td></tr>
<tr><td>
<a href="/help/import">
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -636,7 +636,7 @@ Make sure no one adds back a -b option:
-f --force force removal of changesets, discard uncommitted changes
(no backup)
--no-backup no backups
- -k --keep do not modify working copy during strip
+ -k --keep do not modify working directory during strip
-B --bookmark VALUE remove revs only reachable from given bookmark
--mq operate on patch repository
More information about the Mercurial-devel
mailing list