Mercurial > hg
changeset 7907:853fc76d8564
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sat, 28 Mar 2009 19:25:10 +0100 |
| parents | c0dc1f15b30d (diff) ccc6531e6db8 (current diff) |
| children | 27f23c9da186 |
| files | |
| diffstat | 12 files changed, 33 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/p4.py Sat Mar 28 16:34:40 2009 +0100 +++ b/hgext/convert/p4.py Sat Mar 28 19:25:10 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/mercurial/hbisect.py Sat Mar 28 16:34:40 2009 +0100 +++ b/mercurial/hbisect.py Sat Mar 28 19:25:10 2009 +0100 @@ -78,7 +78,7 @@ unskipped = [c for c in candidates if (c not in skip) and (c != badrev)] if tot == 1 or not unskipped: return ([changelog.node(rev) for rev in candidates], 0, good) - perfect = tot / 2 + perfect = tot // 2 # find the best node to test best_rev = None
--- a/mercurial/help.py Sat Mar 28 16:34:40 2009 +0100 +++ b/mercurial/help.py Sat Mar 28 19:25:10 2009 +0100 @@ -135,8 +135,8 @@ from the current repository is read. For each element in HGRCPATH: - * if it's a directory, all directories ending with .rc are added - * otherwise, the directory itself will be added + * if it's a directory, all files ending with .rc are added + * otherwise, the file itself will be added HGUSER:: This is the string used as the author of a commit. If not set,
--- a/mercurial/posix.py Sat Mar 28 16:34:40 2009 +0100 +++ b/mercurial/posix.py Sat Mar 28 19:25:10 2009 +0100 @@ -9,7 +9,7 @@ """ from i18n import _ -import os, sys, osutil, errno, stat, getpass +import os, sys, osutil, errno, stat, getpass, pwd, grp posixfile = file nulldev = '/dev/null'
--- a/tests/test-bad-pull Sat Mar 28 16:34:40 2009 +0100 +++ b/tests/test-bad-pull Sat Mar 28 19:25:10 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh -hg clone http://localhost:$HGPORT/ copy -echo $? +{ hg clone http://localhost:$HGPORT/ copy 2>&1; echo $?; } | \ + sed 's/error:.*/error:/' test -d copy || echo copy: No such file or directory cat > dumb.py <<EOF @@ -23,8 +23,7 @@ # give the server some time to start running sleep 1 -http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1 | \ +{ http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1; echo $?; } | \ sed -e 's/404.*/404/' -e 's/Date:.*/Date:/' -echo $? kill $!
--- a/tests/test-bad-pull.out Sat Mar 28 16:34:40 2009 +0100 +++ b/tests/test-bad-pull.out Sat Mar 28 19:25:10 2009 +0100 @@ -1,5 +1,5 @@ -abort: error: Connection refused +abort: error: 255 copy: No such file or directory abort: HTTP Error 404 -0 +255
--- a/tests/test-convert Sat Mar 28 16:34:40 2009 +0100 +++ b/tests/test-convert Sat Mar 28 19:25:10 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 28 16:34:40 2009 +0100 +++ b/tests/test-convert.out Sat Mar 28 19:25:10 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
--- a/tests/test-http-proxy Sat Mar 28 16:34:40 2009 +0100 +++ b/tests/test-http-proxy Sat Mar 28 19:25:10 2009 +0100 @@ -36,7 +36,8 @@ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e echo %% bad host:port for proxy -http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f +http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f 2>&1 | \ + sed 's/error:.*/error:/' echo %% do not use the proxy if it is in the no list http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g
--- a/tests/test-http-proxy.out Sat Mar 28 16:34:40 2009 +0100 +++ b/tests/test-http-proxy.out Sat Mar 28 19:25:10 2009 +0100 @@ -48,7 +48,7 @@ updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% bad host:port for proxy -abort: error: Connection refused +abort: error: %% do not use the proxy if it is in the no list requesting all changes adding changesets
--- a/tests/test-static-http Sat Mar 28 16:34:40 2009 +0100 +++ b/tests/test-static-http Sat Mar 28 19:25:10 2009 +0100 @@ -2,8 +2,8 @@ cp "$TESTDIR"/printenv.py . -http_proxy= hg clone http://localhost:$HGPORT/ copy -echo $? +{ http_proxy= hg clone http://localhost:$HGPORT/ copy 2>&1; echo $?; } | \ + sed 's/error:.*/error:/' test -d copy || echo copy: No such file or directory # This server doesn't do range requests so it's basically only good for