test-pull-r.t
194 lines
| 4.5 KiB
| text/troff
|
Tads3Lexer
/ tests / test-pull-r.t
|
r45033 | $ cat <<EOF >> $HGRCPATH | ||
> [ui] | ||||
> interactive = true | ||||
> EOF | ||||
|
r12279 | $ hg init repo | ||
$ cd repo | ||||
$ echo foo > foo | ||||
$ hg ci -qAm 'add foo' | ||||
$ echo >> foo | ||||
$ hg ci -m 'change foo' | ||||
$ hg up -qC 0 | ||||
$ echo bar > bar | ||||
$ hg ci -qAm 'add bar' | ||||
$ hg log | ||||
changeset: 2:effea6de0384 | ||||
tag: tip | ||||
parent: 0:bbd179dfa0a7 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add bar | ||||
changeset: 1:ed1b79f46b9a | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: change foo | ||||
changeset: 0:bbd179dfa0a7 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add foo | ||||
$ cd .. | ||||
|
r14036 | |||
don't show "(+1 heads)" message when pulling closed head | ||||
$ hg clone -q repo repo2 | ||||
$ hg clone -q repo2 repo3 | ||||
$ cd repo2 | ||||
$ hg up -q 0 | ||||
$ echo hello >> foo | ||||
$ hg ci -mx1 | ||||
created new head | ||||
$ hg ci -mx2 --close-branch | ||||
$ cd ../repo3 | ||||
$ hg heads -q --closed | ||||
2:effea6de0384 | ||||
1:ed1b79f46b9a | ||||
|
r45033 | $ hg pull --confirm << EOF | ||
> n | ||||
> EOF | ||||
|
r35394 | pulling from $TESTTMP/repo2 | ||
|
r14036 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r45033 | adding 2 changesets with 1 changes to 1 files | ||
new changesets 8c900227dd5d:00cfe9073916 | ||||
accept incoming changes (yn)? n | ||||
transaction abort! | ||||
rollback completed | ||||
abort: user aborted | ||||
[255] | ||||
$ hg pull --config pull.confirm=true << EOF | ||||
> n | ||||
> EOF | ||||
pulling from $TESTTMP/repo2 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
adding 2 changesets with 1 changes to 1 files | ||||
new changesets 8c900227dd5d:00cfe9073916 | ||||
accept incoming changes (yn)? n | ||||
transaction abort! | ||||
rollback completed | ||||
abort: user aborted | ||||
[255] | ||||
$ hg pull --confirm << EOF | ||||
> y | ||||
> EOF | ||||
pulling from $TESTTMP/repo2 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
adding 2 changesets with 1 changes to 1 files | ||||
new changesets 8c900227dd5d:00cfe9073916 | ||||
accept incoming changes (yn)? y | ||||
|
r14036 | added 2 changesets with 1 changes to 1 files | ||
|
r34662 | new changesets 8c900227dd5d:00cfe9073916 | ||
|
r14036 | (run 'hg update' to get a working copy) | ||
$ hg heads -q --closed | ||||
|
r14162 | 4:00cfe9073916 | ||
|
r14036 | 2:effea6de0384 | ||
1:ed1b79f46b9a | ||||
|
r45033 | pull--confirm config option should be ignored if HGPLAIN is set | ||
$ HGPLAIN=1 hg pull --config pull.confirm=True | ||||
pulling from $TESTTMP/repo2 | ||||
searching for changes | ||||
no changes found | ||||
|
r14036 | $ cd .. | ||
|
r12279 | $ hg init copy | ||
$ cd copy | ||||
Pull a missing revision: | ||||
$ hg pull -qr missing ../repo | ||||
|
r46518 | abort: unknown revision 'missing' | ||
|
r49191 | [10] | ||
|
r12279 | |||
Pull multiple revisions with update: | ||||
$ hg pull -qu -r 0 -r 1 ../repo | ||||
$ hg -q parents | ||||
0:bbd179dfa0a7 | ||||
$ hg rollback | ||||
|
r13446 | repository tip rolled back to revision -1 (undo pull) | ||
working directory now based on revision -1 | ||||
|
r12279 | |||
$ hg pull -qr 0 ../repo | ||||
$ hg log | ||||
changeset: 0:bbd179dfa0a7 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add foo | ||||
$ hg pull -qr 1 ../repo | ||||
$ hg log | ||||
changeset: 1:ed1b79f46b9a | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: change foo | ||||
changeset: 0:bbd179dfa0a7 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add foo | ||||
This used to abort: received changelog group is empty: | ||||
$ hg pull -qr 1 ../repo | ||||
|
r25425 | Test race condition with -r and -U (issue4707) | ||
We pull '-U -r <name>' and the name change right after/during the changegroup emission. | ||||
We use http because http is better is our racy-est option. | ||||
$ echo babar > ../repo/jungle | ||||
$ cat <<EOF > ../repo/.hg/hgrc | ||||
> [hooks] | ||||
> outgoing.makecommit = hg ci -Am 'racy commit'; echo committed in pull-race | ||||
> EOF | ||||
|
r28549 | $ hg serve -R ../repo -p $HGPORT2 -d --pid-file=../repo.pid | ||
|
r25425 | $ cat ../repo.pid >> $DAEMON_PIDS | ||
$ hg pull --rev default --update http://localhost:$HGPORT2/ | ||||
pulling from http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r34662 | new changesets effea6de0384 | ||
|
r25425 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ hg log -G | ||||
@ changeset: 2:effea6de0384 | ||||
| tag: tip | ||||
| parent: 0:bbd179dfa0a7 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: add bar | ||||
| | ||||
| o changeset: 1:ed1b79f46b9a | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: change foo | ||||
| | ||||
o changeset: 0:bbd179dfa0a7 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add foo | ||||
|
r16913 | $ cd .. | ||
|
r35630 | $ killdaemons.py | ||