# HG changeset patch # User Benoit Boissinot # Date 1242522877 -7200 # Node ID e33baed7c1bc41c777907386e4e435ec6c75f7ad # Parent e9e2a2c9b2949ecb70b7a8824dbd59265c3cad61# Parent cb93eee1fbcd605503e2366f6120c2e36e6dd8f8 merge with crew diff -r e9e2a2c9b294 -r e33baed7c1bc tests/get-with-headers.py --- a/tests/get-with-headers.py Sun May 17 03:04:17 2009 +0200 +++ b/tests/get-with-headers.py Sun May 17 03:14:37 2009 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python -__doc__ = """This does HTTP get requests given a host:port and path and returns +"""This does HTTP GET requests given a host:port and path and returns a subset of the headers plus the body of the result.""" import httplib, sys, re diff -r e9e2a2c9b294 -r e33baed7c1bc tests/printrepr.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/printrepr.py Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,11 @@ +#!/usr/bin/env python +# +# Copyright 2009 Matt Mackall and others +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. + +"""prints repr(sys.stdin) but preserves newlines in input""" + +import sys +print repr(sys.stdin.read())[1:-1].replace('\\n', '\n'), diff -r e9e2a2c9b294 -r e33baed7c1bc tests/repr.py --- a/tests/repr.py Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2009 Matt Mackall and others -# -# This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. - -"""prints repr(sys.stdin) but preserves newlines in input""" - -import sys -print repr(sys.stdin.read())[1:-1].replace('\\n', '\n'), diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-bdiff --- a/tests/test-bdiff Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -#!/usr/bin/env python - -import sys, struct -from mercurial import bdiff, mpatch - -def test1(a, b): - d = bdiff.bdiff(a, b) - c = a - if d: - c = mpatch.patches(a, [d]) - if c != b: - print "***", repr(a), repr(b) - print "bad:" - print repr(c)[:200] - print repr(d) - -def test(a, b): - print "***", repr(a), repr(b) - test1(a, b) - test1(b, a) - -test("a\nc\n\n\n\n", "a\nb\n\n\n") -test("a\nb\nc\n", "a\nc\n") -test("", "") -test("a\nb\nc", "a\nb\nc") -test("a\nb\nc\nd\n", "a\nd\n") -test("a\nb\nc\nd\n", "a\nc\ne\n") -test("a\nb\nc\n", "a\nc\n") -test("a\n", "c\na\nb\n") -test("a\n", "") -test("a\n", "b\nc\n") -test("a\n", "c\na\n") -test("", "adjfkjdjksdhfksj") -test("", "ab") -test("", "abc") -test("a", "a") -test("ab", "ab") -test("abc", "abc") -test("a\n", "a\n") -test("a\nb", "a\nb") - -#issue1295 -def showdiff(a, b): - bin = bdiff.bdiff(a, b) - pos = 0 - while pos < len(bin): - p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) - pos += 12 - print p1, p2, repr(bin[pos:pos + l]) - pos += l -showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n") -showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n") - -print "done" diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-bdiff.out --- a/tests/test-bdiff.out Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -*** 'a\nc\n\n\n\n' 'a\nb\n\n\n' -*** 'a\nb\nc\n' 'a\nc\n' -*** '' '' -*** 'a\nb\nc' 'a\nb\nc' -*** 'a\nb\nc\nd\n' 'a\nd\n' -*** 'a\nb\nc\nd\n' 'a\nc\ne\n' -*** 'a\nb\nc\n' 'a\nc\n' -*** 'a\n' 'c\na\nb\n' -*** 'a\n' '' -*** 'a\n' 'b\nc\n' -*** 'a\n' 'c\na\n' -*** '' 'adjfkjdjksdhfksj' -*** '' 'ab' -*** '' 'abc' -*** 'a' 'a' -*** 'ab' 'ab' -*** 'abc' 'abc' -*** 'a\n' 'a\n' -*** 'a\nb' 'a\nb' -6 6 'y\n\n' -6 6 'y\n\n' -9 9 'y\n\n' -done diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-bdiff.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-bdiff.py Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,54 @@ +#!/usr/bin/env python + +import sys, struct +from mercurial import bdiff, mpatch + +def test1(a, b): + d = bdiff.bdiff(a, b) + c = a + if d: + c = mpatch.patches(a, [d]) + if c != b: + print "***", repr(a), repr(b) + print "bad:" + print repr(c)[:200] + print repr(d) + +def test(a, b): + print "***", repr(a), repr(b) + test1(a, b) + test1(b, a) + +test("a\nc\n\n\n\n", "a\nb\n\n\n") +test("a\nb\nc\n", "a\nc\n") +test("", "") +test("a\nb\nc", "a\nb\nc") +test("a\nb\nc\nd\n", "a\nd\n") +test("a\nb\nc\nd\n", "a\nc\ne\n") +test("a\nb\nc\n", "a\nc\n") +test("a\n", "c\na\nb\n") +test("a\n", "") +test("a\n", "b\nc\n") +test("a\n", "c\na\n") +test("", "adjfkjdjksdhfksj") +test("", "ab") +test("", "abc") +test("a", "a") +test("ab", "ab") +test("abc", "abc") +test("a\n", "a\n") +test("a\nb", "a\nb") + +#issue1295 +def showdiff(a, b): + bin = bdiff.bdiff(a, b) + pos = 0 + while pos < len(bin): + p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) + pos += 12 + print p1, p2, repr(bin[pos:pos + l]) + pos += l +showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n") +showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n") + +print "done" diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-bdiff.py.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-bdiff.py.out Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,23 @@ +*** 'a\nc\n\n\n\n' 'a\nb\n\n\n' +*** 'a\nb\nc\n' 'a\nc\n' +*** '' '' +*** 'a\nb\nc' 'a\nb\nc' +*** 'a\nb\nc\nd\n' 'a\nd\n' +*** 'a\nb\nc\nd\n' 'a\nc\ne\n' +*** 'a\nb\nc\n' 'a\nc\n' +*** 'a\n' 'c\na\nb\n' +*** 'a\n' '' +*** 'a\n' 'b\nc\n' +*** 'a\n' 'c\na\n' +*** '' 'adjfkjdjksdhfksj' +*** '' 'ab' +*** '' 'abc' +*** 'a' 'a' +*** 'ab' 'ab' +*** 'abc' 'abc' +*** 'a\n' 'a\n' +*** 'a\nb' 'a\nb' +6 6 'y\n\n' +6 6 'y\n\n' +9 9 'y\n\n' +done diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints --- a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints Sun May 17 03:14:37 2009 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh "$TESTDIR/hghave" cvs || exit 80 diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-demandimport --- a/tests/test-demandimport Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -#!/usr/bin/env python - -from mercurial import demandimport -demandimport.enable() - -import re - -rsub = re.sub -def f(obj): - l = repr(obj) - l = rsub("0x[0-9a-fA-F]+", "0x?", l) - l = rsub("from '.*'", "from '?'", l) - return l - -import os - -print "os =", f(os) -print "os.system =", f(os.system) -print "os =", f(os) - -from mercurial import util - -print "util =", f(util) -print "util.system =", f(util.system) -print "util =", f(util) -print "util.system =", f(util.system) - -import re as fred -print "fred =", f(fred) - -import sys as re -print "re =", f(re) - -print "fred =", f(fred) -print "fred.sub =", f(fred.sub) -print "fred =", f(fred) - -print "re =", f(re) -print "re.stdout =", f(re.stdout) -print "re =", f(re) diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-demandimport.out --- a/tests/test-demandimport.out Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -os = -os.system = -os = -util = -util.system = -util = -util.system = -fred = -re = -fred = -fred.sub = -fred = -re = -re.stdout = ', mode 'w' at 0x?> -re = diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-demandimport.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-demandimport.py Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,40 @@ +#!/usr/bin/env python + +from mercurial import demandimport +demandimport.enable() + +import re + +rsub = re.sub +def f(obj): + l = repr(obj) + l = rsub("0x[0-9a-fA-F]+", "0x?", l) + l = rsub("from '.*'", "from '?'", l) + return l + +import os + +print "os =", f(os) +print "os.system =", f(os.system) +print "os =", f(os) + +from mercurial import util + +print "util =", f(util) +print "util.system =", f(util.system) +print "util =", f(util) +print "util.system =", f(util.system) + +import re as fred +print "fred =", f(fred) + +import sys as re +print "re =", f(re) + +print "fred =", f(fred) +print "fred.sub =", f(fred.sub) +print "fred =", f(fred) + +print "re =", f(re) +print "re.stdout =", f(re.stdout) +print "re =", f(re) diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-demandimport.py.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-demandimport.py.out Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,15 @@ +os = +os.system = +os = +util = +util.system = +util = +util.system = +fred = +re = +fred = +fred.sub = +fred = +re = +re.stdout = ', mode 'w' at 0x?> +re = diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-hgweb-commands --- a/tests/test-hgweb-commands Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-hgweb-commands Sun May 17 03:14:37 2009 +0200 @@ -50,7 +50,7 @@ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=branches' echo % changegroup "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup' \ - | $TESTDIR/repr.py + | $TESTDIR/printrepr.py echo % stream_out "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=stream_out' echo % failing unbundle, requires POST request diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-hgweb-diffs --- a/tests/test-hgweb-diffs Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-hgweb-diffs Sun May 17 03:14:37 2009 +0200 @@ -1,3 +1,5 @@ +#!/bin/sh + echo % setting up repo hg init test cd test diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-hgweb-filelog --- a/tests/test-hgweb-filelog Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-hgweb-filelog Sun May 17 03:14:37 2009 +0200 @@ -1,3 +1,5 @@ +#!/bin/sh + hg init test cd test diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-hgweb-removed --- a/tests/test-hgweb-removed Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-hgweb-removed Sun May 17 03:14:37 2009 +0200 @@ -1,3 +1,5 @@ +#!/bin/sh + echo % setting up repo hg init test cd test diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-highlight.out --- a/tests/test-highlight.out Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-highlight.out Sun May 17 03:14:37 2009 +0200 @@ -12,7 +12,7 @@ -test: 7c3facd7c58a get-with-headers.py +test: 93b701795893 get-with-headers.py @@ -23,27 +23,27 @@ mercurial

