upstream/mercurial-mirror Files · tests/test-show-work.t

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Gregory Szorc - - Load All Authors

File last commit:

r32058:0bb157be stable


                r32255:7e35d31b

default

Download file

             test-show-work.t
        
                    168 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-show-work.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > show =

        > EOF

        $ hg init repo0

        $ cd repo0

      Command works on an empty repo

        $ hg show work

      Single draft changeset shown

        $ echo 0 > foo

        $ hg -q commit -A -m 'commit 0'

        $ hg show work

        @  9f171 commit 0

      Even when it isn't the wdir

        $ hg -q up null

        $ hg show work

        o  9f171 commit 0

      Single changeset is still there when public because it is a head

        $ hg phase --public -r 0

        $ hg show work

        o  9f171 commit 0

      A draft child will show both it and public parent

        $ hg -q up 0

        $ echo 1 > foo

        $ hg commit -m 'commit 1'

        $ hg show work

        @  181cc commit 1

        o  9f171 commit 0

      Multiple draft children will be shown

        $ echo 2 > foo

        $ hg commit -m 'commit 2'

        $ hg show work

        @  128c8 commit 2

        o  181cc commit 1

        o  9f171 commit 0

      Bumping first draft changeset to public will hide its parent

        $ hg phase --public -r 1

        $ hg show work

        @  128c8 commit 2

        o  181cc commit 1

        |

        ~

      Multiple DAG heads will be shown

        $ hg -q up -r 1

        $ echo 3 > foo

        $ hg commit -m 'commit 3'

        created new head

        $ hg show work

        @  f0abc commit 3

        | o  128c8 commit 2

        |/

        o  181cc commit 1

        |

        ~

      Even when wdir is something else

        $ hg -q up null

        $ hg show work

        o  f0abc commit 3

        | o  128c8 commit 2

        |/

        o  181cc commit 1

        |

        ~

      Draft child shows public head (multiple heads)

        $ hg -q up 0

        $ echo 4 > foo

        $ hg commit -m 'commit 4'

        created new head

        $ hg show work

        @  668ca commit 4

        | o  f0abc commit 3

        | | o  128c8 commit 2

        | |/

        | o  181cc commit 1

        |/

        o  9f171 commit 0

        $ cd ..

      Branch name appears in output

        $ hg init branches

        $ cd branches

        $ echo 0 > foo

        $ hg -q commit -A -m 'commit 0'

        $ echo 1 > foo

        $ hg commit -m 'commit 1'

        $ echo 2 > foo

        $ hg commit -m 'commit 2'

        $ hg phase --public -r .

        $ hg -q up -r 1

        $ hg branch mybranch

        marked working directory as branch mybranch

        (branches are permanent and global, did you want a bookmark?)

        $ echo 3 > foo

        $ hg commit -m 'commit 3'

        $ echo 4 > foo

        $ hg commit -m 'commit 4'

        $ hg show work

        @  f8dd3 (mybranch) commit 4

        o  90cfc (mybranch) commit 3

        | o  128c8 commit 2

        |/

        o  181cc commit 1

        |

        ~

        $ cd ..

      Bookmark name appears in output

        $ hg init bookmarks

        $ cd bookmarks

        $ echo 0 > foo

        $ hg -q commit -A -m 'commit 0'

        $ echo 1 > foo

        $ hg commit -m 'commit 1'

        $ echo 2 > foo

        $ hg commit -m 'commit 2'

        $ hg phase --public -r .

        $ hg bookmark @

        $ hg -q up -r 1

        $ echo 3 > foo

        $ hg commit -m 'commit 3'

        created new head

        $ echo 4 > foo

        $ hg commit -m 'commit 4'

        $ hg bookmark mybook

        $ hg show work

        @  cac82 (mybook) commit 4

        o  f0abc commit 3

        | o  128c8 (@) commit 2

        |/

        o  181cc commit 1

        |

        ~

        $ 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

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

				$ hg init repo0
				$ cd repo0

				Command works on an empty repo

				$ hg show work

				Single draft changeset shown

				$ echo 0 > foo
				$ hg -q commit -A -m 'commit 0'

				$ hg show work
				@ 9f171 commit 0

				Even when it isn't the wdir

				$ hg -q up null

				$ hg show work
				o 9f171 commit 0

				Single changeset is still there when public because it is a head

				$ hg phase --public -r 0
				$ hg show work
				o 9f171 commit 0

				A draft child will show both it and public parent

				$ hg -q up 0
				$ echo 1 > foo
				$ hg commit -m 'commit 1'

				$ hg show work
				@ 181cc commit 1
				o 9f171 commit 0

				Multiple draft children will be shown

				$ echo 2 > foo
				$ hg commit -m 'commit 2'

				$ hg show work
				@ 128c8 commit 2
				o 181cc commit 1
				o 9f171 commit 0

				Bumping first draft changeset to public will hide its parent

				$ hg phase --public -r 1
				$ hg show work
				@ 128c8 commit 2
				o 181cc commit 1
				\|
				~

				Multiple DAG heads will be shown

				$ hg -q up -r 1
				$ echo 3 > foo
				$ hg commit -m 'commit 3'
				created new head

				$ hg show work
				@ f0abc commit 3
				\| o 128c8 commit 2
				\|/
				o 181cc commit 1
				\|
				~

				Even when wdir is something else

				$ hg -q up null

				$ hg show work
				o f0abc commit 3
				\| o 128c8 commit 2
				\|/
				o 181cc commit 1
				\|
				~

				Draft child shows public head (multiple heads)

				$ hg -q up 0
				$ echo 4 > foo
				$ hg commit -m 'commit 4'
				created new head

				$ hg show work
				@ 668ca commit 4
				\| o f0abc commit 3
				\| \| o 128c8 commit 2
				\| \|/
				\| o 181cc commit 1
				\|/
				o 9f171 commit 0

				$ cd ..

				Branch name appears in output

				$ hg init branches
				$ cd branches
				$ echo 0 > foo
				$ hg -q commit -A -m 'commit 0'
				$ echo 1 > foo
				$ hg commit -m 'commit 1'
				$ echo 2 > foo
				$ hg commit -m 'commit 2'
				$ hg phase --public -r .
				$ hg -q up -r 1
				$ hg branch mybranch
				marked working directory as branch mybranch
				(branches are permanent and global, did you want a bookmark?)
				$ echo 3 > foo
				$ hg commit -m 'commit 3'
				$ echo 4 > foo
				$ hg commit -m 'commit 4'

				$ hg show work
				@ f8dd3 (mybranch) commit 4
				o 90cfc (mybranch) commit 3
				\| o 128c8 commit 2
				\|/
				o 181cc commit 1
				\|
				~

				$ cd ..

				Bookmark name appears in output

				$ hg init bookmarks
				$ cd bookmarks
				$ echo 0 > foo
				$ hg -q commit -A -m 'commit 0'
				$ echo 1 > foo
				$ hg commit -m 'commit 1'
				$ echo 2 > foo
				$ hg commit -m 'commit 2'
				$ hg phase --public -r .
				$ hg bookmark @
				$ hg -q up -r 1
				$ echo 3 > foo
				$ hg commit -m 'commit 3'
				created new head
				$ echo 4 > foo
				$ hg commit -m 'commit 4'
				$ hg bookmark mybook

				$ hg show work
				@ cac82 (mybook) commit 4
				o f0abc commit 3
				\| o 128c8 (@) commit 2
				\|/
				o 181cc commit 1
				\|
				~

				$ cd ..