mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
75f4bab4a5
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.
148 lines
4.3 KiB
Perl
148 lines
4.3 KiB
Perl
setup
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> blackbox=
|
|
> mock=$TESTDIR/mockblackbox.py
|
|
> mq=
|
|
> EOF
|
|
$ hg init blackboxtest
|
|
$ cd blackboxtest
|
|
|
|
command, exit codes, and duration
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg blackbox
|
|
1970/01/01 00:00:00 bob (*)> add a (glob)
|
|
1970/01/01 00:00:00 bob (*)> add a exited 0 after * seconds (glob)
|
|
|
|
incoming change tracking
|
|
|
|
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
|
|
$ hg clone . ../blackboxtest2
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo c > c
|
|
$ hg commit -Amc
|
|
adding c
|
|
$ cd ../blackboxtest2
|
|
$ hg pull
|
|
pulling from $TESTTMP/blackboxtest (glob)
|
|
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)
|
|
$ hg blackbox -l 5
|
|
1970/01/01 00:00:00 bob (*)> pull (glob)
|
|
1970/01/01 00:00:00 bob (*)> updated served branch cache in ?.???? seconds (glob)
|
|
1970/01/01 00:00:00 bob (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
|
|
1970/01/01 00:00:00 bob (*)> 1 incoming changes - new heads: d02f48003e62 (glob)
|
|
1970/01/01 00:00:00 bob (*)> pull exited 0 after * seconds (glob)
|
|
|
|
we must not cause a failure if we cannot write to the log
|
|
|
|
$ hg rollback
|
|
repository tip rolled back to revision 1 (undo pull)
|
|
|
|
#if unix-permissions no-root
|
|
$ chmod 000 .hg/blackbox.log
|
|
$ hg --debug incoming
|
|
warning: cannot write to blackbox.log: Permission denied
|
|
comparing with $TESTTMP/blackboxtest (glob)
|
|
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
|
|
|
|
|
|
#endif
|
|
$ hg pull
|
|
pulling from $TESTTMP/blackboxtest (glob)
|
|
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)
|
|
|
|
a failure reading from the log is fine
|
|
#if unix-permissions no-root
|
|
$ hg blackbox -l 3
|
|
abort: Permission denied: $TESTTMP/blackboxtest2/.hg/blackbox.log
|
|
[255]
|
|
|
|
$ chmod 600 .hg/blackbox.log
|
|
#endif
|
|
|
|
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)
|
|
$ hg blackbox -l 5
|
|
1970/01/01 00:00:00 bob (*)> strip tip (glob)
|
|
1970/01/01 00:00:00 bob (*)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
|
|
1970/01/01 00:00:00 bob (*)> updated base branch cache in ?.???? seconds (glob)
|
|
1970/01/01 00:00:00 bob (*)> wrote base branch cache with 1 labels and 2 nodes (glob)
|
|
1970/01/01 00:00:00 bob (*)> strip tip exited 0 after * seconds (glob)
|
|
|
|
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
|
|
hooked
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg blackbox -l 5
|
|
1970/01/01 00:00:00 bob (*)> update (glob)
|
|
1970/01/01 00:00:00 bob (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
|
|
1970/01/01 00:00:00 bob (*)> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob)
|
|
1970/01/01 00:00:00 bob (*)> exthook-update: echo hooked finished in * seconds (glob)
|
|
1970/01/01 00:00:00 bob (*)> update exited 0 after * seconds (glob)
|
|
|
|
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
|
|
2:d02f48003e62
|
|
$ ls .hg/blackbox.log*
|
|
.hg/blackbox.log
|
|
.hg/blackbox.log.1
|
|
.hg/blackbox.log.2
|
|
|
|
cleanup
|
|
$ cd ..
|