upstream/mercurial-mirror Files · tests/test-import-merge.t

hg: establish a cache for localrepository instances...

hg: establish a cache for localrepository instances hgweb contained code for determining whether a cached localrepository instance was up to date. This code was way too low-level to be in hgweb. This functionality has been moved to a new "cachedlocalrepo" class in hg.py. The code has been changed slightly to facilitate use inside a class. hgweb has been refactored to use the new API. As part of this refactor, hgweb.repo no longer exists! We're very close to using a distinct repo instance per thread. The new cache records state when it is created. This intelligence prevents an extra localrepository from being created on the first hgweb request. This is why some redundant output from test-extension.t has gone away.

Matt Mackall - - Load All Authors

File last commit:

r22305:bdc0e04d default


                r26219:ae33fff1

default

Download file

             test-import-merge.t
        
                    165 lines
            
             | 4.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-import-merge.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Patrick Mezard
    
import: fix parent selection when importing merges...

              r15511
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ tipparents() {

        > hg parents --template "{rev}:{node|short} {desc|firstline}\n" -r tip

        > }

      Test import and merge diffs

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg ci -Am adda

        adding a

        $ echo a >> a

        $ hg ci -m changea

        $ echo c > c

        $ hg ci -Am addc

        adding c

        $ hg up 0

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

        $ echo b > b

        $ hg ci -Am addb

        adding b

        created new head

        $ hg up 1

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

        $ hg merge 3

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

        (branch merge, don't forget to commit)

        $ hg ci -m merge

        $ hg export . > ../merge.diff

        FUJIWARA Katsunori
    
import: change "editform" to distinguish merge commits from others...

              r22250
            
        $ grep -v '^merge$' ../merge.diff > ../merge.nomsg.diff

        Patrick Mezard
    
import: fix parent selection when importing merges...

              r15511
            
        $ cd ..

        $ hg clone -r2 repo repo2

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 2 files

        updating to branch default

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

        $ cd repo2

        $ hg pull -r3 ../repo

        pulling from ../repo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

      Test without --exact and diff.p1 == workingdir.p1

        $ hg up 1

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

        FUJIWARA Katsunori
    
import: change "editform" to distinguish merge commits from others...

              r22250
            
        $ cat > $TESTTMP/editor.sh <<EOF

        > env | grep HGEDITFORM

        > echo merge > \$1

        > EOF

        $ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff

        applying ../merge.nomsg.diff

        HGEDITFORM=import.normal.merge

        Patrick Mezard
    
import: fix parent selection when importing merges...

              r15511
            
        $ tipparents

        1:540395c44225 changea

        3:102a90ea7b4a addb

        $ hg strip --no-backup tip

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

      Test without --exact and diff.p1 != workingdir.p1

        $ hg up 2

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

        $ hg import ../merge.diff

        applying ../merge.diff

        FUJIWARA Katsunori
    
import: show the warning message for failure of merging...

              r22303
            
        warning: import the patch as a normal revision

        (use --exact to import the patch as a merge)

        Patrick Mezard
    
import: fix parent selection when importing merges...

              r15511
            
        $ tipparents

        2:890ecaa90481 addc

        $ hg strip --no-backup tip

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

      Test with --exact

        $ hg import --exact ../merge.diff

        applying ../merge.diff

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

        $ tipparents

        1:540395c44225 changea

        3:102a90ea7b4a addb

        $ hg strip --no-backup tip

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

      Test with --bypass and diff.p1 == workingdir.p1

        $ hg up 1

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

        $ hg import --bypass ../merge.diff

        applying ../merge.diff

        $ tipparents

        1:540395c44225 changea

        3:102a90ea7b4a addb

        $ hg strip --no-backup tip

      Test with --bypass and diff.p1 != workingdir.p1

        $ hg up 2

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

        $ hg import --bypass ../merge.diff

        applying ../merge.diff

        FUJIWARA Katsunori
    
import: show the warning message for failure of merging...

              r22303
            
        warning: import the patch as a normal revision

        (use --exact to import the patch as a merge)

        Patrick Mezard
    
import: fix parent selection when importing merges...

              r15511
            
        $ tipparents

        2:890ecaa90481 addc

        $ hg strip --no-backup tip

      Test with --bypass and --exact

        $ hg import --bypass --exact ../merge.diff

        applying ../merge.diff

        $ tipparents

        1:540395c44225 changea

        3:102a90ea7b4a addb

        $ hg strip --no-backup tip

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

              r16913
            
        $ cd ..

        Kevin Bullock
    
import: don't rollback on failed import --exact (issue3616)...

              r18656
            
      Test that --exact on a bad header doesn't corrupt the repo (issue3616)

        $ hg init repo3

        $ cd repo3

        $ echo a>a

        $ hg ci -Aqm0

        $ echo a>>a

        $ hg ci -m1

        $ echo a>>a

        $ hg ci -m2

        $ echo a>a

        $ echo b>>a

        $ echo a>>a

        $ hg ci -m3

        $ hg export 2 | head -7 > ../a.patch

        Danek Duvall
    
solaris: tests can't use tail -n...

              r19628
            
        $ hg export tip > out

        Matt Mackall
    
test-import-merge: mangle file in binary mode...

              r20303
            
        >>> apatch = open("../a.patch", "ab")

        Danek Duvall
    
solaris: tests can't use tail -n...

              r19628
            
        >>> apatch.write("".join(open("out").readlines()[7:]))

        Kevin Bullock
    
import: don't rollback on failed import --exact (issue3616)...

              r18656
            
        $ cd ..

        $ hg clone -qr0 repo3 repo3-clone

        $ cd repo3-clone

        $ hg pull -qr1 ../repo3

        $ hg import --exact ../a.patch

        applying ../a.patch

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

        patching file a

        Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).

        transaction abort!

        rollback completed

        abort: patch is damaged or loses information

        [255]

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

	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

