mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
1dcb7966fc
Summary: These are the tests that passed after adding "$ eagerepo". I attempted to turn on eagerepo for all tests that didn't contain "$ eagerepo" or "configure modern". Reviewed By: quark-zju Differential Revision: D44445379 fbshipit-source-id: b283be6d5249f74e11a3205622961e457587e93b
102 lines
3.3 KiB
Perl
102 lines
3.3 KiB
Perl
#debugruntest-compatible
|
|
$ eagerepo
|
|
$ configure mutation-norecord
|
|
Test mergedriver invalidation with IMM.
|
|
|
|
$ newrepo
|
|
$ enable rebase
|
|
$ setconfig rebase.singletransaction=True
|
|
$ setconfig rebase.experimental.inmemory=True
|
|
$ setconfig rebase.experimental.inmemorywarning="rebasing in-memory!"
|
|
|
|
$ mkdir driver
|
|
$ cat > driver/__init__.py <<EOF
|
|
> from .generators import someFunction, VERSION
|
|
> def preprocess(ui, repo, hooktype, mergestate, wctx, labels=None):
|
|
> unresolved_files = list(mergestate.unresolved())
|
|
> ui.warn("generators version = %s\n" % VERSION)
|
|
> someFunction(repo)
|
|
> for unresolved_file in unresolved_files:
|
|
> mergestate.mark(unresolved_file, 'd')
|
|
> mergestate.commit()
|
|
> def conclude(ui, repo, hooktype, mergestate, wctx, labels=None):
|
|
> pass
|
|
> EOF
|
|
|
|
$ cat > driver/generators.py <<EOF
|
|
> VERSION = "BASE"
|
|
> def someFunction(repo):
|
|
> repo.ui.warn("base's someFunction() called\n")
|
|
> pass
|
|
> EOF
|
|
$ setconfig experimental.mergedriver=python:driver/
|
|
|
|
|
|
A dummy file (FILE) is created to force a simple three-way merge (without
|
|
conflicts, though a conflict would work too). Otherwise, mergedriver won't run.
|
|
|
|
$ seq 1 10 > FILE
|
|
$ hg add FILE
|
|
$ hg commit -Aq -m "base mergedriver"
|
|
$ hg book -r . "base"
|
|
|
|
Next, off of BASE, make an API change to the driver.
|
|
|
|
$ cat > driver/__init__.py <<EOF
|
|
> from .generators import someFunction, VERSION
|
|
>
|
|
> def preprocess(ui, repo, hooktype, mergestate, wctx, labels=None):
|
|
> unresolved_files = list(mergestate.unresolved())
|
|
> ui.warn("generators version = %s\n" % VERSION)
|
|
> someFunction(repo, "new_required")
|
|
>
|
|
> for unresolved_file in unresolved_files:
|
|
> mergestate.mark(unresolved_file, 'd')
|
|
>
|
|
> mergestate.commit()
|
|
>
|
|
> def conclude(ui, repo, hooktype, mergestate, wctx, labels=None):
|
|
> pass
|
|
> EOF
|
|
$ cat > driver/generators.py <<EOF
|
|
> VERSION = "NEW"
|
|
>
|
|
> def someFunction(repo, new_required_arg):
|
|
> repo.ui.write("new_required_arg = %s\n" % new_required_arg)
|
|
> pass
|
|
> EOF
|
|
$ seq 1 11 > FILE
|
|
$ hg com -m "new driver"
|
|
$ hg book -r . new_driver
|
|
$ hg up -q .~1
|
|
|
|
|
|
Next make a change to the dummy file off BASE.
|
|
$ hg up base
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark base)
|
|
$ hg up -C .
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(leaving bookmark base)
|
|
$ seq 0 10 > FILE
|
|
$ hg commit -m "prefix FILE with 0"
|
|
$ hg book -r . "base_1"
|
|
|
|
Rebase on top of the new driver, with the old driver checked out.
|
|
- We expect to see "generators version = BASE" as we run preprocess() with the old driver.
|
|
- Then, after restarting and using on-disk merge (and thus, checking out dest, which has the new driver),
|
|
we expect to see "generators version = NEW".
|
|
- If mergedriver isn't invalidated correctly, it'll say "generators version = BASE".
|
|
|
|
$ hg rebase -d new_driver
|
|
rebasing in-memory!
|
|
rebasing * "prefix FILE with 0" (base_1) (glob)
|
|
generators version = BASE
|
|
base's someFunction() called
|
|
artifact rebuild required (in FILE); switching to on-disk merge
|
|
rebasing * "prefix FILE with 0" (base_1) (glob)
|
|
generators version = NEW
|
|
new_required_arg = new_required
|
|
note: rebase of * created no changes to commit (glob)
|
|
|