Skip to content

Commit

Permalink
vcs-svn: drop treap
Browse files Browse the repository at this point in the history
This reverts commit 951f316
(Add treap implementation, 2010-08-09).  The string_pool was
trp.h's last user.

Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  • Loading branch information
David Barr authored and Jonathan Nieder committed Mar 22, 2011
1 parent 28c5d9e commit 5db348d
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 445 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@
/test-sigchain
/test-subprocess
/test-svn-fe
/test-treap
/common-cmds.h
*.tar.gz
*.dsc
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ TEST_PROGRAMS_NEED_X += test-sha1
TEST_PROGRAMS_NEED_X += test-sigchain
TEST_PROGRAMS_NEED_X += test-subprocess
TEST_PROGRAMS_NEED_X += test-svn-fe
TEST_PROGRAMS_NEED_X += test-treap
TEST_PROGRAMS_NEED_X += test-index-version
TEST_PROGRAMS_NEED_X += test-mktemp

Expand Down Expand Up @@ -1839,7 +1838,7 @@ XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
xdiff/xmerge.o xdiff/xpatience.o
VCSSVN_OBJS = vcs-svn/line_buffer.o vcs-svn/repo_tree.o \
vcs-svn/fast_export.o vcs-svn/svndump.o
VCSSVN_TEST_OBJS = test-obj-pool.o test-line-buffer.o test-treap.o
VCSSVN_TEST_OBJS = test-obj-pool.o test-line-buffer.o
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)

dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
Expand Down Expand Up @@ -1963,7 +1962,7 @@ xdiff-interface.o $(XDIFF_OBJS): \
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h

$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \
vcs-svn/obj_pool.h vcs-svn/trp.h \
vcs-svn/obj_pool.h \
vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
vcs-svn/svndump.h

Expand Down
22 changes: 0 additions & 22 deletions t/t0080-vcs-svn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,26 +76,4 @@ test_expect_success 'obj pool: high-water mark' '
test_cmp expected actual
'

test_expect_success 'treap sort' '
cat <<-\EOF >unsorted &&
68
12
13
13
68
13
13
21
10
11
12
13
13
EOF
sort unsorted >expected &&
test-treap <unsorted >actual &&
test_cmp expected actual
'

test_done
70 changes: 0 additions & 70 deletions test-treap.c

This file was deleted.

3 changes: 0 additions & 3 deletions vcs-svn/LICENSE
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
Copyright (C) 2010 David Barr <david.barr@cordelta.com>.
All rights reserved.

Copyright (C) 2008 Jason Evans <jasone@canonware.com>.
All rights reserved.

Copyright (C) 2005 Stefan Hegny, hydrografix Consulting GmbH,
Frankfurt/Main, Germany
and others, see http://svn2cc.sarovar.org
Expand Down
237 changes: 0 additions & 237 deletions vcs-svn/trp.h

This file was deleted.

Loading

0 comments on commit 5db348d

Please sign in to comment.