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

hgweb: render next pages on /graph incrementally...

hgweb: render next pages on /graph incrementally Previously, when user scrolled down to see the next page on /graph, all hgweb did was re-render everything that would be visible (by simply incrementing revcount). It was not efficient at all, and this patch makes /graph page behave similarly to the regular /log: every new page only consists of new changesets, no duplication, and only jsdata is based on the full set of changesets required to build accurate graph. This is achieved by adding "?graphtop=<node>" to the next page URL template, effectively remembering where the graph started, and using that value to create the new `tree` that covers the whole visible graph. That variable is then used to produce jsdata for redrawing graph client-side. nextentry is used for the same purpose as on /log page (to format the next page URL), but it's not a part of the graph.

Ryan McElroy - - Load All Authors

File last commit:

r34885:05535d0d default


                r35410:f84b0125

default

Download file

             test-merge-halt.t
        
                    164 lines
            
             | 3.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-halt.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > [phases]

        > publish=False

        > [merge]

        > EOF

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ echo b > b

        $ hg commit -qAm ab

        $ echo c >> a

        $ echo c >> b

        $ hg commit -qAm c

        $ hg up -q ".^"

        $ echo d >> a

        $ echo d >> b

        $ hg commit -qAm d

      Testing on-failure=continue

        $ echo on-failure=continue >> $HGRCPATH

        $ hg rebase -s 1 -d 2 --tool false

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merging b failed!

        unresolved conflicts (see hg resolve, then hg rebase --continue)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Testing on-failure=halt

        $ echo on-failure=halt >> $HGRCPATH

        $ hg rebase -s 1 -d 2 --tool false

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Testing on-failure=prompt

        $ cat <<EOS >> $HGRCPATH

        > [merge]

        > on-failure=prompt

        > [ui]

        > interactive=1

        > EOS

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool false

        > y

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        continue merge operation (yn)? y

        merging b failed!

        continue merge operation (yn)? n

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that successful tool with failed post-check halts the merge

        $ cat <<EOS >> $HGRCPATH

        > [merge-tools]

        > true.check=changed

        > EOS

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool true

        > y

        > n

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

         output file a appears unchanged

        was merge successful (yn)? y

         output file b appears unchanged

        was merge successful (yn)? n

        merging b failed!

        continue merge operation (yn)? n

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        R a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that conflicts with conflict check also halts the merge

        $ cat <<EOS >> $HGRCPATH

        > [merge-tools]

        > true.check=conflicts

        > true.premerge=keep

        > [merge]

        > on-failure=halt

        > EOS

        $ hg rebase -s 1 -d 2 --tool true

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that always-prompt also can halt the merge

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt

        > y

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        was merge of 'a' successful (yn)? y

        was merge of 'b' successful (yn)? n

        merging b failed!

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        R a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that successful tool otherwise allows the merge to continue

        $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        $TESTTMP/repo/a *a~base* *a~other* (glob)

        $TESTTMP/repo/b *b~base* *b~other* (glob)

	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]
				> rebase=
				> [phases]
				> publish=False
				> [merge]
				> EOF

				$ hg init repo
				$ cd repo
				$ echo a > a
				$ echo b > b
				$ hg commit -qAm ab
				$ echo c >> a
				$ echo c >> b
				$ hg commit -qAm c
				$ hg up -q ".^"
				$ echo d >> a
				$ echo d >> b
				$ hg commit -qAm d

				Testing on-failure=continue
				$ echo on-failure=continue >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merging b failed!
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Testing on-failure=halt
				$ echo on-failure=halt >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Testing on-failure=prompt
				$ cat <<EOS >> $HGRCPATH
				> [merge]
				> on-failure=prompt
				> [ui]
				> interactive=1
				> EOS
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false
				> y
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				continue merge operation (yn)? y
				merging b failed!
				continue merge operation (yn)? n
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that successful tool with failed post-check halts the merge
				$ cat <<EOS >> $HGRCPATH
				> [merge-tools]
				> true.check=changed
				> EOS
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true
				> y
				> n
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				output file a appears unchanged
				was merge successful (yn)? y
				output file b appears unchanged
				was merge successful (yn)? n
				merging b failed!
				continue merge operation (yn)? n
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				R a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that conflicts with conflict check also halts the merge
				$ cat <<EOS >> $HGRCPATH
				> [merge-tools]
				> true.check=conflicts
				> true.premerge=keep
				> [merge]
				> on-failure=halt
				> EOS
				$ hg rebase -s 1 -d 2 --tool true
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that always-prompt also can halt the merge
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt
				> y
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				was merge of 'a' successful (yn)? y
				was merge of 'b' successful (yn)? n
				merging b failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				R a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that successful tool otherwise allows the merge to continue
				$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				$TESTTMP/repo/a a~base a~other (glob)
				$TESTTMP/repo/b b~base b~other (glob)