Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 08 Apr 2009 23:13:51 +0200
changeset 530 09d1575f16c7
parent 528 bde29dbc3fc2 (current diff)
parent 529 7197324dfa4d (diff)
child 533 fa7d7d6ca1ad
Merge with stable
--- a/hgkw/keyword.py	Sun Apr 05 12:15:32 2009 +0200
+++ b/hgkw/keyword.py	Wed Apr 08 23:13:51 2009 +0200
@@ -54,7 +54,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".
@@ -301,7 +301,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'):
@@ -355,7 +355,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/tests/test-keyword.out	Sun Apr 05 12:15:32 2009 +0200
+++ b/tests/test-keyword.out	Wed Apr 08 23:13:51 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".