svn commit: r1696772 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h

[ju...@apache.org]

Author: julianfoad
Date: Thu Aug 20 11:37:28 2015
New Revision: 1696772

URL: http://svn.apache.org/r1696772
Log:
On the 'move-tracking-2' branch: A tiny refactoring.

* subversion/svnmover/svnmover.h
  (svnmover_wc_version_t): New.
  (svnmover_wc_t): Move base and working fields into sub-structures.

* subversion/svnmover/svnmover.c
  (wc_checkout): Initialize the new sub-structures.
  (wc_commit,
   find_el_rev_by_rrpath_rev,
   do_update,
   do_revert,
   execute): Adjust references accordingly.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h?rev=1696772&r1=1696771&r2=1696772&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h Thu Aug 20 11:37:28 2015
@@ -38,21 +38,27 @@ extern "C" {
 #endif /* __cplusplus */
 
 
+typedef struct svnmover_wc_version_t
+{
+  svn_revnum_t revision;  /* always SVN_INVALID_REVNUM in working version */
+  const char *branch_id;
+  svn_branch_state_t *branch;
+} svnmover_wc_version_t;
+
 typedef struct svnmover_wc_t
 {
   apr_pool_t *pool;
   const char *repos_root_url;
   /*const char *anchor_repos_relpath;*/
   svn_revnum_t head_revision;
-  svn_revnum_t base_revision;
 
   svn_ra_session_t *ra_session;
   svn_editor3_t *editor;
   int top_branch_num;
-  const char *base_branch_id;
-  svn_branch_state_t *base_branch;
-  const char *working_branch_id;
-  svn_branch_state_t *working_branch;
+
+  /* Base and working versions. */
+  svnmover_wc_version_t *base, *working;
+
   svn_client_ctx_t *ctx;
 
 } svnmover_wc_t;