upstream/mercurial-mirror Files · tests/test-inotify-dirty-dirstate.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.

Matt Mackall - - Load All Authors

File last commit:

r12452:f727db60 default


                r13155:f02d7a56

default

Download file

             test-inotify-dirty-dirstate.t
        
                    71 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-inotify-dirty-dirstate.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      issues when status queries are issued when dirstate is dirty

        $ "$TESTDIR/hghave" inotify || exit 80

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "inotify=" >> $HGRCPATH

        $ echo "fetch=" >> $HGRCPATH

      issue1810: inotify and fetch

        $ mkdir test; cd test

        $ hg init

        $ hg inserve -d --pid-file=../hg.pid

        $ cat ../hg.pid >> "$DAEMON_PIDS"

        $ echo foo > foo

        $ hg add

        adding foo

        $ hg ci -m foo

        $ cd ..

        $ hg --config "inotify.pidfile=../hg2.pid" clone test test2

        updating to branch default

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

        $ cat ../hg2.pid >> "$DAEMON_PIDS"

        $ cd test2

        $ echo bar > bar

        $ hg add

        adding bar

        $ hg ci -m bar

        $ cd ../test

        $ echo spam > spam

        $ hg add

        adding spam

        $ hg ci -m spam

        $ cd ../test2

        $ hg st

      abort, outstanding changes

        $ hg fetch -q

        $ hg st

        $ cd ..

      issue1719: inotify and mq

        $ echo "mq=" >> $HGRCPATH

        $ hg init test-1719

        $ cd test-1719

      inserve

        $ hg inserve -d --pid-file=../hg-test-1719.pid

        $ cat ../hg-test-1719.pid >> "$DAEMON_PIDS"

        $ echo content > file

        $ hg add file

        $ hg qnew -f test.patch

        $ hg status

        $ hg qpop

        popping test.patch

        patch queue now empty

      st should not output anything

        $ hg status

        $ hg qpush

        applying test.patch

        now at: test.patch

      st should not output anything

        $ hg status

        $ hg qrefresh

        $ hg status

	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

				issues when status queries are issued when dirstate is dirty

				$ "$TESTDIR/hghave" inotify \|\| exit 80
				$ echo "[extensions]" >> $HGRCPATH
				$ echo "inotify=" >> $HGRCPATH
				$ echo "fetch=" >> $HGRCPATH

				issue1810: inotify and fetch

				$ mkdir test; cd test
				$ hg init
				$ hg inserve -d --pid-file=../hg.pid
				$ cat ../hg.pid >> "$DAEMON_PIDS"
				$ echo foo > foo
				$ hg add
				adding foo
				$ hg ci -m foo
				$ cd ..
				$ hg --config "inotify.pidfile=../hg2.pid" clone test test2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cat ../hg2.pid >> "$DAEMON_PIDS"
				$ cd test2
				$ echo bar > bar
				$ hg add
				adding bar
				$ hg ci -m bar
				$ cd ../test
				$ echo spam > spam
				$ hg add
				adding spam
				$ hg ci -m spam
				$ cd ../test2
				$ hg st

				abort, outstanding changes

				$ hg fetch -q
				$ hg st
				$ cd ..

				issue1719: inotify and mq

				$ echo "mq=" >> $HGRCPATH
				$ hg init test-1719
				$ cd test-1719

				inserve

				$ hg inserve -d --pid-file=../hg-test-1719.pid
				$ cat ../hg-test-1719.pid >> "$DAEMON_PIDS"
				$ echo content > file
				$ hg add file
				$ hg qnew -f test.patch
				$ hg status
				$ hg qpop
				popping test.patch
				patch queue now empty

				st should not output anything

				$ hg status
				$ hg qpush
				applying test.patch
				now at: test.patch

				st should not output anything

				$ hg status
				$ hg qrefresh
				$ hg status