##// END OF EJS Templates
wireprotov2: define and implement "manifestdata" command...
wireprotov2: define and implement "manifestdata" command The added command can be used for obtaining manifest data. Given a manifest path and set of manifest nodes, data about manifests can be retrieved. Unlike changeset data, we wish to emit deltas to describe manifest revisions. So the command uses the relatively new API for building delta requests and emitting them. The code calls into deltaparent(), which I'm not very keen of. There's still work to be done in delta generation land so implementation details of storage (e.g. exactly one delta is stored/available) don't creep into higher levels. But we can worry about this later (there is already a TODO on imanifestorage tracking this). On the subject of parent deltas, the server assumes parent revisions exist on the receiving end. This is obviously wrong for shallow clone. I've added TODOs to add a mechanism to the command to allow clients to specify desired behavior. This shouldn't be too difficult to implement. Another big change is that the client must explicitly request manifest nodes to retrieve. This is a major departure from "getbundle," where the server derives relevant manifests as it iterates changesets and sends them automatically. As implemented, the client must transmit each requested node to the server. At 20 bytes per node, we're looking at 2 MB per 100,000 nodes. Plus wire encoding overhead. This isn't ideal for clients with limited upload bandwidth. I plan to address this in the future by allowing alternate mechanisms for defining the revisions to retrieve. One idea is to define a range of changeset revisions whose manifest revisions to retrieve (similar to how "changesetdata" works). We almost certainly want an API to look up an individual manifest by node. And that's where I've chosen to start with the implementation. Again, a theme of this early exchangev2 work is I want to start by building primitives for accessing raw repository data first and see how far we can get with those before we need more complexity. Differential Revision: https://phab.mercurial-scm.org/D4488

File last commit:

r39516:89630d0b default
r39673:c7a7c7e8 default
Show More
test-notify-changegroup.t
216 lines | 5.4 KiB | text/troff | Tads3Lexer
/ tests / test-notify-changegroup.t
Matt Mackall
tests: unify test-notify-changegroup
r12474
$ cat <<EOF >> $HGRCPATH
> [extensions]
> notify=
>
> [hooks]
> changegroup.notify = python:hgext.notify.hook
>
> [notify]
> sources = push
> diffstat = False
> maxsubject = 10
>
> [usersubs]
> foo@bar = *
>
> [reposubs]
> * = baz
> EOF
$ hg init a
clone
$ hg --traceback clone a b
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a > b/a
commit
$ hg --traceback --cwd b commit -Ama
adding a
$ echo a >> b/a
commit
$ hg --traceback --cwd b commit -Amb
push
$ hg --traceback --cwd b push ../a 2>&1 |
Augie Fackler
tests: clean up many print statements to be print functions instead...
r33687 > $PYTHON -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
Matt Mackall
tests: unify test-notify-changegroup
r12474 pushing to ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311 MIME-Version: 1.0
Matt Mackall
tests: unify test-notify-changegroup
r12474 Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: * (glob)
From: test
X-Hg-Notification: changeset cb9a9f314b8b
Message-Id: <*> (glob)
To: baz, foo@bar
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset cb9a9f314b8b in $TESTTMP/a
Mads Kiilerich
tests: remove redundant globs...
r12640 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
Matt Mackall
tests: unify test-notify-changegroup
r12474 summary: a
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset ba677d0156c1 in $TESTTMP/a
Mads Kiilerich
tests: remove redundant globs...
r12640 details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
Matt Mackall
tests: unify test-notify-changegroup
r12474 summary: b
diffs (6 lines):
diff -r 000000000000 -r ba677d0156c1 a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+a
+a
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
r14868 $ hg --cwd a rollback
repository tip rolled back to revision -1 (undo push)
Matt Mackall
tests: unify test-notify-changegroup
r12474
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
r14868 unbundle with unrelated source
$ hg --cwd b bundle ../test.hg ../a
searching for changes
2 changesets found
$ hg --cwd a unbundle ../test.hg
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets cb9a9f314b8b:ba677d0156c1 (2 drafts)
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
r14868 (run 'hg update' to get a working copy)
$ hg --cwd a rollback
repository tip rolled back to revision -1 (undo unbundle)
unbundle with correct source
$ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 |
Augie Fackler
tests: clean up many print statements to be print functions instead...
r33687 > $PYTHON -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
r14868 adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets cb9a9f314b8b:ba677d0156c1 (2 drafts)
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311 MIME-Version: 1.0
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
r14868 Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: * (glob)
From: test
X-Hg-Notification: changeset cb9a9f314b8b
Message-Id: <*> (glob)
To: baz, foo@bar
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset cb9a9f314b8b in $TESTTMP/a
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
r14868 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
summary: a
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset ba677d0156c1 in $TESTTMP/a
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
r14868 details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
summary: b
diffs (6 lines):
diff -r 000000000000 -r ba677d0156c1 a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+a
+a
(run 'hg update' to get a working copy)
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
r15654
Check that using the first committer as the author of a changeset works:
Check that the config option works.
Check that the first committer is indeed used for "From:".
Check that the merge user is NOT used for "From:"
Create new file
$ echo a > b/b
$ echo b >> b/b
$ echo c >> b/b
$ hg --traceback --cwd b commit -Amnewfile -u committer_1
adding b
commit as one user
$ echo x > b/b
$ echo b >> b/b
$ echo c >> b/b
$ hg --traceback --cwd b commit -Amx -u committer_2
commit as other user, change file so we can do an (automatic) merge
$ hg --cwd b up 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a > b/b
$ echo b >> b/b
$ echo y >> b/b
$ hg --traceback --cwd b commit -Amy -u committer_3
created new head
merge as a different user
$ hg --cwd b merge --config notify.fromauthor=True
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg --traceback --cwd b commit -Am "merged"
push
$ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 |
Augie Fackler
tests: clean up many print statements to be print functions instead...
r33687 > $PYTHON -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
r15654 pushing to ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311 MIME-Version: 1.0
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
r15654 Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: * (glob)
From: committer_1
X-Hg-Notification: changeset 84e487dddc58
Message-Id: <*> (glob)
To: baz, foo@bar
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset 84e487dddc58 in $TESTTMP/a
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
r15654 details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
summary: newfile
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset b29c7a2b6b0c in $TESTTMP/a
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
r15654 details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
summary: x
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset 0957c7d64886 in $TESTTMP/a
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
r15654 details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
summary: y
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 changeset 485b4e6b0249 in $TESTTMP/a
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
r15654 details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
summary: merged
diffs (7 lines):
diff -r ba677d0156c1 -r 485b4e6b0249 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,3 @@
+x
+b
+y
$ hg --cwd a rollback
repository tip rolled back to revision 1 (undo push)