Skip to content

Commit c19d653

Browse files
committed
Merge branch 'db/svn-fe-code-purge' into svn-fe
* db/svn-fe-code-purge: vcs-svn: drop obj_pool vcs-svn: drop treap vcs-svn: drop string_pool vcs-svn: pass paths through to fast-import Conflicts: vcs-svn/fast_export.c vcs-svn/fast_export.h vcs-svn/repo_tree.c vcs-svn/repo_tree.h vcs-svn/string_pool.c vcs-svn/svndump.c vcs-svn/trp.txt
2 parents 9ecfa8a + cba3546 commit c19d653

18 files changed

+61
-983
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,13 @@
169169
/test-line-buffer
170170
/test-match-trees
171171
/test-mktemp
172-
/test-obj-pool
173172
/test-parse-options
174173
/test-path-utils
175174
/test-run-command
176175
/test-sha1
177176
/test-sigchain
178-
/test-string-pool
179177
/test-subprocess
180178
/test-svn-fe
181-
/test-treap
182179
/common-cmds.h
183180
*.tar.gz
184181
*.dsc

Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,16 +425,13 @@ TEST_PROGRAMS_NEED_X += test-dump-cache-tree
425425
TEST_PROGRAMS_NEED_X += test-genrandom
426426
TEST_PROGRAMS_NEED_X += test-line-buffer
427427
TEST_PROGRAMS_NEED_X += test-match-trees
428-
TEST_PROGRAMS_NEED_X += test-obj-pool
429428
TEST_PROGRAMS_NEED_X += test-parse-options
430429
TEST_PROGRAMS_NEED_X += test-path-utils
431430
TEST_PROGRAMS_NEED_X += test-run-command
432431
TEST_PROGRAMS_NEED_X += test-sha1
433432
TEST_PROGRAMS_NEED_X += test-sigchain
434-
TEST_PROGRAMS_NEED_X += test-string-pool
435433
TEST_PROGRAMS_NEED_X += test-subprocess
436434
TEST_PROGRAMS_NEED_X += test-svn-fe
437-
TEST_PROGRAMS_NEED_X += test-treap
438435
TEST_PROGRAMS_NEED_X += test-index-version
439436
TEST_PROGRAMS_NEED_X += test-mktemp
440437

@@ -1837,10 +1834,9 @@ ifndef NO_CURL
18371834
endif
18381835
XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
18391836
xdiff/xmerge.o xdiff/xpatience.o
1840-
VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \
1841-
vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o
1842-
VCSSVN_TEST_OBJS = test-obj-pool.o test-string-pool.o \
1843-
test-line-buffer.o test-treap.o
1837+
VCSSVN_OBJS = vcs-svn/line_buffer.o vcs-svn/repo_tree.o \
1838+
vcs-svn/fast_export.o vcs-svn/svndump.o
1839+
VCSSVN_TEST_OBJS = test-line-buffer.o
18441840
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
18451841

18461842
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
@@ -1964,7 +1960,6 @@ xdiff-interface.o $(XDIFF_OBJS): \
19641960
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
19651961

19661962
$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \
1967-
vcs-svn/obj_pool.h vcs-svn/trp.h vcs-svn/string_pool.h \
19681963
vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
19691964
vcs-svn/svndump.h
19701965

@@ -2148,8 +2143,6 @@ test-line-buffer$X: vcs-svn/lib.a
21482143

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

2151-
test-string-pool$X: vcs-svn/lib.a
2152-
21532146
test-svn-fe$X: vcs-svn/lib.a
21542147

21552148
.PRECIOUS: $(TEST_OBJS)

t/t0080-vcs-svn.sh

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

test-obj-pool.c

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

test-string-pool.c

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

0 commit comments

Comments
 (0)