test

-

view get-with-headers.py @ 0:7c3facd7c58a

+

view get-with-headers.py @ 0:93b701795893

@@ -76,7 +76,7 @@
line source
-
1 #!/usr/bin/env python
2
3 __doc__ = """This does HTTP get requests given a host:port and path and returns
4 a subset of the headers plus the body of the result."""
5
6 import httplib, sys, re
7
8 try:
9 import msvcrt, os
10 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
11 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
12 except ImportError:
13 pass
14
15 headers = [h.lower() for h in sys.argv[3:]]
16 conn = httplib.HTTPConnection(sys.argv[1])
17 conn.request("GET", sys.argv[2])
18 response = conn.getresponse()
19 print response.status, response.reason
20 for h in headers:
21 if response.getheader(h, None) is not None:
22 print "%s: %s" % (h, response.getheader(h))
23 print
24 data = response.read()
25 data = re.sub('\d+ years', 'many years', data)
26 sys.stdout.write(data)
27
28 if 200 <= response.status <= 299:
29 sys.exit(0)
30 sys.exit(1)
+
1 #!/usr/bin/env python
2
3 """This does HTTP GET requests given a host:port and path and returns
4 a subset of the headers plus the body of the result."""
5
6 import httplib, sys, re
7
8 try:
9 import msvcrt, os
10 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
11 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
12 except ImportError:
13 pass
14
15 headers = [h.lower() for h in sys.argv[3:]]
16 conn = httplib.HTTPConnection(sys.argv[1])
17 conn.request("GET", sys.argv[2])
18 response = conn.getresponse()
19 print response.status, response.reason
20 for h in headers:
21 if response.getheader(h, None) is not None:
22 print "%s: %s" % (h, response.getheader(h))
23 print
24 data = response.read()
25 data = re.sub('\d+ years', 'many years', data)
26 sys.stdout.write(data)
27
28 if 200 <= response.status <= 299:
29 sys.exit(0)
30 sys.exit(1)
@@ -98,7 +98,7 @@ -test: 7c3facd7c58a isolatin.txt +test: 93b701795893 isolatin.txt @@ -109,27 +109,27 @@ mercurial

