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

Pierre-Yves David - - Load All Authors

File last commit:

r25744:e78a80f8 default


                r33051:15a79ac8

default

Download file

             test-bookmarks-strip.t
        
                    65 lines
            
             | 1007 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bookmarks-strip.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ echo qqq>qqq.txt

        David Soria Parra
    
bookmarks: respect rollbacks dryrun parameter

              r13307
            
      rollback dry run without rollback information

        $ hg rollback

        no rollback information available

        [1]

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      add file

        $ hg add

        adding qqq.txt

      commit first revision

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 1

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      set bookmark

        $ hg book test

        $ echo www>>qqq.txt

      commit second revision

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 2

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      set bookmark

        $ hg book test2

        timeless@mozdev.org
    
spelling: deactivates

              r17497
            
      update to -2 (deactivates the active bookmark)

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        $ hg update -r -2

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

        Siddharth Agarwal
    
update: when deactivating a bookmark, print a message...

              r21404
            
        (leaving bookmark test2)

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        $ echo eee>>qqq.txt

      commit new head

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 3

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        created new head

      bookmarks updated?

        $ hg book

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
           test                      1:25e1ee7a0081

           test2                     1:25e1ee7a0081

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      strip to revision 1

        Nicolas Dumazet
    
tests: use regular expressions instead of helpers

              r11907
            
        $ hg strip 1

        Mads Kiilerich
    
tests: remove redundant globs...

              r12640
            
        saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      list bookmarks

        $ hg book

        Augie Fackler
    
strip: move bookmarks to nearest ancestor rather than '.'...

              r17264
            
           test                      0:5c9ad3787638

           test2                     0:5c9ad3787638

	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

Martin Geisler tests: unify test-bookmarks-strip	r11864	$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH

		$ hg init

		$ echo qqq>qqq.txt

David Soria Parra bookmarks: respect rollbacks dryrun parameter	r13307	rollback dry run without rollback information

		$ hg rollback
		no rollback information available
		[1]

Martin Geisler tests: unify test-bookmarks-strip	r11864	add file

		$ hg add
		adding qqq.txt

		commit first revision

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 1
Martin Geisler tests: unify test-bookmarks-strip	r11864
		set bookmark

		$ hg book test

		$ echo www>>qqq.txt

		commit second revision

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 2
Martin Geisler tests: unify test-bookmarks-strip	r11864
		set bookmark

		$ hg book test2

timeless@mozdev.org spelling: deactivates	r17497	update to -2 (deactivates the active bookmark)
Martin Geisler tests: unify test-bookmarks-strip	r11864
		$ hg update -r -2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Siddharth Agarwal update: when deactivating a bookmark, print a message...	r21404	(leaving bookmark test2)
Martin Geisler tests: unify test-bookmarks-strip	r11864
		$ echo eee>>qqq.txt

		commit new head

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 3
Martin Geisler tests: unify test-bookmarks-strip	r11864	created new head

		bookmarks updated?

		$ hg book
Martin Geisler tests: remove unneeded -d flags...	r12156	test 1:25e1ee7a0081
		test2 1:25e1ee7a0081
Martin Geisler tests: unify test-bookmarks-strip	r11864
		strip to revision 1

Nicolas Dumazet tests: use regular expressions instead of helpers	r11907	$ hg strip 1
Mads Kiilerich tests: remove redundant globs...	r12640	saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
Martin Geisler tests: unify test-bookmarks-strip	r11864
		list bookmarks

		$ hg book
Augie Fackler strip: move bookmarks to nearest ancestor rather than '.'...	r17264	test 0:5c9ad3787638
		test2 0:5c9ad3787638