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

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

changegroup: move message about added changes to transaction summary...
changegroup: move message about added changes to transaction summary Before that, applying multiple changegroups in the same transaction issued the message multiple time. This result in a confusing output: adding changesets adding manifests adding file changes added 32768 changesets with 60829 changes to 2668 files adding changesets adding manifests adding file changes added 8192 changesets with 16885 changes to 1553 files adding changesets adding manifests adding file changes added 1020 changesets with 1799 changes to 536 files adding changesets adding manifests ... Instead, we now only issue the message once at the end of the transaction, summing up all added changesets, changes and files. The line is identical, but happens sightly later in the output. There are other suboptimal behavior around issue multiple changegroup (eg: progress bar). We'll cover them later. This impact of lot of test as one would expect, but a two pass check show they are just the order change we expected. To deal with "under the hood" bundle application by internal code, we had to take a slightly hacky move. We could clean that up with a more official way to enter "under the hood" section, however I want to keep this series simple to get it landed. This kind of change have a very high bit rot rate since it impact a lot of test output.
marmoute - - Load All Authors

File last commit:

r43167:d7304434 default
r43167:d7304434 default
Show More
test-pull-update.t
248 lines | 6.1 KiB | text/troff | Tads3Lexer
/ tests / test-pull-update.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
combine tests
 r12279 $ hg init t
$ cd t
$ echo 1 > foo
$ hg ci -Am m
adding foo
$ cd ..
$ hg clone t tt
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd tt
$ echo 1.1 > foo
$ hg ci -Am m
$ cd ../t
$ echo 1.2 > foo
$ hg ci -Am m
Martin von Zweigbergk
update: add experimental config for default way of handling dirty wdir...
 r31167 Should respect config to disable dirty update
$ hg co -qC 0
$ echo 2 > foo
Augie Fackler
config: graduate experimental.updatecheck to commands.update.check...
 r34706 $ hg --config commands.update.check=abort pull -u ../tt
Martin von Zweigbergk
update: add experimental config for default way of handling dirty wdir...
 r31167 pulling from ../tt
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 107cefe13e42
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
Martin von Zweigbergk
update: add experimental config for default way of handling dirty wdir...
 r31167 abort: uncommitted changes
[255]
$ hg --config extensions.strip= strip --no-backup tip
$ hg co -qC tip
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 Should not update to the other topological branch:
Adrian Buehlmann
combine tests
 r12279
$ hg pull -u ../tt
pulling from ../tt
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 107cefe13e42
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
 r32698 updated to "800c91d5bfc1: m"
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 1 other heads for branch "default"
Adrian Buehlmann
combine tests
 r12279
$ cd ../tt
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 Should not update to the other branch:
Adrian Buehlmann
combine tests
 r12279
$ hg pull -u ../t
pulling from ../t
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 800c91d5bfc1
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
 r32698 updated to "107cefe13e42: m"
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 1 other heads for branch "default"
Adrian Buehlmann
combine tests
 r12279
$ HGMERGE=true hg merge
merging foo
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -mm
$ cd ../t
Should work:
$ hg pull -u ../tt
pulling from ../tt
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 483b76ad4309
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
Adrian Buehlmann
combine tests
 r12279 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 Similarity between "hg update" and "hg pull -u" in handling bookmark
====================================================================
Test that updating activates the bookmark, which matches with the
explicit destination of the update.
$ echo 4 >> foo
$ hg commit -m "#4"
$ hg bookmark active-after-pull
$ cd ../tt
(1) activating by --rev BOOKMARK
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u -r active-after-pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 searching for changes
adding changesets
adding manifests
adding file changes
marmoute
changegroup: move message about added changes to transaction summary...
 r43167 adding remote bookmark active-after-pull
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 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 f815b3da6163
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark active-after-pull)
$ hg parents -q
4:f815b3da6163
$ hg bookmarks
* active-after-pull 4:f815b3da6163
active-before-pull 3:483b76ad4309
(discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
(2) activating by URL#BOOKMARK
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u $TESTTMP/t#active-after-pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 searching for changes
adding changesets
adding manifests
adding file changes
marmoute
changegroup: move message about added changes to transaction summary...
 r43167 adding remote bookmark active-after-pull
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 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 f815b3da6163
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark active-after-pull)
$ hg parents -q
4:f815b3da6163
$ hg bookmarks
* active-after-pull 4:f815b3da6163
active-before-pull 3:483b76ad4309
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 (discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
Test that updating deactivates current active bookmark, if the
destination of the update is explicitly specified, and it doesn't
Mads Kiilerich
spelling: fixes of non-dictionary words
 r30332 match with the name of any existing bookmarks.
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274
$ cd ../t
$ hg bookmark -d active-after-pull
$ hg branch bar -q
$ hg commit -m "#5 (bar #1)"
$ cd ../tt
(1) deactivating by --rev REV
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u -r b5e4babfaaa7
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 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 f815b3da6163:b5e4babfaaa7
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
$ hg parents -q
5:b5e4babfaaa7
$ hg bookmarks
active-before-pull 3:483b76ad4309
(discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
(2) deactivating by --branch BRANCH
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u -b bar
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 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 f815b3da6163:b5e4babfaaa7
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
$ hg parents -q
5:b5e4babfaaa7
$ hg bookmarks
active-before-pull 3:483b76ad4309
(discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
(3) deactivating by URL#ANOTHER-BRANCH
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u $TESTTMP/t#bar
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 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 f815b3da6163:b5e4babfaaa7
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
$ hg parents -q
5:b5e4babfaaa7
$ hg bookmarks
active-before-pull 3:483b76ad4309
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913 $ cd ..