Skip to content

Commit 5db348d

Browse files
barrbrainjrn
authored andcommitted
vcs-svn: drop treap
This reverts commit 951f316 (Add treap implementation, 2010-08-09). The string_pool was trp.h's last user. Signed-off-by: David Barr <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]>
1 parent 28c5d9e commit 5db348d

File tree

7 files changed

+2
-445
lines changed

7 files changed

+2
-445
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@
179179
/test-sigchain
180180
/test-subprocess
181181
/test-svn-fe
182-
/test-treap
183182
/common-cmds.h
184183
*.tar.gz
185184
*.dsc

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ TEST_PROGRAMS_NEED_X += test-sha1
432432
TEST_PROGRAMS_NEED_X += test-sigchain
433433
TEST_PROGRAMS_NEED_X += test-subprocess
434434
TEST_PROGRAMS_NEED_X += test-svn-fe
435-
TEST_PROGRAMS_NEED_X += test-treap
436435
TEST_PROGRAMS_NEED_X += test-index-version
437436
TEST_PROGRAMS_NEED_X += test-mktemp
438437

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

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

19651964
$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \
1966-
vcs-svn/obj_pool.h vcs-svn/trp.h \
1965+
vcs-svn/obj_pool.h \
19671966
vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
19681967
vcs-svn/svndump.h
19691968

t/t0080-vcs-svn.sh

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,4 @@ test_expect_success 'obj pool: high-water mark' '
7676
test_cmp expected actual
7777
'
7878

79-
test_expect_success 'treap sort' '
80-
cat <<-\EOF >unsorted &&
81-
68
82-
12
83-
13
84-
13
85-
68
86-
13
87-
13
88-
21
89-
10
90-
11
91-
12
92-
13
93-
13
94-
EOF
95-
sort unsorted >expected &&
96-
97-
test-treap <unsorted >actual &&
98-
test_cmp expected actual
99-
'
100-
10179
test_done

test-treap.c

Lines changed: 0 additions & 70 deletions
This file was deleted.

vcs-svn/LICENSE

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
Copyright (C) 2010 David Barr <[email protected]>.
22
All rights reserved.
33

4-
Copyright (C) 2008 Jason Evans <[email protected]>.
5-
All rights reserved.
6-
74
Copyright (C) 2005 Stefan Hegny, hydrografix Consulting GmbH,
85
Frankfurt/Main, Germany
96
and others, see http://svn2cc.sarovar.org

vcs-svn/trp.h

Lines changed: 0 additions & 237 deletions
This file was deleted.

0 commit comments

Comments
 (0)