upstream/mercurial-mirror Files · tests/test-pull.t

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Mads Kiilerich - - Load All Authors

File last commit:

r12643:d08bb648 default


                r13155:f02d7a56

default

Download file

             test-pull.t
        
                    81 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ mkdir test

        $ cd test

        $ echo foo>foo

        $ hg init

        $ hg addremove

        adding foo

        $ hg commit -m 1

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg serve -p $HGPORT -d --pid-file=hg.pid

        $ cat hg.pid >> $DAEMON_PIDS

        $ cd ..

        $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy

        requesting all changes

        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 copy

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg co

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat foo

        foo

        $ hg manifest --debug

        2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo

        $ hg pull

        pulling from http://foo:***@localhost:$HGPORT/

        searching for changes

        no changes found

        $ hg rollback --dry-run --verbose

        rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)

      Issue622: hg init && hg pull -u URL doesn't checkout default branch

        $ cd ..

        $ hg init empty

        $ cd empty

        $ hg pull -u ../test

        pulling from ../test

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      Test 'file:' uri handling:

        $ hg pull -q file://../test-doesnt-exist

        abort: repository /test-doesnt-exist not found!

        [255]

        $ hg pull -q file:../test

      It's tricky to make file:// URLs working on every platform with

      regular shell commands.

        $ URL=`python -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`

        $ hg pull -q "$URL"

	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

				$ mkdir test
				$ cd test

				$ echo foo>foo
				$ hg init
				$ hg addremove
				adding foo
				$ hg commit -m 1

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				$ hg serve -p $HGPORT -d --pid-file=hg.pid
				$ cat hg.pid >> $DAEMON_PIDS
				$ cd ..

				$ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy
				requesting all changes
				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 copy
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				$ hg co
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cat foo
				foo

				$ hg manifest --debug
				2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo

				$ hg pull
				pulling from http://foo:***@localhost:$HGPORT/
				searching for changes
				no changes found

				$ hg rollback --dry-run --verbose
				rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)

				Issue622: hg init && hg pull -u URL doesn't checkout default branch

				$ cd ..
				$ hg init empty
				$ cd empty
				$ hg pull -u ../test
				pulling from ../test
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test 'file:' uri handling:

				$ hg pull -q file://../test-doesnt-exist
				abort: repository /test-doesnt-exist not found!
				[255]

				$ hg pull -q file:../test

				It's tricky to make file:// URLs working on every platform with
				regular shell commands.

				$ URL=`python -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
				$ hg pull -q "$URL"