upstream/mercurial-mirror Files · tests/test-abort-checkin.t

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Pierre-Yves David - - Load All Authors

File last commit:

r26587:56b2bcea default


                r28189:fac3a24b

default

Download file

             test-abort-checkin.t
        
                    37 lines
            
             | 870 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-abort-checkin.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > abortcommit.py <<EOF

        > from mercurial import error

        > def hook(**args):

        >     raise error.Abort("no commits allowed")

        > def reposetup(ui, repo):

        >     repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook)

        > EOF

        $ abspath=`pwd`/abortcommit.py

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > mq =

        > abortcommit = $abspath

        > EOF

        $ hg init foo

        $ cd foo

        $ echo foo > foo

        $ hg add foo

      mq may keep a reference to the repository so __del__ will not be

      called and .hg/journal.dirstate will not be deleted:

        $ hg ci -m foo

        error: pretxncommit.nocommits hook failed: no commits allowed

        transaction abort!

        rollback completed

        abort: no commits allowed

        [255]

        $ hg ci -m foo

        error: pretxncommit.nocommits hook failed: no commits allowed

        transaction abort!

        rollback completed

        abort: no commits allowed

        [255]

        $ cd ..

	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

				$ cat > abortcommit.py <<EOF
				> from mercurial import error
				> def hook(**args):
				> raise error.Abort("no commits allowed")
				> def reposetup(ui, repo):
				> repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook)
				> EOF
				$ abspath=`pwd`/abortcommit.py

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> mq =
				> abortcommit = $abspath
				> EOF

				$ hg init foo
				$ cd foo
				$ echo foo > foo
				$ hg add foo

				mq may keep a reference to the repository so __del__ will not be
				called and .hg/journal.dirstate will not be deleted:

				$ hg ci -m foo
				error: pretxncommit.nocommits hook failed: no commits allowed
				transaction abort!
				rollback completed
				abort: no commits allowed
				[255]
				$ hg ci -m foo
				error: pretxncommit.nocommits hook failed: no commits allowed
				transaction abort!
				rollback completed
				abort: no commits allowed
				[255]

				$ cd ..