##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: choose default destination the same way as 'hg merge' (BC)...
rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.
Matt Mackall - - Load All Authors

File last commit:

r25472:4d2b9b30 default
r28189:fac3a24b default
Show More
test-http-branchmap.t
96 lines | 2.9 KiB | text/troff | Tads3Lexer
/ tests / test-http-branchmap.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: replace exit 80 with #require
 r22046 #require killdaemons
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
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
> import sys
> from mercurial import ui, hg, commands
>
> class StdoutWrapper(object):
> def __init__(self, stdout):
> self._file = stdout
>
> def write(self, data):
> if data == '47\n':
> # latin1 encoding is one %xx (3 bytes) shorter
> data = '44\n'
> elif data.startswith('%C3%A6 '):
> # translate to latin1 encoding
> data = '%%E6 %s' % data[7:]
> self._file.write(data)
>
> def __getattr__(self, name):
> return getattr(self._file, name)
>
> sys.stdout = StdoutWrapper(sys.stdout)
> sys.stderr = StdoutWrapper(sys.stderr)
>
> myui = ui.ui()
> repo = hg.repository(myui, 'a')
Idan Kamara
serve: add --cmdserver option to communicate with hg over a pipe
 r14647 > commands.serve(myui, repo, stdio=True, cmdserver=False)
Matt Mackall
tests: unify test-http-branchmap
 r12447 > EOF
$ echo baz >> b/foo
$ hg -R b ci -m baz
$ hg push -R b -e 'python oldhg' ssh://dummy/ --encoding latin1
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