2013-02-10 01:35:30 +04:00
|
|
|
setup
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> blackbox=
|
2015-04-13 16:36:33 +03:00
|
|
|
> mock=$TESTDIR/mockblackbox.py
|
2013-03-13 21:43:51 +04:00
|
|
|
> mq=
|
2013-02-10 01:35:30 +04:00
|
|
|
> EOF
|
|
|
|
$ hg init blackboxtest
|
|
|
|
$ cd blackboxtest
|
|
|
|
|
|
|
|
command, exit codes, and duration
|
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
$ hg add a
|
2016-02-09 18:44:13 +03:00
|
|
|
$ hg blackbox --config blackbox.dirty=True
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a
|
2016-02-03 20:05:04 +03:00
|
|
|
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a exited 0 after * seconds (glob)
|
2016-02-09 18:44:13 +03:00
|
|
|
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000+ (5000)> blackbox
|
2013-02-10 01:35:30 +04:00
|
|
|
|
|
|
|
incoming change tracking
|
|
|
|
|
2013-02-13 23:07:01 +04:00
|
|
|
create two heads to verify that we only see one change in the log later
|
|
|
|
$ hg commit -ma
|
|
|
|
$ hg up null
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo b > b
|
|
|
|
$ hg commit -Amb
|
|
|
|
adding b
|
|
|
|
created new head
|
|
|
|
|
|
|
|
clone, commit, pull
|
2013-02-10 01:35:30 +04:00
|
|
|
$ hg clone . ../blackboxtest2
|
|
|
|
updating to branch default
|
2013-02-13 23:07:01 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo c > c
|
|
|
|
$ hg commit -Amc
|
|
|
|
adding c
|
2013-02-10 01:35:30 +04:00
|
|
|
$ cd ../blackboxtest2
|
|
|
|
$ hg pull
|
2013-02-24 01:07:38 +04:00
|
|
|
pulling from $TESTTMP/blackboxtest (glob)
|
2013-02-13 23:07:01 +04:00
|
|
|
searching for changes
|
2013-02-10 01:35:30 +04:00
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
(run 'hg update' to get a working copy)
|
2016-02-03 18:18:29 +03:00
|
|
|
$ hg blackbox -l 6
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated served branch cache in * seconds (glob)
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote served branch cache with 1 labels and 2 nodes
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> 1 incoming changes - new heads: d02f48003e62
|
2016-02-03 20:05:04 +03:00
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull exited 0 after * seconds (glob)
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6
|
2013-02-10 01:35:30 +04:00
|
|
|
|
2013-03-21 00:40:05 +04:00
|
|
|
we must not cause a failure if we cannot write to the log
|
|
|
|
|
|
|
|
$ hg rollback
|
|
|
|
repository tip rolled back to revision 1 (undo pull)
|
2013-04-23 05:00:59 +04:00
|
|
|
|
2016-02-03 21:15:18 +03:00
|
|
|
$ mv .hg/blackbox.log .hg/blackbox.log-
|
|
|
|
$ mkdir .hg/blackbox.log
|
2013-03-21 00:40:05 +04:00
|
|
|
$ hg --debug incoming
|
2016-02-03 21:15:18 +03:00
|
|
|
warning: cannot write to blackbox.log: * (glob)
|
2013-03-27 20:00:43 +04:00
|
|
|
comparing with $TESTTMP/blackboxtest (glob)
|
2013-03-21 00:40:05 +04:00
|
|
|
query 1; heads
|
|
|
|
searching for changes
|
|
|
|
all local heads known remotely
|
|
|
|
changeset: 2:d02f48003e62c24e2659d97d30f2a83abe5d5d51
|
|
|
|
tag: tip
|
|
|
|
phase: draft
|
|
|
|
parent: 1:6563da9dcf87b1949716e38ff3e3dfaa3198eb06
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
manifest: 2:ab9d46b053ebf45b7996f2922b9893ff4b63d892
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
files+: c
|
|
|
|
extra: branch=default
|
|
|
|
description:
|
|
|
|
c
|
|
|
|
|
|
|
|
|
|
|
|
$ hg pull
|
2013-03-27 20:00:43 +04:00
|
|
|
pulling from $TESTTMP/blackboxtest (glob)
|
2013-03-21 00:40:05 +04:00
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
|
2016-02-03 21:15:18 +03:00
|
|
|
a failure reading from the log is fatal
|
|
|
|
|
2013-03-21 00:40:05 +04:00
|
|
|
$ hg blackbox -l 3
|
2016-02-03 21:15:18 +03:00
|
|
|
abort: *$TESTTMP/blackboxtest2/.hg/blackbox.log* (glob)
|
2013-03-21 00:40:05 +04:00
|
|
|
[255]
|
|
|
|
|
2016-02-03 21:15:18 +03:00
|
|
|
$ rmdir .hg/blackbox.log
|
|
|
|
$ mv .hg/blackbox.log- .hg/blackbox.log
|
2013-03-21 00:40:05 +04:00
|
|
|
|
2013-03-13 21:43:51 +04:00
|
|
|
backup bundles get logged
|
|
|
|
|
|
|
|
$ touch d
|
|
|
|
$ hg commit -Amd
|
|
|
|
adding d
|
|
|
|
created new head
|
|
|
|
$ hg strip tip
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
|
2016-02-03 18:18:29 +03:00
|
|
|
$ hg blackbox -l 6
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated base branch cache in * seconds (glob)
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote base branch cache with 1 labels and 2 nodes
|
2016-02-03 20:05:04 +03:00
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob)
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6
|
2013-03-13 21:43:51 +04:00
|
|
|
|
2013-02-13 23:07:01 +04:00
|
|
|
extension and python hooks - use the eol extension for a pythonhook
|
|
|
|
|
|
|
|
$ echo '[extensions]' >> .hg/hgrc
|
|
|
|
$ echo 'eol=' >> .hg/hgrc
|
|
|
|
$ echo '[hooks]' >> .hg/hgrc
|
|
|
|
$ echo 'update = echo hooked' >> .hg/hgrc
|
|
|
|
$ hg update
|
2015-08-12 02:26:12 +03:00
|
|
|
hooked
|
merge: make in-memory changes visible to external update hooks
c67339617276 (while 3.4 code-freeze) made all 'update' hooks run after
releasing wlock for visibility of in-memory dirstate changes. But this
breaks paired invocation of 'preupdate' and 'update' hooks.
For example, 'hg backout --merge' for TARGET revision, which isn't
parent of CURRENT, consists of steps below:
1. update from CURRENT to TARGET
2. commit BACKOUT revision, which backs TARGET out
3. update from BACKOUT to CURRENT
4. merge TARGET into CURRENT
Then, we expects hooks to run in the order below:
- 'preupdate' on CURRENT for (1)
- 'update' on TARGET for (1)
- 'preupdate' on BACKOUT for (3)
- 'update' on CURRENT for (3)
- 'preupdate' on TARGET for (4)
- 'update' on CURRENT/TARGET for (4)
But hooks actually run in the order below:
- 'preupdate' on CURRENT for (1)
- 'preupdate' on BACKOUT for (3)
- 'preupdate' on TARGET for (4)
- 'update' on TARGET for (1), but actually on CURRENT/TARGET
- 'update' on CURRENT for (3), but actually on CURRENT/TARGET
- 'update' on CURRENT for (4), but actually on CURRENT/TARGET
Root cause of the issue focused by c67339617276 is that external
'update' hook process can't view in-memory changes (especially, of
dirstate), because they aren't written out until the end of
transaction (or wlock).
Now, hooks can be invoked just after updating, because previous
patches made in-memory changes visible to external process.
This patch may break backward compatibility from the point of view of
"scheduling hook execution", but should be reasonable because 'update'
hooks had been executed in this order before 3.4.
This patch tests "hg backout" and "hg unshelve", because the former
activates the transaction before 'update' hook invocation, but the
former doesn't.
2015-10-16 19:15:34 +03:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2016-02-02 17:49:02 +03:00
|
|
|
1 other heads for branch "default"
|
2016-02-03 18:18:29 +03:00
|
|
|
$ hg blackbox -l 6
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> writing .hg/cache/tags2-visible with 0 tags
|
|
|
|
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob)
|
|
|
|
1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> exthook-update: echo hooked finished in * seconds (glob)
|
2016-02-03 20:05:04 +03:00
|
|
|
1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> update exited 0 after * seconds (glob)
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> blackbox -l 6
|
2013-02-13 23:07:01 +04:00
|
|
|
|
2013-04-19 03:17:59 +04:00
|
|
|
log rotation
|
|
|
|
|
|
|
|
$ echo '[blackbox]' >> .hg/hgrc
|
|
|
|
$ echo 'maxsize = 20 b' >> .hg/hgrc
|
|
|
|
$ echo 'maxfiles = 3' >> .hg/hgrc
|
|
|
|
$ hg status
|
|
|
|
$ hg status
|
|
|
|
$ hg status
|
|
|
|
$ hg tip -q
|
2015-04-13 20:28:37 +03:00
|
|
|
2:d02f48003e62
|
2013-04-19 03:17:59 +04:00
|
|
|
$ ls .hg/blackbox.log*
|
|
|
|
.hg/blackbox.log
|
|
|
|
.hg/blackbox.log.1
|
|
|
|
.hg/blackbox.log.2
|
2016-02-03 21:15:18 +03:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
$ hg init blackboxtest3
|
|
|
|
$ cd blackboxtest3
|
|
|
|
$ hg blackbox
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> blackbox
|
2016-02-03 21:15:18 +03:00
|
|
|
$ mv .hg/blackbox.log .hg/blackbox.log-
|
|
|
|
$ mkdir .hg/blackbox.log
|
2016-03-03 01:55:13 +03:00
|
|
|
$ sed -e 's/\(.*test1.*\)/#\1/; s#\(.*commit2.*\)#os.rmdir(".hg/blackbox.log")\
|
|
|
|
> os.rename(".hg/blackbox.log-", ".hg/blackbox.log")\
|
|
|
|
> \1#' $TESTDIR/test-dispatch.py > ../test-dispatch.py
|
2016-02-03 21:15:18 +03:00
|
|
|
$ python ../test-dispatch.py
|
|
|
|
running: add foo
|
|
|
|
result: 0
|
|
|
|
running: commit -m commit1 -d 2000-01-01 foo
|
|
|
|
result: None
|
|
|
|
running: commit -m commit2 -d 2000-01-02 foo
|
|
|
|
result: None
|
|
|
|
running: log -r 0
|
|
|
|
changeset: 0:0e4634943879
|
|
|
|
user: test
|
|
|
|
date: Sat Jan 01 00:00:00 2000 +0000
|
|
|
|
summary: commit1
|
|
|
|
|
|
|
|
result: None
|
|
|
|
running: log -r tip
|
|
|
|
changeset: 1:45589e459b2e
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Sun Jan 02 00:00:00 2000 +0000
|
|
|
|
summary: commit2
|
|
|
|
|
|
|
|
result: None
|
|
|
|
$ hg blackbox
|
2016-02-03 07:54:40 +03:00
|
|
|
1970/01/01 00:00:00 bob @0e46349438790c460c5c9f7546bfcd39b267bbd2 (5000)> commit -m commit2 -d 2000-01-02 foo
|
|
|
|
1970/01/01 00:00:00 bob @0e46349438790c460c5c9f7546bfcd39b267bbd2 (5000)> updated served branch cache in * seconds (glob)
|
|
|
|
1970/01/01 00:00:00 bob @0e46349438790c460c5c9f7546bfcd39b267bbd2 (5000)> wrote served branch cache with 1 labels and 1 nodes
|
|
|
|
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> commit -m commit2 -d 2000-01-02 foo exited 0 after * seconds (glob)
|
|
|
|
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r 0
|
|
|
|
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags
|
|
|
|
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r 0 exited 0 after * seconds (glob)
|
|
|
|
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r tip
|
|
|
|
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r tip exited 0 after * seconds (glob)
|
2016-02-09 22:16:06 +03:00
|
|
|
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox
|
2013-04-19 03:17:59 +04:00
|
|
|
|
2013-02-10 01:35:30 +04:00
|
|
|
cleanup
|
|
|
|
$ cd ..
|