facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity
b1306a0d26
sapling/tests/test-pull.t

259 lines
7.4 KiB
Perl
Raw Normal View History

tests: extract extension configuration into a testutil library Thanks to Felipe Contreras for the patch which this was based on. Even though the MQ extension was only used in a single test (test-pull-after-strip.t), I included it in the testutil. It shouldn't hurt anything to have it enabled and not used, and saves us from having to deal with enabling extensions in individual tests at all. Similarly, this changeset results in the graphlog extension being enabled for all tests, even though there were some that didn't use it before. This is even less significant in Mercurial 2.3+, since in those versions, graphlog is part of core, and is available even when the extension is disabled.
2012-10-31 04:03:26 +04:00
Load commonly used test logic
$ . "$TESTDIR/testutil"
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
set up a git repo with some commits, branches and a tag
$ git init -q gitrepo
$ cd gitrepo
$ echo alpha > alpha
$ git add alpha
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_git_commit -m 'add alpha'
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
$ git tag t_alpha
$ git checkout -qb beta
$ echo beta > beta
$ git add beta
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_git_commit -m 'add beta'
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
$ git checkout -qb delta master
$ echo delta > delta
$ git add delta
$ fn_git_commit -m 'add delta'
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
$ cd ..
safebranchrevs: handle changelog having no commits The usage of getattr was unsafe. Use hgutil.safehasattr instead. util.safehasattr has been around since Mercurial 2.0. This also fixes the formerly disabled test in test-pull.t.
2014-03-05 11:20:50 +04:00
pull a tag
$ hg init hgrepo
$ echo "[paths]" >> hgrepo/.hg/hgrc
$ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc
$ hg -R hgrepo pull -r t_alpha
pulling from $TESTTMP/gitrepo
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
importing git objects into hg
safebranchrevs: handle changelog having no commits The usage of getattr was unsafe. Use hgutil.safehasattr instead. util.safehasattr has been around since Mercurial 2.0. This also fixes the formerly disabled test in test-pull.t.
2014-03-05 11:20:50 +04:00
(run 'hg update' to get a working copy)
$ hg -R hgrepo update t_alpha
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
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
test-pull.t: add test for no-op pull
2014-03-05 04:30:12 +04:00
no-op pull
$ hg -R hgrepo pull -r t_alpha
pulling from $TESTTMP/gitrepo
no changes found
no-op pull with added bookmark
$ cd gitrepo
$ git checkout -qb epsilon t_alpha
$ cd ..
$ hg -R hgrepo pull -r epsilon
pulling from $TESTTMP/gitrepo
no changes found
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
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
test-pull.t: add test for no-op pull
2014-03-05 04:30:12 +04:00
bookmark: epsilon
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
bookmark: master
test-pull.t: add test for no-op pull
2014-03-05 04:30:12 +04:00
tag: default/epsilon
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
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_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
$ git checkout -q beta
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
$ git tag t_beta
$ git checkout -q master
$ echo gamma > gamma
$ git add gamma
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_git_commit -m 'add gamma'
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
$ cd ..
pull everything else
$ hg -R hgrepo pull
pulling from $TESTTMP/gitrepo
importing git objects into hg
git_handler.fetch: actually return number of heads added or removed The return value as implemented in git_handler.fetch was pretty bogus. It used to return the number of values that changed in the 'refs/heads/' namespace, regardless of whether multiple values in there point to the same Mercurial commit, or whether particular heads were even imported. Fix all of that by using the actual heads in the changelog, just like vanilla Mercurial. The test output changes demonstrate examples where the code was buggy.
2014-03-05 04:05:19 +04:00
(run 'hg heads' to see heads, 'hg merge' to merge)
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
$ hg -R hgrepo log --graph
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
o changeset: 3:56cabe48c4b0
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
| bookmark: master
| tag: default/master
| tag: tip
| parent: 0:3442585be8a6
| user: test <test@example.org>
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
| date: Mon Jan 01 00:00:13 2007 +0000
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
| summary: add gamma
|
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
| o changeset: 2:4d41070bf840
|/ bookmark: delta
| tag: default/delta
| parent: 0:3442585be8a6
| user: test <test@example.org>
| date: Mon Jan 01 00:00:12 2007 +0000
| summary: add delta
|
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
| 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
test-pull.t: add test for no-op pull
2014-03-05 04:30:12 +04:00
bookmark: epsilon
tag: default/epsilon
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
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
test-pull.t: normalize git-merge output
2012-10-30 06:25:24 +04:00
$ git merge beta | sed 's/| */| /'
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
Merge made by the 'recursive' strategy.
test-pull.t: normalize git-merge output
2012-10-30 06:25:24 +04:00
beta | 1 +
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
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
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
o changeset: 4:892d20308ddf
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
|\ bookmark: master
| | tag: default/master
| | tag: tip
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
| | parent: 3:56cabe48c4b0
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
| | parent: 1:7bcd915dc873
| | user: test <test@example.org>
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
| | date: Mon Jan 01 00:00:13 2007 +0000
git_handler: support wildcards for Git branch name matching This is quite similar to syntax Git supports. In the future maybe core Mercurial could be extended to support this, but I think this independently makes sense in hg-git.
2014-10-31 21:14:35 +03:00
| | summary: Merge branch 'beta'
| |
| o changeset: 3:56cabe48c4b0
| | parent: 0:3442585be8a6
| | user: test <test@example.org>
| | date: Mon Jan 01 00:00:13 2007 +0000
| | summary: add gamma
| |
| | o changeset: 2:4d41070bf840
| |/ bookmark: delta
| | tag: default/delta
| | parent: 0:3442585be8a6
| | user: test <test@example.org>
| | date: Mon Jan 01 00:00:12 2007 +0000
| | summary: add delta
| |
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
bookmark: epsilon
tag: default/epsilon
tag: t_alpha
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
pull with wildcards
$ cd gitrepo
$ git checkout -qb releases/v1 master
$ echo zeta > zeta
$ git add zeta
$ fn_git_commit -m 'add zeta'
$ git checkout -qb releases/v2 master
$ echo eta > eta
$ git add eta
$ fn_git_commit -m 'add eta'
$ git checkout -qb notreleases/v1 master
$ echo theta > theta
$ git add theta
$ fn_git_commit -m 'add theta'
ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1
$ cd ..
$ hg -R hgrepo pull -r 'releases/*'
pulling from $TESTTMP/gitrepo
importing git objects into hg
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R hgrepo log --graph
o changeset: 6:bdc34645137e
| bookmark: releases/v2
| tag: default/releases/v2
| tag: tip
| parent: 4:892d20308ddf
| user: test <test@example.org>
| date: Mon Jan 01 00:00:15 2007 +0000
| summary: add eta
|
| o changeset: 5:3e35a45c61f9
|/ bookmark: releases/v1
| tag: default/releases/v1
| user: test <test@example.org>
| date: Mon Jan 01 00:00:14 2007 +0000
| summary: add zeta
|
o changeset: 4:892d20308ddf
|\ bookmark: master
| | tag: default/master
| | parent: 3:56cabe48c4b0
| | parent: 1:7bcd915dc873
| | user: test <test@example.org>
| | date: Mon Jan 01 00:00:13 2007 +0000
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
| | summary: Merge branch 'beta'
| |
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
| o changeset: 3:56cabe48c4b0
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
| | parent: 0:3442585be8a6
| | user: test <test@example.org>
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
| | date: Mon Jan 01 00:00:13 2007 +0000
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
| | summary: add gamma
| |
git_handler.fetch: only import commits reachable from requested heads Previously we'd attempt to import every single reachable commit in the Git object store. The test adds another branch to the Git repo and doesn't import it until much later. Previously we'd import it when we ran `hg -R hgrepo pull -r beta`. Now we won't.
2014-03-05 04:23:11 +04:00
| | o changeset: 2:4d41070bf840
| |/ bookmark: delta
| | tag: default/delta
| | parent: 0:3442585be8a6
| | user: test <test@example.org>
| | date: Mon Jan 01 00:00:12 2007 +0000
| | summary: add delta
| |
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
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
test-pull.t: add test for no-op pull
2014-03-05 04:30:12 +04:00
bookmark: epsilon
tag: default/epsilon
pull: don't pull tags as bookmarks This should fix a bug introduced by 4f4ab2d which caused all tags to be duplicated as bookmarks on pull. Test coverage has been added for pull to allow verifying the fix.
2012-10-27 06:46:02 +04:00
tag: t_alpha
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
Reference in New Issue Copy Permalink