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
082e2a2d
Commit
082e2a2d
authored
12 years ago
by
David M. Carr
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-git-workflow
parent
ce0b350d
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-workflow.out
+0
-49
0 additions, 49 deletions
tests/test-git-workflow.out
tests/test-git-workflow.t
+108
-61
108 additions, 61 deletions
tests/test-git-workflow.t
with
108 additions
and
110 deletions
tests/test-git-workflow.out
deleted
100644 → 0
+
0
−
49
View file @
ce0b350d
@ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2
tag: tip
parent: -1:0000000000000000000000000000000000000000
parent: -1:0000000000000000000000000000000000000000
manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
user: test
date: Mon Jan 01 00:00:10 2007 +0000
files+: alpha
extra: branch=default
description:
add alpha
% configure for use from git
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
exporting hg objects to git
% do some work
Already on "master"
% get things back to hg
importing git objects into hg
o changeset: 1:7108ae7bd184226a29b8203619a8253d314643bf
| tag: tip
| parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2
| parent: -1:0000000000000000000000000000000000000000
| manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d
| user: test <test@example.org>
| date: Mon Jan 01 00:00:11 2007 +0000
| files+: beta
| extra: branch=default
| description:
| add beta
|
|
o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2
parent: -1:0000000000000000000000000000000000000000
parent: -1:0000000000000000000000000000000000000000
manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
user: test
date: Mon Jan 01 00:00:10 2007 +0000
files+: alpha
extra: branch=default
description:
add alpha
% gimport should have updated the bookmarks as well
master 1:7108ae7bd184
This diff is collapsed.
Click to expand it.
tests/test-git-workflow
→
tests/test-git-workflow
.t
+
108
−
61
View file @
082e2a2d
#!/bin/sh
# Fails for some reason, need to investigate
# $ "$TESTDIR/hghave" git || exit 80
...
...
@@ -2,4 +3,7 @@
# 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
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,16 @@
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
"
>
count
=
`
expr
$count
+ 1
`
>
}
$
hgcommit
()
>
{
>
HGDATE
=
"
2007-01-01 00:00:
$count
+0000
"
>
hg
commit
-
d
"
$HGDATE
"
"
$@
"
>
/dev/null
2
>
/dev/null
||
echo
"
hg commit error
"
>
count
=
`
expr
$count
+ 1
`
>
}
...
...
@@ -16,8 +36,23 @@
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
hgrepo
$
cd
hgrepo
$
hg
init
$
echo
alpha
>
alpha
$
hg
add
alpha
$
hgcommit
-
m "add alpha"
$
hg
log
--
graph
--
debug
|
grep
-
v
phase:
@
changeset:
0
:
0221
c246a56712c6aa64e5ee382244d8a471b1e2
tag:
tip
parent:
-
1
:
0000000000000000000000000000000000000000
parent:
-
1
:
0000000000000000000000000000000000000000
manifest:
0
:
8
b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
user:
test
date:
Mon
Jan
01
00
:
00
:
10
2007
+
0000
files
+
:
alpha
extra:
branch
=
default
description:
add
alpha
...
...
@@ -23,16 +58,3 @@
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"
count
=
`
expr
$count
+ 1
`
}
hgcommit
()
{
HGDATE
=
"2007-01-01 00:00:
$count
+0000"
hg commit
-d
"
$HGDATE
"
"
$@
"
>
/dev/null 2>/dev/null
||
echo
"hg commit error"
count
=
`
expr
$count
+ 1
`
}
$
cd
..
...
...
@@ -38,5 +60,15 @@
mkdir
hgrepo
cd
hgrepo
hg init
$
echo
%
configure
for
use
from
git
%
configure
for
use
from
git
$
hg
clone
hgrepo
gitrepo
updating
to
branch
default
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
cd
gitrepo
$
hg
book
master
$
hg
up
null
0
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
$
echo
"
[git]
"
>>
.
hg
/
hgrc
$
echo
"
intree = True
"
>>
.
hg
/
hgrc
$
hg
gexport
exporting
hg
objects
to
git
...
...
@@ -42,6 +74,10 @@
echo
alpha
>
alpha
hg add alpha
hgcommit
-m
"add alpha"
hg log
--graph
--debug
|
grep
-v
phase:
$
echo
%
do
some
work
%
do
some
work
$
git
config
core
.
bare
false
$
git
checkout
master
2
>&
1
|
sed
s/\'/\"/g
Already
on
"
master
"
$
echo
beta
>
beta
$
git
add
beta
$
commit
-
m 'add beta'
...
...
@@ -47,24 +83,35 @@
cd
..
echo
% configure
for
use from git
hg clone hgrepo gitrepo
cd
gitrepo
hg book master
hg up null
echo
"[git]"
>>
.hg/hgrc
echo
"intree = True"
>>
.hg/hgrc
hg gexport
echo
%
do
some work
git config core.bare
false
git checkout master 2>&1 |
sed
s/
\'
/
\"
/g
echo
beta
>
beta
git add beta
commit
-m
'add beta'
echo
% get things back to hg
hg gimport
hg log
--graph
--debug
|
grep
-v
': *master'
|
grep
-v
phase:
echo
% gimport should have updated the bookmarks as well
hg bookmarks
$
echo
%
get
things
back
to
hg
%
get
things
back
to
hg
$
hg
gimport
importing
git
objects
into
hg
$
hg
log
--
graph
--
debug
|
grep
-
v
'
: *master
'
|
grep
-
v
phase:
o
changeset:
1
:
7108
ae7bd184226a29b8203619a8253d314643bf
|
tag:
tip
|
parent:
0
:
0221
c246a56712c6aa64e5ee382244d8a471b1e2
|
parent:
-
1
:
0000000000000000000000000000000000000000
|
manifest:
1
:
f0bd6fbafbaebe4bb59c35108428f6fce152431d
|
user:
test
<
test@example
.
org
>
|
date:
Mon
Jan
01
00
:
00
:
11
2007
+
0000
|
files
+
:
beta
|
extra:
branch
=
default
|
description:
|
add
beta
|
|
o
changeset:
0
:
0221
c246a56712c6aa64e5ee382244d8a471b1e2
parent:
-
1
:
0000000000000000000000000000000000000000
parent:
-
1
:
0000000000000000000000000000000000000000
manifest:
0
:
8
b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
user:
test
date:
Mon
Jan
01
00
:
00
:
10
2007
+
0000
files
+
:
alpha
extra:
branch
=
default
description:
add
alpha
$
echo
%
gimport
should
have
updated
the
bookmarks
as
well
%
gimport
should
have
updated
the
bookmarks
as
well
$
hg
bookmarks
master
1
:
7108
ae7bd184
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