Skip to content
Snippets Groups Projects
Commit 1224d118 authored by Abderrahim Kitouni's avatar Abderrahim Kitouni
Browse files

Update tests

parent 7bf98d30
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@
# "$TESTDIR/hghave" git || exit 80
# bail early if the user is already running git-daemon
echo hi | nc localhost 9418 && exit 80
echo hi | nc localhost 9418 2> /dev/null && exit 80
echo "[extensions]" >> $HGRCPATH
echo "hggit=$(echo $(dirname $(dirname $0)))" >> $HGRCPATH
......@@ -31,7 +31,7 @@
--pid-file=gitdaemon.pid \
--detach --reuseaddr
hg gclone git://localhost/gitrepo hgrepo
hg clone git://localhost/gitrepo hgrepo
cd hgrepo
hg log -r tip --template 'files: {files}\n'
......
Initialized empty Git repository in gitrepo/.git/
[master (root-commit) 6782568] empty
fetching from : origin
exporting git objects
Created initial commit 6782568: empty
fetching from : git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 2, done.
Total 2 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
......@@ -6,6 +6,8 @@
Counting objects: 2, done.
Total 2 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
at: 0/1
updating working directory
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
files:
clearing out the git cache data
......@@ -9,5 +11,5 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
files:
clearing out the git cache data
exporting git objects
importing Hg objects into Git
at: 0/1
......@@ -13,2 +15,1 @@
at: 0/1
converting revision 0
......@@ -55,7 +55,7 @@
--pid-file=gitdaemon.pid \
--detach --reuseaddr
hg gclone git://localhost/gitrepo hgrepo
hg clone git://localhost/gitrepo hgrepo
cd hgrepo
hg log --graph
......
......@@ -4,9 +4,9 @@
rm 'foo/bar'
% final manifest in git is just beta
beta
fetching from : origin
exporting git objects
fetching from : git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 14, done.
Compressing objects: 12% (1/8) Compressing objects: 25% (2/8) Compressing objects: 37% (3/8) Compressing objects: 50% (4/8) Compressing objects: 62% (5/8) Compressing objects: 75% (6/8) Compressing objects: 87% (7/8) Compressing objects: 100% (8/8) Compressing objects: 100% (8/8), done.
Total 14 (delta 1), reused 0 (delta 0)
importing Git objects into Hg
......@@ -9,6 +9,8 @@
Counting objects: 14, done.
Compressing objects: 12% (1/8) Compressing objects: 25% (2/8) Compressing objects: 37% (3/8) Compressing objects: 50% (4/8) Compressing objects: 62% (5/8) Compressing objects: 75% (6/8) Compressing objects: 87% (7/8) Compressing objects: 100% (8/8) Compressing objects: 100% (8/8), done.
Total 14 (delta 1), reused 0 (delta 0)
importing Git objects into Hg
at: 0/5
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 4:ea41a3f0ed10
......@@ -13,6 +15,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 4:ea41a3f0ed10
| tag: origin/master
| tag: master
| tag: default/master
| tag: tip
| user: test <test@example.org>
| date: Mon Jan 01 00:00:14 2007 +0000
......
......@@ -45,7 +45,7 @@
--pid-file=gitdaemon.pid \
--detach --reuseaddr
hg gclone git://localhost/gitrepo hgrepo
hg clone git://localhost/gitrepo hgrepo
cd hgrepo
hg log --graph
......
Initialized empty Git repository in gitrepo/.git/
fetching from : origin
exporting git objects
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
......@@ -5,6 +5,8 @@
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/2
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 1:7bcd915dc873
......@@ -9,6 +11,7 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 1:7bcd915dc873
| tag: origin/master
| tag: master
| tag: default/master
| tag: tip
| user: test <test@example.org>
| date: Mon Jan 01 00:00:11 2007 +0000
......@@ -20,4 +23,4 @@
summary: add alpha
% we should have some bookmarks
* origin/master 1:7bcd915dc873
* master 1:7bcd915dc873
......
......@@ -44,7 +44,7 @@
--pid-file=gitdaemon.pid \
--detach --reuseaddr
hg gclone git://localhost/gitrepo hgrepo
hg clone git://localhost/gitrepo hgrepo
cd hgrepo
hg log --graph
......
Initialized empty Git repository in gitrepo/.git/
fetching from : origin
exporting git objects
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
......@@ -5,5 +5,6 @@
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/2
creating bookmarks failed, do you have bookmarks enabled?
......@@ -9,3 +10,4 @@
creating bookmarks failed, do you have bookmarks enabled?
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 1:7bcd915dc873
......@@ -10,5 +12,6 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 1:7bcd915dc873
| tag: default/master
| tag: tip
| user: test <test@example.org>
| date: Mon Jan 01 00:00:11 2007 +0000
......
......@@ -4,7 +4,7 @@
# "$TESTDIR/hghave" git || exit 80
# bail early if the user is already running git-daemon
echo hi | nc localhost 9418 && exit 80
echo hi | nc localhost 9418 2> /dev/null && exit 80
echo "[extensions]" >> $HGRCPATH
echo "hggit=$(echo $(dirname $(dirname $0)))" >> $HGRCPATH
......@@ -47,7 +47,7 @@
--pid-file=gitdaemon.pid \
--detach --reuseaddr
hg gclone git://localhost/gitrepo hgrepo
hg clone git://localhost/gitrepo hgrepo
cd hgrepo
hg log -r tip --template 'adds: {file_adds}\ndels: {file_dels}\n'
......
Initialized empty Git repository in gitrepo/.git/
[master (root-commit) 60fd61f] initial
Created initial commit 60fd61f: initial
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 d1/f1
create mode 100644 d1/f2
......@@ -4,6 +4,6 @@
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 d1/f1
create mode 100644 d1/f2
[master a2e8665] rename
Created commit a2e8665: rename
1 files changed, 0 insertions(+), 0 deletions(-)
rename {d1 => d2}/f2 (100%)
......@@ -8,8 +8,8 @@
1 files changed, 0 insertions(+), 0 deletions(-)
rename {d1 => d2}/f2 (100%)
fetching from : origin
exporting git objects
fetching from : git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 8, done.
Compressing objects: 25% (1/4) Compressing objects: 50% (2/4) Compressing objects: 75% (3/4) Compressing objects: 100% (4/4) Compressing objects: 100% (4/4), done.
Total 8 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
......@@ -12,7 +12,9 @@
Counting objects: 8, done.
Compressing objects: 25% (1/4) Compressing objects: 50% (2/4) Compressing objects: 75% (3/4) Compressing objects: 100% (4/4) Compressing objects: 100% (4/4), done.
Total 8 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
at: 0/2
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
adds: d2/f2
dels: d1/f2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment