upstream/mercurial-mirror Files · tests/test-automv.t

repository: define manifest interfaces...

repository: define manifest interfaces The long march towards declaring interfaces for repository primitives continues. This commit essentially defines interfaces based on the following types: * manifest.manifestdict -> imanifestdict * manifest.manifestlog -> imanifestlog * manifest.memmanifestctx -> imanifestrevisionwritable * manifest.manifestctx -> imanifestrevisionstored * manifest.memtreemanifestctx -> imanifestrevisionwritable * manifest.treemanifestctx -> imanifestrevisionstored * util.dirs -> idirs The interfaces are thoroughly documented. Their documentation is now better than the documentation in manifest.py in many cases. With the exception of util.dirs, classes have been annotated with their interfaces. (I didn't feel like util.dirs needed the proper interface treatment.) Tests have been added demonstrating that all classes and instances conform to their interfaces. This work was much easier than filelogs. That's because Durham did an excellent job formalizing the manifest API a while back. There are still some minor kludges with the interfaces that should probably be addressed. But the primary goal with interface declarations is getting something established. Once we have an interface, we can modify it later easily enough. Differential Revision: https://phab.mercurial-scm.org/D3869

Jun Wu - - Load All Authors

File last commit:

r33334:20f533a9 default


                r38549:c82ea938

default

Download file

             test-automv.t
        
                    338 lines
            
             | 7.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-automv.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Tests for the automv extension; detect moved files at commit time.

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > automv=

        > rebase=

        > EOF

      Setup repo

        $ hg init repo

        $ cd repo

      Test automv command for commit

        $ printf 'foo\nbar\nbaz\n' > a.txt

        $ hg add a.txt

        $ hg commit -m 'init repo with a'

      mv/rm/add

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit -m 'msg'

        detected move of 1 files

        $ hg status --change . -C

        A b.txt

          a.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/modif

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ printf '\n' >> b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit -m 'msg'

        detected move of 1 files

        created new head

        $ hg status --change . -C

        A b.txt

          a.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/modif

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ printf '\nfoo\n' >> b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit -m 'msg'

        created new head

        $ hg status --change . -C

        A b.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/modif/changethreshold

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ printf '\nfoo\n' >> b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --config automv.similarity='60' -m 'msg'

        detected move of 1 files

        created new head

        $ hg status --change . -C

        A b.txt

          a.txt

        R a.txt

        $ hg up -r 0

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

      mv

        $ mv a.txt b.txt

        $ hg status -C

        ! a.txt

        ? b.txt

        $ hg commit -m 'msg'

        nothing changed (1 missing files, see 'hg status')

        [1]

        $ hg status -C

        ! a.txt

        ? b.txt

        $ hg revert -aqC

        $ rm b.txt

      mv/rm/add/notincommitfiles

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ echo 'bar' > c.txt

        $ hg add c.txt

        $ hg status -C

        A b.txt

        A c.txt

        R a.txt

        $ hg commit c.txt -m 'msg'

        created new head

        $ hg status --change . -C

        A c.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg up -r 0

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

        $ hg rm a.txt

        $ echo 'bar' > c.txt

        $ hg add c.txt

        $ hg commit -m 'msg'

        detected move of 1 files

        created new head

        $ hg status --change . -C

        A b.txt

          a.txt

        A c.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/--no-automv

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --no-automv -m 'msg'

        created new head

        $ hg status --change . -C

        A b.txt

        R a.txt

        $ hg up -r 0

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

      Test automv command for commit --amend

      mv/rm/add

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --amend -m 'amended'

        detected move of 1 files

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A b.txt

          a.txt

        A c.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/modif

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ printf '\n' >> b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --amend -m 'amended'

        detected move of 1 files

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A b.txt

          a.txt

        A c.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/modif

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ printf '\nfoo\n' >> b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --amend -m 'amended'

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A b.txt

        A c.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/modif/changethreshold

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ printf '\nfoo\n' >> b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --amend --config automv.similarity='60' -m 'amended'

        detected move of 1 files

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A b.txt

          a.txt

        A c.txt

        R a.txt

        $ hg up -r 0

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

      mv

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg status -C

        ! a.txt

        ? b.txt

        $ hg commit --amend -m 'amended'

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status -C

        ! a.txt

        ? b.txt

        $ hg up -Cr 0

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

      mv/rm/add/notincommitfiles

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ echo 'bar' > d.txt

        $ hg add d.txt

        $ hg status -C

        A b.txt

        A d.txt

        R a.txt

        $ hg commit --amend -m 'amended' d.txt

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A c.txt

        A d.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --amend -m 'amended'

        detected move of 1 files

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A b.txt

          a.txt

        A c.txt

        A d.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/add/--no-automv

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg add b.txt

        $ hg status -C

        A b.txt

        R a.txt

        $ hg commit --amend -m 'amended' --no-automv

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A b.txt

        A c.txt

        R a.txt

        $ hg up -r 0

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

      mv/rm/commit/add/amend

        $ echo 'c' > c.txt

        $ hg add c.txt

        $ hg commit -m 'revision to amend to'

        created new head

        $ mv a.txt b.txt

        $ hg rm a.txt

        $ hg status -C

        R a.txt

        ? b.txt

        $ hg commit -m "removed a"

        $ hg add b.txt

        $ hg commit --amend -m 'amended'

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)

        $ hg status --change . -C

        A b.txt

        R a.txt

      error conditions

        $ cat >> $HGRCPATH << EOF

        > [automv]

        > similarity=110

        > EOF

        $ hg commit -m 'revision to amend to'

        abort: automv.similarity must be between 0 and 100

        [255]

	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

				Tests for the automv extension; detect moved files at commit time.

				$ cat >> $HGRCPATH << EOF
				> [extensions]
				> automv=
				> rebase=
				> EOF

				Setup repo

				$ hg init repo
				$ cd repo

				Test automv command for commit

				$ printf 'foo\nbar\nbaz\n' > a.txt
				$ hg add a.txt
				$ hg commit -m 'init repo with a'

				mv/rm/add
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit -m 'msg'
				detected move of 1 files
				$ hg status --change . -C
				A b.txt
				a.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				mv/rm/add/modif
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ printf '\n' >> b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit -m 'msg'
				detected move of 1 files
				created new head
				$ hg status --change . -C
				A b.txt
				a.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				mv/rm/add/modif
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ printf '\nfoo\n' >> b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit -m 'msg'
				created new head
				$ hg status --change . -C
				A b.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				mv/rm/add/modif/changethreshold
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ printf '\nfoo\n' >> b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --config automv.similarity='60' -m 'msg'
				detected move of 1 files
				created new head
				$ hg status --change . -C
				A b.txt
				a.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				mv
				$ mv a.txt b.txt
				$ hg status -C
				! a.txt
				? b.txt
				$ hg commit -m 'msg'
				nothing changed (1 missing files, see 'hg status')
				[1]
				$ hg status -C
				! a.txt
				? b.txt
				$ hg revert -aqC
				$ rm b.txt

				mv/rm/add/notincommitfiles
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ echo 'bar' > c.txt
				$ hg add c.txt
				$ hg status -C
				A b.txt
				A c.txt
				R a.txt
				$ hg commit c.txt -m 'msg'
				created new head
				$ hg status --change . -C
				A c.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg up -r 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg rm a.txt
				$ echo 'bar' > c.txt
				$ hg add c.txt
				$ hg commit -m 'msg'
				detected move of 1 files
				created new head
				$ hg status --change . -C
				A b.txt
				a.txt
				A c.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				mv/rm/add/--no-automv
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --no-automv -m 'msg'
				created new head
				$ hg status --change . -C
				A b.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				Test automv command for commit --amend

				mv/rm/add
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --amend -m 'amended'
				detected move of 1 files
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A b.txt
				a.txt
				A c.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				mv/rm/add/modif
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ printf '\n' >> b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --amend -m 'amended'
				detected move of 1 files
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A b.txt
				a.txt
				A c.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				mv/rm/add/modif
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ printf '\nfoo\n' >> b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --amend -m 'amended'
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A b.txt
				A c.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				mv/rm/add/modif/changethreshold
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ printf '\nfoo\n' >> b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --amend --config automv.similarity='60' -m 'amended'
				detected move of 1 files
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A b.txt
				a.txt
				A c.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				mv
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg status -C
				! a.txt
				? b.txt
				$ hg commit --amend -m 'amended'
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status -C
				! a.txt
				? b.txt
				$ hg up -Cr 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				mv/rm/add/notincommitfiles
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ echo 'bar' > d.txt
				$ hg add d.txt
				$ hg status -C
				A b.txt
				A d.txt
				R a.txt
				$ hg commit --amend -m 'amended' d.txt
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A c.txt
				A d.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --amend -m 'amended'
				detected move of 1 files
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A b.txt
				a.txt
				A c.txt
				A d.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 3 files removed, 0 files unresolved

				mv/rm/add/--no-automv
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg add b.txt
				$ hg status -C
				A b.txt
				R a.txt
				$ hg commit --amend -m 'amended' --no-automv
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A b.txt
				A c.txt
				R a.txt
				$ hg up -r 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				mv/rm/commit/add/amend
				$ echo 'c' > c.txt
				$ hg add c.txt
				$ hg commit -m 'revision to amend to'
				created new head
				$ mv a.txt b.txt
				$ hg rm a.txt
				$ hg status -C
				R a.txt
				? b.txt
				$ hg commit -m "removed a"
				$ hg add b.txt
				$ hg commit --amend -m 'amended'
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob)
				$ hg status --change . -C
				A b.txt
				R a.txt

				error conditions

				$ cat >> $HGRCPATH << EOF
				> [automv]
				> similarity=110
				> EOF
				$ hg commit -m 'revision to amend to'
				abort: automv.similarity must be between 0 and 100
				[255]