##// END OF EJS Templates
graft: do not try to skip rev derived from ancestor more than once (issue6024)...
graft: do not try to skip rev derived from ancestor more than once (issue6024) We check 'x in revs' in other cases, so let's do the same. The test case credits to Tom Prince.

File last commit:

r38051:37ef6ee8 default
r40692:3bc2e550 stable
Show More
test-http-branchmap.t
95 lines | 3.0 KiB | text/troff | Tads3Lexer
/ tests / test-http-branchmap.t
Matt Mackall
tests: unify test-http-branchmap
r12447 $ hgserve() {
Patrick Mezard
test-http-branchmap: enable on Windows...
r17467 > hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid \
> -E errors.log -v $@ > startup.log
> # Grepping hg serve stdout would hang on Windows
> grep -v 'listening at' startup.log
Matt Mackall
tests: unify test-http-branchmap
r12447 > cat hg.pid >> "$DAEMON_PIDS"
> }
$ hg init a
$ hg --encoding utf-8 -R a branch æ
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 marked working directory as branch \xc3\xa6 (esc)
Matt Mackall
branch: warn on branching
r15615 (branches are permanent and global, did you want a bookmark?)
Matt Mackall
tests: unify test-http-branchmap
r12447 $ echo foo > a/foo
$ hg -R a ci -Am foo
adding foo
$ hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1
$ hg --encoding utf-8 clone http://localhost:$HGPORT1 b
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 867c11ce77b8
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 updating to branch \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
r12447 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --encoding utf-8 -R b log
changeset: 0:867c11ce77b8
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 branch: \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
r12447 tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
$ echo bar >> b/foo
$ hg -R b ci -m bar
$ hg --encoding utf-8 -R b push
Brodie Rao
url: add trailing slashes to URLs with hostnames that don't have one...
r13815 pushing to http://localhost:$HGPORT1/
Matt Mackall
tests: unify test-http-branchmap
r12447 searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
$ hg -R a --encoding utf-8 log
changeset: 1:58e7c90d67cb
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 branch: \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
r12447 tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: bar
changeset: 0:867c11ce77b8
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 branch: \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
r12447 user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ killdaemons.py hg.pid
Matt Mackall
tests: unify test-http-branchmap
r12447
verify 7e7d56fe4833 (encoding fallback in branchmap to maintain compatibility with 1.3.x)
$ cat <<EOF > oldhg
Yuya Nishihara
test-http-branchmap: fix encoding test to wrap the server stream...
r38050 > import threading
Yuya Nishihara
test-http-branchmap: fix stdio mode on Windows
r38051 > from mercurial import dispatch, hg, ui, wireprotoserver
Matt Mackall
tests: unify test-http-branchmap
r12447 >
> class StdoutWrapper(object):
> def __init__(self, stdout):
> self._file = stdout
>
> def write(self, data):
Augie Fackler
tests: port inline Python in test-http-branchmap.t to Python 3...
r36293 > if data == b'47\n':
Matt Mackall
tests: unify test-http-branchmap
r12447 > # latin1 encoding is one %xx (3 bytes) shorter
Augie Fackler
tests: port inline Python in test-http-branchmap.t to Python 3...
r36293 > data = b'44\n'
> elif data.startswith(b'%C3%A6 '):
Matt Mackall
tests: unify test-http-branchmap
r12447 > # translate to latin1 encoding
Augie Fackler
tests: port inline Python in test-http-branchmap.t to Python 3...
r36293 > data = b'%%E6 %s' % data[7:]
Matt Mackall
tests: unify test-http-branchmap
r12447 > self._file.write(data)
>
> def __getattr__(self, name):
> return getattr(self._file, name)
>
Yuya Nishihara
test-http-branchmap: fix stdio mode on Windows
r38051 > dispatch.initstdio()
Yuya Nishihara
ui: factor out ui.load() to create a ui without loading configs (API)...
r30559 > myui = ui.ui.load()
Yuya Nishihara
test-http-branchmap: fix encoding test to wrap the server stream...
r38050 > fout = StdoutWrapper(myui.fout)
> myui.fout = myui.ferr
Augie Fackler
tests: port inline Python in test-http-branchmap.t to Python 3...
r36293 > repo = hg.repository(myui, b'a')
Yuya Nishihara
test-http-branchmap: fix encoding test to wrap the server stream...
r38050 > wireprotoserver._runsshserver(myui, repo, myui.fin, fout, threading.Event())
Matt Mackall
tests: unify test-http-branchmap
r12447 > EOF
$ echo baz >> b/foo
$ hg -R b ci -m baz
Matt Harbison
tests: quote $PYTHON for Windows...
r33335 $ hg push -R b -e "\"$PYTHON\" oldhg" ssh://dummy/ --encoding latin1
Matt Mackall
tests: unify test-http-branchmap
r12447 pushing to ssh://dummy/
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files