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

Augie Fackler - - Load All Authors

File last commit:

r33969:00658bb0 default


                r35410:f84b0125

default

Download file

             test-merge-symlinks.t
        
                    65 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-symlinks.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > echo.py <<EOF

        > #!$PYTHON

        > from __future__ import absolute_import, print_function

        > import os

        > import sys

        > try:

        >     import msvcrt

        >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

        >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

        > except ImportError:

        >     pass

        > 

        > for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):

        >     print(k, os.environ[k])

        > EOF

      Create 2 heads containing the same file, once as

      a file, once as a link. Bundle was generated with:

      # hg init t

      # cd t

      # echo a > a

      # hg ci -qAm t0 -d '0 0'

      # echo l > l

      # hg ci -qAm t1 -d '1 0'

      # hg up -C 0

      # ln -s a l

      # hg ci -qAm t2 -d '2 0'

      # echo l2 > l2

      # hg ci -qAm t3 -d '3 0'

        $ hg init t

        $ cd t

        $ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"

        $ hg up -C 3

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

      Merge them and display *_ISLINK vars

      merge heads

        $ hg merge --tool="$PYTHON ../echo.py"

        merging l

        HG_FILE l

        HG_MY_ISLINK 1

        HG_OTHER_ISLINK 0

        HG_BASE_ISLINK 0

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

        (branch merge, don't forget to commit)

      Test working directory symlink bit calculation wrt copies,

      especially on non-supporting systems.

      merge working directory

        $ hg up -C 2

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

        $ hg copy l l2

        $ HGMERGE="$PYTHON ../echo.py" hg up 3

        merging l2

        HG_FILE l2

        HG_MY_ISLINK 1

        HG_OTHER_ISLINK 0

        HG_BASE_ISLINK 0

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

        $ 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 > echo.py <<EOF
				> #!$PYTHON
				> from __future__ import absolute_import, print_function
				> import os
				> import sys
				> try:
				> import msvcrt
				> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
				> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
				> except ImportError:
				> pass
				>
				> for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
				> print(k, os.environ[k])
				> EOF

				Create 2 heads containing the same file, once as
				a file, once as a link. Bundle was generated with:

				# hg init t
				# cd t
				# echo a > a
				# hg ci -qAm t0 -d '0 0'
				# echo l > l
				# hg ci -qAm t1 -d '1 0'
				# hg up -C 0
				# ln -s a l
				# hg ci -qAm t2 -d '2 0'
				# echo l2 > l2
				# hg ci -qAm t3 -d '3 0'

				$ hg init t
				$ cd t
				$ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"
				$ hg up -C 3
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Merge them and display *_ISLINK vars
				merge heads

				$ hg merge --tool="$PYTHON ../echo.py"
				merging l
				HG_FILE l
				HG_MY_ISLINK 1
				HG_OTHER_ISLINK 0
				HG_BASE_ISLINK 0
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Test working directory symlink bit calculation wrt copies,
				especially on non-supporting systems.
				merge working directory

				$ hg up -C 2
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg copy l l2
				$ HGMERGE="$PYTHON ../echo.py" hg up 3
				merging l2
				HG_FILE l2
				HG_MY_ISLINK 1
				HG_OTHER_ISLINK 0
				HG_BASE_ISLINK 0
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved

				$ cd ..