Yikes -- Sander & everyone else:
Please send patches, and any other human-originated mails, to
`dev@subversion.tigris.org', not to `svn'. The latter list is for
commit mails and their follow-ups. New non-commit-related threads
shouldn't be appearing there -- not all developers read the commit
list carefully, since there are other ways (the logs) to get the same
information.
-Karl
"Sander Striker" <striker@apache.org> writes:
> Log:
> * status.c
>
> (add_update_info_to_status_hash): Don't store errors we are going
> to ignore anyway. Add some whitespace for readability.
>
> Index: subversion/libsvn_client/status.c
> ===================================================================
> --- subversion/libsvn_client/SVN/text-base/status.c Sat Sep 22 17:28:42
> 2001
> +++ subversion/libsvn_client/status.c Sat Sep 22 17:44:51 2001
> @@ -74,14 +74,17 @@
> return svn_error_createf
> (SVN_ERR_WC_OBSTRUCTED_UPDATE, 0, NULL, pool,
> "svn_client_update: %s is not under revision control",
> anchor->data);
> +
> if (entry->existence == svn_wc_existence_deleted)
> return svn_error_createf
> (SVN_ERR_WC_ENTRY_NOT_FOUND, 0, NULL, pool,
> "svn_client_update: entry '%s' has been deleted", anchor->data);
> +
> if (! entry->ancestor)
> return svn_error_createf
> (SVN_ERR_WC_ENTRY_MISSING_ANCESTRY, 0, NULL, pool,
> "svn_client_update: entry '%s' has no URL", anchor->data);
> +
> URL = svn_stringbuf_create (entry->ancestor->data, pool);
>
> /* Do RA interaction here to figure out what is out of date with
> @@ -96,7 +99,7 @@
> SVN_ERR (svn_client__get_ra_callbacks (&ra_callbacks, &cb_baton,
> auth_baton, anchor, TRUE,
> TRUE, pool));
> - if ((err = ra_lib->open (&session, URL, ra_callbacks, cb_baton, pool)))
> + if (ra_lib->open (&session, URL, ra_callbacks, cb_baton, pool) !=
> SVN_NO_ERROR)
> return SVN_NO_ERROR;
>
>
> @@ -109,19 +112,18 @@
> if (ra_lib->do_status (session,
> &reporter, &report_baton,
> target,
> - status_editor, edit_baton))
> - goto close;
> + status_editor, edit_baton) == SVN_NO_ERROR)
> + {
> + /* Drive the reporter structure, describing the revisions within
> + PATH. When we call reporter->finish_report, the
> + status_editor will be driven by svn_repos_dir_delta. */
> + SVN_ERR (svn_wc_crawl_revisions (path, reporter, report_baton,
> + FALSE, /* don't notice unversioned
> stuff */
> + pool));
> + }
>
> - /* Drive the reporter structure, describing the revisions within
> - PATH. When we call reporter->finish_report, the
> - status_editor will be driven by svn_repos_dir_delta. */
> - SVN_ERR (svn_wc_crawl_revisions (path, reporter, report_baton,
> - FALSE, /* don't notice unversioned stuff
> */
> - pool));
> -
> - close:
> /* We're done with the RA session. */
> - err = ra_lib->close (session);
> + ra_lib->close (session);
>
> return SVN_NO_ERROR;
> }
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:42 2006