]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/vcs-svn-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:05 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:05 +0000 (22:55 -0700)
Code clean-up.

* bc/vcs-svn-cleanup:
  vcs-svn: rename repo functions to "svn_repo"
  vcs-svn: remove unused prototypes

1  2 
vcs-svn/svndump.c

diff --combined vcs-svn/svndump.c
index 1846685a21a44decfe5790f0020dcf933c8d6583,7da84b2aab6172f0969e351fb489b45a256db521..37c4a36b921a4dc5c6c370b08c03441c83590d45
@@@ -47,7 -47,7 +47,7 @@@ static struct 
  
  static struct {
        uint32_t revision;
 -      unsigned long timestamp;
 +      timestamp_t timestamp;
        struct strbuf log, author, note;
  } rev_ctx;
  
@@@ -225,15 -225,15 +225,15 @@@ static void handle_node(void
                if (have_text || have_props || node_ctx.srcRev)
                        die("invalid dump: deletion node has "
                                "copyfrom info, text, or properties");
-               repo_delete(node_ctx.dst.buf);
+               svn_repo_delete(node_ctx.dst.buf);
                return;
        }
        if (node_ctx.action == NODEACT_REPLACE) {
-               repo_delete(node_ctx.dst.buf);
+               svn_repo_delete(node_ctx.dst.buf);
                node_ctx.action = NODEACT_ADD;
        }
        if (node_ctx.srcRev) {
-               repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
+               svn_repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
                if (node_ctx.action == NODEACT_ADD)
                        node_ctx.action = NODEACT_CHANGE;
        }
                old_data = NULL;
        } else if (node_ctx.action == NODEACT_CHANGE) {
                uint32_t mode;
-               old_data = repo_read_path(node_ctx.dst.buf, &mode);
+               old_data = svn_repo_read_path(node_ctx.dst.buf, &mode);
                if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
                        die("invalid dump: cannot modify a directory into a file");
                if (mode != REPO_MODE_DIR && type == REPO_MODE_DIR)