Skip to content

Commit 28c5d9e

Browse files
barrbrainjrn
barrbrain
authored and
jrn
committed
vcs-svn: drop string_pool
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>
1 parent 0308797 commit 28c5d9e

File tree

7 files changed

+4
-224
lines changed

7 files changed

+4
-224
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
/test-run-command
178178
/test-sha1
179179
/test-sigchain
180-
/test-string-pool
181180
/test-subprocess
182181
/test-svn-fe
183182
/test-treap

‎Makefile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ TEST_PROGRAMS_NEED_X += test-path-utils
430430
TEST_PROGRAMS_NEED_X += test-run-command
431431
TEST_PROGRAMS_NEED_X += test-sha1
432432
TEST_PROGRAMS_NEED_X += test-sigchain
433-
TEST_PROGRAMS_NEED_X += test-string-pool
434433
TEST_PROGRAMS_NEED_X += test-subprocess
435434
TEST_PROGRAMS_NEED_X += test-svn-fe
436435
TEST_PROGRAMS_NEED_X += test-treap
@@ -1838,10 +1837,9 @@ ifndef NO_CURL
18381837
endif
18391838
XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
18401839
xdiff/xmerge.o xdiff/xpatience.o
1841-
VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \
1842-
vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o
1843-
VCSSVN_TEST_OBJS = test-obj-pool.o test-string-pool.o \
1844-
test-line-buffer.o test-treap.o
1840+
VCSSVN_OBJS = vcs-svn/line_buffer.o vcs-svn/repo_tree.o \
1841+
vcs-svn/fast_export.o vcs-svn/svndump.o
1842+
VCSSVN_TEST_OBJS = test-obj-pool.o test-line-buffer.o test-treap.o
18451843
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
18461844

18471845
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
@@ -1965,7 +1963,7 @@ xdiff-interface.o $(XDIFF_OBJS): \
19651963
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
19661964

19671965
$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \
1968-
vcs-svn/obj_pool.h vcs-svn/trp.h vcs-svn/string_pool.h \
1966+
vcs-svn/obj_pool.h vcs-svn/trp.h \
19691967
vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
19701968
vcs-svn/svndump.h
19711969

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

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

2136-
test-string-pool$X: vcs-svn/lib.a
2137-
21382134
test-svn-fe$X: vcs-svn/lib.a
21392135

21402136
.PRECIOUS: $(TEST_OBJS)

‎t/t0080-vcs-svn.sh‎

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

79-
test_expect_success 'string pool' '
80-
echo a does not equal b >expected.differ &&
81-
echo a equals a >expected.match &&
82-
echo equals equals equals >expected.matchmore &&
83-
84-
test-string-pool "a,--b" >actual.differ &&
85-
test-string-pool "a,a" >actual.match &&
86-
test-string-pool "equals-equals" >actual.matchmore &&
87-
test_must_fail test-string-pool a,a,a &&
88-
test_must_fail test-string-pool a &&
89-
90-
test_cmp expected.differ actual.differ &&
91-
test_cmp expected.match actual.match &&
92-
test_cmp expected.matchmore actual.matchmore
93-
'
94-
9579
test_expect_success 'treap sort' '
9680
cat <<-\EOF >unsorted &&
9781
68

‎test-string-pool.c‎

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

‎vcs-svn/string_pool.c‎

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

‎vcs-svn/string_pool.h‎

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

‎vcs-svn/string_pool.txt‎

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

0 commit comments

Comments
 (0)