##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.
Augie Fackler - - Load All Authors

File last commit:

r22947:c63a09b6 default
r23524:a1a7c94d default
Show More
test-notify-changegroup.t
214 lines | 5.2 KiB | text/troff | Tads3Lexer
/ tests / test-notify-changegroup.t
History | Source | Raw |Copy content |Copy permalink
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: use $PYTHON instead of hardcoding python...
 r22947 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
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
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: * (glob)
From: test
X-Hg-Notification: changeset cb9a9f314b8b
Message-Id: <*> (glob)
To: baz, foo@bar
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 changeset cb9a9f314b8b in $TESTTMP/a (glob)
Mads Kiilerich
tests: remove redundant globs...
 r12640 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
Matt Mackall
tests: unify test-notify-changegroup
 r12474 summary: a
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 changeset ba677d0156c1 in $TESTTMP/a (glob)
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
(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: use $PYTHON instead of hardcoding python...
 r22947 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
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
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: * (glob)
From: test
X-Hg-Notification: changeset cb9a9f314b8b
Message-Id: <*> (glob)
To: baz, foo@bar
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 changeset cb9a9f314b8b in $TESTTMP/a (glob)
Patrick Mezard
test-notify-changegroup: test notifications on unbundle
 r14868 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
summary: a
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 changeset ba677d0156c1 in $TESTTMP/a (glob)
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: use $PYTHON instead of hardcoding python...
 r22947 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
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
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: * (glob)
From: committer_1
X-Hg-Notification: changeset 84e487dddc58
Message-Id: <*> (glob)
To: baz, foo@bar
Mads Kiilerich
tests: ignore slash direction in paths in test-notify-changegroup.t...
 r15766 changeset 84e487dddc58 in $TESTTMP/a (glob)
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
 r15654 details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
summary: newfile
Mads Kiilerich
tests: ignore slash direction in paths in test-notify-changegroup.t...
 r15766 changeset b29c7a2b6b0c in $TESTTMP/a (glob)
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
 r15654 details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
summary: x
Mads Kiilerich
tests: ignore slash direction in paths in test-notify-changegroup.t...
 r15766 changeset 0957c7d64886 in $TESTTMP/a (glob)
Nikolaus Schueler
notify: change behavior of "changegroup" hook...
 r15654 details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
summary: y
Mads Kiilerich
tests: ignore slash direction in paths in test-notify-changegroup.t...
 r15766 changeset 485b4e6b0249 in $TESTTMP/a (glob)
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)