upstream/mercurial-mirror Files · tests/test-simple-update.t

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default


                r33051:15a79ac8

default

Download file

             test-simple-update.t
        
                    93 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-simple-update.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init test

        $ cd test

        $ echo foo>foo

        $ hg addremove

        adding foo

        $ hg commit -m "1"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg clone . ../branch

        updating to branch default

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

        $ cd ../branch

        $ hg co

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

        $ echo bar>>foo

        $ hg commit -m "2"

        $ cd ../test

        $ hg pull ../branch

        pulling from ../branch

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

        $ hg co

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

        $ cat foo

        foo

        bar

        $ hg manifest --debug

        6f4310b00b9a147241b071a60c28a650827fb03d 644   foo

      update to rev 0 with a date

        $ hg upd -d foo 0

        abort: you can't specify a revision and a date

        [255]

        $ cd ..

      update with worker processes

      #if no-windows

        $ cat <<EOF > forceworker.py

        > from mercurial import extensions, worker

        > def nocost(orig, ui, costperop, nops):

        >     return worker._numworkers(ui) > 1

        > def uisetup(ui):

        >     extensions.wrapfunction(worker, 'worthwhile', nocost)

        > EOF

        $ hg init worker

        $ cd worker

        $ cat <<EOF >> .hg/hgrc

        > [extensions]

        > forceworker = $TESTTMP/forceworker.py

        > [worker]

        > numcpus = 4

        > EOF

        $ for i in `$PYTHON $TESTDIR/seq.py 1 100`; do

        >   echo $i > $i

        > done

        $ hg ci -qAm 'add 100 files'

        $ hg update null

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

        $ hg update -v | grep 100

        getting 100

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

        $ cd ..

      #endif

	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

				$ hg init test
				$ cd test
				$ echo foo>foo
				$ hg addremove
				adding foo
				$ hg commit -m "1"

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				$ hg clone . ../branch
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd ../branch
				$ hg co
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo bar>>foo
				$ hg commit -m "2"

				$ cd ../test

				$ hg pull ../branch
				pulling from ../branch
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 2 changesets, 2 total revisions

				$ hg co
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cat foo
				foo
				bar

				$ hg manifest --debug
				6f4310b00b9a147241b071a60c28a650827fb03d 644 foo

				update to rev 0 with a date

				$ hg upd -d foo 0
				abort: you can't specify a revision and a date
				[255]

				$ cd ..

				update with worker processes

				#if no-windows

				$ cat <<EOF > forceworker.py
				> from mercurial import extensions, worker
				> def nocost(orig, ui, costperop, nops):
				> return worker._numworkers(ui) > 1
				> def uisetup(ui):
				> extensions.wrapfunction(worker, 'worthwhile', nocost)
				> EOF

				$ hg init worker
				$ cd worker
				$ cat <<EOF >> .hg/hgrc
				> [extensions]
				> forceworker = $TESTTMP/forceworker.py
				> [worker]
				> numcpus = 4
				> EOF
				$ for i in `$PYTHON $TESTDIR/seq.py 1 100`; do
				> echo $i > $i
				> done
				$ hg ci -qAm 'add 100 files'

				$ hg update null
				0 files updated, 0 files merged, 100 files removed, 0 files unresolved
				$ hg update -v \| grep 100
				getting 100
				100 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd ..

				#endif