##// END OF EJS Templates
util: make new timedcmstats class Python 3 compatible
util: make new timedcmstats class Python 3 compatible

File last commit:

r35630:edf52be9 default
r38848:9d49bb11 default
Show More
test-pull-r.t
147 lines | 3.4 KiB | text/troff | Tads3Lexer
Adrian Buehlmann
combine tests
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 ..
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
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
$ hg pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pulling from $TESTTMP/repo2
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 8c900227dd5d:00cfe9073916
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 (run 'hg update' to get a working copy)
$ hg heads -q --closed
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 4:00cfe9073916
Adrian Buehlmann
changegroup: do not count closed new heads (issue2697)...
r14036 2:effea6de0384
1:ed1b79f46b9a
$ cd ..
Adrian Buehlmann
combine tests
r12279 $ hg init copy
$ cd copy
Pull a missing revision:
$ hg pull -qr missing ../repo
abort: unknown revision 'missing'!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
combine tests
r12279
Pull multiple revisions with update:
$ hg pull -qu -r 0 -r 1 ../repo
$ hg -q parents
0:bbd179dfa0a7
$ hg rollback
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision -1 (undo pull)
working directory now based on revision -1
Adrian Buehlmann
combine tests
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
Pierre-Yves David
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...
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
Jun Wu
tests: reorder hg serve commands...
r28549 $ hg serve -R ../repo -p $HGPORT2 -d --pid-file=../repo.pid
Pierre-Yves David
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...
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)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets effea6de0384
Pierre-Yves David
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...
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
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..
Joerg Sonnenberger
test-pull-r: explicitly kill server processes...
r35630 $ killdaemons.py