upstream/mercurial-mirror Files · tests/test-histedit-non-commute-abort.t

serve: add chdir command for --daemon-postexec...

serve: add chdir command for --daemon-postexec For chgserver, it probably needs a chdir to /. This patch adds chdir command support for --daemon-postexec so chg client can make use of it.

Durham Goode - - Load All Authors

File last commit:

r28011:8abd9f78 default


                r28452:0bb01c87

default

Download file

             test-histedit-non-commute-abort.t
        
                    159 lines
            
             | 4.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-histedit-non-commute-abort.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        $ . "$TESTDIR/histedit-helpers.sh"

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > histedit=

        > EOF

        $ initrepo ()

        > {

        >     hg init r

        >     cd r

        >     for x in a b c d e f ; do

        >         echo $x > $x

        >         hg add $x

        >         hg ci -m $x

        >     done

        >     echo a >> e

        >     hg ci -m 'does not commute with e'

        >     cd ..

        > }

        $ initrepo

        $ cd r

      log before edit

        $ hg log --graph

        @  changeset:   6:bfa474341cc9

        |  tag:         tip

        |  user:        test

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

        |  summary:     does not commute with e

        |

        o  changeset:   5:652413bf663e

        |  user:        test

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

        |  summary:     f

        |

        o  changeset:   4:e860deea161a

        |  user:        test

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

        |  summary:     e

        |

        o  changeset:   3:055a42cdd887

        |  user:        test

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

        |  summary:     d

        |

        o  changeset:   2:177f92b77385

        |  user:        test

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

        |  summary:     c

        |

        o  changeset:   1:d2ae7f538514

        |  user:        test

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

        |  summary:     b

        |

        o  changeset:   0:cb9a9f314b8b

           user:        test

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

           summary:     a

      edit the history

        Pierre-Yves David
    
histedit-test: generalise --commands "-" usage...

              r19019
            
        $ hg histedit 177f92b77385 --commands - 2>&1 <<EOF | fixbundle

        > pick 177f92b77385 c

        > pick 055a42cdd887 d

        > pick bfa474341cc9 does not commute with e

        > pick e860deea161a e

        > pick 652413bf663e f

        > EOF

        Pierre-Yves David
    
histedit: replaces patching logic by merges...

              r17647
            
        merging e

        Siddharth Agarwal
    
simplemerge: move conflict warning message to filemerge...

              r26614
            
        warning: conflicts while merging e! (edit, then use 'hg resolve --mark')

        timeless
    
histedit: list action when intervention is required

              r27629
            
        Fix up the change (pick e860deea161a)

        (hg histedit --continue to resume)

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        Siddharth Agarwal
    
mergestate: handle additional record types specially...

              r27027
            
      insert unsupported advisory merge record

        $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x

        $ hg debugmergestate

        * version 2 records

        local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758

        other: e860deea161a2f77de56603b340ebbb4536308ae

        unrecognized entry: x	advisory record

        Durham Goode
    
merge: add file ancestor linknode to mergestate...

              r28011
            
        file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000)

        Siddharth Agarwal
    
mergestate: handle additional record types specially...

              r27027
            
        file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f)

          local path: e (flags "")

        Siddharth Agarwal
    
debugmergestate: print out null nodes as 'null'...

              r27134
            
          ancestor path: e (node null)

        Siddharth Agarwal
    
mergestate: handle additional record types specially...

              r27027
            
          other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)

        $ hg resolve -l

        U e

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        Siddharth Agarwal
    
mergestate: handle additional record types specially...

              r27027
            
      insert unsupported mandatory merge record

        $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X

        $ hg debugmergestate

        * version 2 records

        local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758

        other: e860deea161a2f77de56603b340ebbb4536308ae

        Durham Goode
    
merge: add file ancestor linknode to mergestate...

              r28011
            
        file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000)

        Siddharth Agarwal
    
mergestate: handle additional record types specially...

              r27027
            
        file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f)

          local path: e (flags "")

        Siddharth Agarwal
    
debugmergestate: print out null nodes as 'null'...

              r27134
            
          ancestor path: e (node null)

        Siddharth Agarwal
    
mergestate: handle additional record types specially...

              r27027
            
          other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)

        unrecognized entry: X	mandatory record

        $ hg resolve -l

        abort: unsupported merge state records: X

        (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)

        [255]

        $ hg resolve -ma

        abort: unsupported merge state records: X

        (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)

        [255]

      abort the edit (should clear out merge state)

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        $ hg histedit --abort 2>&1 | fixbundle

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

        Siddharth Agarwal
    
mergestate: handle additional record types specially...

              r27027
            
        $ hg debugmergestate

        no merge state found

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
      log after abort

        Pierre-Yves David
    
