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

r12327:92e30e13 default


                r13155:f02d7a56

default

Download file

             test-dumprevlog.t
        
                    107 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-dumprevlog.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Set vars:

        $ CONTRIBDIR=$TESTDIR/../contrib

      Prepare repo-a:

        $ mkdir repo-a

        $ cd repo-a

        $ hg init

        $ echo this is file a > a

        $ hg add a

        $ hg commit -m first

        $ echo adding to file a >> a

        $ hg commit -m second

        $ echo adding more to file a >> a

        $ hg commit -m third

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 3 changesets, 3 total revisions

      Dumping revlog of file a to stdout:

        $ python $CONTRIBDIR/dumprevlog .hg/store/data/a.i

        file: .hg/store/data/a.i

        node: 183d2312b35066fb6b3b449b84efc370d50993d0

        linkrev: 0

        parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000

        length: 15

        -start-

        this is file a

        -end-

        node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b

        linkrev: 1

        parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000

        length: 32

        -start-

        this is file a

        adding to file a

        -end-

        node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1

        linkrev: 2

        parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000

        length: 54

        -start-

        this is file a

        adding to file a

        adding more to file a

        -end-

      Dump all revlogs to file repo.dump:

        $ find .hg/store -name "*.i" | sort | xargs python $CONTRIBDIR/dumprevlog > ../repo.dump

        $ cd ..

      Undumping into repo-b:

        $ mkdir repo-b

        $ cd repo-b

        $ hg init

        $ python $CONTRIBDIR/undumprevlog < ../repo.dump

        .hg/store/00changelog.i

        .hg/store/00manifest.i

        .hg/store/data/a.i

        $ cd ..

      Rebuild fncache with clone --pull:

        $ hg clone --pull -U repo-b repo-c

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 1 files

      Verify:

        $ hg -R repo-c verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 3 changesets, 3 total revisions

      Compare repos:

        $ hg -R repo-c incoming repo-a

        comparing with repo-a

        searching for changes

        no changes found

        [1]

        $ hg -R repo-a incoming repo-c

        comparing with repo-c

        searching for changes

        no changes found

        [1]

	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

				Set vars:

				$ CONTRIBDIR=$TESTDIR/../contrib

				Prepare repo-a:

				$ mkdir repo-a
				$ cd repo-a
				$ hg init

				$ echo this is file a > a
				$ hg add a
				$ hg commit -m first

				$ echo adding to file a >> a
				$ hg commit -m second

				$ echo adding more to file a >> a
				$ hg commit -m third

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

				Dumping revlog of file a to stdout:

				$ python $CONTRIBDIR/dumprevlog .hg/store/data/a.i
				file: .hg/store/data/a.i
				node: 183d2312b35066fb6b3b449b84efc370d50993d0
				linkrev: 0
				parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
				length: 15
				-start-
				this is file a

				-end-
				node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
				linkrev: 1
				parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
				length: 32
				-start-
				this is file a
				adding to file a

				-end-
				node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
				linkrev: 2
				parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
				length: 54
				-start-
				this is file a
				adding to file a
				adding more to file a

				-end-

				Dump all revlogs to file repo.dump:

				$ find .hg/store -name "*.i" \| sort \| xargs python $CONTRIBDIR/dumprevlog > ../repo.dump
				$ cd ..

				Undumping into repo-b:

				$ mkdir repo-b
				$ cd repo-b
				$ hg init
				$ python $CONTRIBDIR/undumprevlog < ../repo.dump
				.hg/store/00changelog.i
				.hg/store/00manifest.i
				.hg/store/data/a.i
				$ cd ..

				Rebuild fncache with clone --pull:

				$ hg clone --pull -U repo-b repo-c
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 1 files

				Verify:

				$ hg -R repo-c verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 3 changesets, 3 total revisions

				Compare repos:

				$ hg -R repo-c incoming repo-a
				comparing with repo-a
				searching for changes
				no changes found
				[1]

				$ hg -R repo-a incoming repo-c
				comparing with repo-c
				searching for changes
				no changes found
				[1]