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
d8c0ad93
Commit
d8c0ad93
authored
12 years ago
by
David M. Carr
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-keywords
parent
6d010ec2
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-keywords.out
+0
-11
0 additions, 11 deletions
tests/test-keywords.out
tests/test-keywords.t
+55
-46
55 additions, 46 deletions
tests/test-keywords.t
with
55 additions
and
57 deletions
tests/test-keywords.out
deleted
100644 → 0
+
0
−
11
View file @
6d010ec2
Initialized empty Git repository in gitrepo/.git/
importing git objects into hg
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 a9da0c7c9bb7574b0f3139ab65cabac7468d6b8d a9da0c7c9bb7
1 7bcd915dc873c654b822f01b0a39269b2739e86d 7bcd915dc873 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1
0 3442585be8a60c6cd476bbc4e45755339f2a23ef 3442585be8a6 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec
fromgit 0
fromgit 1
gitnode_existsA 1
gitnode_existsB 0
This diff is collapsed.
Click to expand it.
tests/test-keywords
→
tests/test-keywords
.t
+
55
−
46
View file @
d8c0ad93
#!/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,5 +13,8 @@
echo
"[extensions]"
>>
$HGRCPATH
echo
"hggit=
$(
echo
$(
dirname
$(
dirname
$0
)))
/hggit"
>>
$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
...
...
@@ -15,8 +20,10 @@
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
"
git commit error
"
>
count
=
`
expr
$count
+ 1
`
>
}
...
...
@@ -22,10 +29,15 @@
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
`
}
$
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'
$
echo
beta
>
beta
$
git
add
beta
$
commit
-
m 'add beta'
$
cd
..
...
...
@@ -31,13 +43,9 @@
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'
echo
beta
>
beta
git add beta
commit
-m
'add beta'
cd
..
$
hg
clone
gitrepo
hgrepo
|
grep
-
v
'
^updating
'
importing
git
objects
into
hg
2
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
cd
hgrepo
$
echo
gamma
>
gamma
$
hg
add
gamma
$
hg
commit
-
m 'add gamma'
...
...
@@ -43,12 +51,13 @@
hg clone gitrepo hgrepo |
grep
-v
'^updating'
cd
hgrepo
echo
gamma
>
gamma
hg add gamma
hg commit
-m
'add gamma'
hg log
--template
"{rev} {node} {node|short} {gitnode} {gitnode|short}
\n
"
hg log
--template
"fromgit {rev}
\n
"
--rev
"fromgit()"
hg log
--template
"gitnode_existsA {rev}
\n
"
--rev
"gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)"
hg log
--template
"gitnode_existsB {rev}
\n
"
--rev
"gitnode(7eeab2ea75ec)"
hg log
--template
"gitnode_notexists {rev}
\n
"
--rev
"gitnode(1234567890ab)"
$
hg
log
--
template
"
{rev} {node} {node|short} {gitnode} {gitnode|short}
\n
"
2
a9da0c7c9bb7574b0f3139ab65cabac7468d6b8d
a9da0c7c9bb7
1
7
bcd915dc873c654b822f01b0a39269b2739e86d
7
bcd915dc873
9497
a4ee62e16ee641860d7677cdb2589ea15554
9497
a4ee62e1
0
3442585
be8a60c6cd476bbc4e45755339f2a23ef
3442585
be8a6
7
eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
7
eeab2ea75ec
$
hg
log
--
template
"
fromgit {rev}
\n
"
--
rev
"
fromgit()
"
fromgit
0
fromgit
1
$
hg
log
--
template
"
gitnode_existsA {rev}
\n
"
--
rev
"
gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)
"
gitnode_existsA
1
$
hg
log
--
template
"
gitnode_existsB {rev}
\n
"
--
rev
"
gitnode(7eeab2ea75ec)
"
gitnode_existsB
0
$
hg
log
--
template
"
gitnode_notexists {rev}
\n
"
--
rev
"
gitnode(1234567890ab)
"
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