histedit: replaces patching logic by merges...

              r17647
            
        $ hg resolve -l

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        $ hg log --graph

        @  changeset:   6:bfa474341cc9

        |  tag:         tip

        |  user:        test

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

        |  summary:     does not commute with e

        |

        o  changeset:   5:652413bf663e

        |  user:        test

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

        |  summary:     f

        |

        o  changeset:   4:e860deea161a

        |  user:        test

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

        |  summary:     e

        |

        o  changeset:   3:055a42cdd887

        |  user:        test

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

        |  summary:     d

        |

        o  changeset:   2:177f92b77385

        |  user:        test

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

        |  summary:     c

        |

        o  changeset:   1:d2ae7f538514

        |  user:        test

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

        |  summary:     b

        |

        o  changeset:   0:cb9a9f314b8b

           user:        test

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

           summary:     a

        $ 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

Mads Kiilerich tests: convert histedit tests to .t...	r17085	$ . "$TESTDIR/histedit-helpers.sh"

		$ cat >> $HGRCPATH <<EOF
		> [extensions]
		> histedit=
		> EOF

		$ initrepo ()
		> {
		> hg init r
		> cd r
		> for x in a b c d e f ; do
		> echo $x > $x
		> hg add $x
		> hg ci -m $x
		> done
		> echo a >> e
		> hg ci -m 'does not commute with e'
		> cd ..
		> }

		$ initrepo
		$ cd r

		log before edit
		$ hg log --graph
		@ changeset: 6:bfa474341cc9
		\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: does not commute with e
		\|
		o changeset: 5:652413bf663e
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: f
		\|
		o changeset: 4:e860deea161a
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: e
		\|
		o changeset: 3:055a42cdd887
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: d
		\|
		o changeset: 2:177f92b77385
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: c
		\|
		o changeset: 1:d2ae7f538514
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a


		edit the history
Pierre-Yves David histedit-test: generalise --commands "-" usage...	r19019	$ hg histedit 177f92b77385 --commands - 2>&1 <<EOF \| fixbundle
		> pick 177f92b77385 c
		> pick 055a42cdd887 d
		> pick bfa474341cc9 does not commute with e
		> pick e860deea161a e
		> pick 652413bf663e f
		> EOF
Pierre-Yves David histedit: replaces patching logic by merges...	r17647	merging e
Siddharth Agarwal simplemerge: move conflict warning message to filemerge...	r26614	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
timeless histedit: list action when intervention is required	r27629	Fix up the change (pick e860deea161a)
		(hg histedit --continue to resume)
Mads Kiilerich tests: convert histedit tests to .t...	r17085
Siddharth Agarwal mergestate: handle additional record types specially...	r27027	insert unsupported advisory merge record
		$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
		$ hg debugmergestate
		* version 2 records
		local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
		other: e860deea161a2f77de56603b340ebbb4536308ae
		unrecognized entry: x advisory record
Durham Goode merge: add file ancestor linknode to mergestate...	r28011	file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000)
Siddharth Agarwal mergestate: handle additional record types specially...	r27027	file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f)
		local path: e (flags "")
Siddharth Agarwal debugmergestate: print out null nodes as 'null'...	r27134	ancestor path: e (node null)
Siddharth Agarwal mergestate: handle additional record types specially...	r27027	other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
		$ hg resolve -l
		U e
Mads Kiilerich tests: convert histedit tests to .t...	r17085
Siddharth Agarwal mergestate: handle additional record types specially...	r27027	insert unsupported mandatory merge record
		$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
		$ hg debugmergestate
		* version 2 records
		local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
		other: e860deea161a2f77de56603b340ebbb4536308ae
Durham Goode merge: add file ancestor linknode to mergestate...	r28011	file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000)
Siddharth Agarwal mergestate: handle additional record types specially...	r27027	file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f)
		local path: e (flags "")
Siddharth Agarwal debugmergestate: print out null nodes as 'null'...	r27134	ancestor path: e (node null)
Siddharth Agarwal mergestate: handle additional record types specially...	r27027	other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
		unrecognized entry: X mandatory record
		$ hg resolve -l
		abort: unsupported merge state records: X
		(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
		[255]
		$ hg resolve -ma
		abort: unsupported merge state records: X
		(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
		[255]

		abort the edit (should clear out merge state)
Mads Kiilerich tests: convert histedit tests to .t...	r17085	$ hg histedit --abort 2>&1 \| fixbundle
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Siddharth Agarwal mergestate: handle additional record types specially...	r27027	$ hg debugmergestate
		no merge state found
Mads Kiilerich tests: convert histedit tests to .t...	r17085
		log after abort
Pierre-Yves David histedit: replaces patching logic by merges...	r17647	$ hg resolve -l
Mads Kiilerich tests: convert histedit tests to .t...	r17085	$ hg log --graph
		@ changeset: 6:bfa474341cc9
		\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: does not commute with e
		\|
		o changeset: 5:652413bf663e
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: f
		\|
		o changeset: 4:e860deea161a
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: e
		\|
		o changeset: 3:055a42cdd887
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: d
		\|
		o changeset: 2:177f92b77385
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: c
		\|
		o changeset: 1:d2ae7f538514
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a


		$ cd ..