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
ab8099aa
Commit
ab8099aa
authored
12 years ago
by
David M. Carr
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-empty-working-tree
parent
9f061212
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-empty-working-tree.out
+0
-16
0 additions, 16 deletions
tests/test-empty-working-tree.out
tests/test-empty-working-tree.t
+61
-47
61 additions, 47 deletions
tests/test-empty-working-tree.t
with
61 additions
and
63 deletions
tests/test-empty-working-tree.out
deleted
100644 → 0
+
0
−
16
View file @
9f061212
Initialized empty Git repository in gitrepo/.git/
Initialized empty Git repository in gitrepo2/
importing git objects into hg
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
files:
clearing out the git cache data
pushing to git://localhost/gitrepo2
exporting hg objects to git
creating and sending data
commit 678256865a8c85ae925bf834369264193c88f8de
Author: test <test@example.org>
Date: Mon Jan 1 00:00:00 2007 +0000
empty
This diff is collapsed.
Click to expand it.
tests/test-empty-working-tree
→
tests/test-empty-working-tree
.t
+
61
−
47
View file @
ab8099aa
#!/bin/sh
# Fails for some reason, need to investigate
# $ "$TESTDIR/hghave" git || exit 80
...
...
@@ -2,4 +3,4 @@
# 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
...
...
@@ -5,4 +6,4 @@
#
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
...
...
@@ -8,4 +9,5 @@
# 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
$TESTDIR
))/hggit
"
>>
$HGRCPATH
$
echo
'
hgext.bookmarks =
'
>>
$HGRCPATH
...
...
@@ -11,7 +13,7 @@
echo
"[extensions]"
>>
$HGRCPATH
echo
"hggit=
$(
echo
$(
dirname
$(
dirname
$0
)))
/hggit"
>>
$HGRCPATH
echo
'hgext.bookmarks ='
>>
$HGRCPATH
cat
>>
$HGRCPATH
<<
EOF
$
cat
>>
$HGRCPATH
<<
EOF
>
>
[
bookmarks
]
>
track
.
current
=
True
>
EOF
...
...
@@ -17,5 +19,8 @@
[bookmarks]
track.current = True
EOF
$
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
...
...
@@ -21,8 +26,9 @@
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/
$
git
commit
--
allow
-
empty
-
m empty >/de
v
/null 2>/d
ev
/
null
||
echo
"
git commit error
"
...
...
@@ -28,5 +34,8 @@
mkdir
gitrepo
cd
gitrepo
git init | python
-c
"import sys; print sys.stdin.read().replace('
$(
dirname
$(
pwd
))
/', '')"
$
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
/
...
...
@@ -32,8 +41,10 @@
git commit
--allow-empty
-m
empty
>
/dev/null 2>/dev/null
||
echo
"git commit error"
cd
..
mkdir
gitrepo2
cd
gitrepo2
git init
--bare
| python
-c
"import sys; print sys.stdin.read().replace('
$(
dirname
$(
pwd
))
/', '')"
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
...
...
@@ -39,10 +50,8 @@
# 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:
//local
host
/
gitrepo
hgrepo
|
grep
-
v
'
^updating
'
importing
git
objects
into
hg
0
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
cd
hgrepo
$
hg
log
-
r
tip
--
template
'
files: {files}\n
'
files:
...
...
@@ -48,5 +57,8 @@
hg clone git://localhost/gitrepo hgrepo |
grep
-v
'^updating'
cd
hgrepo
hg log
-r
tip
--template
'files: {files}\n'
$
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
...
...
@@ -52,4 +64,9 @@
hg gclear
hg push git://localhost/gitrepo2
$
cd
../
gitrepo2
$
git
log
--
pretty
=
medium
commit
678256865
a8c85ae925bf834369264193c88f8de
Author:
test
<
test@example
.
org
>
Date:
Mon
Jan
1
00
:
00
:
00
2007
+
0000
empty
...
...
@@ -55,5 +72,2 @@
cd
../gitrepo2
git log
--pretty
=
medium
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