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

localrepo: use the path relative to "self.vfs" instead of "path" argument...

localrepo: use the path relative to "self.vfs" instead of "path" argument As a part of migration to vfs, this patch uses "self.root", which can be recognized as the path relative to "self.vfs", instead of "path" argument. This fix allows to make invocations of "util.makedirs()" and "os.path.exists()" while ensuring repository directory in "localrepository.__init__()" ones indirectly via vfs. But this fix also raises issue 2528: "hg clone" with empty destination. "path" argument is empty in many cases, so this issue can't be fixed in the view of "localrepository.__init__()". Before this patch, it is fixed by empty-ness check ("not name") of exception handler in "util.makedirs()". try: os.mkdir(name) except OSError, err: if err.errno == errno.EEXIST: return if err.errno != errno.ENOENT or not name: raise This requires "localrepository.__init__()" to invoke "util.makedirs()" with "path" instead of "self.root", because empty "path" is treated as "current directory" and "self.root" becomes valid path. But "hg clone" with empty destination can be detected also in "hg.clone()" before "localrepository.__init__()" invocation, so this patch re-fixes issue2528 by checking it in "hg.clone()".

Patrick Mezard - - Load All Authors

File last commit:

r16124:0e0060bf stable


                r17159:36a30168

default

Download file

             test-mq-merge.t
        
                    173 lines
            
             | 3.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-merge.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Setup extension:

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq =" >> $HGRCPATH

        $ echo "[mq]" >> $HGRCPATH

        $ echo "git = keep" >> $HGRCPATH

      Test merge with mq changeset as the second parent:

        $ hg init m

        $ cd m

        $ touch a b c

        $ hg add a

        $ hg commit -m a

        $ hg add b

        $ hg qnew -d "0 0" b

        $ hg update 0

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

        $ hg add c

        $ hg commit -m c

        created new head

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg commit -m merge

        abort: cannot commit over an applied mq patch

        [255]

        $ cd ..

      Issue529: mq aborts when merging patch deleting files

        $ checkundo()

        > {

        >     if [ -f .hg/store/undo ]; then

        >         echo ".hg/store/undo still exists"

        >     fi

        > }

      Commit two dummy files in "init" changeset:

        $ hg init t

        $ cd t

        $ echo a > a

        $ echo b > b

        $ hg ci -Am init

        adding a

        adding b

        $ hg tag -l init

      Create a patch removing a:

        $ hg qnew rm_a

        $ hg rm a

        $ hg qrefresh -m "rm a"

      Save the patch queue so we can merge it later:

        $ hg qsave -c -e

        copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob)

        $ checkundo

      Update b and commit in an "update" changeset:

        $ hg up -C init

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

        $ echo b >> b

        $ hg st

        M b

        $ hg ci -m update

        created new head

      # Here, qpush used to abort with :

      # The system cannot find the file specified => a

        $ hg manifest

        a

        b

        $ hg qpush -a -m

        merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)

        applying rm_a

        now at: rm_a

        $ checkundo

        $ hg manifest

        b

      Ensure status is correct after merge:

        $ hg qpop -a

        popping rm_a

        popping .hg.patches.merge.marker

        patch queue now empty

        $ cd ..

      Classic MQ merge sequence *with an explicit named queue*:

        $ hg init t2

        $ cd t2

        $ echo '[diff]' > .hg/hgrc

        $ echo 'nodates = 1' >> .hg/hgrc

        $ echo a > a

        $ hg ci -Am init

        adding a

        $ echo b > a

        $ hg ci -m changea

        $ hg up -C 0

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

        $ hg cp a aa

        $ echo c >> a

        $ hg qnew --git -f -e patcha

        $ echo d >> a

        $ hg qnew -d '0 0' -f -e patcha2

      Create the reference queue:

        $ hg qsave -c -e -n refqueue

        copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob)

        $ hg up -C 1

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

      Merge:

        $ HGMERGE=internal:other hg qpush -a -m -n refqueue

        merging with queue at: $TESTTMP/t2/.hg/refqueue (glob)

        applying patcha

        patching file a

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

        fuzz found when applying patch, stopping

        patch didn't work out, merging patcha

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

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

        (branch merge, don't forget to commit)

        applying patcha2

        now at: patcha2

      Check patcha is still a git patch:

        $ cat .hg/patches/patcha

        # HG changeset patch

        # Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4

        diff --git a/a b/a

        --- a/a

        +++ b/a

        @@ -1,1 +1,2 @@

        -b

        +a

        +c

        diff --git a/aa b/aa

        new file mode 100644

        --- /dev/null

        +++ b/aa

        @@ -0,0 +1,1 @@

        +a

      Check patcha2 is still a regular patch:

        $ cat .hg/patches/patcha2

        # HG changeset patch

        # Parent ???????????????????????????????????????? (glob)

        # Date 0 0

        diff -r ???????????? -r ???????????? a (glob)

        --- a/a

        +++ b/a

        @@ -1,2 +1,3 @@

         a

         c

        +d

        $ 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

				Setup extension:

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq =" >> $HGRCPATH
				$ echo "[mq]" >> $HGRCPATH
				$ echo "git = keep" >> $HGRCPATH

				Test merge with mq changeset as the second parent:

				$ hg init m
				$ cd m
				$ touch a b c
				$ hg add a
				$ hg commit -m a
				$ hg add b
				$ hg qnew -d "0 0" b
				$ hg update 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg add c
				$ hg commit -m c
				created new head
				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m merge
				abort: cannot commit over an applied mq patch
				[255]
				$ cd ..

				Issue529: mq aborts when merging patch deleting files

				$ checkundo()
				> {
				> if [ -f .hg/store/undo ]; then
				> echo ".hg/store/undo still exists"
				> fi
				> }

				Commit two dummy files in "init" changeset:

				$ hg init t
				$ cd t
				$ echo a > a
				$ echo b > b
				$ hg ci -Am init
				adding a
				adding b
				$ hg tag -l init

				Create a patch removing a:

				$ hg qnew rm_a
				$ hg rm a
				$ hg qrefresh -m "rm a"

				Save the patch queue so we can merge it later:

				$ hg qsave -c -e
				copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob)
				$ checkundo

				Update b and commit in an "update" changeset:

				$ hg up -C init
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo b >> b
				$ hg st
				M b
				$ hg ci -m update
				created new head

				# Here, qpush used to abort with :
				# The system cannot find the file specified => a
				$ hg manifest
				a
				b

				$ hg qpush -a -m
				merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)
				applying rm_a
				now at: rm_a

				$ checkundo
				$ hg manifest
				b

				Ensure status is correct after merge:

				$ hg qpop -a
				popping rm_a
				popping .hg.patches.merge.marker
				patch queue now empty

				$ cd ..

				Classic MQ merge sequence with an explicit named queue:

				$ hg init t2
				$ cd t2
				$ echo '[diff]' > .hg/hgrc
				$ echo 'nodates = 1' >> .hg/hgrc
				$ echo a > a
				$ hg ci -Am init
				adding a
				$ echo b > a
				$ hg ci -m changea
				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg cp a aa
				$ echo c >> a
				$ hg qnew --git -f -e patcha
				$ echo d >> a
				$ hg qnew -d '0 0' -f -e patcha2

				Create the reference queue:

				$ hg qsave -c -e -n refqueue
				copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob)
				$ hg up -C 1
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				Merge:

				$ HGMERGE=internal:other hg qpush -a -m -n refqueue
				merging with queue at: $TESTTMP/t2/.hg/refqueue (glob)
				applying patcha
				patching file a
				Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
				fuzz found when applying patch, stopping
				patch didn't work out, merging patcha
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				0 files updated, 2 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				applying patcha2
				now at: patcha2

				Check patcha is still a git patch:

				$ cat .hg/patches/patcha
				# HG changeset patch
				# Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4

				diff --git a/a b/a
				--- a/a
				+++ b/a
				@@ -1,1 +1,2 @@
				-b
				+a
				+c
				diff --git a/aa b/aa
				new file mode 100644
				--- /dev/null
				+++ b/aa
				@@ -0,0 +1,1 @@
				+a

				Check patcha2 is still a regular patch:

				$ cat .hg/patches/patcha2
				# HG changeset patch
				# Parent ???????????????????????????????????????? (glob)
				# Date 0 0

				diff -r ???????????? -r ???????????? a (glob)
				--- a/a
				+++ b/a
				@@ -1,2 +1,3 @@
				a
				c
				+d

				$ cd ..