--- a/hgext/keyword.py Tue Apr 07 22:47:56 2009 +0200
+++ b/hgext/keyword.py Tue Apr 07 22:58:05 2009 +0200
@@ -52,7 +52,7 @@
x* = ignore
Note: the more specific you are in your filename patterns
- the less you lose speed in huge repos.
+ the less you lose speed in huge repositories.
For [keywordmaps] template mapping and expansion demonstration and
control run "hg kwdemo".
@@ -299,7 +299,7 @@
fn = 'demo.txt'
branchname = 'demobranch'
tmpdir = tempfile.mkdtemp('', 'kwdemo.')
- ui.note(_('creating temporary repo at %s\n') % tmpdir)
+ ui.note(_('creating temporary repository at %s\n') % tmpdir)
repo = localrepo.localrepository(ui, tmpdir, True)
ui.setconfig('keyword', fn, '')
if args or opts.get('rcfile'):
@@ -353,7 +353,7 @@
fmt = ui.verbose and ' in %s' % path or ''
demostatus('%s keywords expanded%s' % (kwstatus, fmt))
ui.write(repo.wread(fn))
- ui.debug(_('\nremoving temporary repo %s\n') % tmpdir)
+ ui.debug(_('\nremoving temporary repository %s\n') % tmpdir)
shutil.rmtree(tmpdir, ignore_errors=True)
def expand(ui, repo, *pats, **opts):
--- a/hgext/mq.py Tue Apr 07 22:47:56 2009 +0200
+++ b/hgext/mq.py Tue Apr 07 22:58:05 2009 +0200
@@ -1765,22 +1765,23 @@
qbase = sr.lookup('qbase')
except error.RepoError:
pass
- ui.note(_('cloning main repo\n'))
+ ui.note(_('cloning main repository\n'))
sr, dr = hg.clone(ui, sr.url(), dest,
pull=opts['pull'],
rev=destrev,
update=False,
stream=opts['uncompressed'])
- ui.note(_('cloning patch repo\n'))
+ ui.note(_('cloning patch repository\n'))
hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr),
pull=opts['pull'], update=not opts['noupdate'],
stream=opts['uncompressed'])
if dr.local():
if qbase:
- ui.note(_('stripping applied patches from destination repo\n'))
+ ui.note(_('stripping applied patches from destination '
+ 'repository\n'))
dr.mq.strip(dr, qbase, update=False, backup=None)
if not opts['noupdate']:
- ui.note(_('updating destination repo\n'))
+ ui.note(_('updating destination repository\n'))
hg.update(dr, dr.changelog.tip())
def commit(ui, repo, *pats, **opts):
@@ -2480,7 +2481,7 @@
('U', 'noupdate', None, _('do not update the new working directories')),
('', 'uncompressed', None,
_('use uncompressed transfer (fast over LAN)')),
- ('p', 'patches', '', _('location of source patch repo')),
+ ('p', 'patches', '', _('location of source patch repository')),
] + commands.remoteopts,
_('hg qclone [OPTION]... SOURCE [DEST]')),
"qcommit|qci":
--- a/hgext/notify.py Tue Apr 07 22:47:56 2009 +0200
+++ b/hgext/notify.py Tue Apr 07 22:58:05 2009 +0200
@@ -59,9 +59,9 @@
# key is glob pattern, value is ","-separated list of subscriber emails
pattern = user@host
- glob patterns are matched against path to repo root.
+ glob patterns are matched against path to repository root.
- if you like, you can put notify config file in repo that users can
+ if you like, you can put notify config file in repository that users can
push changes to, they can manage their own subscriptions.'''
from mercurial.i18n import _
@@ -268,7 +268,7 @@
ctx = repo[node]
if not n.subs:
- ui.debug(_('notify: no subscribers to repo %s\n') % n.root)
+ ui.debug(_('notify: no subscribers to repository %s\n') % n.root)
return
if n.skipsource(source):
ui.debug(_('notify: changes have source "%s" - skipping\n') % source)
--- a/mercurial/commands.py Tue Apr 07 22:47:56 2009 +0200
+++ b/mercurial/commands.py Tue Apr 07 22:58:05 2009 +0200
@@ -542,7 +542,7 @@
for the export command, with the following additions:
%s basename of file being printed
- %d dirname of file being printed, or '.' if in repo root
+ %d dirname of file being printed, or '.' if in repository root
%p root-relative path name of file being printed
"""
ctx = repo[opts.get('rev')]
@@ -1538,7 +1538,7 @@
"""identify the working copy or specified revision
With no revision, print a summary of the current state of the
- repo.
+ repository.
With a path, do a lookup in another repository.
@@ -2925,7 +2925,7 @@
clone -U').
When the working directory contains no uncommitted changes, it will be
- replaced by the state of the requested revision from the repo.
+ replaced by the state of the requested revision from the repository.
When the requested revision is on a different branch, the working
directory will additionally be switched to that branch.
@@ -3387,7 +3387,7 @@
('n', 'name', '',
_('name to show in web pages (default: working directory)')),
('', 'webdir-conf', '', _('name of the webdir config file'
- ' (serve more than one repo)')),
+ ' (serve more than one repository)')),
('', 'pid-file', '', _('name of file to write process ID to')),
('', 'stdio', None, _('for remote clients')),
('t', 'templates', '', _('web templates to use')),
--- a/tests/test-dispatch.out Tue Apr 07 22:47:56 2009 +0200
+++ b/tests/test-dispatch.out Tue Apr 07 22:58:05 2009 +0200
@@ -14,7 +14,7 @@
for the export command, with the following additions:
%s basename of file being printed
- %d dirname of file being printed, or '.' if in repo root
+ %d dirname of file being printed, or '.' if in repository root
%p root-relative path name of file being printed
options:
--- a/tests/test-keyword.out Tue Apr 07 22:47:56 2009 +0200
+++ b/tests/test-keyword.out Tue Apr 07 22:58:05 2009 +0200
@@ -19,7 +19,7 @@
x* = ignore
Note: the more specific you are in your filename patterns
- the less you lose speed in huge repos.
+ the less you lose speed in huge repositories.
For [keywordmaps] template mapping and expansion demonstration and
control run "hg kwdemo".
--- a/tests/test-notify.out Tue Apr 07 22:47:56 2009 +0200
+++ b/tests/test-notify.out Tue Apr 07 22:58:05 2009 +0200
@@ -52,9 +52,9 @@
# key is glob pattern, value is ","-separated list of subscriber emails
pattern = user@host
- glob patterns are matched against path to repo root.
+ glob patterns are matched against path to repository root.
- if you like, you can put notify config file in repo that users can
+ if you like, you can put notify config file in repository that users can
push changes to, they can manage their own subscriptions.
no commands defined