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

r12316:4134686b default


                r13155:f02d7a56

default

Download file

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

      Init repo1:

        $ hg init repo1

        $ cd repo1

        $ echo "some text" > a

        $ hg add

        adding a

        $ hg ci -m first

        $ cat .hg/store/fncache

        data/a.i

      Testing a.i/b:

        $ mkdir a.i

        $ echo "some other text" > a.i/b

        $ hg add

        adding a.i/b

        $ hg ci -m second

        $ cat .hg/store/fncache

        data/a.i

        data/a.i.hg/b.i

      Testing a.i.hg/c:

        $ mkdir a.i.hg

        $ echo "yet another text" > a.i.hg/c

        $ hg add

        adding a.i.hg/c

        $ hg ci -m third

        $ cat .hg/store/fncache

        data/a.i

        data/a.i.hg/b.i

        data/a.i.hg.hg/c.i

      Testing verify:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        3 files, 3 changesets, 3 total revisions

        $ rm .hg/store/fncache

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

         data/a.i@0: missing revlog!

         data/a.i.hg/c.i@2: missing revlog!

         data/a.i/b.i@1: missing revlog!

        3 files, 3 changesets, 3 total revisions

        3 integrity errors encountered!

        (first damaged changeset appears to be 0)

        [1]

        $ cd ..

      Non store repo:

        $ hg --config format.usestore=False init foo

        $ cd foo

        $ mkdir tst.d

        $ echo foo > tst.d/foo

        $ hg ci -Amfoo

        adding tst.d/foo

        $ find .hg | sort

        .hg

        .hg/00changelog.i

        .hg/00manifest.i

        .hg/data

        .hg/data/tst.d.hg

        .hg/data/tst.d.hg/foo.i

        .hg/dirstate

        .hg/last-message.txt

        .hg/requires

        .hg/undo

        .hg/undo.branch

        .hg/undo.desc

        .hg/undo.dirstate

        $ cd ..

      Non fncache repo:

        $ hg --config format.usefncache=False init bar

        $ cd bar

        $ mkdir tst.d

        $ echo foo > tst.d/Foo

        $ hg ci -Amfoo

        adding tst.d/Foo

        $ find .hg | sort

        .hg

        .hg/00changelog.i

        .hg/dirstate

        .hg/last-message.txt

        .hg/requires

        .hg/store

        .hg/store/00changelog.i

        .hg/store/00manifest.i

        .hg/store/data

        .hg/store/data/tst.d.hg

        .hg/store/data/tst.d.hg/_foo.i

        .hg/store/undo

        .hg/undo.branch

        .hg/undo.desc

        .hg/undo.dirstate

        $ 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

				Init repo1:

				$ hg init repo1
				$ cd repo1
				$ echo "some text" > a
				$ hg add
				adding a
				$ hg ci -m first
				$ cat .hg/store/fncache
				data/a.i

				Testing a.i/b:

				$ mkdir a.i
				$ echo "some other text" > a.i/b
				$ hg add
				adding a.i/b
				$ hg ci -m second
				$ cat .hg/store/fncache
				data/a.i
				data/a.i.hg/b.i

				Testing a.i.hg/c:

				$ mkdir a.i.hg
				$ echo "yet another text" > a.i.hg/c
				$ hg add
				adding a.i.hg/c
				$ hg ci -m third
				$ cat .hg/store/fncache
				data/a.i
				data/a.i.hg/b.i
				data/a.i.hg.hg/c.i

				Testing verify:

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

				$ rm .hg/store/fncache

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				data/a.i@0: missing revlog!
				data/a.i.hg/c.i@2: missing revlog!
				data/a.i/b.i@1: missing revlog!
				3 files, 3 changesets, 3 total revisions
				3 integrity errors encountered!
				(first damaged changeset appears to be 0)
				[1]
				$ cd ..

				Non store repo:

				$ hg --config format.usestore=False init foo
				$ cd foo
				$ mkdir tst.d
				$ echo foo > tst.d/foo
				$ hg ci -Amfoo
				adding tst.d/foo
				$ find .hg \| sort
				.hg
				.hg/00changelog.i
				.hg/00manifest.i
				.hg/data
				.hg/data/tst.d.hg
				.hg/data/tst.d.hg/foo.i
				.hg/dirstate
				.hg/last-message.txt
				.hg/requires
				.hg/undo
				.hg/undo.branch
				.hg/undo.desc
				.hg/undo.dirstate
				$ cd ..

				Non fncache repo:

				$ hg --config format.usefncache=False init bar
				$ cd bar
				$ mkdir tst.d
				$ echo foo > tst.d/Foo
				$ hg ci -Amfoo
				adding tst.d/Foo
				$ find .hg \| sort
				.hg
				.hg/00changelog.i
				.hg/dirstate
				.hg/last-message.txt
				.hg/requires
				.hg/store
				.hg/store/00changelog.i
				.hg/store/00manifest.i
				.hg/store/data
				.hg/store/data/tst.d.hg
				.hg/store/data/tst.d.hg/_foo.i
				.hg/store/undo
				.hg/undo.branch
				.hg/undo.desc
				.hg/undo.dirstate
				$ cd ..