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

largefiles: factor out procedures to update standins for pre-committing...

largefiles: factor out procedures to update standins for pre-committing This patch factors out procedures to update standins for pre-committing. This is one of preparations to avoid execution of such procedures according to invocation context. For example, resuming automated committing (e.g. "hg rebase --continue") should update standins at the 1st commit, because largefiles in the working directory may be modified manually. But on the other hand, it should avoid updating standins at subsequent committings for efficiency reason. For simplicity, this patch just moves procedures mechanically only with replacing below. - "self" => "repo" - "lfutil." => (none) - "orig" invocation => returning "match" Using "fstandin" instead "standin" as the name of local variable for the loop below is the only special care, because the latter shadows the same name function in "lfutil.py". [before] for standin in standins: lfile = lfutil.splitstandin(standin) if lfdirstate[lfile] != 'r': lfutil.updatestandin(self, standin) [after] for fstandin in standins: lfile = splitstandin(fstandin) if lfdirstate[lfile] != 'r': updatestandin(repo, fstandin)

Mads Kiilerich - - Load All Authors

File last commit:

r18506:ef60083b stable


                r23185:9870173e

default

Download file

             test-parents.t
        
                    154 lines
            
             | 3.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-parents.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test parents command

        $ hg init repo

        $ cd repo

      no working directory

        $ hg parents

        $ echo a > a

        $ echo b > b

        $ hg ci -Amab -d '0 0'

        adding a

        adding b

        $ echo a >> a

        $ hg ci -Ama -d '1 0'

        $ echo b >> b

        $ hg ci -Amb -d '2 0'

        $ echo c > c

        $ hg ci -Amc -d '3 0'

        adding c

        $ hg up -C 1

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

        $ echo d > c

        $ hg ci -Amc2 -d '4 0'

        adding c

        created new head

        $ hg up -C 3

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

        $ hg parents

        changeset:   3:02d851b7e549

        user:        test

        date:        Thu Jan 01 00:00:03 1970 +0000

        summary:     c

        $ hg parents a

        changeset:   1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:01 1970 +0000

        summary:     a

      hg parents c, single revision

        $ hg parents c

        changeset:   3:02d851b7e549

        user:        test

        date:        Thu Jan 01 00:00:03 1970 +0000

        summary:     c

        $ hg parents -r 3 c

        abort: 'c' not found in manifest!

        [255]

        $ hg parents -r 2

        changeset:   1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:01 1970 +0000

        summary:     a

        $ hg parents -r 2 a

        changeset:   1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:01 1970 +0000

        summary:     a

        $ hg parents -r 2 ../a

        abort: ../a not under root '$TESTTMP/repo' (glob)

        [255]

      cd dir; hg parents -r 2 ../a

        $ mkdir dir

        $ cd dir

        $ hg parents -r 2 ../a

        changeset:   1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:01 1970 +0000

        summary:     a

        $ hg parents -r 2 path:a

        changeset:   1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:01 1970 +0000

        summary:     a

        $ cd ..

        $ hg parents -r 2 glob:a

        abort: can only specify an explicit filename

        [255]

      merge working dir with 2 parents, hg parents c

        $ HGMERGE=true hg merge

        merging c

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

        (branch merge, don't forget to commit)

        $ hg parents c

        changeset:   3:02d851b7e549

        user:        test

        date:        Thu Jan 01 00:00:03 1970 +0000

        summary:     c

        changeset:   4:48cee28d4b4e

        tag:         tip

        parent:      1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:04 1970 +0000

        summary:     c2

      merge working dir with 1 parent, hg parents

        $ hg up -C 2

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

        $ HGMERGE=true hg merge -r 4

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

        (branch merge, don't forget to commit)

        $ hg parents

        changeset:   2:6cfac479f009

        user:        test

        date:        Thu Jan 01 00:00:02 1970 +0000

        summary:     b

        changeset:   4:48cee28d4b4e

        tag:         tip

        parent:      1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:04 1970 +0000

        summary:     c2

      merge working dir with 1 parent, hg parents c

        $ hg parents c

        changeset:   4:48cee28d4b4e

        tag:         tip

        parent:      1:d786049f033a

        user:        test

        date:        Thu Jan 01 00:00:04 1970 +0000

        summary:     c2

        $ 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

				test parents command

				$ hg init repo
				$ cd repo

				no working directory

				$ hg parents

				$ echo a > a
				$ echo b > b
				$ hg ci -Amab -d '0 0'
				adding a
				adding b
				$ echo a >> a
				$ hg ci -Ama -d '1 0'
				$ echo b >> b
				$ hg ci -Amb -d '2 0'
				$ echo c > c
				$ hg ci -Amc -d '3 0'
				adding c
				$ hg up -C 1
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo d > c
				$ hg ci -Amc2 -d '4 0'
				adding c
				created new head
				$ hg up -C 3
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved


				$ hg parents
				changeset: 3:02d851b7e549
				user: test
				date: Thu Jan 01 00:00:03 1970 +0000
				summary: c


				$ hg parents a
				changeset: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:01 1970 +0000
				summary: a


				hg parents c, single revision

				$ hg parents c
				changeset: 3:02d851b7e549
				user: test
				date: Thu Jan 01 00:00:03 1970 +0000
				summary: c


				$ hg parents -r 3 c
				abort: 'c' not found in manifest!
				[255]

				$ hg parents -r 2
				changeset: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:01 1970 +0000
				summary: a


				$ hg parents -r 2 a
				changeset: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:01 1970 +0000
				summary: a


				$ hg parents -r 2 ../a
				abort: ../a not under root '$TESTTMP/repo' (glob)
				[255]


				cd dir; hg parents -r 2 ../a

				$ mkdir dir
				$ cd dir
				$ hg parents -r 2 ../a
				changeset: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:01 1970 +0000
				summary: a

				$ hg parents -r 2 path:a
				changeset: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:01 1970 +0000
				summary: a

				$ cd ..

				$ hg parents -r 2 glob:a
				abort: can only specify an explicit filename
				[255]


				merge working dir with 2 parents, hg parents c

				$ HGMERGE=true hg merge
				merging c
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg parents c
				changeset: 3:02d851b7e549
				user: test
				date: Thu Jan 01 00:00:03 1970 +0000
				summary: c

				changeset: 4:48cee28d4b4e
				tag: tip
				parent: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:04 1970 +0000
				summary: c2



				merge working dir with 1 parent, hg parents

				$ hg up -C 2
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ HGMERGE=true hg merge -r 4
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg parents
				changeset: 2:6cfac479f009
				user: test
				date: Thu Jan 01 00:00:02 1970 +0000
				summary: b

				changeset: 4:48cee28d4b4e
				tag: tip
				parent: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:04 1970 +0000
				summary: c2


				merge working dir with 1 parent, hg parents c

				$ hg parents c
				changeset: 4:48cee28d4b4e
				tag: tip
				parent: 1:d786049f033a
				user: test
				date: Thu Jan 01 00:00:04 1970 +0000
				summary: c2


				$ cd ..