Update SVN warnings and compile using Go 1.13

Author: Stanislav Kolotinskiy

Dockerfile

@@ -0,0 +1,15 @@
+FROM debian:stretch
+
+VOLUME /app
+
+RUN apt-get update && apt-get -y install git wget curl cmake make gcc g++ liblz4-1 pkg-config liblz4-dev \
+    libutf8proc2 libutf8proc-dev libserf-1-1 libserf-dev libsqlite3-dev zlib1g zlib1g-dev && \
+    cd /usr/src && \
+    wget https://www-eu.apache.org/dist/subversion/subversion-1.13.0.tar.bz2 -q -O subversion.tar.bz2 && \
+    tar xjf subversion.tar.bz2 && cd subversion-1.13.0 && \
+    ./configure --without-berkeley-db && make -j4 && make install && ldconfig && \
+		cd /usr/src && wget https://dl.google.com/go/go1.13.6.linux-amd64.tar.gz -q -O go.tar.gz && \
+		tar xzf go.tar.gz -C /usr/local && ln -sf /usr/local/go/bin/go /usr/local/bin/
+
+WORKDIR /app
+CMD ["/bin/bash"]

Readme.md

@@ -2,11 +2,11 @@ Subversion bindings for go.
 
 #Install
 
-It needs subversion >= 1.8
+It needs subversion >= 1.13.0
 
 You will need libsvn-dev on Ubuntu/Debian or subversion installed with `brew` on OSX. apr-dev and apr-util-dev are also required.
 
-    go get github.com/Assembla/svn2go
+    go get -u github.com/Assembla/svn2go
 
 See svn_test.go for usage.
 

addons.c

@@ -6,12 +6,11 @@
 #include "_cgo_export.h"
 
 svn_error_t *
