upstream/mercurial-mirror Files · tests/test-pager.t

hg: acquire wlock while updating the working directory via updatetotally...

hg: acquire wlock while updating the working directory via updatetotally updatetotally() might be invoked outside wlock scope (e.g. invocation via postincoming() at "hg unbundle" or "hg pull"). In such case, acquisition of wlock is needed for consistent view, because parallel "hg update" and/or "hg bookmarks" might change working directory status while executing updatetotally(). Strictly speaking, truly consistent updating should acquire also store lock, because active bookmark might be moved to another one outside wlock scope (e.g. pulling from other repository causes updating current active one). Acquisition of wlock in this patch ensures consistency in as same level as past "hg update".

Augie Fackler - - Load All Authors

File last commit:

r28319:09222d39 default


                r28503:138ec883

default

Download file

             test-pager.t
        
                    153 lines
            
             | 4.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pager.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> fakepager.py <<EOF

        > import sys

        > for line in sys.stdin:

        >     sys.stdout.write('paged! %r\n' % line)

        > EOF

      Enable ui.formatted because pager won't fire without it, and set up

      pager and tell it to use our fake pager that lets us see when the

      pager was running.

        $ cat >> $HGRCPATH <<EOF

        > [ui]

        > formatted = yes

        > [extensions]

        > pager=

        > [pager]

        > pager = python $TESTTMP/fakepager.py

        > EOF

        $ hg init repo

        $ cd repo

        $ echo a >> a

        $ hg add a

        $ hg ci -m 'add a'

        $ for x in `python $TESTDIR/seq.py 1 10`; do

        >   echo a $x >> a

        >   hg ci -m "modify a $x"

        > done

      By default diff and log are paged, but summary is not:

        $ hg diff -c 2 --pager=yes

        paged! 'diff -r f4be7687d414 -r bce265549556 a\n'

        paged! '--- a/a\tThu Jan 01 00:00:00 1970 +0000\n'

        paged! '+++ b/a\tThu Jan 01 00:00:00 1970 +0000\n'

        paged! '@@ -1,2 +1,3 @@\n'

        paged! ' a\n'

        paged! ' a 1\n'

        paged! '+a 2\n'

        $ hg log --limit 2

        paged! 'changeset:   10:46106edeeb38\n'

        paged! 'tag:         tip\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 10\n'

        paged! '\n'

        paged! 'changeset:   9:6dd8ea7dd621\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 9\n'

        paged! '\n'

        $ hg summary

        parent: 10:46106edeeb38 tip

         modify a 10

        branch: default

        commit: (clean)

        update: (current)

        phases: 11 draft

      We can enable the pager on summary:

        $ hg --config pager.attend-summary=yes summary

        paged! 'parent: 10:46106edeeb38 tip\n'

        paged! ' modify a 10\n'

        paged! 'branch: default\n'

        paged! 'commit: (clean)\n'

        paged! 'update: (current)\n'

        paged! 'phases: 11 draft\n'

      If we completely change the attend list that's respected:

        $ hg --config pager.attend-diff=no diff -c 2

        diff -r f4be7687d414 -r bce265549556 a

        --- a/a	Thu Jan 01 00:00:00 1970 +0000

        +++ b/a	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,2 +1,3 @@

         a

         a 1

        +a 2

        $ hg --config pager.attend=summary diff -c 2

        diff -r f4be7687d414 -r bce265549556 a

        --- a/a	Thu Jan 01 00:00:00 1970 +0000

        +++ b/a	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,2 +1,3 @@

         a

         a 1

        +a 2

      If 'log' is in attend, then 'history' should also be paged:

        $ hg history --limit 2 --config pager.attend=log

        paged! 'changeset:   10:46106edeeb38\n'

        paged! 'tag:         tip\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 10\n'

        paged! '\n'

        paged! 'changeset:   9:6dd8ea7dd621\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 9\n'

        paged! '\n'

      Possible bug: history is explicitly ignored in pager config, but

      because log is in the attend list it still gets pager treatment.

        $ hg history --limit 2 --config pager.attend=log \

        >   --config pager.ignore=history

        paged! 'changeset:   10:46106edeeb38\n'

        paged! 'tag:         tip\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 10\n'

        paged! '\n'

        paged! 'changeset:   9:6dd8ea7dd621\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 9\n'

        paged! '\n'

      Possible bug: history is explicitly marked as attend-history=no, but

      it doesn't fail to get paged because log is still in the attend list.

        $ hg history --limit 2 --config pager.attend-history=no

        paged! 'changeset:   10:46106edeeb38\n'

        paged! 'tag:         tip\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 10\n'

        paged! '\n'

        paged! 'changeset:   9:6dd8ea7dd621\n'

        paged! 'user:        test\n'

        paged! 'date:        Thu Jan 01 00:00:00 1970 +0000\n'

        paged! 'summary:     modify a 9\n'

        paged! '\n'

      Possible bug: disabling pager for log but enabling it for history

      doesn't result in history being paged.

        $ hg history --limit 2 --config pager.attend-log=no \

        > --config pager.attend-history=yes

        changeset:   10:46106edeeb38

        tag:         tip

        user:        test

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

        summary:     modify a 10

        changeset:   9:6dd8ea7dd621

        user:        test

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

        summary:     modify a 9

	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 >> fakepager.py <<EOF
				> import sys
				> for line in sys.stdin:
				> sys.stdout.write('paged! %r\n' % line)
				> EOF

				Enable ui.formatted because pager won't fire without it, and set up
				pager and tell it to use our fake pager that lets us see when the
				pager was running.
				$ cat >> $HGRCPATH <<EOF
				> [ui]
				> formatted = yes
				> [extensions]
				> pager=
				> [pager]
				> pager = python $TESTTMP/fakepager.py
				> EOF

				$ hg init repo
				$ cd repo
				$ echo a >> a
				$ hg add a
				$ hg ci -m 'add a'
				$ for x in `python $TESTDIR/seq.py 1 10`; do
				> echo a $x >> a
				> hg ci -m "modify a $x"
				> done

				By default diff and log are paged, but summary is not:

				$ hg diff -c 2 --pager=yes
				paged! 'diff -r f4be7687d414 -r bce265549556 a\n'
				paged! '--- a/a\tThu Jan 01 00:00:00 1970 +0000\n'
				paged! '+++ b/a\tThu Jan 01 00:00:00 1970 +0000\n'
				paged! '@@ -1,2 +1,3 @@\n'
				paged! ' a\n'
				paged! ' a 1\n'
				paged! '+a 2\n'

				$ hg log --limit 2
				paged! 'changeset: 10:46106edeeb38\n'
				paged! 'tag: tip\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 10\n'
				paged! '\n'
				paged! 'changeset: 9:6dd8ea7dd621\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 9\n'
				paged! '\n'

				$ hg summary
				parent: 10:46106edeeb38 tip
				modify a 10
				branch: default
				commit: (clean)
				update: (current)
				phases: 11 draft

				We can enable the pager on summary:

				$ hg --config pager.attend-summary=yes summary
				paged! 'parent: 10:46106edeeb38 tip\n'
				paged! ' modify a 10\n'
				paged! 'branch: default\n'
				paged! 'commit: (clean)\n'
				paged! 'update: (current)\n'
				paged! 'phases: 11 draft\n'

				If we completely change the attend list that's respected:

				$ hg --config pager.attend-diff=no diff -c 2
				diff -r f4be7687d414 -r bce265549556 a
				--- a/a Thu Jan 01 00:00:00 1970 +0000
				+++ b/a Thu Jan 01 00:00:00 1970 +0000
				@@ -1,2 +1,3 @@
				a
				a 1
				+a 2

				$ hg --config pager.attend=summary diff -c 2
				diff -r f4be7687d414 -r bce265549556 a
				--- a/a Thu Jan 01 00:00:00 1970 +0000
				+++ b/a Thu Jan 01 00:00:00 1970 +0000
				@@ -1,2 +1,3 @@
				a
				a 1
				+a 2

				If 'log' is in attend, then 'history' should also be paged:
				$ hg history --limit 2 --config pager.attend=log
				paged! 'changeset: 10:46106edeeb38\n'
				paged! 'tag: tip\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 10\n'
				paged! '\n'
				paged! 'changeset: 9:6dd8ea7dd621\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 9\n'
				paged! '\n'

				Possible bug: history is explicitly ignored in pager config, but
				because log is in the attend list it still gets pager treatment.

				$ hg history --limit 2 --config pager.attend=log \
				> --config pager.ignore=history
				paged! 'changeset: 10:46106edeeb38\n'
				paged! 'tag: tip\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 10\n'
				paged! '\n'
				paged! 'changeset: 9:6dd8ea7dd621\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 9\n'
				paged! '\n'

				Possible bug: history is explicitly marked as attend-history=no, but
				it doesn't fail to get paged because log is still in the attend list.

				$ hg history --limit 2 --config pager.attend-history=no
				paged! 'changeset: 10:46106edeeb38\n'
				paged! 'tag: tip\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 10\n'
				paged! '\n'
				paged! 'changeset: 9:6dd8ea7dd621\n'
				paged! 'user: test\n'
				paged! 'date: Thu Jan 01 00:00:00 1970 +0000\n'
				paged! 'summary: modify a 9\n'
				paged! '\n'

				Possible bug: disabling pager for log but enabling it for history
				doesn't result in history being paged.

				$ hg history --limit 2 --config pager.attend-log=no \
				> --config pager.attend-history=yes
				changeset: 10:46106edeeb38
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: modify a 10

				changeset: 9:6dd8ea7dd621
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: modify a 9