upstream/mercurial-mirror Files · tests/test-rebase-inmemory.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.

Phil Cohen - - Load All Authors

File last commit:

r35389:dd11df90 default


                r35410:f84b0125

default

Download file

             test-rebase-inmemory.t
        
                    159 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-inmemory.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require symlink execbit

        $ cat << EOF >> $HGRCPATH

        > [extensions]

        > amend=

        > rebase=

        > debugdrawdag=$TESTDIR/drawdag.py

        > [rebase]

        > experimental.inmemory=1

        > [diff]

        > git=1

        > [alias]

        > tglog = log -G --template "{rev}: {node|short} '{desc}'\n"

        > EOF

      Rebase a simple DAG:

        $ hg init repo1

        $ cd repo1

        $ hg debugdrawdag <<'EOS'

        > c b

        > |/

        > d

        > |

        > a

        > EOS

        $ hg up -C a

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

        $ hg tglog

        o  3: 814f6bd05178 'c'

        |

        | o  2: db0e82a16a62 'b'

        |/

        o  1: 02952614a83d 'd'

        |

        @  0: b173517d0057 'a'

        $ hg cat -r 3 c

        c (no-eol)

        $ hg cat -r 2 b

        b (no-eol)

        $ hg rebase --debug -r b -d c | grep rebasing

        rebasing in-memory

        rebasing 2:db0e82a16a62 "b" (b)

        $ hg tglog

        o  3: ca58782ad1e4 'b'

        |

        o  2: 814f6bd05178 'c'

        |

        o  1: 02952614a83d 'd'

        |

        @  0: b173517d0057 'a'

        $ hg cat -r 3 b

        b (no-eol)

        $ hg cat -r 2 c

        c (no-eol)

      Case 2:

        $ hg init repo2

        $ cd repo2

        $ hg debugdrawdag <<'EOS'

        > c b

        > |/

        > d

        > |

        > a

        > EOS

      Add a symlink and executable file:

        $ hg up -C c

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

        $ ln -s somefile e

        $ echo f > f

        $ chmod +x f

        $ hg add e f

        $ hg amend -q

        $ hg up -Cq a

      Write files to the working copy, and ensure they're still there after the rebase

        $ echo "abc" > a

        $ ln -s def b

        $ echo "ghi" > c

        $ echo "jkl" > d

        $ echo "mno" > e

        $ hg tglog

        o  3: f56b71190a8f 'c'

        |

        | o  2: db0e82a16a62 'b'

        |/

        o  1: 02952614a83d 'd'

        |

        @  0: b173517d0057 'a'

        $ hg cat -r 3 c

        c (no-eol)

        $ hg cat -r 2 b

        b (no-eol)

        $ hg cat -r 3 e

        somefile (no-eol)

        $ hg rebase --debug -s b -d a | grep rebasing

        rebasing in-memory

        rebasing 2:db0e82a16a62 "b" (b)

        $ hg tglog

        o  3: fc055c3b4d33 'b'

        |

        | o  2: f56b71190a8f 'c'

        | |

        | o  1: 02952614a83d 'd'

        |/

        @  0: b173517d0057 'a'

        $ hg cat -r 2 c

        c (no-eol)

        $ hg cat -r 3 b

        b (no-eol)

        $ hg rebase --debug -s 1 -d 3 | grep rebasing

        rebasing in-memory

        rebasing 1:02952614a83d "d" (d)

        rebasing 2:f56b71190a8f "c"

        $ hg tglog

        o  3: 753feb6fd12a 'c'

        |

        o  2: 09c044d2cb43 'd'

        |

        o  1: fc055c3b4d33 'b'

        |

        @  0: b173517d0057 'a'

      Ensure working copy files are still there:

        $ cat a

        abc

        $ readlink.py b

        b -> def

        $ cat e

        mno

      Ensure symlink and executable files were rebased properly:

        $ hg up -Cq 3

        $ readlink.py e

        e -> somefile

        $ ls -l f | cut -c -10

        -rwxr-xr-x

      Rebase the working copy parent, which should default to an on-disk merge even if

      we requested in-memory.

        $ hg up -C 3

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

        $ hg rebase -r 3 -d 0 --debug | grep rebasing

        rebasing on disk

        rebasing 3:753feb6fd12a "c" (tip)

        $ hg tglog

        @  3: 844a7de3e617 'c'

        |

        | o  2: 09c044d2cb43 'd'

        | |

        | o  1: fc055c3b4d33 'b'

        |/

        o  0: b173517d0057 'a'

	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

				#require symlink execbit
				$ cat << EOF >> $HGRCPATH
				> [extensions]
				> amend=
				> rebase=
				> debugdrawdag=$TESTDIR/drawdag.py
				> [rebase]
				> experimental.inmemory=1
				> [diff]
				> git=1
				> [alias]
				> tglog = log -G --template "{rev}: {node\|short} '{desc}'\n"
				> EOF

				Rebase a simple DAG:
				$ hg init repo1
				$ cd repo1
				$ hg debugdrawdag <<'EOS'
				> c b
				> \|/
				> d
				> \|
				> a
				> EOS
				$ hg up -C a
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg tglog
				o 3: 814f6bd05178 'c'
				\|
				\| o 2: db0e82a16a62 'b'
				\|/
				o 1: 02952614a83d 'd'
				\|
				@ 0: b173517d0057 'a'

				$ hg cat -r 3 c
				c (no-eol)
				$ hg cat -r 2 b
				b (no-eol)
				$ hg rebase --debug -r b -d c \| grep rebasing
				rebasing in-memory
				rebasing 2:db0e82a16a62 "b" (b)
				$ hg tglog
				o 3: ca58782ad1e4 'b'
				\|
				o 2: 814f6bd05178 'c'
				\|
				o 1: 02952614a83d 'd'
				\|
				@ 0: b173517d0057 'a'

				$ hg cat -r 3 b
				b (no-eol)
				$ hg cat -r 2 c
				c (no-eol)

				Case 2:
				$ hg init repo2
				$ cd repo2
				$ hg debugdrawdag <<'EOS'
				> c b
				> \|/
				> d
				> \|
				> a
				> EOS

				Add a symlink and executable file:
				$ hg up -C c
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ ln -s somefile e
				$ echo f > f
				$ chmod +x f
				$ hg add e f
				$ hg amend -q
				$ hg up -Cq a

				Write files to the working copy, and ensure they're still there after the rebase
				$ echo "abc" > a
				$ ln -s def b
				$ echo "ghi" > c
				$ echo "jkl" > d
				$ echo "mno" > e
				$ hg tglog
				o 3: f56b71190a8f 'c'
				\|
				\| o 2: db0e82a16a62 'b'
				\|/
				o 1: 02952614a83d 'd'
				\|
				@ 0: b173517d0057 'a'

				$ hg cat -r 3 c
				c (no-eol)
				$ hg cat -r 2 b
				b (no-eol)
				$ hg cat -r 3 e
				somefile (no-eol)
				$ hg rebase --debug -s b -d a \| grep rebasing
				rebasing in-memory
				rebasing 2:db0e82a16a62 "b" (b)
				$ hg tglog
				o 3: fc055c3b4d33 'b'
				\|
				\| o 2: f56b71190a8f 'c'
				\| \|
				\| o 1: 02952614a83d 'd'
				\|/
				@ 0: b173517d0057 'a'

				$ hg cat -r 2 c
				c (no-eol)
				$ hg cat -r 3 b
				b (no-eol)
				$ hg rebase --debug -s 1 -d 3 \| grep rebasing
				rebasing in-memory
				rebasing 1:02952614a83d "d" (d)
				rebasing 2:f56b71190a8f "c"
				$ hg tglog
				o 3: 753feb6fd12a 'c'
				\|
				o 2: 09c044d2cb43 'd'
				\|
				o 1: fc055c3b4d33 'b'
				\|
				@ 0: b173517d0057 'a'

				Ensure working copy files are still there:
				$ cat a
				abc
				$ readlink.py b
				b -> def
				$ cat e
				mno

				Ensure symlink and executable files were rebased properly:
				$ hg up -Cq 3
				$ readlink.py e
				e -> somefile
				$ ls -l f \| cut -c -10
				-rwxr-xr-x

				Rebase the working copy parent, which should default to an on-disk merge even if
				we requested in-memory.
				$ hg up -C 3
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg rebase -r 3 -d 0 --debug \| grep rebasing
				rebasing on disk
				rebasing 3:753feb6fd12a "c" (tip)
				$ hg tglog
				@ 3: 844a7de3e617 'c'
				\|
				\| o 2: 09c044d2cb43 'd'
				\| \|
				\| o 1: fc055c3b4d33 'b'
				\|/
				o 0: b173517d0057 'a'