* [PATCH] vcs-svn: remove header files as well
@ 2021-03-14 14:37 René Scharfe.
2021-03-15 3:23 ` Johannes Schindelin
2021-03-15 15:32 ` Jeff King
0 siblings, 2 replies; 3+ messages in thread
From: René Scharfe. @ 2021-03-14 14:37 UTC (permalink / raw)
To: Git List; +Cc: Jeff King, Junio C Hamano
fc47391e24 (drop vcs-svn experiment, 2020-08-13) removed most vcs-svn
files. Drop the remaining header files as well, as they are no longer
used.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
vcs-svn/fast_export.h | 34 ----------------------------------
vcs-svn/line_buffer.h | 30 ------------------------------
vcs-svn/sliding_window.h | 18 ------------------
vcs-svn/svndiff.h | 10 ----------
vcs-svn/svndump.h | 10 ----------
5 files changed, 102 deletions(-)
delete mode 100644 vcs-svn/fast_export.h
delete mode 100644 vcs-svn/line_buffer.h
delete mode 100644 vcs-svn/sliding_window.h
delete mode 100644 vcs-svn/svndiff.h
delete mode 100644 vcs-svn/svndump.h
diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h
deleted file mode 100644
index 9dcf9337c1..0000000000
--- a/vcs-svn/fast_export.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef FAST_EXPORT_H
-#define FAST_EXPORT_H
-
-struct strbuf;
-struct line_buffer;
-
-void fast_export_init(int fd);
-void fast_export_deinit(void);
-
-void fast_export_delete(const char *path);
-void fast_export_modify(const char *path, uint32_t mode, const char *dataref);
-void fast_export_note(const char *committish, const char *dataref);
-void fast_export_begin_note(uint32_t revision, const char *author,
- const char *log, timestamp_t timestamp, const char *note_ref);
-void fast_export_begin_commit(uint32_t revision, const char *author,
- const struct strbuf *log, const char *uuid,const char *url,
- timestamp_t timestamp, const char *local_ref);
-void fast_export_end_commit(uint32_t revision);
-void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input);
-void fast_export_buf_to_data(const struct strbuf *data);
-void fast_export_blob_delta(uint32_t mode,
- uint32_t old_mode, const char *old_data,
- off_t len, struct line_buffer *input);
-
-/* If there is no such file at that rev, returns -1, errno == ENOENT. */
-int fast_export_ls_rev(uint32_t rev, const char *path,
- uint32_t *mode_out, struct strbuf *dataref_out);
-int fast_export_ls(const char *path,
- uint32_t *mode_out, struct strbuf *dataref_out);
-
-void fast_export_copy(uint32_t revision, const char *src, const char *dst);
-const char *fast_export_read_path(const char *path, uint32_t *mode_out);
-
-#endif
diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h
deleted file mode 100644
index e192aedea2..0000000000
--- a/vcs-svn/line_buffer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef LINE_BUFFER_H
-#define LINE_BUFFER_H
-
-#include "strbuf.h"
-
-#define LINE_BUFFER_LEN 10000
-
-struct line_buffer {
- char line_buffer[LINE_BUFFER_LEN];
- FILE *infile;
-};
-#define LINE_BUFFER_INIT { "", NULL }
-
-int buffer_init(struct line_buffer *buf, const char *filename);
-int buffer_fdinit(struct line_buffer *buf, int fd);
-int buffer_deinit(struct line_buffer *buf);
-
-int buffer_tmpfile_init(struct line_buffer *buf);
-FILE *buffer_tmpfile_rewind(struct line_buffer *buf); /* prepare to write. */
-long buffer_tmpfile_prepare_to_read(struct line_buffer *buf);
-
-int buffer_ferror(struct line_buffer *buf);
-char *buffer_read_line(struct line_buffer *buf);
-int buffer_read_char(struct line_buffer *buf);
-size_t buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, size_t len);
-/* Returns number of bytes read (not necessarily written). */
-off_t buffer_copy_bytes(struct line_buffer *buf, off_t len);
-off_t buffer_skip_bytes(struct line_buffer *buf, off_t len);
-
-#endif
diff --git a/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h
deleted file mode 100644
index a7fc0999cb..0000000000
--- a/vcs-svn/sliding_window.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SLIDING_WINDOW_H
-#define SLIDING_WINDOW_H
-
-#include "strbuf.h"
-
-struct sliding_view {
- struct line_buffer *file;
- off_t off;
- size_t width;
- off_t max_off; /* -1 means unlimited */
- struct strbuf buf;
-};
-
-#define SLIDING_VIEW_INIT(input, len) { (input), 0, 0, (len), STRBUF_INIT }
-
-int move_window(struct sliding_view *view, off_t off, size_t width);
-
-#endif
diff --git a/vcs-svn/svndiff.h b/vcs-svn/svndiff.h
deleted file mode 100644
index 625d950bb8..0000000000
--- a/vcs-svn/svndiff.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef SVNDIFF_H
-#define SVNDIFF_H
-
-struct line_buffer;
-struct sliding_view;
-
-int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
- struct sliding_view *preimage, FILE *postimage);
-
-#endif
diff --git a/vcs-svn/svndump.h b/vcs-svn/svndump.h
deleted file mode 100644
index 26faed5968..0000000000
--- a/vcs-svn/svndump.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef SVNDUMP_H
-#define SVNDUMP_H
-
-int svndump_init(const char *filename);
-int svndump_init_fd(int in_fd, int back_fd);
-void svndump_read(const char *url, const char *local_ref, const char *notes_ref);
-void svndump_deinit(void);
-void svndump_reset(void);
-
-#endif
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] vcs-svn: remove header files as well
2021-03-14 14:37 [PATCH] vcs-svn: remove header files as well René Scharfe.
@ 2021-03-15 3:23 ` Johannes Schindelin
2021-03-15 15:32 ` Jeff King
1 sibling, 0 replies; 3+ messages in thread
From: Johannes Schindelin @ 2021-03-15 3:23 UTC (permalink / raw)
To: René Scharfe.; +Cc: Git List, Jeff King, Junio C Hamano
[-- Attachment #1: Type: text/plain, Size: 5583 bytes --]
Hi René,
On Sun, 14 Mar 2021, René Scharfe. wrote:
> fc47391e24 (drop vcs-svn experiment, 2020-08-13) removed most vcs-svn
> files. Drop the remaining header files as well, as they are no longer
> used.
While it is sad to say good-bye to the last chance of replacing the Perl
script `git-svn` with anything that works with less problems on Windows, I
agree it is the right thing to do.
Thanks,
Dscho
>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> vcs-svn/fast_export.h | 34 ----------------------------------
> vcs-svn/line_buffer.h | 30 ------------------------------
> vcs-svn/sliding_window.h | 18 ------------------
> vcs-svn/svndiff.h | 10 ----------
> vcs-svn/svndump.h | 10 ----------
> 5 files changed, 102 deletions(-)
> delete mode 100644 vcs-svn/fast_export.h
> delete mode 100644 vcs-svn/line_buffer.h
> delete mode 100644 vcs-svn/sliding_window.h
> delete mode 100644 vcs-svn/svndiff.h
> delete mode 100644 vcs-svn/svndump.h
>
> diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h
> deleted file mode 100644
> index 9dcf9337c1..0000000000
> --- a/vcs-svn/fast_export.h
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -#ifndef FAST_EXPORT_H
> -#define FAST_EXPORT_H
> -
> -struct strbuf;
> -struct line_buffer;
> -
> -void fast_export_init(int fd);
> -void fast_export_deinit(void);
> -
> -void fast_export_delete(const char *path);
> -void fast_export_modify(const char *path, uint32_t mode, const char *dataref);
> -void fast_export_note(const char *committish, const char *dataref);
> -void fast_export_begin_note(uint32_t revision, const char *author,
> - const char *log, timestamp_t timestamp, const char *note_ref);
> -void fast_export_begin_commit(uint32_t revision, const char *author,
> - const struct strbuf *log, const char *uuid,const char *url,
> - timestamp_t timestamp, const char *local_ref);
> -void fast_export_end_commit(uint32_t revision);
> -void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input);
> -void fast_export_buf_to_data(const struct strbuf *data);
> -void fast_export_blob_delta(uint32_t mode,
> - uint32_t old_mode, const char *old_data,
> - off_t len, struct line_buffer *input);
> -
> -/* If there is no such file at that rev, returns -1, errno == ENOENT. */
> -int fast_export_ls_rev(uint32_t rev, const char *path,
> - uint32_t *mode_out, struct strbuf *dataref_out);
> -int fast_export_ls(const char *path,
> - uint32_t *mode_out, struct strbuf *dataref_out);
> -
> -void fast_export_copy(uint32_t revision, const char *src, const char *dst);
> -const char *fast_export_read_path(const char *path, uint32_t *mode_out);
> -
> -#endif
> diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h
> deleted file mode 100644
> index e192aedea2..0000000000
> --- a/vcs-svn/line_buffer.h
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -#ifndef LINE_BUFFER_H
> -#define LINE_BUFFER_H
> -
> -#include "strbuf.h"
> -
> -#define LINE_BUFFER_LEN 10000
> -
> -struct line_buffer {
> - char line_buffer[LINE_BUFFER_LEN];
> - FILE *infile;
> -};
> -#define LINE_BUFFER_INIT { "", NULL }
> -
> -int buffer_init(struct line_buffer *buf, const char *filename);
> -int buffer_fdinit(struct line_buffer *buf, int fd);
> -int buffer_deinit(struct line_buffer *buf);
> -
> -int buffer_tmpfile_init(struct line_buffer *buf);
> -FILE *buffer_tmpfile_rewind(struct line_buffer *buf); /* prepare to write. */
> -long buffer_tmpfile_prepare_to_read(struct line_buffer *buf);
> -
> -int buffer_ferror(struct line_buffer *buf);
> -char *buffer_read_line(struct line_buffer *buf);
> -int buffer_read_char(struct line_buffer *buf);
> -size_t buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, size_t len);
> -/* Returns number of bytes read (not necessarily written). */
> -off_t buffer_copy_bytes(struct line_buffer *buf, off_t len);
> -off_t buffer_skip_bytes(struct line_buffer *buf, off_t len);
> -
> -#endif
> diff --git a/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h
> deleted file mode 100644
> index a7fc0999cb..0000000000
> --- a/vcs-svn/sliding_window.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -#ifndef SLIDING_WINDOW_H
> -#define SLIDING_WINDOW_H
> -
> -#include "strbuf.h"
> -
> -struct sliding_view {
> - struct line_buffer *file;
> - off_t off;
> - size_t width;
> - off_t max_off; /* -1 means unlimited */
> - struct strbuf buf;
> -};
> -
> -#define SLIDING_VIEW_INIT(input, len) { (input), 0, 0, (len), STRBUF_INIT }
> -
> -int move_window(struct sliding_view *view, off_t off, size_t width);
> -
> -#endif
> diff --git a/vcs-svn/svndiff.h b/vcs-svn/svndiff.h
> deleted file mode 100644
> index 625d950bb8..0000000000
> --- a/vcs-svn/svndiff.h
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -#ifndef SVNDIFF_H
> -#define SVNDIFF_H
> -
> -struct line_buffer;
> -struct sliding_view;
> -
> -int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
> - struct sliding_view *preimage, FILE *postimage);
> -
> -#endif
> diff --git a/vcs-svn/svndump.h b/vcs-svn/svndump.h
> deleted file mode 100644
> index 26faed5968..0000000000
> --- a/vcs-svn/svndump.h
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -#ifndef SVNDUMP_H
> -#define SVNDUMP_H
> -
> -int svndump_init(const char *filename);
> -int svndump_init_fd(int in_fd, int back_fd);
> -void svndump_read(const char *url, const char *local_ref, const char *notes_ref);
> -void svndump_deinit(void);
> -void svndump_reset(void);
> -
> -#endif
> --
> 2.30.2
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] vcs-svn: remove header files as well
2021-03-14 14:37 [PATCH] vcs-svn: remove header files as well René Scharfe.
2021-03-15 3:23 ` Johannes Schindelin
@ 2021-03-15 15:32 ` Jeff King
1 sibling, 0 replies; 3+ messages in thread
From: Jeff King @ 2021-03-15 15:32 UTC (permalink / raw)
To: René Scharfe.; +Cc: Git List, Junio C Hamano
On Sun, Mar 14, 2021 at 03:37:39PM +0100, René Scharfe. wrote:
> fc47391e24 (drop vcs-svn experiment, 2020-08-13) removed most vcs-svn
> files. Drop the remaining header files as well, as they are no longer
> used.
Oops, I don't know how I managed to miss these in my initial commit. It
definitely was not intentional. :)
They were present in the initial patch in 2018:
https://lore.kernel.org/git/20180817190310.GA5360@sigill.intra.peff.net/
but when I later posted it as part of a series in 2020:
https://lore.kernel.org/git/20200813150017.GE891370@coredump.intra.peff.net/
they were gone. I guess I must have made some mistake in rebasing it
forward over time. I'm not sure how, though.
Anyway, this is clearly the right thing to do. Thanks for noticing.
-Peff
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-15 15:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-14 14:37 [PATCH] vcs-svn: remove header files as well René Scharfe.
2021-03-15 3:23 ` Johannes Schindelin
2021-03-15 15:32 ` Jeff King
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.