convert: write "repository" instead of "repo" stable
authorMartin Geisler <mg@lazybytes.net>
Sun, 18 Apr 2010 15:47:49 +0200
branchstable
changeset 10938 02d6149a480b
parent 10933 e3396b218e10
child 10939 9f6731b03906
convert: write "repository" instead of "repo" We should strive to avoid slang in our messages to the users.
hgext/convert/bzr.py
hgext/convert/darcs.py
hgext/convert/git.py
hgext/convert/gnuarch.py
hgext/convert/hg.py
hgext/convert/monotone.py
hgext/convert/p4.py
hgext/convert/subversion.py
tests/test-convert-svn-sink.out
tests/test-convert.out
--- a/hgext/convert/bzr.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/bzr.py	Sun Apr 18 15:47:49 2010 +0200
@@ -37,7 +37,7 @@
         super(bzr_source, self).__init__(ui, path, rev=rev)
 
         if not os.path.exists(os.path.join(path, '.bzr')):
-            raise NoRepo('%s does not look like a Bazaar repo' % path)
+            raise NoRepo('%s does not look like a Bazaar repository' % path)
 
         try:
             # access bzrlib stuff
--- a/hgext/convert/darcs.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/darcs.py	Sun Apr 18 15:47:49 2010 +0200
@@ -34,10 +34,10 @@
         # check for _darcs, ElementTree, _darcs/inventory so that we can
         # easily skip test-convert-darcs if ElementTree is not around
         if not os.path.exists(os.path.join(path, '_darcs', 'inventories')):
-            raise NoRepo("%s does not look like a darcs repo" % path)
+            raise NoRepo("%s does not look like a darcs repository" % path)
 
         if not os.path.exists(os.path.join(path, '_darcs')):
-            raise NoRepo("%s does not look like a darcs repo" % path)
+            raise NoRepo("%s does not look like a darcs repository" % path)
 
         checktool('darcs')
         version = self.run0('--version').splitlines()[0].strip()
--- a/hgext/convert/git.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/git.py	Sun Apr 18 15:47:49 2010 +0200
@@ -35,7 +35,7 @@
         if os.path.isdir(path + "/.git"):
             path += "/.git"
         if not os.path.exists(path + "/objects"):
-            raise NoRepo("%s does not look like a Git repo" % path)
+            raise NoRepo("%s does not look like a Git repository" % path)
 
         checktool('git', 'git')
 
--- a/hgext/convert/gnuarch.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/gnuarch.py	Sun Apr 18 15:47:49 2010 +0200
@@ -31,7 +31,8 @@
         super(gnuarch_source, self).__init__(ui, path, rev=rev)
 
         if not os.path.exists(os.path.join(path, '{arch}')):
-            raise NoRepo(_("%s does not look like a GNU Arch repo") % path)
+            raise NoRepo(_("%s does not look like a GNU Arch repository")
+                         % path)
 
         # Could use checktool, but we want to check for baz or tla.
         self.execmd = None
--- a/hgext/convert/hg.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/hg.py	Sun Apr 18 15:47:49 2010 +0200
@@ -36,7 +36,8 @@
             try:
                 self.repo = hg.repository(self.ui, path)
                 if not self.repo.local():
-                    raise NoRepo(_('%s is not a local Mercurial repo') % path)
+                    raise NoRepo(_('%s is not a local Mercurial repository')
+                                 % path)
             except error.RepoError, err:
                 ui.traceback()
                 raise NoRepo(err.args[0])
@@ -45,11 +46,13 @@
                 ui.status(_('initializing destination %s repository\n') % path)
                 self.repo = hg.repository(self.ui, path, create=True)
                 if not self.repo.local():
-                    raise NoRepo(_('%s is not a local Mercurial repo') % path)
+                    raise NoRepo(_('%s is not a local Mercurial repository')
+                                 % path)
                 self.created.append(path)
             except error.RepoError:
                 ui.traceback()
-                raise NoRepo("could not create hg repo %s as sink" % path)
+                raise NoRepo("could not create hg repository %s as sink"
+                             % path)
         self.lock = None
         self.wlock = None
         self.filemapmode = False
@@ -224,7 +227,7 @@
                 raise error.RepoError()
         except error.RepoError:
             ui.traceback()