test

-

view isolatin.txt @ 0:7c3facd7c58a

+

view isolatin.txt @ 0:93b701795893

@@ -195,28 +195,28 @@ mercurial

test

-

annotate get-with-headers.py @ 0:7c3facd7c58a

+

annotate get-with-headers.py @ 0:93b701795893

@@ -258,211 +258,211 @@ -test@0 +test@0 1 #!/usr/bin/env python -test@0 +test@0 2 -test@0 +test@0 - 3 __doc__ = """This does HTTP get requests given a host:port and path and returns + 3 """This does HTTP GET requests given a host:port and path and returns -test@0 +test@0 - 4 a subset of the headers plus the body of the result.""" + 4 a subset of the headers plus the body of the result.""" -test@0 +test@0 5 -test@0 +test@0 6 import httplib, sys, re -test@0 +test@0 7 -test@0 +test@0 8 try: -test@0 +test@0 9 import msvcrt, os -test@0 +test@0 10 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) -test@0 +test@0 11 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) -test@0 +test@0 12 except ImportError: -test@0 +test@0 13 pass -test@0 +test@0 14 -test@0 +test@0 15 headers = [h.lower() for h in sys.argv[3:]] -test@0 +test@0 16 conn = httplib.HTTPConnection(sys.argv[1]) -test@0 +test@0 17 conn.request("GET", sys.argv[2]) -test@0 +test@0 18 response = conn.getresponse() -test@0 +test@0 19 print response.status, response.reason -test@0 +test@0 20 for h in headers: -test@0 +test@0 21 if response.getheader(h, None) is not None: -test@0 +test@0 22 print "%s: %s" % (h, response.getheader(h)) -test@0 +test@0 23 print -test@0 +test@0 24 data = response.read() -test@0 +test@0 25 data = re.sub('\d+ years', 'many years', data) -test@0 +test@0 26 sys.stdout.write(data) -test@0 +test@0 27 -test@0 +test@0 28 if 200 <= response.status <= 299: -test@0 +test@0 29 sys.exit(0) -test@0 +test@0 30 sys.exit(1) diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-hybridencode.py diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-issue1306 --- a/tests/test-issue1306 Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-issue1306 Sun May 17 03:14:37 2009 +0200 @@ -1,3 +1,5 @@ +#!/bin/sh + echo % initialize remote repo with branches hg init remote cd remote diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-issue842 --- a/tests/test-issue842 Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-issue842 Sun May 17 03:14:37 2009 +0200 @@ -1,3 +1,5 @@ +#!/bin/sh + hg init test cd test echo foo > a diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-mq-strip --- a/tests/test-mq-strip Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-mq-strip Sun May 17 03:14:37 2009 +0200 @@ -1,3 +1,5 @@ +#!/bin/sh + echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-simplemerge-cmd --- a/tests/test-simplemerge-cmd Sun May 17 03:04:17 2009 +0200 +++ b/tests/test-simplemerge-cmd Sun May 17 03:14:37 2009 +0200 @@ -47,7 +47,7 @@ python simplemerge -p binary-local base other echo '% binary file --text' -python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/repr.py +python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/printrepr.py echo '% help' python simplemerge --help diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-config --- a/tests/test-ui-config Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -#!/usr/bin/env python - -from mercurial import ui, util, dispatch, error - -testui = ui.ui() -parsed = dispatch._parseconfig(testui, [ - 'values.string=string value', - 'values.bool1=true', - 'values.bool2=false', - 'lists.list1=foo', - 'lists.list2=foo bar baz', - 'lists.list3=alice, bob', - 'lists.list4=foo bar baz alice, bob', -]) - -print repr(testui.configitems('values')) -print repr(testui.configitems('lists')) -print "---" -print repr(testui.config('values', 'string')) -print repr(testui.config('values', 'bool1')) -print repr(testui.config('values', 'bool2')) -print repr(testui.config('values', 'unknown')) -print "---" -try: - print repr(testui.configbool('values', 'string')) -except error.ConfigError, inst: - print inst -print repr(testui.configbool('values', 'bool1')) -print repr(testui.configbool('values', 'bool2')) -print repr(testui.configbool('values', 'bool2', True)) -print repr(testui.configbool('values', 'unknown')) -print repr(testui.configbool('values', 'unknown', True)) -print "---" -print repr(testui.configlist('lists', 'list1')) -print repr(testui.configlist('lists', 'list2')) -print repr(testui.configlist('lists', 'list3')) -print repr(testui.configlist('lists', 'list4')) -print repr(testui.configlist('lists', 'list4', ['foo'])) -print repr(testui.configlist('lists', 'unknown')) -print repr(testui.configlist('lists', 'unknown', '')) -print repr(testui.configlist('lists', 'unknown', 'foo')) -print repr(testui.configlist('lists', 'unknown', ['foo'])) -print repr(testui.configlist('lists', 'unknown', 'foo bar')) -print repr(testui.configlist('lists', 'unknown', 'foo, bar')) -print repr(testui.configlist('lists', 'unknown', ['foo bar'])) -print repr(testui.configlist('lists', 'unknown', ['foo', 'bar'])) - -print repr(testui.config('values', 'String')) - -def function(): - pass - -# values that aren't strings should work -testui.setconfig('hook', 'commit', function) -print function == testui.config('hook', 'commit') diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-config.out --- a/tests/test-ui-config.out Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -[('string', 'string value'), ('bool1', 'true'), ('bool2', 'false')] -[('list1', 'foo'), ('list2', 'foo bar baz'), ('list3', 'alice, bob'), ('list4', 'foo bar baz alice, bob')] ---- -'string value' -'true' -'false' -None ---- -values.string not a boolean ('string value') -True -False -False -False -True ---- -['foo'] -['foo', 'bar', 'baz'] -['alice', 'bob'] -['foo', 'bar', 'baz', 'alice', 'bob'] -['foo', 'bar', 'baz', 'alice', 'bob'] -[] -[] -['foo'] -['foo'] -['foo', 'bar'] -['foo', 'bar'] -['foo bar'] -['foo', 'bar'] -None -True diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-config.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-ui-config.py Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,55 @@ +#!/usr/bin/env python + +from mercurial import ui, util, dispatch, error + +testui = ui.ui() +parsed = dispatch._parseconfig(testui, [ + 'values.string=string value', + 'values.bool1=true', + 'values.bool2=false', + 'lists.list1=foo', + 'lists.list2=foo bar baz', + 'lists.list3=alice, bob', + 'lists.list4=foo bar baz alice, bob', +]) + +print repr(testui.configitems('values')) +print repr(testui.configitems('lists')) +print "---" +print repr(testui.config('values', 'string')) +print repr(testui.config('values', 'bool1')) +print repr(testui.config('values', 'bool2')) +print repr(testui.config('values', 'unknown')) +print "---" +try: + print repr(testui.configbool('values', 'string')) +except error.ConfigError, inst: + print inst +print repr(testui.configbool('values', 'bool1')) +print repr(testui.configbool('values', 'bool2')) +print repr(testui.configbool('values', 'bool2', True)) +print repr(testui.configbool('values', 'unknown')) +print repr(testui.configbool('values', 'unknown', True)) +print "---" +print repr(testui.configlist('lists', 'list1')) +print repr(testui.configlist('lists', 'list2')) +print repr(testui.configlist('lists', 'list3')) +print repr(testui.configlist('lists', 'list4')) +print repr(testui.configlist('lists', 'list4', ['foo'])) +print repr(testui.configlist('lists', 'unknown')) +print repr(testui.configlist('lists', 'unknown', '')) +print repr(testui.configlist('lists', 'unknown', 'foo')) +print repr(testui.configlist('lists', 'unknown', ['foo'])) +print repr(testui.configlist('lists', 'unknown', 'foo bar')) +print repr(testui.configlist('lists', 'unknown', 'foo, bar')) +print repr(testui.configlist('lists', 'unknown', ['foo bar'])) +print repr(testui.configlist('lists', 'unknown', ['foo', 'bar'])) + +print repr(testui.config('values', 'String')) + +def function(): + pass + +# values that aren't strings should work +testui.setconfig('hook', 'commit', function) +print function == testui.config('hook', 'commit') diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-config.py.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-ui-config.py.out Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,30 @@ +[('string', 'string value'), ('bool1', 'true'), ('bool2', 'false')] +[('list1', 'foo'), ('list2', 'foo bar baz'), ('list3', 'alice, bob'), ('list4', 'foo bar baz alice, bob')] +--- +'string value' +'true' +'false' +None +--- +values.string not a boolean ('string value') +True +False +False +False +True +--- +['foo'] +['foo', 'bar', 'baz'] +['alice', 'bob'] +['foo', 'bar', 'baz', 'alice', 'bob'] +['foo', 'bar', 'baz', 'alice', 'bob'] +[] +[] +['foo'] +['foo'] +['foo', 'bar'] +['foo', 'bar'] +['foo bar'] +['foo', 'bar'] +None +True diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-verbosity --- a/tests/test-ui-verbosity Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -#!/usr/bin/env python - -import os -from mercurial import ui - -hgrc = os.environ['HGRCPATH'] -f = open(hgrc) -basehgrc = f.read() -f.close() - -print ' hgrc settings command line options final result ' -print ' quiet verbo debug quiet verbo debug quiet verbo debug' - -for i in xrange(64): - hgrc_quiet = bool(i & 1<<0) - hgrc_verbose = bool(i & 1<<1) - hgrc_debug = bool(i & 1<<2) - cmd_quiet = bool(i & 1<<3) - cmd_verbose = bool(i & 1<<4) - cmd_debug = bool(i & 1<<5) - - f = open(hgrc, 'w') - f.write(basehgrc) - f.write('\n[ui]\n') - if hgrc_quiet: - f.write('quiet = True\n') - if hgrc_verbose: - f.write('verbose = True\n') - if hgrc_debug: - f.write('debug = True\n') - f.close() - - u = ui.ui() - if cmd_quiet or cmd_debug or cmd_verbose: - u.setconfig('ui', 'quiet', str(bool(cmd_quiet))) - u.setconfig('ui', 'verbose', str(bool(cmd_verbose))) - u.setconfig('ui', 'debug', str(bool(cmd_debug))) - - check = '' - if u.debugflag: - if not u.verbose or u.quiet: - check = ' *' - elif u.verbose and u.quiet: - check = ' +' - - print ('%2d %5s %5s %5s %5s %5s %5s -> %5s %5s %5s%s' - % (i, hgrc_quiet, hgrc_verbose, hgrc_debug, - cmd_quiet, cmd_verbose, cmd_debug, - u.quiet, u.verbose, u.debugflag, check)) diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-verbosity.out --- a/tests/test-ui-verbosity.out Sun May 17 03:04:17 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ - hgrc settings command line options final result - quiet verbo debug quiet verbo debug quiet verbo debug - 0 False False False False False False -> False False False - 1 True False False False False False -> True False False - 2 False True False False False False -> False True False - 3 True True False False False False -> False False False - 4 False False True False False False -> False True True - 5 True False True False False False -> False True True - 6 False True True False False False -> False True True - 7 True True True False False False -> False True True - 8 False False False True False False -> True False False - 9 True False False True False False -> True False False -10 False True False True False False -> True False False -11 True True False True False False -> True False False -12 False False True True False False -> True False False -13 True False True True False False -> True False False -14 False True True True False False -> True False False -15 True True True True False False -> True False False -16 False False False False True False -> False True False -17 True False False False True False -> False True False -18 False True False False True False -> False True False -19 True True False False True False -> False True False -20 False False True False True False -> False True False -21 True False True False True False -> False True False -22 False True True False True False -> False True False -23 True True True False True False -> False True False -24 False False False True True False -> False False False -25 True False False True True False -> False False False -26 False True False True True False -> False False False -27 True True False True True False -> False False False -28 False False True True True False -> False False False -29 True False True True True False -> False False False -30 False True True True True False -> False False False -31 True True True True True False -> False False False -32 False False False False False True -> False True True -33 True False False False False True -> False True True -34 False True False False False True -> False True True -35 True True False False False True -> False True True -36 False False True False False True -> False True True -37 True False True False False True -> False True True -38 False True True False False True -> False True True -39 True True True False False True -> False True True -40 False False False True False True -> False True True -41 True False False True False True -> False True True -42 False True False True False True -> False True True -43 True True False True False True -> False True True -44 False False True True False True -> False True True -45 True False True True False True -> False True True -46 False True True True False True -> False True True -47 True True True True False True -> False True True -48 False False False False True True -> False True True -49 True False False False True True -> False True True -50 False True False False True True -> False True True -51 True True False False True True -> False True True -52 False False True False True True -> False True True -53 True False True False True True -> False True True -54 False True True False True True -> False True True -55 True True True False True True -> False True True -56 False False False True True True -> False True True -57 True False False True True True -> False True True -58 False True False True True True -> False True True -59 True True False True True True -> False True True -60 False False True True True True -> False True True -61 True False True True True True -> False True True -62 False True True True True True -> False True True -63 True True True True True True -> False True True diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-verbosity.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-ui-verbosity.py Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,49 @@ +#!/usr/bin/env python + +import os +from mercurial import ui + +hgrc = os.environ['HGRCPATH'] +f = open(hgrc) +basehgrc = f.read() +f.close() + +print ' hgrc settings command line options final result ' +print ' quiet verbo debug quiet verbo debug quiet verbo debug' + +for i in xrange(64): + hgrc_quiet = bool(i & 1<<0) + hgrc_verbose = bool(i & 1<<1) + hgrc_debug = bool(i & 1<<2) + cmd_quiet = bool(i & 1<<3) + cmd_verbose = bool(i & 1<<4) + cmd_debug = bool(i & 1<<5) + + f = open(hgrc, 'w') + f.write(basehgrc) + f.write('\n[ui]\n') + if hgrc_quiet: + f.write('quiet = True\n') + if hgrc_verbose: + f.write('verbose = True\n') + if hgrc_debug: + f.write('debug = True\n') + f.close() + + u = ui.ui() + if cmd_quiet or cmd_debug or cmd_verbose: + u.setconfig('ui', 'quiet', str(bool(cmd_quiet))) + u.setconfig('ui', 'verbose', str(bool(cmd_verbose))) + u.setconfig('ui', 'debug', str(bool(cmd_debug))) + + check = '' + if u.debugflag: + if not u.verbose or u.quiet: + check = ' *' + elif u.verbose and u.quiet: + check = ' +' + + print ('%2d %5s %5s %5s %5s %5s %5s -> %5s %5s %5s%s' + % (i, hgrc_quiet, hgrc_verbose, hgrc_debug, + cmd_quiet, cmd_verbose, cmd_debug, + u.quiet, u.verbose, u.debugflag, check)) diff -r e9e2a2c9b294 -r e33baed7c1bc tests/test-ui-verbosity.py.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-ui-verbosity.py.out Sun May 17 03:14:37 2009 +0200 @@ -0,0 +1,66 @@ + hgrc settings command line options final result + quiet verbo debug quiet verbo debug quiet verbo debug + 0 False False False False False False -> False False False + 1 True False False False False False -> True False False + 2 False True False False False False -> False True False + 3 True True False False False False -> False False False + 4 False False True False False False -> False True True + 5 True False True False False False -> False True True + 6 False True True False False False -> False True True + 7 True True True False False False -> False True True + 8 False False False True False False -> True False False + 9 True False False True False False -> True False False +10 False True False True False False -> True False False +11 True True False True False False -> True False False +12 False False True True False False -> True False False +13 True False True True False False -> True False False +14 False True True True False False -> True False False +15 True True True True False False -> True False False +16 False False False False True False -> False True False +17 True False False False True False -> False True False +18 False True False False True False -> False True False +19 True True False False True False -> False True False +20 False False True False True False -> False True False +21 True False True False True False -> False True False +22 False True True False True False -> False True False +23 True True True False True False -> False True False +24 False False False True True False -> False False False +25 True False False True True False -> False False False +26 False True False True True False -> False False False +27 True True False True True False -> False False False +28 False False True True True False -> False False False +29 True False True True True False -> False False False +30 False True True True True False -> False False False +31 True True True True True False -> False False False +32 False False False False False True -> False True True +33 True False False False False True -> False True True +34 False True False False False True -> False True True +35 True True False False False True -> False True True +36 False False True False False True -> False True True +37 True False True False False True -> False True True +38 False True True False False True -> False True True +39 True True True False False True -> False True True +40 False False False True False True -> False True True +41 True False False True False True -> False True True +42 False True False True False True -> False True True +43 True True False True False True -> False True True +44 False False True True False True -> False True True +45 True False True True False True -> False True True +46 False True True True False True -> False True True +47 True True True True False True -> False True True +48 False False False False True True -> False True True +49 True False False False True True -> False True True +50 False True False False True True -> False True True +51 True True False False True True -> False True True +52 False False True False True True -> False True True +53 True False True False True True -> False True True +54 False True True False True True -> False True True +55 True True True False True True -> False True True +56 False False False True True True -> False True True +57 True False False True True True -> False True True +58 False True False True True True -> False True True +59 True True False True True True -> False True True +60 False False True True True True -> False True True +61 True False True True True True -> False True True +62 False True True True True True -> False True True +63 True True True True True True -> False True True