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

httppeer: implement command executor for version 2 peer...

httppeer: implement command executor for version 2 peer Now that we have a new API for issuing commands which is compatible with wire protocol version 2, we can start using it with wire protocol version 2. This commit replaces our hacky implementation of _call() with something a bit more robust based on the new command executor interface. We now have proper support for issuing multiple commands per HTTP request. Each HTTP request maintains its own client reactor. The implementation is similar to the one in the legacy wire protocol. We use a ThreadPoolExecutor for spinning up a thread to read the HTTP response in the background. This allows responses to resolve in any order. While not implemented on the server yet, a client could use concurrent.futures.as_completed() with a collection of futures and handle responses as they arrive from the server. The return value from issued commands is still a simple list of raw or decoded CBOR data. This is still super hacky. We will want a rich data type for representing command responses. But at least this commit gets us one step closer to a proper peer implementation. Differential Revision: https://phab.mercurial-scm.org/D3297

Pulkit Goyal - - Load All Authors

File last commit:

r35124:a9cc233d default


                r37669:950294e2

default

Download file

             test-histedit-templates.t
        
                    54 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-histedit-templates.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing templating for histedit command

      Setup

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > histedit=

        > [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 histedit -Tjson --commands - 2>&1 <<EOF

        > pick 28ad74487de9 Added c

        > pick 62615734edd5 Added d

        > pick 18d04c59bb5d Added a

        > pick 29becc82797a Added b

        > EOF

        [

         {

          "nodechanges": {"18d04c59bb5d2d4090ad9a5b59bd6274adb63add": ["109f8ec895447f81b380ba8d4d8b66539ccdcb94"], "28ad74487de9599d00d81085be739c61fc340652": ["bff9e07c1807942b161dab768aa793b48e9a7f9d"], "29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["f5dcf3b4db23f31f1aacf46c33d1393de303d26f"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["201423b441c84d9e6858daed653e0d22485c1cfa"]}

         }

        ]

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

        @  7:f5dcf3b4db23 Added b

        |

        o  6:109f8ec89544 Added a

        |

        o  5:201423b441c8 Added d

        |

        o  4:bff9e07c1807 Added c

        $ hg histedit -T "{nodechanges|json}" --commands - 2>&1 <<EOF

        > pick bff9e07c1807 Added c

        > pick 201423b441c8 Added d

        > pick 109f8ec89544 Added a

        > roll f5dcf3b4db23 Added b

        > EOF

        {"109f8ec895447f81b380ba8d4d8b66539ccdcb94": ["8d01470bfeab64d3de13c49adb79d88790d38396"], "f3ec56a374bdbdf1953cacca505161442c6f3a3e": [], "f5dcf3b4db23f31f1aacf46c33d1393de303d26f": ["8d01470bfeab64d3de13c49adb79d88790d38396"]} (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 histedit command

				Setup

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> histedit=
				> [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 histedit -Tjson --commands - 2>&1 <<EOF
				> pick 28ad74487de9 Added c
				> pick 62615734edd5 Added d
				> pick 18d04c59bb5d Added a
				> pick 29becc82797a Added b
				> EOF
				[
				{
				"nodechanges": {"18d04c59bb5d2d4090ad9a5b59bd6274adb63add": ["109f8ec895447f81b380ba8d4d8b66539ccdcb94"], "28ad74487de9599d00d81085be739c61fc340652": ["bff9e07c1807942b161dab768aa793b48e9a7f9d"], "29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["f5dcf3b4db23f31f1aacf46c33d1393de303d26f"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["201423b441c84d9e6858daed653e0d22485c1cfa"]}
				}
				]

				$ hg log -G -T "{rev}:{node\|short} {desc}"
				@ 7:f5dcf3b4db23 Added b
				\|
				o 6:109f8ec89544 Added a
				\|
				o 5:201423b441c8 Added d
				\|
				o 4:bff9e07c1807 Added c

				$ hg histedit -T "{nodechanges\|json}" --commands - 2>&1 <<EOF
				> pick bff9e07c1807 Added c
				> pick 201423b441c8 Added d
				> pick 109f8ec89544 Added a
				> roll f5dcf3b4db23 Added b
				> EOF
				{"109f8ec895447f81b380ba8d4d8b66539ccdcb94": ["8d01470bfeab64d3de13c49adb79d88790d38396"], "f3ec56a374bdbdf1953cacca505161442c6f3a3e": [], "f5dcf3b4db23f31f1aacf46c33d1393de303d26f": ["8d01470bfeab64d3de13c49adb79d88790d38396"]} (no-eol)