You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/06/22 15:52:11 UTC
svn commit: r956897 - in /subversion/trunk/subversion/libsvn_wc:
adm_crawler.c copy.c crop.c diff.c entries.c entries.h lock.c log.c merge.c
node.c props.c relocate.c status.c tree_conflicts.c update_editor.c
workqueue.c
Author: rhuijben
Date: Tue Jun 22 13:52:11 2010
New Revision: 956897
URL: http://svn.apache.org/viewvc?rev=956897&view=rev
Log:
Following up the last batch of commits, remove header includes
and entry modification flags that are no longer used.
* subversion/libsvn_wc/adm_crawler.c
* subversion/libsvn_wc/copy.c
* subversion/libsvn_wc/crop.c
* subversion/libsvn_wc/diff.c
Remove some unused includes of entry.h, lock.h and prop.h
* subversion/libsvn_wc/entries.c
(fold_entry): Remove unused foldings.
(svn_wc__entry_modify_stub): Remove flag.
* subversion/libsvn_wc/entries.h
(SVN_WC__ENTRY_MODIFY_REVISION, SVN_WC__ENTRY_MODIFY_URL,
SVN_WC__ENTRY_MODIFY_DELETED): Remove unused flags.
* subversion/libsvn_wc/lock.c
* subversion/libsvn_wc/log.c
* subversion/libsvn_wc/merge.c
* subversion/libsvn_wc/node.c
* subversion/libsvn_wc/props.c
* subversion/libsvn_wc/relocate.c
* subversion/libsvn_wc/status.c
* subversion/libsvn_wc/tree_conflicts.c
* subversion/libsvn_wc/update_editor.c
* subversion/libsvn_wc/workqueue.c
Remove some unused includes of entry.h, lock.h and prop.h
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/copy.c
subversion/trunk/subversion/libsvn_wc/crop.c
subversion/trunk/subversion/libsvn_wc/diff.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/entries.h
subversion/trunk/subversion/libsvn_wc/lock.c
subversion/trunk/subversion/libsvn_wc/log.c
subversion/trunk/subversion/libsvn_wc/merge.c
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/relocate.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Jun 22 13:52:11 2010
@@ -45,8 +45,6 @@
#include "adm_files.h"
#include "props.h"
#include "translate.h"
-#include "entries.h"
-#include "lock.h"
#include "workqueue.h"
#include "conflicts.h"
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Tue Jun 22 13:52:11 2010
@@ -37,10 +37,8 @@
#include "log.h"
#include "workqueue.h"
#include "adm_files.h"
-#include "entries.h"
#include "props.h"
#include "translate.h"
-#include "lock.h"
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
Modified: subversion/trunk/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Tue Jun 22 13:52:11 2010
@@ -31,9 +31,6 @@
#include "svn_path.h"
#include "wc.h"
-#include "lock.h"
-#include "entries.h"
-#include "adm_files.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Tue Jun 22 13:52:11 2010
@@ -58,8 +58,6 @@
#include "wc.h"
#include "props.h"
#include "adm_files.h"
-#include "lock.h"
-#include "entries.h"
#include "translate.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue Jun 22 13:52:11 2010
@@ -2608,13 +2608,7 @@ fold_entry(svn_wc_entry_t *cur_entry,
if (! cur_entry->name)
cur_entry->name = apr_pstrdup(pool, name);
- /* Revision */
- if (modify_flags & SVN_WC__ENTRY_MODIFY_REVISION)
- cur_entry->revision = entry->revision;
-
- /* Ancestral URL in repository */
- if (modify_flags & SVN_WC__ENTRY_MODIFY_URL)
- cur_entry->url = entry->url ? apr_pstrdup(pool, entry->url) : NULL;
+ /* Revision and URL are no longer passed to entry_modify() */
/* Kind */
if (modify_flags & SVN_WC__ENTRY_MODIFY_KIND)
@@ -2640,11 +2634,7 @@ fold_entry(svn_wc_entry_t *cur_entry,
if (modify_flags & SVN_WC__ENTRY_MODIFY_COPYFROM_REV)
cur_entry->copyfrom_rev = entry->copyfrom_rev;
- /* Deleted state */
- if (modify_flags & SVN_WC__ENTRY_MODIFY_DELETED)
- cur_entry->deleted = entry->deleted;
-
- /* Absent state is no longer passed to entry_modify() */
+ /* Deleted and absent are no longer passed to entry_modify() */
/* text_time, prop_time no longer passed to entry_modify() */
@@ -3005,7 +2995,6 @@ svn_wc__entry_modify_stub(svn_wc__db_t *
/* from adm_ops.c */
SVN_WC__ENTRY_MODIFY_SCHEDULE
| SVN_WC__ENTRY_MODIFY_KIND
- | SVN_WC__ENTRY_MODIFY_REVISION
| SVN_WC__ENTRY_MODIFY_COPYFROM_URL
| SVN_WC__ENTRY_MODIFY_COPYFROM_REV
| SVN_WC__ENTRY_MODIFY_COPIED
Modified: subversion/trunk/subversion/libsvn_wc/entries.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.h?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.h (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.h Tue Jun 22 13:52:11 2010
@@ -40,14 +40,12 @@ extern "C" {
/* The MODIFY_FLAGS that tell svn_wc__entry_modify which parameters to
pay attention to. ### These should track the changes made to the
SVN_WC__ENTRY_ATTR_* #defines! */
-#define SVN_WC__ENTRY_MODIFY_REVISION 0x00000001
-#define SVN_WC__ENTRY_MODIFY_URL 0x00000002
+/* ### gap */
#define SVN_WC__ENTRY_MODIFY_KIND 0x00000004
/* ### gap */
#define SVN_WC__ENTRY_MODIFY_CHECKSUM 0x00000010
#define SVN_WC__ENTRY_MODIFY_SCHEDULE 0x00000020
#define SVN_WC__ENTRY_MODIFY_COPIED 0x00000040
-#define SVN_WC__ENTRY_MODIFY_DELETED 0x00000080
#define SVN_WC__ENTRY_MODIFY_COPYFROM_URL 0x00000100
#define SVN_WC__ENTRY_MODIFY_COPYFROM_REV 0x00000200
/* ### gap */
Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Tue Jun 22 13:52:11 2010
@@ -36,7 +36,6 @@
#include "lock.h"
#include "props.h"
#include "log.h"
-#include "entries.h"
#include "wc_db.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_wc/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/log.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/log.c (original)
+++ subversion/trunk/subversion/libsvn_wc/log.c Tue Jun 22 13:52:11 2010
@@ -43,7 +43,6 @@
#include "log.h"
#include "props.h"
#include "adm_files.h"
-#include "entries.h"
#include "lock.h"
#include "translate.h"
#include "tree_conflicts.h"
Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Tue Jun 22 13:52:11 2010
@@ -28,7 +28,6 @@
#include "svn_pools.h"
#include "wc.h"
-#include "entries.h"
#include "adm_files.h"
#include "translate.h"
#include "log.h"
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue Jun 22 13:52:11 2010
@@ -45,10 +45,8 @@
#include "svn_types.h"
#include "wc.h"
-#include "lock.h"
#include "props.h"
#include "log.h"
-#include "entries.h"
#include "wc_db.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Jun 22 13:52:11 2010
@@ -54,7 +54,6 @@
#include "wc.h"
#include "log.h"
#include "adm_files.h"
-#include "entries.h"
#include "props.h"
#include "translate.h"
#include "lock.h" /* for svn_wc__write_check() */
Modified: subversion/trunk/subversion/libsvn_wc/relocate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/relocate.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/relocate.c (original)
+++ subversion/trunk/subversion/libsvn_wc/relocate.c Tue Jun 22 13:52:11 2010
@@ -30,8 +30,6 @@
#include "svn_path.h"
#include "wc.h"
-#include "entries.h"
-#include "lock.h"
#include "props.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Jun 22 13:52:11 2010
@@ -45,7 +45,6 @@
#include "svn_private_config.h"
#include "wc.h"
-#include "lock.h"
#include "props.h"
#include "entries.h"
#include "translate.h"
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Tue Jun 22 13:52:11 2010
@@ -27,9 +27,6 @@
#include "svn_pools.h"
#include "tree_conflicts.h"
-#include "log.h"
-#include "entries.h"
-#include "lock.h"
#include "wc.h"
#include "private/svn_skel.h"
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Jun 22 13:52:11 2010
@@ -53,7 +53,6 @@
#include "adm_ops.h"
#include "entries.h"
#include "lock.h"
-#include "props.h"
#include "translate.h"
#include "tree_conflicts.h"
#include "workqueue.h"
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=956897&r1=956896&r2=956897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Jun 22 13:52:11 2010
@@ -33,8 +33,6 @@
#include "wc.h"
#include "wc_db.h"
#include "workqueue.h"
-#include "entries.h"
-#include "props.h"
#include "adm_files.h"
#include "translate.h"
#include "log.h"