##// END OF EJS Templates
transaction-summary: display the summary for all transactions...
transaction-summary: display the summary for all transactions Now that we records "all" changes happening in a transaction (in tr.changes) we will be able to provide better report on various changes (phases turned public, changeset obsoleted, branch merged or created, etc..) This is far too late in the cycle to play with this, but having this existing method called more widely will help extensions to play around with various options during the 4.4 cycle. Instead of calling registersummarycallback only for transactions we want, we always call it and use the transaction name to decide when to report (eg: we do not want `hg amend` to report new obsoleted changesets). Filtering on transaction name does not seems great, but seems good enough for the moment. We can change the API during the next cycle. The previous manual call during unbundling of the bundle2 "obsmarkers" part is no longer necessary and has been dropped.

File last commit:

r32096:c52728b3 stable
r33541:b47fef6d default
Show More
test-obsolete-checkheads.t
312 lines | 7.5 KiB | text/troff | Tads3Lexer
/ tests / test-obsolete-checkheads.t
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 Check that obsolete properly strip heads
$ cat >> $HGRCPATH << EOF
> [phases]
> # public changeset are not obsolete
> publish=false
> [ui]
> logtemplate='{node|short} ({phase}) {desc|firstline}\n'
Durham Goode
obsolete: update tests to use obsolete options...
r22955 > [experimental]
> evolution=createmarkers
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 > EOF
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
> hg ci -m "add $1"
> }
$ getid() {
> hg id --debug -ir "desc('$1')"
> }
$ hg init remote
$ cd remote
$ mkcommit base
$ hg phase --public .
$ cd ..
Jun Wu
tests: replace "cp -r" with "cp -R"...
r30556 $ cp -R remote base
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 $ hg clone remote local
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local
New head replaces old head
==========================
setup
Pierre-Yves David
push: refuse to push bumped changeset...
r17834 (we add the 1 flags to prevent bumped error during the test)
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546
$ mkcommit old
$ hg push
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pushing to $TESTTMP/remote (glob)
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
$ hg up -q '.^'
$ mkcommit new
created new head
Pierre-Yves David
push: refuse to push bumped changeset...
r17834 $ hg debugobsolete --flags 1 `getid old` `getid new`
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --hidden
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 @ 71e3228bffe1 (draft) add new
|
| x c70b08862e08 (draft) add old
|/
o b4952fcf48cf (public) add base
Jun Wu
tests: replace "cp -r" with "cp -R"...
r30556 $ cp -R ../remote ../backup1
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546
old exists remotely as draft. It is obsoleted by new that we now push.
Push should not warn about creating new head
$ hg push
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pushing to $TESTTMP/remote (glob)
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 old head is now public (public local version)
=============================================
setup
$ rm -fr ../remote
Jun Wu
tests: replace "cp -r" with "cp -R"...
r30556 $ cp -R ../backup1 ../remote
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 $ hg -R ../remote phase --public c70b08862e08
$ hg pull -v
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pulling from $TESTTMP/remote (glob)
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 searching for changes
no changes found
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --hidden
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 @ 71e3228bffe1 (draft) add new
|
| o c70b08862e08 (public) add old
|/
o b4952fcf48cf (public) add base
Abort: old will still be an head because it's public.
$ hg push
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pushing to $TESTTMP/remote (glob)
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 searching for changes
abort: push creates new remote head 71e3228bffe1!
timeless
discovery: use single quotes in use warning
r29973 (merge or see 'hg help push' for details about pushing new heads)
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 [255]
old head is now public (public remote version)
==============================================
TODO: Not implemented yet.
# setup
#
# $ rm -fr ../remote
Jun Wu
tests: replace "cp -r" with "cp -R"...
r30556 # $ cp -R ../backup1 ../remote
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 # $ hg -R ../remote phase --public c70b08862e08
# $ hg phase --draft --force c70b08862e08
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 # $ hg log -G --hidden
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 # @ 71e3228bffe1 (draft) add new
# |
# | x c70b08862e08 (draft) add old
# |/
# o b4952fcf48cf (public) add base
#
#
#
# Abort: old will still be an head because it's public.
#
# $ hg push
# pushing to $TESTTMP/remote
# searching for changes
# abort: push creates new remote head 71e3228bffe1!
timeless
tests: favor single quotes for wrapping hg help ...
r29979 # (merge or see 'hg help push' for details about pushing new heads)
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 # [255]
old head is obsolete but replacement is not pushed
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 ==================================================
setup
$ rm -fr ../remote
Jun Wu
tests: replace "cp -r" with "cp -R"...
r30556 $ cp -R ../backup1 ../remote
Pierre-Yves David
checkheads: attend to phases when computing new heads with obsolete...
r17547 $ hg phase --draft --force '(0::) - 0'
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 $ hg up -q '.^'
$ mkcommit other
created new head
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --hidden
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 @ d7d41ccbd4de (draft) add other
|
| o 71e3228bffe1 (draft) add new
|/
| x c70b08862e08 (draft) add old
|/
o b4952fcf48cf (public) add base
old exists remotely as draft. It is obsoleted by new but we don't push new.
Push should abort on new head
$ hg push -r 'desc("other")'
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pushing to $TESTTMP/remote (glob)
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 searching for changes
abort: push creates new remote head d7d41ccbd4de!
timeless
discovery: use single quotes in use warning
r29973 (merge or see 'hg help push' for details about pushing new heads)
Pierre-Yves David
test: add testing of checkheads behavior with obsolete...
r17546 [255]
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548
Both precursors and successors are already know remotely. Descendant adds heads
===============================================================================
setup. (The obsolete marker is known locally only
$ cd ..
$ rm -rf local
$ hg clone remote local
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local
$ mkcommit old
old already tracked!
nothing changed
[1]
$ hg up -q '.^'
$ mkcommit new
created new head
$ hg push -f
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pushing to $TESTTMP/remote (glob)
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
$ mkcommit desc1
$ hg up -q '.^'
$ mkcommit desc2
created new head
$ hg debugobsolete `getid old` `getid new`
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --hidden
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 @ 5fe37041cc2b (draft) add desc2
|
| o a3ef1d111c5f (draft) add desc1
|/
o 71e3228bffe1 (draft) add new
|
| x c70b08862e08 (draft) add old
|/
o b4952fcf48cf (public) add base
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --hidden -R ../remote
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 o 71e3228bffe1 (draft) add new
|
| o c70b08862e08 (draft) add old
|/
@ b4952fcf48cf (public) add base
Jun Wu
tests: replace "cp -r" with "cp -R"...
r30556 $ cp -R ../remote ../backup2
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548
Push should not warn about adding new heads. We create one, but we'll delete
one anyway.
$ hg push
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pushing to $TESTTMP/remote (glob)
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
Remote head is unknown but obsoleted by a local changeset
=========================================================
setup
$ rm -fr ../remote
Jun Wu
tests: replace "cp -r" with "cp -R"...
r30556 $ cp -R ../backup1 ../remote
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 $ cd ..
$ rm -rf local
$ hg clone remote local -r 0
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local
$ mkcommit new
$ hg -R ../remote id --debug -r tip
c70b08862e0838ea6d7c59c85da2f1ed6c8d67da tip
$ hg id --debug -r tip
71e3228bffe1886550777233d6c97bb5a6b2a650 tip
$ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --hidden
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 @ 71e3228bffe1 (draft) add new
|
o b4952fcf48cf (public) add base
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --hidden -R ../remote
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 o c70b08862e08 (draft) add old
|
@ b4952fcf48cf (public) add base
Pierre-Yves David
checkheads: upgrade the obsolescence postprocessing logic (issue4354)...
r32009 We do not have enought data to take the right decision, we should fail
$ hg push
pushing to $TESTTMP/remote (glob)
searching for changes
remote has heads on branch 'default' that are not known locally: c70b08862e08
abort: push creates new remote head 71e3228bffe1!
(pull and merge or see 'hg help push' for details about pushing new heads)
[255]
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548
Pierre-Yves David
checkheads: upgrade the obsolescence postprocessing logic (issue4354)...
r32009 Pulling the missing data makes it work
$ hg pull
pulling from $TESTTMP/remote (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads)
$ hg push
Patrick Mezard
test-obsolete-checkheads: fix on windows
r17564 pushing to $TESTTMP/remote (glob)
Pierre-Yves David
checkheads: check successors for new heads in both missing and common...
r17548 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Yuya Nishihara
discovery: prevent crash caused by prune marker having no parent data...
r32096
Old head is pruned without parent data and new unrelated head added
===================================================================
setup
$ cd ..
$ rm -R remote local
$ cp -R backup1 remote
$ hg clone remote local -qr c70b08862e08
$ cd local
$ hg up -q '.^'
$ mkcommit new-unrelated
created new head
$ hg debugobsolete `getid old`
$ hg log -G --hidden
@ 350a93b716be (draft) add new-unrelated
|
| x c70b08862e08 (draft) add old
|/
o b4952fcf48cf (public) add base
$ hg push
pushing to $TESTTMP/remote (glob)
searching for changes
abort: push creates new remote head 350a93b716be!
(merge or see 'hg help push' for details about pushing new heads)
[255]