2012-10-31 04:03:26 +04:00
|
|
|
Load commonly used test logic
|
|
|
|
$ . "$TESTDIR/testutil"
|
|
|
|
|
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
|
2012-10-31 06:59:20 +04:00
|
|
|
$ fn_git_commit -m 'add alpha'
|
2012-10-27 06:46:02 +04:00
|
|
|
$ git tag t_alpha
|
|
|
|
$ git checkout -qb beta
|
|
|
|
$ echo beta > beta
|
|
|
|
$ git add beta
|
2012-10-31 06:59:20 +04:00
|
|
|
$ fn_git_commit -m 'add beta'
|
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'
|
2012-10-27 06:46:02 +04:00
|
|
|
$ cd ..
|
|
|
|
|
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
|
2012-10-27 06:46:02 +04:00
|
|
|
importing git objects into hg
|
2014-03-05 11:20:50 +04:00
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hg -R hgrepo update t_alpha
|
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
|
|
|
|
|
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
|
|
|
|
|
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
|
2014-03-05 04:30:12 +04:00
|
|
|
bookmark: epsilon
|
2012-10-27 06:46:02 +04:00
|
|
|
bookmark: master
|
2014-03-05 04:30:12 +04:00
|
|
|
tag: default/epsilon
|
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
|
2014-03-05 04:23:11 +04:00
|
|
|
$ git checkout -q beta
|
2012-10-27 06:46:02 +04:00
|
|
|
$ git tag t_beta
|
|
|
|
$ git checkout -q master
|
|
|
|
$ echo gamma > gamma
|
|
|
|
$ git add gamma
|
2012-10-31 06:59:20 +04:00
|
|
|
$ fn_git_commit -m 'add gamma'
|
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
|
2014-03-05 04:05:19 +04:00
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
2012-10-27 06:46:02 +04:00
|
|
|
$ hg -R hgrepo log --graph
|
2014-03-05 04:23:11 +04:00
|
|
|
o changeset: 3:56cabe48c4b0
|
2012-10-27 06:46:02 +04:00
|
|
|
| bookmark: master
|
|
|
|
| tag: default/master
|
|
|
|
| tag: tip
|
|
|
|
| parent: 0:3442585be8a6
|
|
|
|
| user: test <test@example.org>
|
2014-03-05 04:23:11 +04:00
|
|
|
| date: Mon Jan 01 00:00:13 2007 +0000
|
2012-10-27 06:46:02 +04:00
|
|
|
| summary: add gamma
|
|
|
|
|
|
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
|
|
|
|
|
|
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
|
2014-03-05 04:30:12 +04:00
|
|
|
bookmark: epsilon
|
|
|
|
tag: default/epsilon
|
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
|
2012-10-30 06:25:24 +04:00
|
|
|
$ git merge beta | sed 's/| */| /'
|
2012-10-27 06:46:02 +04:00
|
|
|
Merge made by the 'recursive' strategy.
|
2012-10-30 06:25:24 +04:00
|
|
|
beta | 1 +
|
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
|
2014-03-05 04:23:11 +04:00
|
|
|
o changeset: 4:892d20308ddf
|
2012-10-27 06:46:02 +04:00
|
|
|
|\ bookmark: master
|
|
|
|
| | tag: default/master
|
|
|
|
| | tag: tip
|
2014-03-05 04:23:11 +04:00
|
|
|
| | parent: 3:56cabe48c4b0
|
2012-10-27 06:46:02 +04:00
|
|
|
| | parent: 1:7bcd915dc873
|
|
|
|
| | user: test <test@example.org>
|
2014-03-05 04:23:11 +04:00
|
|
|
| | date: Mon Jan 01 00:00:13 2007 +0000
|
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
|
2012-10-27 06:46:02 +04:00
|
|
|
| | summary: Merge branch 'beta'
|
|
|
|
| |
|
2014-03-05 04:23:11 +04:00
|
|
|
| o changeset: 3:56cabe48c4b0
|
2012-10-27 06:46:02 +04:00
|
|
|
| | parent: 0:3442585be8a6
|
|
|
|
| | user: test <test@example.org>
|
2014-03-05 04:23:11 +04:00
|
|
|
| | date: Mon Jan 01 00:00:13 2007 +0000
|
2012-10-27 06:46:02 +04:00
|
|
|
| | summary: add gamma
|
|
|
|
| |
|
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
|
|
|
|
| |
|
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
|
2014-03-05 04:30:12 +04:00
|
|
|
bookmark: epsilon
|
|
|
|
tag: default/epsilon
|
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
|
|
|
|
|
2014-10-30 05:37:10 +03:00
|
|
|
|
|
|
|
add old and new commits to the git repo -- make sure we're using the commit date
|
|
|
|
and not the author date
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [git]
|
|
|
|
> mindate = 2014-01-02 00:00:00 +0000
|
|
|
|
> EOF
|
|
|
|
$ cd gitrepo
|
|
|
|
$ git checkout -q master
|
|
|
|
$ echo oldcommit > oldcommit
|
|
|
|
$ git add oldcommit
|
|
|
|
$ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \
|
|
|
|
> GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \
|
|
|
|
> git commit -m oldcommit > /dev/null || echo "git commit error"
|
|
|
|
$ cd ..
|
|
|
|
$ hg -R hgrepo pull
|
|
|
|
pulling from $TESTTMP/gitrepo
|
|
|
|
no changes found
|
|
|
|
$ hg -R hgrepo log -r master
|
|
|
|
changeset: 4:892d20308ddf
|
|
|
|
bookmark: master
|
|
|
|
parent: 3:56cabe48c4b0
|
|
|
|
parent: 1:7bcd915dc873
|
|
|
|
user: test <test@example.org>
|
|
|
|
date: Mon Jan 01 00:00:13 2007 +0000
|
|
|
|
summary: Merge branch 'beta'
|
|
|
|
|
|
|
|
|
|
|
|
$ cd gitrepo
|
|
|
|
$ echo newcommit > newcommit
|
|
|
|
$ git add newcommit
|
|
|
|
$ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \
|
|
|
|
> GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \
|
|
|
|
> git commit -m newcommit > /dev/null || echo "git commit error"
|
|
|
|
$ cd ..
|
|
|
|
$ hg -R hgrepo pull
|
|
|
|
pulling from $TESTTMP/gitrepo
|
|
|
|
importing git objects into hg
|
|
|
|
(run 'hg heads .' to see heads, 'hg merge' to merge)
|
|
|
|
$ hg -R hgrepo log -r master
|
|
|
|
changeset: 8:c7d0cf1a7601
|
|
|
|
bookmark: master
|
|
|
|
tag: default/master
|
|
|
|
tag: tip
|
|
|
|
user: test <test@example.org>
|
|
|
|
date: Wed Jan 01 00:00:00 2014 +0000
|
|
|
|
summary: newcommit
|
|
|
|
|