mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 06:47:41 +03:00
63bb40f9c4
Summary: Those messages like "pulling from ...", "added n commits ..." belong to stderr. This makes it possible for us to turn on verbose output for auto pull, without breaking tools that parses stdout. Reviewed By: sfilipco Differential Revision: D25315955 fbshipit-source-id: 933f631610840eb5f603ad817f7560c78b19e4ad
370 lines
11 KiB
Perl
370 lines
11 KiB
Perl
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
|
|
@ commit: 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="$(dummysshcmd)"
|
|
pulling from git+ssh://user@dummy/gitrepo
|
|
fatal: '/gitrepo' does not appear to be a git repository
|
|
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 commit: 3bb02b6794dd
|
|
│ bookmark: beta
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:11 2007 +0000
|
|
│ summary: add beta
|
|
│
|
|
@ commit: 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 commit: 78f47553e70d
|
|
│ bookmark: master
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:13 2007 +0000
|
|
│ summary: add gamma
|
|
│
|
|
│ o commit: 0a22250873dd
|
|
├─╯ bookmark: delta
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:12 2007 +0000
|
|
│ summary: add delta
|
|
│
|
|
│ o commit: 3bb02b6794dd
|
|
├─╯ bookmark: beta
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:11 2007 +0000
|
|
│ summary: add beta
|
|
│
|
|
@ commit: 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 commit: 10c1db28cc89
|
|
├─╮ bookmark: master
|
|
│ │ user: test <test@example.org>
|
|
│ │ date: Mon Jan 01 00:00:13 2007 +0000
|
|
│ │ summary: Merge branch 'beta'
|
|
│ │
|
|
│ o commit: 78f47553e70d
|
|
│ │ user: test <test@example.org>
|
|
│ │ date: Mon Jan 01 00:00:13 2007 +0000
|
|
│ │ summary: add gamma
|
|
│ │
|
|
│ │ o commit: 0a22250873dd
|
|
│ ├─╯ bookmark: delta
|
|
│ │ user: test <test@example.org>
|
|
│ │ date: Mon Jan 01 00:00:12 2007 +0000
|
|
│ │ summary: add delta
|
|
│ │
|
|
o │ commit: 3bb02b6794dd
|
|
├─╯ bookmark: beta
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:11 2007 +0000
|
|
│ summary: add beta
|
|
│
|
|
@ commit: 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 commit: 47d709856ce8
|
|
│ bookmark: releases/v2
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:15 2007 +0000
|
|
│ summary: add eta
|
|
│
|
|
│ o commit: e09a50abb1b1
|
|
├─╯ bookmark: releases/v1
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:14 2007 +0000
|
|
│ summary: add zeta
|
|
│
|
|
o commit: 10c1db28cc89
|
|
├─╮ bookmark: master
|
|
│ │ user: test <test@example.org>
|
|
│ │ date: Mon Jan 01 00:00:13 2007 +0000
|
|
│ │ summary: Merge branch 'beta'
|
|
│ │
|
|
│ o commit: 78f47553e70d
|
|
│ │ user: test <test@example.org>
|
|
│ │ date: Mon Jan 01 00:00:13 2007 +0000
|
|
│ │ summary: add gamma
|
|
│ │
|
|
│ │ o commit: 0a22250873dd
|
|
│ ├─╯ bookmark: delta
|
|
│ │ user: test <test@example.org>
|
|
│ │ date: Mon Jan 01 00:00:12 2007 +0000
|
|
│ │ summary: add delta
|
|
│ │
|
|
o │ commit: 3bb02b6794dd
|
|
├─╯ bookmark: beta
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:11 2007 +0000
|
|
│ summary: add beta
|
|
│
|
|
@ commit: 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
|
|
commit: 10c1db28cc89
|
|
bookmark: master
|
|
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
|
|
commit: 497a89953f7c
|
|
bookmark: master
|
|
user: test <test@example.org>
|
|
date: Wed Jan 01 00:00:00 2014 +0000
|
|
summary: newcommit
|
|
|
|
commit: 6809e41e5128
|
|
user: test <test@example.org>
|
|
date: Sat Mar 01 00:00:00 2014 +0000
|
|
summary: oldtag
|
|
|
|
commit: 47d709856ce8
|
|
bookmark: releases/v2
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:15 2007 +0000
|
|
summary: add eta
|
|
|
|
commit: e09a50abb1b1
|
|
bookmark: releases/v1
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:14 2007 +0000
|
|
summary: add zeta
|
|
|
|
commit: 0a22250873dd
|
|
bookmark: delta
|
|
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
|
|
commit: 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
|
|
pulling from git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path
|
|
abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent'
|
|
[255]
|
|
$ hg pull 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 2>&1 >/dev/null
|
|
pulling from git+ssh://-oProxyCommand%3Drm%20nonexistent/path
|
|
abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent'
|
|
[255]
|
|
$ hg pull 'git+ssh://fakehost|shellcommand/path' 2>&1 >/dev/null
|
|
pulling from git+ssh://fakehost%7Cshellcommand/path
|
|
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
|
|
pulling from git+ssh://fakehost%7Cshellcommand/path
|
|
ssh: .* fakehost%7[Cc]shellcommand.* (re)
|
|
abort: git remote error: The remote server unexpectedly closed the connection.
|
|
[255]
|