Mercurial > hg > hg-git

annotate tests/test-pull @ 232:0ba1aee0467c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
initial support for pull -r
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Sat, 01 Aug 2009 17:55:54 +0100
parents
children ea0728d8cdc2 ff2d4f541ae9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
232
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
1 #!/bin/sh
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
2
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
3 # Fails for some reason, need to investigate
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
4 # "$TESTDIR/hghave" git || exit 80
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
5
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
6 # bail early if the user is already running git-daemon
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
7 echo hi | nc localhost 9418 2>/dev/null && exit 80
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
8
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
9 echo "[extensions]" >> $HGRCPATH
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
10 echo "hggit=$(echo $(dirname $(dirname $0)))" >> $HGRCPATH
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
11 echo 'hgext.graphlog =' >> $HGRCPATH
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
12 echo 'hgext.bookmarks =' >> $HGRCPATH
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
13
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
14 GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
15 GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
16 GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
17 GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
18 GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
19 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
20
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
21 count=10
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
22 commit()
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
23 {
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
24 GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
25 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
26 git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
27 count=`expr $count + 1`
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
28 }
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
29
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
30 mkdir gitrepo
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
31 cd gitrepo
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
32 git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
33 echo alpha > alpha
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
34 git add alpha
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
35 commit -m 'add alpha'
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
36
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
37 git tag alpha
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
38
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
39 git checkout -b beta
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
40 echo beta > beta
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
41 git add beta
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
42 commit -m 'add beta'
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
43
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
44
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
45 cd ..
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
46 git daemon --base-path="$(pwd)"\
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
47 --listen=localhost\
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
48 --export-all\
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
49 --pid-file=gitdaemon.pid \
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
50 --detach --reuseaddr
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
51
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
52 echo % clone a tag
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
53 hg clone -r alpha git://localhost/gitrepo hgrepo-a
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
54 cd hgrepo-a
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
55 hg log --graph
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
56
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
57 cd ..
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
58 echo % clone a branch
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
59 hg clone -r beta git://localhost/gitrepo hgrepo-b
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
60 cd hgrepo-b
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
61 hg log --graph
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
62
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
63
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
64 cd ..
0ba1aee0467c initial support for pull -r
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
65 kill `cat gitdaemon.pid`