upstream/mercurial-mirror Files · tests/test-push-warn.out

localrepo: introduce method for explicit branch cache update...

localrepo: introduce method for explicit branch cache update Currently, localrepo.branchtags() is called in two locations to update the _branchcache dict, however branchtags() itself does not update anything, it calls branchmap() to do so. This change introduces a new updatebranchcache() method that is used by both branchmap() and the calls to update the cache.

Benoit Boissinot - - Load All Authors

File last commit:

r11574:6381fa7b default


                r12066:d01e2865

default

Download file

             test-push-warn.out
        
                    323 lines
            
             | 8.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-push-warn.out

History | Source | Raw |Copy content |Copy permalink

Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pushing to ../a
		searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'default'!
		(you should pull and merge or use push -f to force)
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pulling from ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
mpm@selenic.com Update tests	r1043	added 1 changesets with 1 changes to 1 files (+1 heads)
Vadim Gelfer add merge command. means same thing as "update -m"....	r2019	(run 'hg heads' to see heads, 'hg merge' to merge)
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pushing to ../a
		searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'default'!
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	(did you forget to merge? use push -f to force)
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pushing to ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
Benoit Boissinot push: use the fast changegroup() path on push...	r7460	added 2 changesets with 1 changes to 1 files
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	adding foo
Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	merging foo
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'default'!
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	(did you forget to merge? use push -f to force)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
		no changes found
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	0
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'default'!
Sune Foldager prepush: fix bug in warning message selection...	r10908	(did you forget to merge? use push -f to force)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	pushing to ../c
		searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'default'!
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	(did you forget to merge? use push -f to force)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Matt Mackall correct remote heads test in prepush	r3684	pushing to ../c
		searching for changes
Matt Mackall Revert push new heads logic...	r2109	adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files (+2 heads)
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	0
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
Matt Mackall Revert push new heads logic...	r2109	adding changesets
		adding manifests
		adding file changes
Thomas Arendsen Hein Report on push/pull if heads are merged, too, like for new heads....	r2424	added 1 changesets with 1 changes to 1 files (-1 heads)
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	0
Sune Foldager prepush: fix bug in warning message selection...	r10908	comparing with ../c
		searching for changes
		no changes found
		% issue 450
Benoit Boissinot fix calculation of new heads added during push with -r...	r3923	pushing to ../e
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		0
		pushing to ../e
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		0
Sune Foldager tests: add tests for new pre-push logic (issue736)...	r8565	% issue 736
		% push on existing branch and new branch
		pushing to ../f
		searching for changes
Dirkjan Ochtman strip apostrophes from an error messages	r10371	abort: push creates new remote branches: c!
Sune Foldager push: add --new-branch option to allow intial push of new branches...	r11211	(use 'hg push --new-branch' to create new remote branches)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Benoit Boissinot prepush: warn about every new outgoing named branch, not just the first	r10354	pushing to ../f
		searching for changes
Dirkjan Ochtman strip apostrophes from an error messages	r10371	abort: push creates new remote branches: c!
Sune Foldager push: add --new-branch option to allow intial push of new branches...	r11211	(use 'hg push --new-branch' to create new remote branches)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Benoit Boissinot prepush: warn about every new outgoing named branch, not just the first	r10354	% multiple new branches
		pushing to ../f
		searching for changes
Dirkjan Ochtman strip apostrophes from an error messages	r10371	abort: push creates new remote branches: c, d!
Sune Foldager push: add --new-branch option to allow intial push of new branches...	r11211	(use 'hg push --new-branch' to create new remote branches)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Benoit Boissinot prepush: warn about every new outgoing named branch, not just the first	r10354	pushing to ../f
		searching for changes
Sune Foldager push: fix bug in prepush logic and its tests	r10771	abort: push creates new remote branches: c, d!
Sune Foldager push: add --new-branch option to allow intial push of new branches...	r11211	(use 'hg push --new-branch' to create new remote branches)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Sune Foldager tests: add tests for new pre-push logic (issue736)...	r8565	% fail on multiple head push
		pushing to ../f
		searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'a'!
Sune Foldager prepush: fix bug in warning message selection...	r10908	(did you forget to merge? use push -f to force)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Sune Foldager tests: add tests for new pre-push logic (issue736)...	r8565	% push replacement head on existing branches
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files
		0
		% merge of branch a to other branch b followed by unrelated push on branch a
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (-1 heads)
		0
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		0
		% cheating the counting algorithm
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files
		0
Sune Foldager push: add --new-branch option to allow intial push of new branches...	r11211	% failed push of new named branch
		pushing to ../f
		searching for changes
		abort: push creates new remote branches: e!
		(use 'hg push --new-branch' to create new remote branches)
Benoit Boissinot Abort: add a hint argument, printed in the next line inside parenthesis...	r11574	255
Sune Foldager push: add --new-branch option to allow intial push of new branches...	r11211	% using --new-branch to push new named branch
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		0
Sune Foldager push: fix subtle bug in prepush logic...	r9479	% checking prepush logic does not allow silently pushing multiple new heads
		adding init
		adding a
Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
Henrik Stuart tests: fix inadvertent use of existing test repository	r9609	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Sune Foldager push: fix subtle bug in prepush logic...	r9479	adding b
		created new head
Henrik Stuart tests: fix inadvertent use of existing test repository	r9609	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Sune Foldager push: fix subtle bug in prepush logic...	r9479	adding c
		created new head
Henrik Stuart tests: fix inadvertent use of existing test repository	r9609	pushing to h
Sune Foldager push: fix subtle bug in prepush logic...	r9479	searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'default'!
		(you should pull and merge or use push -f to force)
Sune Foldager push: fix subtle bug in prepush logic...	r9479
Sune Foldager fix bug in prepush logic involving merge changesets...	r9954	% check prepush logic with merged branches
		marked working directory as branch a
		adding foo
		updating to branch a
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		marked working directory as branch b
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		pushing to j
		searching for changes
Sune Foldager push: fix bug in prepush logic and its tests	r10771	abort: push creates new remote branches: b!
Sune Foldager push: add --new-branch option to allow intial push of new branches...	r11211	(use 'hg push --new-branch' to create new remote branches)
Sune Foldager push: fix bug in prepush logic and its tests	r10771
		% prepush -r should not allow you to sneak in new heads
		pushing to ../l
		searching for changes
Benoit Boissinot prepush: add more precise error messages...	r10396	abort: push creates new remote heads on branch 'a'!
Sune Foldager push: fix bug in prepush logic and its tests	r10771	(did you forget to merge? use push -f to force)
Sune Foldager partial backout of 1e819576e926 and add tests (issue2131)...	r10875	% check prepush with new branch head on former topo non-head
		marked working directory as branch A
		adding a
		marked working directory as branch B
		adding b
		updating to branch B
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		adding b1
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		adding a2
		%% glog of local
		@ 2: A a2
		\|
		\| o 1: B b
		\|/
		o 0: A a

		%% glog of remote
		@ 2: B b1
		\|
		o 1: B b
		\|
		o 0: A a

		%% outgoing
		comparing with inner
		searching for changes
		2: A a2
		pushing to inner
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		% check prepush with new branch head on former topo head
		marked working directory as branch A
		adding a
		marked working directory as branch B
		adding b
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		adding a1
		updating to branch A
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		adding b1
		adding a2
		%% glog of local
		@ 3: A a2
		\|
		o 2: A a1
		\|
		\| o 1: B b
		\|/
		o 0: A a

		%% glog of remote
		@ 3: B b1
		\|
		\| o 2: A a1
		\| \|
		o \| 1: B b
		\|/
		o 0: A a

		%% outgoing
		comparing with inner
		searching for changes
		3: A a2
		pushing to inner
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
Peter Arrenbrecht prepush: add more test cases	r10909	% check prepush with new branch head and new child of former branch head
		% but child is on different branch
		marked working directory as branch A
		adding a
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		marked working directory as branch B
		adding b
		updating to branch B
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		marked working directory as branch B
Gilles Moris commit: fix display of 'created new head' message (issue2186)...	r11317	created new head
Peter Arrenbrecht prepush: add more test cases	r10909	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		marked working directory as branch A
Gilles Moris commit: fix display of 'created new head' message (issue2186)...	r11317	created new head
Peter Arrenbrecht prepush: add more test cases	r10909	%% glog of local
		@ 5: A b3
		\|
		\| o 4: B a3
		\| \|
		o \| 3: B b1
		\| \|
		o \| 2: B b0
		/
		o 1: A a1
		\|
		o 0: A a0

		%% glog of remote
		@ 3: B b1
		\|
		o 2: B b0

		o 1: A a1
		\|
		o 0: A a0

		%% outgoing
		comparing with inner
		searching for changes
		4: B a3
		5: A b3
		pushing to inner
		searching for changes
		abort: push creates new remote heads on branch 'A'!
		(did you forget to merge? use push -f to force)
Sune Foldager prepush: rewrite most of the code from scratch...	r10925	pushing to inner
		searching for changes
		abort: push creates new remote heads on branch 'A'!
		(did you forget to merge? use push -f to force)
		comparing with inner
		searching for changes
		no changes found

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages