upstream/mercurial-mirror Files · tests/test-schemes.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-schemes.t
        
                    45 lines
            
             | 854 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-schemes.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > schemes=

        > 

        > [schemes]

        > l = http://localhost:$HGPORT/

        > parts = http://{1}:$HGPORT/

        > z = file:\$PWD/

        > EOF

        $ hg init test

        $ cd test

        $ echo a > a

        $ hg ci -Am initial

        adding a

        $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

        $ cat hg.pid >> $DAEMON_PIDS

        $ hg incoming l://

        comparing with l://

        searching for changes

        no changes found

        [1]

      check that {1} syntax works

        $ hg incoming --debug parts://localhost

        using http://localhost:$HGPORT/

        sending between command

        comparing with parts://localhost

        sending heads command

        searching for changes

        no changes found

        [1]

      check that paths are expanded

        $ PWD=`pwd` hg incoming z://

        comparing with z://

        searching for changes

        no changes found

        [1]

      errors

        $ cat errors.log

	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 <<EOF >> $HGRCPATH
				> [extensions]
				> schemes=
				>
				> [schemes]
				> l = http://localhost:$HGPORT/
				> parts = http://{1}:$HGPORT/
				> z = file:\$PWD/
				> EOF
				$ hg init test
				$ cd test
				$ echo a > a
				$ hg ci -Am initial
				adding a
				$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
				$ cat hg.pid >> $DAEMON_PIDS
				$ hg incoming l://
				comparing with l://
				searching for changes
				no changes found
				[1]

				check that {1} syntax works

				$ hg incoming --debug parts://localhost
				using http://localhost:$HGPORT/
				sending between command
				comparing with parts://localhost
				sending heads command
				searching for changes
				no changes found
				[1]

				check that paths are expanded

				$ PWD=`pwd` hg incoming z://
				comparing with z://
				searching for changes
				no changes found
				[1]

				errors

				$ cat errors.log