diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py --- a/hgext/convert/bzr.py +++ b/hgext/convert/bzr.py @@ -37,7 +37,7 @@ class bzr_source(converter_source): 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 diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -34,10 +34,10 @@ class darcs_source(converter_source, com # 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() diff --git a/hgext/convert/git.py b/hgext/convert/git.py --- a/hgext/convert/git.py +++ b/hgext/convert/git.py @@ -35,7 +35,7 @@ class convert_git(converter_source): 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') diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py --- a/hgext/convert/gnuarch.py +++ b/hgext/convert/gnuarch.py @@ -31,7 +31,8 @@ class gnuarch_source(converter_source, c 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 diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -36,7 +36,8 @@ class mercurial_sink(converter_sink): 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 @@ class mercurial_sink(converter_sink): 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 @@ class mercurial_source(converter_source) 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 diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py --- a/hgext/convert/monotone.py +++ b/hgext/convert/monotone.py @@ -20,7 +20,8 @@ class monotone_source(converter_source, 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: diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py --- a/hgext/convert/p4.py +++ b/hgext/convert/p4.py @@ -28,7 +28,7 @@ class p4_source(converter_source): 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) diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -207,7 +207,7 @@ class svn_source(converter_source): (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 @@ class svn_source(converter_source): 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 @@ class svn_sink(converter_sink, commandli 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 diff --git a/tests/test-convert-svn-sink.out b/tests/test-convert-svn-sink.out --- a/tests/test-convert-svn-sink.out +++ b/tests/test-convert-svn-sink.out @@ -4,7 +4,7 @@ adding d1/d2/b % 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 % 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 @@ merging b failed! 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... diff --git a/tests/test-convert.out b/tests/test-convert.out --- a/tests/test-convert.out +++ b/tests/test-convert.out @@ -259,13 +259,13 @@ run hg source post-conversion action 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