Mercurial > hg
changeset 7905:d596b1f2935a
convert: missing p4 tool is only slightly fatal
checktool with default abort=True caused convert to fail too early.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 27 Mar 2009 13:39:18 +0100 |
| parents | fef5f3ef84c4 |
| children | c0dc1f15b30d |
| files | hgext/convert/p4.py tests/test-convert tests/test-convert.out |
| diffstat | 3 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/p4.py Sat Mar 07 16:06:46 2009 +0800 +++ b/hgext/convert/p4.py Fri Mar 27 13:39:18 2009 +0100 @@ -28,7 +28,7 @@ def __init__(self, ui, path, rev=None): super(p4_source, self).__init__(ui, path, rev=rev) - checktool('p4') + checktool('p4', abort=False) self.p4changes = {} self.heads = {}
--- a/tests/test-convert Sat Mar 07 16:06:46 2009 +0800 +++ b/tests/test-convert Fri Mar 27 13:39:18 2009 +0100 @@ -44,3 +44,7 @@ echo 'include b' > filemap hg convert --debug --filemap filemap a partialb | \ grep 'run hg' + +echo % converting empty dir should fail "nicely" +mkdir emptydir +PATH=$BINDIR hg convert emptydir 2>&1 | sed 's,file://.*/emptydir,.../emptydir,g'
--- a/tests/test-convert.out Sat Mar 07 16:06:46 2009 +0800 +++ b/tests/test-convert.out Fri Mar 27 13:39:18 2009 +0100 @@ -226,3 +226,16 @@ run hg sink pre-conversion action run hg sink post-conversion action run hg source post-conversion action +% converting empty dir should fail nicely +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 +cannot find required "mtn" tool +emptydir does not look like a GNU Arch repo +emptydir does not look like a Bazaar repo +cannot find required "p4" tool +abort: emptydir: missing or unsupported repository