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

merge: fix UnboundLocalError (issue3791)...

merge: fix UnboundLocalError (issue3791) A wrong variable name was introduced in for a case without test coverage. The variable name is fixed and a test case is introduced.

Mads Kiilerich - - Load All Authors

File last commit:

r18450:4f9a5285 default


                r18505:9de9727c

stable

Download file

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

        Nicolas Dumazet
    
tests: unify test-parents

              r11813
            
      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!

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Nicolas Dumazet
    
tests: unify test-parents

              r11813
            
        $ 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

        Mads Kiilerich
    
scmutil: localize and improve 'not under root' message

              r18450
            
        abort: ../a not under root '$TESTTMP/repo'

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Nicolas Dumazet
    
tests: unify test-parents

              r11813
            
      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

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Nicolas Dumazet
    
tests: unify test-parents

              r11813
            
      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

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Nicolas Dumazet tests: unify test-parents	r11813	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!
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Nicolas Dumazet tests: unify test-parents	r11813
		$ 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
Mads Kiilerich scmutil: localize and improve 'not under root' message	r18450	abort: ../a not under root '$TESTTMP/repo'
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Nicolas Dumazet tests: unify test-parents	r11813

		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
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Nicolas Dumazet tests: unify test-parents	r11813

		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

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..