Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
hg-git
Commits
deb7f683
Commit
deb7f683
authored
12 years ago
by
David M. Carr
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-git-clone
parent
4b64fc97
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test-git-clone.out
+0
-18
0 additions, 18 deletions
tests/test-git-clone.out
tests/test-git-clone.t
+58
-42
58 additions, 42 deletions
tests/test-git-clone.t
with
58 additions
and
60 deletions
tests/test-git-clone.out
deleted
100644 → 0
+
0
−
18
View file @
4b64fc97
Initialized empty Git repository in gitrepo/.git/
importing git objects into hg
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 1:7bcd915dc873
| tag: default/master
| tag: tip
| user: test <test@example.org>
| date: Mon Jan 01 00:00:11 2007 +0000
| summary: add beta
|
o changeset: 0:3442585be8a6
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
% we should have some bookmarks
* master 1:7bcd915dc873
This diff is collapsed.
Click to expand it.
tests/test-git-clone
→
tests/test-git-clone
.t
+
58
−
42
View file @
deb7f683
#!/bin/sh
# Fails for some reason, need to investigate
# $ "$TESTDIR/hghave" git || exit 80
...
@@ -2,4 +3,4 @@
...
@@ -2,4 +3,4 @@
# Fails for some reason, need to investigate
bail
if
the
user
does
not
have
dulwich
# "$TESTDIR/hghave" git
|| exit 80
$
python
-
c
'
import dulwich, dulwich.repo
'
||
exit
80
...
@@ -5,4 +6,4 @@
...
@@ -5,4 +6,4 @@
#
bail if the user
does not have dulwich
bail
early
if
the
user
is
already
running
git
-
daemon
python
-c
'import dulwich, dulwich.repo'
||
exit
80
$
!
(
echo
hi
|
nc
localhost
9418
2
>
/dev/null
)
||
exit
80
...
@@ -8,4 +9,6 @@
...
@@ -8,4 +9,6 @@
# bail early if the user is already running git-daemon
$
echo
"
[extensions]
"
>>
$HGRCPATH
echo
hi | nc localhost 9418 2>/dev/null
&&
exit
80
$
echo
"
hggit=$(echo $(dirname
$TESTDIR
))/hggit
"
>>
$HGRCPATH
$
echo
'
hgext.graphlog =
'
>>
$HGRCPATH
$
echo
'
hgext.bookmarks =
'
>>
$HGRCPATH
...
@@ -11,6 +14,8 @@
...
@@ -11,6 +14,8 @@
echo
"[extensions]"
>>
$HGRCPATH
$
GIT_AUTHOR_NAME
=
'
test
';
export
GIT_AUTHOR_NAME
echo
"hggit=
$(
echo
$(
dirname
$(
dirname
$0
)))
/hggit"
>>
$HGRCPATH
$
GIT_AUTHOR_EMAIL
=
'
test@example.org
';
export
GIT_AUTHOR_EMAIL
echo
'hgext.graphlog ='
>>
$HGRCPATH
$
GIT_AUTHOR_DATE
=
"
2007-01-01 00:00:00 +0000
";
export
GIT_AUTHOR_DATE
echo
'hgext.bookmarks ='
>>
$HGRCPATH
$
GIT_COMMITTER_NAME
=
"
$GIT_AUTHOR_NAME
";
export
GIT_COMMITTER_NAME
$
GIT_COMMITTER_EMAIL
=
"
$GIT_AUTHOR_EMAIL
";
export
GIT_COMMITTER_EMAIL
$
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
";
export
GIT_COMMITTER_DATE
...
@@ -16,8 +21,10 @@
...
@@ -16,8 +21,10 @@
GIT_AUTHOR_NAME
=
'test'
;
export
GIT_AUTHOR_NAME
$
count
=
10
GIT_AUTHOR_EMAIL
=
'test@example.org'
;
export
GIT_AUTHOR_EMAIL
$
commit
()
GIT_AUTHOR_DATE
=
"2007-01-01 00:00:00 +0000"
;
export
GIT_AUTHOR_DATE
>
{
GIT_COMMITTER_NAME
=
"
$GIT_AUTHOR_NAME
"
;
export
GIT_COMMITTER_NAME
>
GIT_AUTHOR_DATE
=
"
2007-01-01 00:00:
$count
+0000
"
GIT_COMMITTER_EMAIL
=
"
$GIT_AUTHOR_EMAIL
"
;
export
GIT_COMMITTER_EMAIL
>
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
"
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
"
;
export
GIT_COMMITTER_DATE
>
git
commit
"
$@
"
>
/dev/null
2
>
/dev/null
||
echo
"
git commit error
"
>
count
=
`
expr
$count
+ 1
`
>
}
...
@@ -23,10 +30,15 @@
...
@@ -23,10 +30,15 @@
count
=
10
$
mkdir
gitrepo
commit
()
$
cd
gitrepo
{
$
git
init
|
python
-
c
"
import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')
"
GIT_AUTHOR_DATE
=
"2007-01-01 00:00:
$count
+0000"
Initialized
empty
Git
repository
in
gitrepo
/.git/
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
"
git commit
"
$@
"
>
/dev/null 2>/dev/null
||
echo
"git commit error"
$
echo
alpha
>
alpha
count
=
`
expr
$count
+ 1
`
$
git
add
alpha
}
$
commit
-
m 'add alpha'
$
echo
beta
>
beta
$
git
add
beta
$
commit
-
m 'add beta'
$
cd
..
...
@@ -32,11 +44,19 @@
...
@@ -32,11 +44,19 @@
mkdir
gitrepo
$
hg
clone
gitrepo
hgrepo
|
grep
-
v
'
^updating
'
cd
gitrepo
importing
git
objects
into
hg
git init | python
-c
"import sys; print sys.stdin.read().replace('
$(
dirname
$(
pwd
))
/', '')"
2
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
echo
alpha
>
alpha
$
cd
hgrepo
git add alpha
$
hg
log
--
graph
|
grep
-
v
'
: *master
'
commit
-m
'add alpha'
@
changeset:
1
:
7
bcd915dc873
echo
beta
>
beta
|
tag:
default
/
master
git add beta
|
tag:
tip
commit
-m
'add beta'
|
user:
test
<
test@example
.
org
>
|
date:
Mon
Jan
01
00
:
00
:
11
2007
+
0000
|
summary:
add
beta
|
o
changeset:
0
:
3442585
be8a6
user:
test
<
test@example
.
org
>
date:
Mon
Jan
01
00
:
00
:
10
2007
+
0000
summary:
add
alpha
...
@@ -42,9 +62,5 @@
...
@@ -42,9 +62,5 @@
cd
..
$
echo
%
we
should
have
some
bookmarks
%
we
should
have
some
bookmarks
hg clone gitrepo hgrepo |
grep
-v
'^updating'
$
hg
book
cd
hgrepo
*
master
1
:
7
bcd915dc873
hg log
--graph
|
grep
-v
': *master'
echo
% we should have some bookmarks
hg book
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment