mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
33f1efdddf
One or both of these requirements were in almost every test in exactly the same
way. Now, these checks are performed in every test that uses the testutil.
This makes it easier for test authors to add these checks into new tests (just
add a reference to the testutil, which you'd probably want anyway).
We considered having each test declare their requirements (currently, either
"git" or "dulwich"), but in this case, preferred the simplicity of having the
check always performed (even if a particular test doesn't need one or the
other). You can't perform any meaningful testing of Hg-Git without both of
these dependencies properly configured. The main value to checking for them
in the tests (rather than just letting the tests fail) is that it gives a
meaningful error message to help people figure out how to fix their environment.
In the case that either git or dulwich is missing, the information will be
just as clearly conveyed regardless of whether its all the tests that are
skipped, or just most of them.
I didn't add dulwich to hghave (even though this is clearly the sort of thing
that hghave is intended for) because hghave is currently pulled from Mercurial
completely unchanged, and it's probably best to keep it that way.
Tested by running the tests in three configurations:
* No dulwich installed (ran 0, skipped 28, failed 0, output:
Skipped *: missing feature: dulwich)
* Bad git on path (ran 1, skipped 27, failed 0, output:
Skipped *: missing feature: git command line client)
* Working git and correct version of dulwich installed
(ran 28, skipped 0, failed 0)
Thanks to Felipe Contreras for the idea to extract this logic into a library.
141 lines
4.0 KiB
Perl
141 lines
4.0 KiB
Perl
Load commonly used test logic
|
|
$ . "$TESTDIR/testutil"
|
|
|
|
set up a git repo with some commits, branches and a tag
|
|
$ git init -q gitrepo
|
|
$ cd gitrepo
|
|
$ echo alpha > alpha
|
|
$ git add alpha
|
|
$ fn_git_commit -m 'add alpha'
|
|
$ git tag t_alpha
|
|
$ git checkout -qb beta
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
$ cd ..
|
|
|
|
clone a tag (ideally we'd want to pull it, but that seems broken for now)
|
|
# $ hg init hgrepo
|
|
# $ echo "[paths]" >> hgrepo/.hg/hgrc
|
|
# $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc
|
|
# $ hg -R hgrepo pull -r t_alpha
|
|
$ hg clone -r t_alpha gitrepo hgrepo
|
|
importing git objects into hg
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo log --graph
|
|
@ changeset: 0:3442585be8a6
|
|
bookmark: master
|
|
tag: default/master
|
|
tag: t_alpha
|
|
tag: tip
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
pull a branch
|
|
$ hg -R hgrepo pull -r beta
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
(run 'hg update' to get a working copy)
|
|
$ hg -R hgrepo log --graph
|
|
o changeset: 1:7bcd915dc873
|
|
| bookmark: beta
|
|
| tag: default/beta
|
|
| tag: tip
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:3442585be8a6
|
|
bookmark: master
|
|
tag: default/master
|
|
tag: t_alpha
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
add another commit and tag to the git repo
|
|
$ cd gitrepo
|
|
$ git tag t_beta
|
|
$ git checkout -q master
|
|
$ echo gamma > gamma
|
|
$ git add gamma
|
|
$ fn_git_commit -m 'add gamma'
|
|
$ cd ..
|
|
|
|
pull everything else
|
|
$ hg -R hgrepo pull
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
(run 'hg update' to get a working copy)
|
|
$ hg -R hgrepo log --graph
|
|
o changeset: 2:37c124f2d0a0
|
|
| bookmark: master
|
|
| tag: default/master
|
|
| tag: tip
|
|
| parent: 0:3442585be8a6
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: add gamma
|
|
|
|
|
| o changeset: 1:7bcd915dc873
|
|
|/ bookmark: beta
|
|
| tag: default/beta
|
|
| tag: t_beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:3442585be8a6
|
|
tag: t_alpha
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
add a merge to the git repo
|
|
$ cd gitrepo
|
|
$ git merge beta | sed 's/| */| /'
|
|
Merge made by the 'recursive' strategy.
|
|
beta | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
create mode 100644 beta
|
|
$ cd ..
|
|
|
|
pull the merge
|
|
$ hg -R hgrepo pull
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
(run 'hg update' to get a working copy)
|
|
$ hg -R hgrepo log --graph
|
|
o changeset: 3:b8668fddf56c
|
|
|\ bookmark: master
|
|
| | tag: default/master
|
|
| | tag: tip
|
|
| | parent: 2:37c124f2d0a0
|
|
| | parent: 1:7bcd915dc873
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:12 2007 +0000
|
|
| | summary: Merge branch 'beta'
|
|
| |
|
|
| o changeset: 2:37c124f2d0a0
|
|
| | parent: 0:3442585be8a6
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:12 2007 +0000
|
|
| | summary: add gamma
|
|
| |
|
|
o | changeset: 1:7bcd915dc873
|
|
|/ bookmark: beta
|
|
| tag: default/beta
|
|
| tag: t_beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:3442585be8a6
|
|
tag: t_alpha
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|