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
f40d18ff
Commit
f40d18ff
authored
15 years ago
by
Abderrahim Kitouni
Browse files
Options
Downloads
Patches
Plain Diff
add test for named branches
parent
9a27c618
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
tests/test-hg-author
+0
-0
0 additions, 0 deletions
tests/test-hg-author
tests/test-hg-author.out
+0
-0
0 additions, 0 deletions
tests/test-hg-author.out
tests/test-hg-branch
+72
-0
72 additions, 0 deletions
tests/test-hg-branch
tests/test-hg-branch.out
+74
-0
74 additions, 0 deletions
tests/test-hg-branch.out
with
146 additions
and
0 deletions
tests/test-
git-push
→
tests/test-
hg-author
+
0
−
0
View file @
f40d18ff
This diff is collapsed.
Click to expand it.
tests/test-
git-push
.out
→
tests/test-
hg-author
.out
+
0
−
0
View file @
f40d18ff
This diff is collapsed.
Click to expand it.
tests/test-hg-branch
0 → 100755
+
72
−
0
View file @
f40d18ff
#!/bin/sh
# 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
echo
"[extensions]"
>>
$HGRCPATH
echo
"hggit=
$(
echo
$(
dirname
$(
dirname
$0
)))
"
>>
$HGRCPATH
echo
'hgext.graphlog ='
>>
$HGRCPATH
echo
'hgext.bookmarks ='
>>
$HGRCPATH
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
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
"hg 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
`
}
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"
# dulwich does not presently support local git repos, workaround
cd
..
git daemon
--base-path
=
"
$(
pwd
)
"
\
--listen
=
localhost
\
--export-all
\
--pid-file
=
gitdaemon.pid
\
--detach
--reuseaddr
\
--enable
=
receive-pack
hg clone git://localhost/gitrepo hgrepo
cd
hgrepo
hg
mv
alpha beta
hgcommit
-m
'rename alpha to beta'
hg push
hg branch gamma
hgcommit
-m
'started branch gamma'
hg push
hg log
--graph
cd
..
hg clone git://localhost/gitrepo hgrepo2
cd
hgrepo2
hg log
--graph
cd
..
kill
`
cat
gitdaemon.pid
`
This diff is collapsed.
Click to expand it.
tests/test-hg-branch.out
0 → 100644
+
74
−
0
View file @
f40d18ff
Initialized empty Git repository in gitrepo/.git/
fetching from : git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 3, done.
Total 3 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
at: 0/1
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to git://localhost/gitrepo
fetching from : git://localhost/gitrepo
importing Hg objects into Git
at: 0/1
importing Git objects into Hg
pushing to : git://localhost/gitrepo
creating and sending data
default::refs/heads/master => GIT:05c2bcbe
marked working directory as branch gamma
pushing to git://localhost/gitrepo
fetching from : git://localhost/gitrepo
importing Hg objects into Git
at: 0/1
importing Git objects into Hg
pushing to : git://localhost/gitrepo
creating and sending data
default::refs/heads/master => GIT:296802ef
@ changeset: 2:698615204564
| branch: gamma
| tag: master
| tag: default/master
| tag: tip
| user: test
| date: Mon Jan 01 00:00:12 2007 +0000
| summary: started branch gamma
|
o changeset: 1:71414c4e3c6f
| user: test
| date: Mon Jan 01 00:00:11 2007 +0000
| summary: rename alpha to beta
|
o changeset: 0:3442585be8a6
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
fetching from : git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 6, done.
Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressing objects: 100% (3/3) Compressing objects: 100% (3/3), done.
Total 6 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
at: 0/3
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
o changeset: 2:698615204564
| branch: gamma
| tag: master
| tag: default/master
| tag: tip
| user: test
| date: Mon Jan 01 00:00:12 2007 +0000
| summary: started branch gamma
|
@ changeset: 1:71414c4e3c6f
| user: test
| date: Mon Jan 01 00:00:11 2007 +0000
| summary: rename alpha to beta
|
o changeset: 0:3442585be8a6
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
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