-Go_svn_repos_get_logs4(svn_repos_t *repos,
+Go_svn_repos_get_logs5(svn_repos_t *repos,
                     const apr_array_header_t *paths,
                     svn_revnum_t start,
                     svn_revnum_t end,
                     int limit,
-                    svn_boolean_t discover_changed_paths,
                     svn_boolean_t strict_node_history,
                     svn_boolean_t include_merged_revisions,
                     const apr_array_header_t *revprops,
@@ -20,31 +19,31 @@ Go_svn_repos_get_logs4(svn_repos_t *repos,
                     svn_log_entry_receiver_t receiver,*/
                     void *receiver_baton,
                     apr_pool_t *pool) {
-	return svn_repos_get_logs4(repos,
+	return svn_repos_get_logs5(repos,
                     paths,
                     start,
                     end,
                     limit,
-                    discover_changed_paths,
                     strict_node_history,
                     include_merged_revisions,
                     revprops,
                     NULL,
                     NULL,
-                    (svn_log_entry_receiver_t)&LogEntryReceiverCallback,
+                    NULL,
+                    NULL,
+                    (svn_repos_log_entry_receiver_t)&LogEntryReceiverCallback,
                     receiver_baton,
                     pool);
 }
 
 svn_error_t *
-Go_repos_history(svn_fs_t *fs,
+Go_svn_repos_history2(svn_fs_t *fs,
                    const char *path,
                    void *history_baton,
                    svn_revnum_t start,
                    svn_revnum_t end,
                    svn_boolean_t cross_copies,
                    apr_pool_t *pool) {
-
     return svn_repos_history2(fs,
                    path,
                    (svn_repos_history_func_t)&HistoryReceiverCallback,

callbacks.go

@@ -1,24 +1,27 @@
 package svn
 
 /*
-#include <svn_types.h>
+#include <svn_repos.h>
 #include <svn_compat.h>
+#include <svn_io.h>
+#include <svn_string.h>
 */
 import "C"
 import (
-	"log"
 	"unsafe"
 )
 
-/* static svn_error_t *
+// LogEntryReceiverCallback implements svn_repos_get_logs5 callback:
+/*
+    static svn_error_t *
 	log_entry_receiver(void *baton,
-                   svn_log_entry_t *log_entry,
+                   svn_repos_log_entry_t *log_entry,
                    apr_pool_t *pool)
 */
 //export LogEntryReceiverCallback
 func LogEntryReceiverCallback(_obj, _entry, _pool unsafe.Pointer) unsafe.Pointer {
 	baton := (*CommitCollector)(_obj)
-	entry := (*C.svn_log_entry_t)(_entry)
+	entry := (*C.svn_repos_log_entry_t)(_entry)
 
 	var author, date, msg *C.char
 	C.svn_compat_log_revprops_out(&author, &date, &msg, entry.revprops)
@@ -27,33 +30,31 @@ func LogEntryReceiverCallback(_obj, _entry, _pool unsafe.Pointer) unsafe.Pointer
 	return nil
 }
 
+// HistoryReceiverCallback implements svn_repos_get_history2 callback
+/* static svn_error_t *
+	svn_repos_history_func_t(void *baton,
+					const char *path,
+                    svn_revnum_t *log_entry,
+                    apr_pool_t *pool)
+*/
 //export HistoryReceiverCallback
 func HistoryReceiverCallback(_obj unsafe.Pointer, path *C.char, revision C.svn_revnum_t, _pool unsafe.Pointer) *C.svn_error_t {
 	baton := (*CommitCollector)(_obj)
 
-	if commit, err := baton.r.CommitInfo(int64(revision)); err != nil {
-		log.Println(err)
-		return nil // ignore
-	} else {
-		baton.commits = append(baton.commits, *commit)
-
-		if len(baton.commits) >= baton.limit {
-			return C.svn_error_create(C.SVN_ERR_CEASE_INVOCATION, nil, nil)
-		}
+	baton.revisions = append(baton.revisions, int64(revision))
+	if len(baton.revisions) >= baton.limit {
+		return C.svn_error_create(C.SVN_ERR_CEASE_INVOCATION, nil, nil)
 	}
 
 	return nil
 }
 
+// StreamWrite implements svn_stream_write callback
 //export StreamWrite
 func StreamWrite(_obj unsafe.Pointer, data *C.char, len *C.apr_size_t) *C.svn_error_t {
-	out := (*stringBuffer)(_obj)
-
-	_, err := out.Write([]byte(C.GoString(data)))
+	out := (*C.svn_stringbuf_t)(_obj)
 
-	if err != nil {
-		log.Println(err)
-	}
+	C.svn_stringbuf_appendbytes(out, data, *len)
 
-	return nil
+	return nil;
 }

changeset.go

@@ -27,12 +27,13 @@ import (
 	"unsafe"
 )
 
+// ChangesetInfo is used to keep commit info
 type ChangesetInfo struct {
 	Commit       *Commit
 	ChangedPaths map[string]*ChangedEntry
 }
 
-// Returns changeset details: author, date, log, change files, dirs, diff of files and properties
+// Changeset returns changeset details: author, date, log, change files, dirs, diff of files and properties
 func (r *Repo) Changeset(rev int64, diffIgnoreSpace bool) (*ChangesetInfo, error) {
 	if rev == 0 {
 		return nil, fmt.Errorf("Invalid revision: %d", rev)
@@ -59,15 +60,13 @@ func (r *Repo) Changeset(rev int64, diffIgnoreSpace bool) (*ChangesetInfo, error
 
 	if e := C.svn_fs_revision_root(&c.baseRoot, r.fs, C.svn_revnum_t(rev)-1, pool); e != nil {
 		return nil, makeError(e)
-	} else {
-		defer C.svn_fs_close_root(c.baseRoot)
 	}
+	defer C.svn_fs_close_root(c.baseRoot)
 
 	if e := C.svn_fs_revision_root(&c.root, r.fs, C.svn_revnum_t(rev), pool); e != nil {
 		return nil, makeError(e)
-	} else {
-		defer C.svn_fs_close_root(c.root)
 	}
+	defer C.svn_fs_close_root(c.root)
 
 	// TODO improvement: rewrite editor #open_file #open_directory to limit entries count that we will process.
 	// We had cases with crazy repos with 16k modifications
@@ -94,6 +93,7 @@ func (r *Repo) Changeset(rev int64, diffIgnoreSpace bool) (*ChangesetInfo, error
 	return rez, nil
 }
 
+// ChangedEntry is used for storing a changed entry
 type ChangedEntry struct {
 	Kind     int    // svn node kind
 	Action   string // file operation A- added,R-changed,D-deleted
@@ -109,11 +109,6 @@ type collector struct {
 	diffIgnoreSpace bool
 }
 
-// Used to collect file diff
-type stringBuffer struct {
-	buf *string
-}
-
 // Collect changed paths
 // similar with print_changed_tree() from svnlook.c
 func (c *collector) collectChangedPaths(node *C.svn_repos_node_t, path string) error {
@@ -173,12 +168,14 @@ func (c *collector) collectChangedPaths(node *C.svn_repos_node_t, path string) e
 			}
 		}
 
-		stream := &stringBuffer{&entry.Diff} // Create string Writer
+		var buf *C.svn_stringbuf_t
+		cdiff := C.CString(entry.Diff)
+		buf = C.svn_stringbuf_create(cdiff, c.r.pool)
 
 		if binaryA || binaryB {
 			entry.IsBinary = true
 			header += "(Binary files differ)\n\n"
-			stream.Write([]byte(header))
+			C.svn_stringbuf_appendcstr(buf, C.CString(header))
 		} else {
 			// TODO check file size and do not dump files bigger than 10Mb for example
 			rootA = c.baseRoot
@@ -223,7 +220,7 @@ func (c *collector) collectChangedPaths(node *C.svn_repos_node_t, path string) e
 			}
 
 			if C.svn_diff_contains_diffs(diff) == C.TRUE {
-				stream.Write([]byte(header))
+				C.svn_stringbuf_appendcstr(buf, C.CString(header))
 
 				//log.Println("Has diff")
 				if rootA != nil {
@@ -239,16 +236,29 @@ func (c *collector) collectChangedPaths(node *C.svn_repos_node_t, path string) e
 				defer C.free(unsafe.Pointer(clabelA))
 				defer C.free(unsafe.Pointer(clabelB))
 
-				cstream := C.CreateWriterStream(unsafe.Pointer(stream), c.r.pool)
-
-				if err := C.svn_diff_file_output_unified3(cstream, diff,
-					cf1Path, cf2Path,
-					clabelA, clabelB,
-					C.defaultEncoding(), nil, C.FALSE, c.r.pool); err != nil {
+				cstream := C.CreateWriterStream(unsafe.Pointer(buf), c.r.pool)
+
+				if err := C.svn_diff_file_output_unified4(
+					cstream,
+					diff,
+					cf1Path,
+					cf2Path,
+					clabelA,
+					clabelB,
+					C.defaultEncoding(),
+					nil,
+					C.FALSE,
+					-1,
+					nil,
+					nil,
+					c.r.pool,
+				); err != nil {
 					return makeError(err)
 				}
 			}
 		} // end binary check
+
+		entry.Diff = C.GoStringN(buf.data, (C.int)(buf.len))
 	} // end file diff
 
 	if node.prop_mod == C.TRUE {
@@ -303,22 +313,17 @@ func (c *collector) dumpFile(fsRoot *C.svn_fs_root_t, path string) (string, erro
 		_, err = io.Copy(tmp, svnStream)
 
 		if err != nil {
-			return "", fmt.Errorf("Can not dump %s:", path, err)
+			return "", fmt.Errorf("Can not dump %s: %s", path, err.Error())
 		}
 	}
 
 	if err = tmp.Close(); err != nil {
-		return "", fmt.Errorf("Can not close temp file %s:", tmp.Name(), err)
+		return "", fmt.Errorf("Can not close temp file %s: %s", tmp.Name(), err.Error())
 	}
 
 	return tmp.Name(), nil
 }
 
-func (s *stringBuffer) Write(p []byte) (int, error) {
-	*s.buf += string(p)
-	return len(p), nil
-}
-
 func (c *collector) isBinary(fsRoot *C.svn_fs_root_t, path *C.char) (bool, error) {
 	var mimetype *C.svn_string_t
 

errors.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 )
 
+// Error is used for wrapping SVN errors
 type Error struct {
 	err *C.svn_error_t
 }

go.mod

@@ -0,0 +1,3 @@
+module github.com/assembla/svn2go
+
+go 1.13

stream.go

@@ -13,17 +13,18 @@ import (
 	"unsafe"
 )
 
+// Stream is used for wrapping SVN stream
 // TODO svn stream supports seek, maybe we can use it
-type SvnStream struct {
+type Stream struct {
 	io   *C.svn_stream_t
 	pool *C.apr_pool_t
 }
 
 // Read bytes from svn stream
-func (s *SvnStream) Read(dest []byte) (n int, err error) {
+func (s *Stream) Read(dest []byte) (n int, err error) {
 	c := C.apr_size_t(len(dest))
 
-	if err := C.svn_stream_read(s.io, (*C.char)(unsafe.Pointer(&dest[0])), &c); err != nil {
+	if err := C.svn_stream_read_full(s.io, (*C.char)(unsafe.Pointer(&dest[0])), &c); err != nil {
 		return int(c), makeError(err)
 	}
 
@@ -33,8 +34,8 @@ func (s *SvnStream) Read(dest []byte) (n int, err error) {
 	return int(c), nil
 }
 
-// Closes svn stream
-func (s *SvnStream) Close() error {
+// Close closes stream
+func (s *Stream) Close() error {
 	runtime.SetFinalizer(s, nil)
 	C.svn_pool_destroy(s.pool)
 	return nil