mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
a7e62ec3de
Summary: We've had cases where a git commit goes in that shouldn't be translated to Mercurial. Let's add an option to skip the commit. Instead of skipping it entirely (which would require complicated logic to then parent the following commit on the last converted commit), let's just convert the skipped commit as an empty commit. This should cover the cases we've encountered so far. Reviewed By: krallin Differential Revision: D20261743 fbshipit-source-id: da401863b09c2ac727aae1ceef10a0e8d8f98a7e
383 lines
11 KiB
Perl
383 lines
11 KiB
Perl
#require py2
|
|
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/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 checkout -qB t_alpha
|
|
$ git checkout -qb beta
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
$ git checkout -qb delta master
|
|
$ echo delta > delta
|
|
$ git add delta
|
|
$ fn_git_commit -m 'add delta'
|
|
$ cd ..
|
|
|
|
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
|
|
importing git objects into hg
|
|
$ hg -R hgrepo update t_alpha
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark t_alpha)
|
|
$ hg -R hgrepo log --graph
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: master
|
|
bookmark: t_alpha
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
pull via ssh
|
|
# dummyssh doesn't actually work with Git, but it gets far enough to prove that
|
|
# the connection succeeded and git was invoked.
|
|
$ hg -R hgrepo pull --config paths.default=git+ssh://user@dummy/gitrepo --config ui.ssh=$TESTDIR/dummyssh
|
|
fatal: '/gitrepo' does not appear to be a git repository
|
|
pulling from git+ssh://user@dummy/gitrepo
|
|
abort: git remote error: The remote server unexpectedly closed the connection.
|
|
[255]
|
|
|
|
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 a branch
|
|
$ hg -R hgrepo pull -r beta
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
$ hg -R hgrepo log --graph
|
|
o changeset: 1:3bb02b6794dd
|
|
| bookmark: beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: epsilon
|
|
bookmark: master
|
|
bookmark: 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 checkout -q beta
|
|
$ 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
|
|
$ hg -R hgrepo log --graph
|
|
o changeset: 3:78f47553e70d
|
|
| bookmark: master
|
|
| parent: 0:69982ec78c6d
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:13 2007 +0000
|
|
| summary: add gamma
|
|
|
|
|
| o changeset: 2:0a22250873dd
|
|
|/ bookmark: delta
|
|
| parent: 0:69982ec78c6d
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: add delta
|
|
|
|
|
| o changeset: 1:3bb02b6794dd
|
|
|/ bookmark: beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: epsilon
|
|
bookmark: 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
|
|
$ hg -R hgrepo log --graph
|
|
o changeset: 4:10c1db28cc89
|
|
|\ bookmark: master
|
|
| | parent: 3:78f47553e70d
|
|
| | parent: 1:3bb02b6794dd
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:13 2007 +0000
|
|
| | summary: Merge branch 'beta'
|
|
| |
|
|
| o changeset: 3:78f47553e70d
|
|
| | parent: 0:69982ec78c6d
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:13 2007 +0000
|
|
| | summary: add gamma
|
|
| |
|
|
| | o changeset: 2:0a22250873dd
|
|
| |/ bookmark: delta
|
|
| | parent: 0:69982ec78c6d
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:12 2007 +0000
|
|
| | summary: add delta
|
|
| |
|
|
o | changeset: 1:3bb02b6794dd
|
|
|/ bookmark: beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: epsilon
|
|
bookmark: 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
|
|
$ hg -R hgrepo log --graph
|
|
o changeset: 6:47d709856ce8
|
|
| bookmark: releases/v2
|
|
| parent: 4:10c1db28cc89
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:15 2007 +0000
|
|
| summary: add eta
|
|
|
|
|
| o changeset: 5:e09a50abb1b1
|
|
|/ bookmark: releases/v1
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:14 2007 +0000
|
|
| summary: add zeta
|
|
|
|
|
o changeset: 4:10c1db28cc89
|
|
|\ bookmark: master
|
|
| | parent: 3:78f47553e70d
|
|
| | parent: 1:3bb02b6794dd
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:13 2007 +0000
|
|
| | summary: Merge branch 'beta'
|
|
| |
|
|
| o changeset: 3:78f47553e70d
|
|
| | parent: 0:69982ec78c6d
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:13 2007 +0000
|
|
| | summary: add gamma
|
|
| |
|
|
| | o changeset: 2:0a22250873dd
|
|
| |/ bookmark: delta
|
|
| | parent: 0:69982ec78c6d
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:12 2007 +0000
|
|
| | summary: add delta
|
|
| |
|
|
o | changeset: 1:3bb02b6794dd
|
|
|/ bookmark: beta
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:69982ec78c6d
|
|
bookmark: epsilon
|
|
bookmark: t_alpha
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
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"
|
|
also add an annotated tag
|
|
$ git checkout -q 'master^'
|
|
$ echo oldtag > oldtag
|
|
$ git add oldtag
|
|
$ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \
|
|
> GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \
|
|
> git commit -m oldtag > /dev/null || echo "git commit error"
|
|
$ GIT_COMMITTER_DATE="2009-02-01 00:00:00 +0000" \
|
|
> git tag -a -m 'tagging oldtag' oldtag
|
|
$ cd ..
|
|
$ hg -R hgrepo pull
|
|
pulling from $TESTTMP/gitrepo
|
|
no changes found
|
|
$ hg -R hgrepo log -r master
|
|
changeset: 4:10c1db28cc89
|
|
bookmark: master
|
|
parent: 3:78f47553e70d
|
|
parent: 1:3bb02b6794dd
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:13 2007 +0000
|
|
summary: Merge branch 'beta'
|
|
|
|
|
|
$ cd gitrepo
|
|
$ git checkout -q master
|
|
$ 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"
|
|
$ git checkout -q refs/tags/oldtag
|
|
$ GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \
|
|
> git tag -a -m 'tagging newtag' newtag
|
|
$ cd ..
|
|
$ hg -R hgrepo pull
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
$ hg -R hgrepo heads
|
|
changeset: 9:497a89953f7c
|
|
bookmark: master
|
|
user: test <test@example.org>
|
|
date: Wed Jan 01 00:00:00 2014 +0000
|
|
summary: newcommit
|
|
|
|
changeset: 7:6809e41e5128
|
|
parent: 4:10c1db28cc89
|
|
user: test <test@example.org>
|
|
date: Sat Mar 01 00:00:00 2014 +0000
|
|
summary: oldtag
|
|
|
|
changeset: 6:47d709856ce8
|
|
bookmark: releases/v2
|
|
parent: 4:10c1db28cc89
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:15 2007 +0000
|
|
summary: add eta
|
|
|
|
changeset: 5:e09a50abb1b1
|
|
bookmark: releases/v1
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:14 2007 +0000
|
|
summary: add zeta
|
|
|
|
changeset: 2:0a22250873dd
|
|
bookmark: delta
|
|
parent: 0:69982ec78c6d
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:12 2007 +0000
|
|
summary: add delta
|
|
|
|
|
|
Skip commits using hggit.skipgithashes
|
|
$ hg init skiprepo
|
|
$ cd skiprepo
|
|
$ hg pull --config extensions.hggit= --config hggit.skipgithashes=cee7863e67baaf98d4b6f3645dd9fa78fba9de0d ../gitrepo
|
|
pulling from ../gitrepo
|
|
importing git objects into hg
|
|
forcing git commit cee7863e67baaf98d4b6f3645dd9fa78fba9de0d to be empty
|
|
$ hg log -G --stat -T '{desc}'
|
|
o newcommit newcommit | 1 +
|
|
| 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
o oldcommit oldcommit | 1 +
|
|
| 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
| o oldtag oldtag | 1 +
|
|
|/ 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
o Merge branch 'beta' beta | 1 +
|
|
|\ 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
| |
|
|
| o add beta beta | 1 +
|
|
| | 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
| |
|
|
o | add gamma
|
|
|/
|
|
o add alpha alpha | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
$ hg log -r 4d4019e3dd06 --stat
|
|
changeset: 1:4d4019e3dd06
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:13 2007 +0000
|
|
summary: add gamma
|
|
|
|
|
|
test for ssh vulnerability
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [ui]
|
|
> ssh = ssh -o ConnectTimeout=1
|
|
> EOF
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ hg pull 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 2>&1 >/dev/null
|
|
abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent'
|
|
[255]
|
|
$ hg pull 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 2>&1 >/dev/null
|
|
abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent'
|
|
[255]
|
|
$ hg pull 'git+ssh://fakehost|shellcommand/path' 2>&1 >/dev/null
|
|
ssh: .* fakehost%7[Cc]shellcommand.* (re)
|
|
abort: git remote error: The remote server unexpectedly closed the connection.
|
|
[255]
|
|
$ hg pull 'git+ssh://fakehost%7Cshellcommand/path' 2>&1 >/dev/null
|
|
ssh: .* fakehost%7[Cc]shellcommand.* (re)
|
|
abort: git remote error: The remote server unexpectedly closed the connection.
|
|
[255]
|