Patrick Mezard import: fix parent selection when importing merges...	r15511	$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH

		$ tipparents() {
		> hg parents --template "{rev}:{node\|short} {desc\|firstline}\n" -r tip
		> }

		Test import and merge diffs

		$ hg init repo
		$ cd repo
		$ echo a > a
		$ hg ci -Am adda
		adding a
		$ echo a >> a
		$ hg ci -m changea
		$ echo c > c
		$ hg ci -Am addc
		adding c
		$ hg up 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo b > b
		$ hg ci -Am addb
		adding b
		created new head
		$ hg up 1
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg merge 3
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg ci -m merge
		$ hg export . > ../merge.diff
FUJIWARA Katsunori import: change "editform" to distinguish merge commits from others...	r22250	$ grep -v '^merge$' ../merge.diff > ../merge.nomsg.diff
Patrick Mezard import: fix parent selection when importing merges...	r15511	$ cd ..
		$ hg clone -r2 repo repo2
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 2 files
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd repo2
		$ hg pull -r3 ../repo
		pulling from ../repo
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		(run 'hg heads' to see heads, 'hg merge' to merge)

		Test without --exact and diff.p1 == workingdir.p1

		$ hg up 1
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
FUJIWARA Katsunori import: change "editform" to distinguish merge commits from others...	r22250	$ cat > $TESTTMP/editor.sh <<EOF
		> env \| grep HGEDITFORM
		> echo merge > \$1
		> EOF
		$ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff
		applying ../merge.nomsg.diff
		HGEDITFORM=import.normal.merge
Patrick Mezard import: fix parent selection when importing merges...	r15511	$ tipparents
		1:540395c44225 changea
		3:102a90ea7b4a addb
		$ hg strip --no-backup tip
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		Test without --exact and diff.p1 != workingdir.p1

		$ hg up 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg import ../merge.diff
		applying ../merge.diff
FUJIWARA Katsunori import: show the warning message for failure of merging...	r22303	warning: import the patch as a normal revision
		(use --exact to import the patch as a merge)
Patrick Mezard import: fix parent selection when importing merges...	r15511	$ tipparents
		2:890ecaa90481 addc
		$ hg strip --no-backup tip
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		Test with --exact

		$ hg import --exact ../merge.diff
		applying ../merge.diff
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ tipparents
		1:540395c44225 changea
		3:102a90ea7b4a addb
		$ hg strip --no-backup tip
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		Test with --bypass and diff.p1 == workingdir.p1

		$ hg up 1
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg import --bypass ../merge.diff
		applying ../merge.diff
		$ tipparents
		1:540395c44225 changea
		3:102a90ea7b4a addb
		$ hg strip --no-backup tip

		Test with --bypass and diff.p1 != workingdir.p1

		$ hg up 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg import --bypass ../merge.diff
		applying ../merge.diff
FUJIWARA Katsunori import: show the warning message for failure of merging...	r22303	warning: import the patch as a normal revision
		(use --exact to import the patch as a merge)
Patrick Mezard import: fix parent selection when importing merges...	r15511	$ tipparents
		2:890ecaa90481 addc
		$ hg strip --no-backup tip

		Test with --bypass and --exact

		$ hg import --bypass --exact ../merge.diff
		applying ../merge.diff
		$ tipparents
		1:540395c44225 changea
		3:102a90ea7b4a addb
		$ hg strip --no-backup tip

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..
Kevin Bullock import: don't rollback on failed import --exact (issue3616)...	r18656
		Test that --exact on a bad header doesn't corrupt the repo (issue3616)

		$ hg init repo3
		$ cd repo3
		$ echo a>a
		$ hg ci -Aqm0
		$ echo a>>a
		$ hg ci -m1
		$ echo a>>a
		$ hg ci -m2
		$ echo a>a
		$ echo b>>a
		$ echo a>>a
		$ hg ci -m3
		$ hg export 2 \| head -7 > ../a.patch
Danek Duvall solaris: tests can't use tail -n...	r19628	$ hg export tip > out
Matt Mackall test-import-merge: mangle file in binary mode...	r20303	>>> apatch = open("../a.patch", "ab")
Danek Duvall solaris: tests can't use tail -n...	r19628	>>> apatch.write("".join(open("out").readlines()[7:]))
Kevin Bullock import: don't rollback on failed import --exact (issue3616)...	r18656
		$ cd ..
		$ hg clone -qr0 repo3 repo3-clone
		$ cd repo3-clone
		$ hg pull -qr1 ../repo3

		$ hg import --exact ../a.patch
		applying ../a.patch
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		patching file a
		Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
		transaction abort!
		rollback completed
		abort: patch is damaged or loses information
		[255]
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 2 changesets, 2 total revisions