-            raise NoRepo("%s is not a local Mercurial repo" % path)
+            raise NoRepo("%s is not a local Mercurial repository" % path)
         self.lastrev = None
         self.lastctx = None
         self._changescache = None
--- a/hgext/convert/monotone.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/monotone.py	Sun Apr 18 15:47:49 2010 +0200
@@ -20,7 +20,8 @@
         self.ui = ui
         self.path = path
 
-        norepo = NoRepo (_("%s does not look like a monotone repo") % path)
+        norepo = NoRepo(_("%s does not look like a monotone repository")
+                        % path)
         if not os.path.exists(os.path.join(path, '_MTN')):
             # Could be a monotone repository (SQLite db file)
             try:
--- a/hgext/convert/p4.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/p4.py	Sun Apr 18 15:47:49 2010 +0200
@@ -28,7 +28,7 @@
         super(p4_source, self).__init__(ui, path, rev=rev)
 
         if "/" in path and not path.startswith('//'):
-            raise NoRepo('%s does not look like a P4 repo' % path)
+            raise NoRepo('%s does not look like a P4 repository' % path)
 
         checktool('p4', abort=False)
 
--- a/hgext/convert/subversion.py	Wed Apr 14 11:59:53 2010 +0530
+++ b/hgext/convert/subversion.py	Sun Apr 18 15:47:49 2010 +0200
@@ -207,7 +207,7 @@
                 (os.path.exists(url) and
                  os.path.exists(os.path.join(url, '.svn'))) or
                 issvnurl(ui, url)):
-            raise NoRepo("%s does not look like a Subversion repo" % url)
+            raise NoRepo("%s does not look like a Subversion repository" % url)
 
         try:
             SubversionException
@@ -252,7 +252,8 @@
             self.uuid = svn.ra.get_uuid(self.ra)
         except SubversionException:
             ui.traceback()
-            raise NoRepo("%s does not look like a Subversion repo" % self.url)
+            raise NoRepo("%s does not look like a Subversion repository"
+                         % self.url)
 
         if rev:
             try:
@@ -984,7 +985,7 @@
 
             if os.path.isdir(os.path.dirname(path)):
                 if not os.path.exists(os.path.join(path, 'db', 'fs-type')):
-                    ui.status(_('initializing svn repo %r\n') %
+                    ui.status(_('initializing svn repository %r\n') %
                               os.path.basename(path))
                     commandline(ui, 'svnadmin').run0('create', path)
                     created = path
--- a/tests/test-convert-svn-sink.out	Wed Apr 14 11:59:53 2010 +0530
+++ b/tests/test-convert-svn-sink.out	Sun Apr 18 15:47:49 2010 +0200
@@ -4,7 +4,7 @@
 % modify
 1:e0e2b8a9156b
 assuming destination a-hg
-initializing svn repo 'a-hg'
+initializing svn repository 'a-hg'
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
@@ -196,7 +196,7 @@
 % executable in new directory
 adding d1/a
 assuming destination a-hg
-initializing svn repo 'a-hg'
+initializing svn repository 'a-hg'
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
@@ -267,7 +267,7 @@
 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 assuming destination b-hg
-initializing svn repo 'b-hg'
+initializing svn repository 'b-hg'
 initializing svn wc 'b-hg-wc'
 scanning source...
 sorting...
--- a/tests/test-convert.out	Wed Apr 14 11:59:53 2010 +0530
+++ b/tests/test-convert.out	Sun Apr 18 15:47:49 2010 +0200
@@ -259,13 +259,13 @@
 assuming destination emptydir-hg
 initializing destination emptydir-hg repository
 emptydir does not look like a CVS checkout
-emptydir does not look like a Git repo
-emptydir does not look like a Subversion repo
-emptydir is not a local Mercurial repo
-emptydir does not look like a darcs repo
-emptydir does not look like a monotone repo
-emptydir does not look like a GNU Arch repo
-emptydir does not look like a Bazaar repo
+emptydir does not look like a Git repository
+emptydir does not look like a Subversion repository
+emptydir is not a local Mercurial repository
+emptydir does not look like a darcs repository
+emptydir does not look like a monotone repository
+emptydir does not look like a GNU Arch repository
+emptydir does not look like a Bazaar repository
 cannot find required "p4" tool
 abort: emptydir: missing or unsupported repository
 % convert with imaginary source type