Mercurial > hg > hg-git

annotate tests/test-file-removal @ 130:8241f16a114e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: suppress netcat's error messages.
author Dmitriy Taychenachev <dimichxp@gmail.com>
date Thu, 14 May 2009 20:21:36 -0700
parents 93980820bba1
children 1224d118ac92
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 #!/bin/sh
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 # Fails for some reason, need to investigate
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 # "$TESTDIR/hghave" git || exit 80
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 # bail early if the user is already running git-daemon
130
8241f16a114e tests: suppress netcat's error messages.
Dmitriy Taychenachev <dimichxp@gmail.com>
parents: 117
diff changeset
7 echo hi | nc localhost 9418 2>/dev/null && exit 80
18
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 echo "[extensions]" >> $HGRCPATH
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 echo "hggit=$(echo $(dirname $(dirname $0)))" >> $HGRCPATH
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 echo 'hgext.graphlog =' >> $HGRCPATH
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 echo 'hgext.bookmarks =' >> $HGRCPATH
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18 GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 count=10
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22 commit()
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 {
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 count=`expr $count + 1`
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 }
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30 mkdir gitrepo
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 cd gitrepo
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32 git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 echo alpha > alpha
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 git add alpha
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 commit -m 'add alpha'
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 echo beta > beta
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 git add beta
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 commit -m 'add beta'
50
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
39 mkdir foo
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
40 echo blah > foo/bar
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
41 git add foo
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
42 commit -m 'add foo'
20
9a93e8b0ec64 Add failing test for file removals.
Augie Fackler <durin42@gmail.com>
parents: 18
diff changeset
43 git rm alpha
9a93e8b0ec64 Add failing test for file removals.
Augie Fackler <durin42@gmail.com>
parents: 18
diff changeset
44 commit -m 'remove alpha'
50
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
45 git rm foo/bar
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
46 commit -m 'remove foo/bar'
27
dc12a36a8d2b Updated test expectations.
Augie Fackler <durin42@gmail.com>
parents: 20
diff changeset
47 echo % final manifest in git is just beta
dc12a36a8d2b Updated test expectations.
Augie Fackler <durin42@gmail.com>
parents: 20
diff changeset
48 git ls-files
18
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
50 # dulwich does not presently support local git repos, workaround
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
51 cd ..
31
48a639cceea6 git-daemon is really git daemon now.
Augie Fackler <durin42@gmail.com>
parents: 27
diff changeset
52 git daemon --base-path="$(pwd)"\
117
93980820bba1 tests: Work around a bug in certain git versions on OS X.
Augie Fackler <durin42@gmail.com>
parents: 50
diff changeset
53 --listen=localhost\
18
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
54 --export-all\
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
55 --pid-file=gitdaemon.pid \
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
56 --detach --reuseaddr
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
57
117
93980820bba1 tests: Work around a bug in certain git versions on OS X.
Augie Fackler <durin42@gmail.com>
parents: 50
diff changeset
58 hg gclone git://localhost/gitrepo hgrepo
18
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
59 cd hgrepo
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
60 hg log --graph
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
61
50
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
62 echo
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
63 echo % make sure alpha is not in this manifest
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
64 hg manifest -r 3
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
65
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
66 echo
d274092e3b24 Hacky implementation of file removals.
Augie Fackler <durin42@gmail.com>
parents: 31
diff changeset
67 echo % make sure that only beta is in the manifest
20
9a93e8b0ec64 Add failing test for file removals.
Augie Fackler <durin42@gmail.com>
parents: 18
diff changeset
68 hg manifest
9a93e8b0ec64 Add failing test for file removals.
Augie Fackler <durin42@gmail.com>
parents: 18
diff changeset
69
18
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
70 cd ..
feab56c76c92 Add a basic test for cloning.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
71 kill `cat gitdaemon.pid`