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
533a0b71
Commit
533a0b71
authored
12 years ago
by
David M. Carr
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-merge
parent
61927d60
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-merge.out
+0
-53
0 additions, 53 deletions
tests/test-merge.out
tests/test-merge.t
+119
-68
119 additions, 68 deletions
tests/test-merge.t
with
119 additions
and
121 deletions
tests/test-merge.out
deleted
100644 → 0
+
0
−
53
View file @
61927d60
Initialized empty Git repository in gitrepo/.git/
Switched to a new branch "beta"
Switched to branch "master"
Merge successful
beta | 1 +
1 file changed, 1 insertion(+)
create mode 100644 beta
Initialized empty Git repository in gitrepo2/
importing git objects into hg
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% clear the cache to be sure it is regenerated correctly
clearing out the git cache data
pushing to git://localhost/gitrepo2
exporting hg objects to git
creating and sending data
% git log in repo pushed from hg
commit 5806851511aaf3bfe813ae3a86c5027165fa9b96
Merge: e5023f9 9497a4e
Author: test <test@example.org>
Date: Mon Jan 1 00:00:12 2007 +0000
Merge branch 'beta'
commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9
Author: test <test@example.org>
Date: Mon Jan 1 00:00:12 2007 +0000
add gamma
commit 9497a4ee62e16ee641860d7677cdb2589ea15554
Author: test <test@example.org>
Date: Mon Jan 1 00:00:11 2007 +0000
add beta
commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
Author: test <test@example.org>
Date: Mon Jan 1 00:00:10 2007 +0000
add alpha
commit 9497a4ee62e16ee641860d7677cdb2589ea15554
Author: test <test@example.org>
Date: Mon Jan 1 00:00:11 2007 +0000
add beta
commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
Author: test <test@example.org>
Date: Mon Jan 1 00:00:10 2007 +0000
add alpha
This diff is collapsed.
Click to expand it.
tests/test-merge
→
tests/test-merge
.t
+
119
−
68
View file @
533a0b71
#!/bin/sh
# Fails for some reason, need to investigate
# $ "$TESTDIR/hghave" git || exit 80
bail
if
the
user
does
not
have
dulwich
$
python
-
c
'
import dulwich, dulwich.repo
'
||
exit
80
...
...
@@ -2,4 +6,4 @@
# Fails for some reason, need to investigate
# "$TESTDIR/hghave" git
|| exit 80
bail
early
if
the
user
is
already
running
git
-
daemon
$
!
(
echo
hi
|
nc
localhost
9418
2
>
/dev/null
)
||
exit
80
...
...
@@ -5,4 +9,6 @@
# bail if the user does not have dulwich
python
-c
'import dulwich, dulwich.repo'
||
exit
80
$
echo
"
[extensions]
"
>>
$HGRCPATH
$
echo
"
hggit=$(echo $(dirname
$TESTDIR
))/hggit
"
>>
$HGRCPATH
$
echo
'
hgext.graphlog =
'
>>
$HGRCPATH
$
echo
'
hgext.bookmarks =
'
>>
$HGRCPATH
...
...
@@ -8,4 +14,8 @@
# bail early if the user is already running git-daemon
echo
hi | nc localhost 9418 2>/dev/null
&&
exit
80
$
GIT_AUTHOR_NAME
=
'
test
';
export
GIT_AUTHOR_NAME
$
GIT_AUTHOR_EMAIL
=
'
test@example.org
';
export
GIT_AUTHOR_EMAIL
$
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_COMMITTER_EMAIL
=
"
$GIT_AUTHOR_EMAIL
";
export
GIT_COMMITTER_EMAIL
$
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
";
export
GIT_COMMITTER_DATE
...
...
@@ -11,6 +21,10 @@
echo
"[extensions]"
>>
$HGRCPATH
echo
"hggit=
$(
echo
$(
dirname
$(
dirname
$0
)))
/hggit"
>>
$HGRCPATH
echo
'hgext.graphlog ='
>>
$HGRCPATH
echo
'hgext.bookmarks ='
>>
$HGRCPATH
$
count
=
10
$
commit
()
>
{
>
GIT_AUTHOR_DATE
=
"
2007-01-01 00:00:
$count
+0000
"
>
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
"
>
git
commit
"
$@
"
>
/dev/null
2
>
/dev/null
||
echo
"
git commit error
"
|
sed
'
s/, 0 deletions(-)//
'
>
count
=
`
expr
$count
+ 1
`
>
}
...
...
@@ -16,8 +30,16 @@
GIT_AUTHOR_NAME
=
'test'
;
export
GIT_AUTHOR_NAME
GIT_AUTHOR_EMAIL
=
'test@example.org'
;
export
GIT_AUTHOR_EMAIL
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_COMMITTER_EMAIL
=
"
$GIT_AUTHOR_EMAIL
"
;
export
GIT_COMMITTER_EMAIL
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
"
;
export
GIT_COMMITTER_DATE
$
mkdir
gitrepo
$
cd
gitrepo
$
git
init
|
python
-
c
"
import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')
"
Initialized
empty
Git
repository
in
gitrepo
/.git/
$
echo
alpha
>
alpha
$
git
add
alpha
$
commit
-
m 'add alpha'
$
git
checkout
-
b
beta
2
>&
1
|
sed
s/\'/\"/g
Switched
to
a
new
branch
"
beta
"
$
echo
beta
>
beta
$
git
add
beta
$
commit
-
m 'add beta'
...
...
@@ -23,10 +45,7 @@
count
=
10
commit
()
{
GIT_AUTHOR_DATE
=
"2007-01-01 00:00:
$count
+0000"
GIT_COMMITTER_DATE
=
"
$GIT_AUTHOR_DATE
"
git commit
"
$@
"
>
/dev/null 2>/dev/null
||
echo
"git commit error"
|
sed
's/, 0 deletions(-)//'
count
=
`
expr
$count
+ 1
`
}
$
git
checkout
master
2
>&
1
|
sed
s/\'/\"/g
Switched
to
branch
"
master
"
$
echo
gamma
>
gamma
$
git
add
gamma
$
commit
-
m 'add gamma'
...
...
@@ -32,8 +51,15 @@
mkdir
gitrepo
cd
gitrepo
git init | python
-c
"import sys; print sys.stdin.read().replace('
$(
dirname
$(
pwd
))
/', '')"
echo
alpha
>
alpha
git add alpha
commit
-m
'add alpha'
clean
merge
$
git
merge
beta
|
sed
"
s/the '//;s/' strategy//
"
|
sed
'
s/^Merge.*recursive.*$/Merge successful/
'
|
sed
'
s/files/file/;s/insertions/insertion/;s/, 0 deletions.*//
'
|
sed
'
s/| */| /
'
Merge
successful
beta
|
1
+
1
file
changed
,
1
insertion
(
+
)
create
mode
100644
beta
$
cd
..
$
mkdir
gitrepo2
$
cd
gitrepo2
$
git
init
--
bare
|
python
-
c
"
import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')
"
Initialized
empty
Git
repository
in
gitrepo2
/
...
...
@@ -39,6 +65,10 @@
git checkout
-b
beta 2>&1 |
sed
s/
\'
/
\"
/g
echo
beta
>
beta
git add beta
commit
-m
'add beta'
dulwich
does
not
presently
support
local
git
repos
,
workaround
$
cd
..
$
git
daemon
--
base
-
path
=
"
$(pwd)
"
\
>
--
listen
=
localhost
\
>
--
export
-
all
\
>
--
pid
-
file
=
"
$DAEMON_PIDS
"
\
>
--
detach
--
reuseaddr
\
>
--
enable
=
receive
-
pack
...
...
@@ -44,6 +74,6 @@
git checkout master 2>&1 |
sed
s/
\'
/
\"
/g
echo
gamma
>
gamma
git add gamma
commit
-m
'add gamma'
$
hg
clone
git:
//local
host
/
gitrepo
hgrepo
|
grep
-
v
'
^updating
'
importing
git
objects
into
hg
3
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
cd
hgrepo
...
...
@@ -49,9 +79,10 @@
# clean merge
git merge beta |
sed
"s/the '//;s/' strategy//"
|
sed
's/^Merge.*recursive.*$/Merge successful/'
|
sed
's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//'
|
sed
's/| */| /'
cd
..
mkdir
gitrepo2
cd
gitrepo2
git init
--bare
| python
-c
"import sys; print sys.stdin.read().replace('
$(
dirname
$(
pwd
))
/', '')"
$
echo
%
clear
the
cache
to
be
sure
it
is
regenerated
correctly
%
clear
the
cache
to
be
sure
it
is
regenerated
correctly
$
hg
gclear
clearing
out
the
git
cache
data
$
hg
push
git:
//local
host
/
gitrepo2
pushing
to
git:
//local
host
/
gitrepo2
exporting
hg
objects
to
git
creating
and
sending
data
...
...
@@ -57,13 +88,43 @@
# dulwich does not presently support local git repos, workaround
cd
..
git daemon
--base-path
=
"
$(
pwd
)
"
\
--listen
=
localhost
\
--export-all
\
--pid-file
=
"
$DAEMON_PIDS
"
\
--detach
--reuseaddr
\
--enable
=
receive-pack
hg clone git://localhost/gitrepo hgrepo |
grep
-v
'^updating'
cd
hgrepo
$
cd
..
$
cd
gitrepo2
$
echo
%
git
log
in
repo
pushed
from
hg
%
git
log
in
repo
pushed
from
hg
$
git
log
--
pretty
=
medium
master
|
sed
'
s/\.\.\.//g
'
commit
5806851511
aaf3bfe813ae3a86c5027165fa9b96
Merge:
e5023f9
9497
a4e
Author:
test
<
test@example
.
org
>
Date:
Mon
Jan
1
00
:
00
:
12
2007
+
0000
Merge
branch
'
beta
'
commit
e5023f9e5cb24fdcec7b6c127cec45d8888e35a9
Author:
test
<
test@example
.
org
>
Date:
Mon
Jan
1
00
:
00
:
12
2007
+
0000
add
gamma
commit
9497
a4ee62e16ee641860d7677cdb2589ea15554
Author:
test
<
test@example
.
org
>
Date:
Mon
Jan
1
00
:
00
:
11
2007
+
0000
add
beta
commit
7
eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
Author:
test
<
test@example
.
org
>
Date:
Mon
Jan
1
00
:
00
:
10
2007
+
0000
add
alpha
$
git
log
--
pretty
=
medium
beta
|
sed
'
s/\.\.\.//g
'
commit
9497
a4ee62e16ee641860d7677cdb2589ea15554
Author:
test
<
test@example
.
org
>
Date:
Mon
Jan
1
00
:
00
:
11
2007
+
0000
add
beta
commit
7
eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
Author:
test
<
test@example
.
org
>
Date:
Mon
Jan
1
00
:
00
:
10
2007
+
0000
add
alpha
...
...
@@ -69,12 +130,2 @@
echo
% clear the cache to be sure it is regenerated correctly
hg gclear
hg push git://localhost/gitrepo2
cd
..
cd
gitrepo2
echo
% git log
in
repo pushed from hg
git log
--pretty
=
medium master |
sed
's/\.\.\.//g'
git log
--pretty
=
medium beta |
sed
's/\.\.\.//g'
cd
..
$
cd
..
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