upstream/mercurial-mirror Files · tests/test-pull-http.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.

Adrian Buehlmann - - Load All Authors

File last commit:

r12743:4c4aeaab default


                r13155:f02d7a56

default

Download file

             test-pull-http.t
        
                    46 lines
            
             | 1.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-http.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cp "$TESTDIR"/printenv.py .

        $ hg init test

        $ cd test

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ cd ..

        $ hg clone test test2

        updating to branch default

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

        $ cd test2

        $ echo a >> a

        $ hg ci -mb

      expect error, cloning not allowed

        $ echo '[web]' > .hg/hgrc

        $ echo 'allowpull = false' >> .hg/hgrc

        $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log

        $ cat hg.pid >> $DAEMON_PIDS

        $ hg clone http://localhost:$HGPORT/ test3

        requesting all changes

        abort: authorization failed

        [255]

        $ "$TESTDIR/killdaemons.py"

      serve errors

        $ cat errors.log

        $ req() {

        >     hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log

        >     cat hg.pid >> $DAEMON_PIDS

        >     hg --cwd ../test pull http://localhost:$HGPORT/

        >     kill `cat hg.pid`

        >     echo % serve errors

        >     cat errors.log

        > }

      expect error, pulling not allowed

        $ req

        pulling from http://localhost:$HGPORT/

        searching for changes

        abort: authorization failed

        % serve errors

	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


				$ cp "$TESTDIR"/printenv.py .
				$ hg init test
				$ cd test
				$ echo a > a
				$ hg ci -Ama
				adding a
				$ cd ..
				$ hg clone test test2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd test2
				$ echo a >> a
				$ hg ci -mb

				expect error, cloning not allowed

				$ echo '[web]' > .hg/hgrc
				$ echo 'allowpull = false' >> .hg/hgrc
				$ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
				$ cat hg.pid >> $DAEMON_PIDS
				$ hg clone http://localhost:$HGPORT/ test3
				requesting all changes
				abort: authorization failed
				[255]
				$ "$TESTDIR/killdaemons.py"

				serve errors

				$ cat errors.log
				$ req() {
				> hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
				> cat hg.pid >> $DAEMON_PIDS
				> hg --cwd ../test pull http://localhost:$HGPORT/
				> kill `cat hg.pid`
				> echo % serve errors
				> cat errors.log
				> }

				expect error, pulling not allowed

				$ req
				pulling from http://localhost:$HGPORT/
				searching for changes
				abort: authorization failed
				% serve errors