[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] rev svn_wc_status2_t to svn_wc_status3_t

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Fri, 9 Apr 2010 17:06:17 +0200

Hi!

This is a _big_ patch but it does very little. I've just replaced every
occurence of svn_wc_status2_t with the new svn_wc_status3_t. It's
needed, in the cause of removing the entry field which I intend to do in
a follow-up. There's a WIP on the list, that handles most of the chores of the
status->entry.

Hopefully someone will not be put of by this gigantic blob. If we hadn't
already revved svn_wc_status3() for 1.7 I could have done the compat
wrappers and declarations in one patch and update the callers in a
follow-up. But since it was already revved, here you go! :)

make check passed.

[[[
As part of replacing the entries field in svn_wc_status2_t for WC-NG, we
rev it to svn_wc_status3_t. No semantic changes, except for adjusting some
compat wrappers, else just revving.

As for now, the compat wrappers just casts to the previous type. Some more
magic will be needed when we're ready to throw away that pescious entry field.

* subversion/include/svn_wc.h
  (svn_wc_status3_t): New. An exact copy svn_wc_status2_t at the moment.
  (svn_wc_status2_t): Mark as deprecated.
  (svn_wc_dup_status3): New.
  (svn_wc_dup_status2): Mark as deprecated.
  (svn_wc_status3,
   svn_wc_status_func4_t): Replace svn_wc_status2_t parameter.

* subversion/include/private/svn_wc_private.h
  (svn_wc__is_sendable_status): Replace svn_wc_status2_t.

* subversion/libsvn_wc/status.c
  (edit_baton): Replace svn_wc_status2_t.
  (dir_baton): Update comment referring to status2_t.
  (internal_status,
   assemble_status,
   send_status_structure,
   send_unversioned_item,
   handle_externals,
   hash_stash,
   tweak_statushash,
   find_dir_url,
   make_dir_baton,
   svn_wc__is_sendable_status,
   mark_deleted,
   handle_statii,
   close_directory): Replace svn_wc_status2_t.
  (svn_wc_dup_status3): New.
  (svn_wc_dup_status2): Moved from here ..

* subversion/libsvn_wc/deprecated.c
  (svn_wc_dup_status2): .. to here.
  (status4_wrapper_func): Replace svn_wc_status2_t parameter and use
    svn_wc_dup_status3().
  (svn_wc_status2): Use svn_wc_status3() for fetching the status struct.

* subversion/libsvn_client/deprecated.c
  (status4_wrapper_func): Use the new status3_t type.

* subversion/libsvn_client/blame.c,
  subversion/libsvn_client/cat.c,
  subversion/libsvn_client/commit.c,
  subversion/libsvn_client/delete.c,
  subversion/libsvn_client/export.c,
  subversion/libsvn_client/merge.c,
  subversion/libsvn_client/patch.c,
  subversion/libsvn_client/status.c:
  subversion/svn/status-cmd.c
  subversion/svn/status.c
  subversion/svn/cl.h
    Use the new svn_wc_status3_t and in some cases svn_wc_dup_status3().
]]]

cheers,
Daniel

Received on 2010-04-09 17:07:17 CEST

This is an archived mail posted to the Subversion Dev mailing list.