upstream/mercurial-mirror Files · tests/test-rebase-templates.t

changegroup: move file matcher from narrow extension...

changegroup: move file matcher from narrow extension Sparse changegroup generation requires the use of a matcher to filter which files are relevant. This commit moves the file matcher from the narrow extension to core and updates the narrow extension to use it. I'm not sure why the narrow extension was storing the matcher as a callable that resolved to a matcher. So I changed it to be a simple matcher instance. In addition, code from narrow to intersect the matcher with the local narrow spec is now performed automatically when the changegroup packer is created. If a matcher is not passed into getbundler() an alwaysmatcher() is assumed. This ensures that a matcher is always defined for all operations. Differential Revision: https://phab.mercurial-scm.org/D4011

Pulkit Goyal - - Load All Authors

File last commit:

r35123:f56a30b8 default


                r38818:9c057acb

default

Download file

             test-rebase-templates.t
        
                    57 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-templates.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing templating for rebase command

      Setup

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > [experimental]

        > evolution=createmarkers

        > EOF

        $ hg init repo

        $ cd repo

        $ for ch in a b c d; do echo foo > $ch; hg commit -Aqm "Added "$ch; done

        $ hg log -G -T "{rev}:{node|short} {desc}"

        @  3:62615734edd5 Added d

        |

        o  2:28ad74487de9 Added c

        |

        o  1:29becc82797a Added b

        |

        o  0:18d04c59bb5d Added a

      Getting the JSON output for nodechanges

        $ hg rebase -s 2 -d 0 -q -Tjson

        [

         {

          "nodechanges": {"28ad74487de9599d00d81085be739c61fc340652": ["849767420fd5519cf0026232411a943ed03cc9fb"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["df21b32134ba85d86bca590cbe9b8b7cbc346c53"]}

         }

        ]

        $ hg log -G -T "{rev}:{node|short} {desc}"

        @  5:df21b32134ba Added d

        |

        o  4:849767420fd5 Added c

        |

        | o  1:29becc82797a Added b

        |/

        o  0:18d04c59bb5d Added a

        $ hg rebase -s 1 -d 5 -q -T "{nodechanges|json}"

        {"29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["d9d6773efc831c274eace04bc13e8e6412517139"]} (no-eol)

        $ hg log -G -T "{rev}:{node|short} {desc}"

        o  6:d9d6773efc83 Added b

        |

        @  5:df21b32134ba Added d

        |

        o  4:849767420fd5 Added c

        |

        o  0:18d04c59bb5d Added a

        $ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{oldnode}:{newnodes % ' {node} '}'}"

        d9d6773efc831c274eace04bc13e8e6412517139: f48cd65c6dc3d2acb55da54402a5b029546e546f  (no-eol)

	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

				Testing templating for rebase command

				Setup

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				> [experimental]
				> evolution=createmarkers
				> EOF

				$ hg init repo
				$ cd repo
				$ for ch in a b c d; do echo foo > $ch; hg commit -Aqm "Added "$ch; done

				$ hg log -G -T "{rev}:{node\|short} {desc}"
				@ 3:62615734edd5 Added d
				\|
				o 2:28ad74487de9 Added c
				\|
				o 1:29becc82797a Added b
				\|
				o 0:18d04c59bb5d Added a

				Getting the JSON output for nodechanges

				$ hg rebase -s 2 -d 0 -q -Tjson
				[
				{
				"nodechanges": {"28ad74487de9599d00d81085be739c61fc340652": ["849767420fd5519cf0026232411a943ed03cc9fb"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["df21b32134ba85d86bca590cbe9b8b7cbc346c53"]}
				}
				]

				$ hg log -G -T "{rev}:{node\|short} {desc}"
				@ 5:df21b32134ba Added d
				\|
				o 4:849767420fd5 Added c
				\|
				\| o 1:29becc82797a Added b
				\|/
				o 0:18d04c59bb5d Added a

				$ hg rebase -s 1 -d 5 -q -T "{nodechanges\|json}"
				{"29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["d9d6773efc831c274eace04bc13e8e6412517139"]} (no-eol)

				$ hg log -G -T "{rev}:{node\|short} {desc}"
				o 6:d9d6773efc83 Added b
				\|
				@ 5:df21b32134ba Added d
				\|
				o 4:849767420fd5 Added c
				\|
				o 0:18d04c59bb5d Added a


				$ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{oldnode}:{newnodes % ' {node} '}'}"
				d9d6773efc831c274eace04bc13e8e6412517139: f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol)