Skip to content

Commit

Permalink
vcs-svn: drop string_pool
Browse files Browse the repository at this point in the history
This reverts commit 1d73b52
(Add string-specific memory pool, 2010-08-09).  Now that svn-fe
does not need to maintain a growing collection of strings (paths)
over a long period of time, the string_pool is not needed.

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 0308797 commit 28c5d9e
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 224 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@
/test-run-command
/test-sha1
/test-sigchain
/test-string-pool
/test-subprocess
/test-svn-fe
/test-treap
Expand Down
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,6 @@ TEST_PROGRAMS_NEED_X += test-path-utils
TEST_PROGRAMS_NEED_X += test-run-command
TEST_PROGRAMS_NEED_X += test-sha1
TEST_PROGRAMS_NEED_X += test-sigchain
TEST_PROGRAMS_NEED_X += test-string-pool
TEST_PROGRAMS_NEED_X += test-subprocess
TEST_PROGRAMS_NEED_X += test-svn-fe
TEST_PROGRAMS_NEED_X += test-treap
Expand Down Expand Up @@ -1838,10 +1837,9 @@ ifndef NO_CURL
endif
XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
xdiff/xmerge.o xdiff/xpatience.o
VCSSVN_OBJS = vcs-svn/string_pool.o 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-string-pool.o \
test-line-buffer.o test-treap.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
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)

dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
Expand Down Expand Up @@ -1965,7 +1963,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/string_pool.h \
vcs-svn/obj_pool.h vcs-svn/trp.h \
vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
vcs-svn/svndump.h

Expand Down Expand Up @@ -2133,8 +2131,6 @@ test-line-buffer$X: vcs-svn/lib.a

test-parse-options$X: parse-options.o

test-string-pool$X: vcs-svn/lib.a

test-svn-fe$X: vcs-svn/lib.a

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

test_expect_success 'string pool' '
echo a does not equal b >expected.differ &&
echo a equals a >expected.match &&
echo equals equals equals >expected.matchmore &&
test-string-pool "a,--b" >actual.differ &&
test-string-pool "a,a" >actual.match &&
test-string-pool "equals-equals" >actual.matchmore &&
test_must_fail test-string-pool a,a,a &&
test_must_fail test-string-pool a &&
test_cmp expected.differ actual.differ &&
test_cmp expected.match actual.match &&
test_cmp expected.matchmore actual.matchmore
'

test_expect_success 'treap sort' '
cat <<-\EOF >unsorted &&
68
Expand Down
31 changes: 0 additions & 31 deletions test-string-pool.c

This file was deleted.

113 changes: 0 additions & 113 deletions vcs-svn/string_pool.c

This file was deleted.

12 changes: 0 additions & 12 deletions vcs-svn/string_pool.h

This file was deleted.

43 changes: 0 additions & 43 deletions vcs-svn/string_pool.txt

This file was deleted.

0 comments on commit 28c5d9e

Please sign in to comment.