You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 19:03:37 UTC
svn commit: r984122 [21/40] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6...
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* client.c : Functions for repository access via the Subversion protocol
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -34,6 +34,7 @@
#include "svn_types.h"
#include "svn_string.h"
+#include "svn_dirent_uri.h"
#include "svn_error.h"
#include "svn_time.h"
#include "svn_path.h"
@@ -213,7 +214,7 @@ static svn_error_t *parse_lock(apr_array
SVN_ERR(svn_ra_svn_parse_tuple(list, pool, "ccc(?c)c(?c)", &(*lock)->path,
&(*lock)->token, &(*lock)->owner,
&(*lock)->comment, &cdate, &edate));
- (*lock)->path = svn_path_canonicalize((*lock)->path, pool);
+ (*lock)->path = svn_uri_canonicalize((*lock)->path, pool);
SVN_ERR(svn_time_from_cstring(&(*lock)->creation_date, cdate, pool));
if (edate)
SVN_ERR(svn_time_from_cstring(&(*lock)->expiration_date, edate, pool));
@@ -488,8 +489,24 @@ static svn_error_t *make_tunnel(const ch
* See also the long dicussion in issue #2580 if you really
* want to know various reasons for these problems and
* the different opinions on this issue.
+ *
+ * On Win32, APR does not support KILL_ONLY_ONCE. It only has
+ * KILL_ALWAYS and KILL_NEVER. Other modes are converted to
+ * KILL_ALWAYS, which immediately calls TerminateProcess().
+ * This instantly kills the tunnel, leaving sshd and svnserve
+ * on a remote machine running indefinitely. These processes
+ * accumulate. The problem is most often seen with a fast client
+ * machine and a modest internet connection, as the tunnel
+ * is killed before being able to gracefully complete the
+ * session. In that case, svn is unusable 100% of the time on
+ * the windows machine. Thus, on Win32, we use KILL_NEVER and
+ * take the lesser of two evils.
*/
+#ifdef WIN32
+ apr_pool_note_subprocess(pool, proc, APR_KILL_NEVER);
+#else
apr_pool_note_subprocess(pool, proc, APR_KILL_ONLY_ONCE);
+#endif
/* APR pipe objects inherit by default. But we don't want the
* tunnel agent's pipes held open by future child processes
@@ -619,7 +636,7 @@ static svn_error_t *open_session(svn_ra_
if (conn->repos_root)
{
- conn->repos_root = svn_path_canonicalize(conn->repos_root, pool);
+ conn->repos_root = svn_uri_canonicalize(conn->repos_root, pool);
/* We should check that the returned string is a prefix of url, since
that's the API guarantee, but this isn't true for 1.0 servers.
Checking the length prevents client crashes. */
@@ -1071,7 +1088,7 @@ static svn_error_t *ra_svn_get_dir(svn_r
SVN_ERR(svn_ra_svn_parse_tuple(elt->u.list, pool, "cwnbr(?c)(?c)",
&name, &kind, &size, &has_props,
&crev, &cdate, &cauthor));
- name = svn_path_canonicalize(name, pool);
+ name = svn_uri_canonicalize(name, pool);
dirent = apr_palloc(pool, sizeof(*dirent));
dirent->kind = svn_node_kind_from_word(kind);
dirent->size = size;/* FIXME: svn_filesize_t */
@@ -1384,9 +1401,9 @@ static svn_error_t *ra_svn_log(svn_ra_se
&cpath, &action, ©_path,
©_rev, &kind_str,
&text_mods, &prop_mods));
- cpath = svn_path_canonicalize(cpath, iterpool);
+ cpath = svn_uri_canonicalize(cpath, iterpool);
if (copy_path)
- copy_path = svn_path_canonicalize(copy_path, iterpool);
+ copy_path = svn_uri_canonicalize(copy_path, iterpool);
change = svn_log_changed_path2_create(iterpool);
change->action = *action;
change->copyfrom_path = copy_path;
@@ -1583,7 +1600,7 @@ static svn_error_t *ra_svn_get_locations
{
SVN_ERR(svn_ra_svn_parse_tuple(item->u.list, pool, "rc",
&revision, &ret_path));
- ret_path = svn_path_canonicalize(ret_path, pool);
+ ret_path = svn_uri_canonicalize(ret_path, pool);
apr_hash_set(*locations, apr_pmemdup(pool, &revision,
sizeof(revision)),
sizeof(revision), ret_path);
@@ -1645,7 +1662,7 @@ ra_svn_get_location_segments(svn_ra_sess
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Expected valid revision range"));
if (ret_path)
- ret_path = svn_path_canonicalize(ret_path, iterpool);
+ ret_path = svn_uri_canonicalize(ret_path, iterpool);
segment->path = ret_path;
segment->range_start = range_start;
segment->range_end = range_end;
@@ -1713,7 +1730,7 @@ static svn_error_t *ra_svn_get_file_revs
SVN_ERR(svn_ra_svn_parse_tuple(item->u.list, rev_pool,
"crll?B", &p, &rev, &rev_proplist,
&proplist, &merged_rev_param));
- p = svn_path_canonicalize(p, rev_pool);
+ p = svn_uri_canonicalize(p, rev_pool);
SVN_ERR(svn_ra_svn_parse_proplist(rev_proplist, rev_pool, &rev_props));
SVN_ERR(parse_prop_diffs(proplist, rev_pool, &props));
if (merged_rev_param == SVN_RA_SVN_UNSPECIFIED_NUMBER)
@@ -2398,6 +2415,7 @@ static const svn_ra__vtable_t ra_svn_vta
ra_svn_has_capability,
ra_svn_replay_range,
ra_svn_get_deleted_rev,
+ NULL /* ra_svn_obliterate_node_rev */
};
svn_error_t *
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cram.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cram.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cram.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cram.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cram.c : Minimal standalone CRAM-MD5 implementation
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cyrus_auth.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cyrus_auth.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cyrus_auth.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cyrus_auth.c : functions for Cyrus SASL-based authentication
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/editorp.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/editorp.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* editorp.c : Driving and consuming an editor across an svn connection
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -31,8 +31,8 @@
#include "svn_types.h"
#include "svn_string.h"
#include "svn_error.h"
-#include "svn_path.h"
#include "svn_delta.h"
+#include "svn_dirent_uri.h"
#include "svn_ra_svn.h"
#include "svn_pools.h"
#include "svn_private_config.h"
@@ -500,7 +500,7 @@ static svn_error_t *ra_svn_handle_delete
SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "c(?r)c", &path, &rev, &token));
SVN_ERR(lookup_token(ds, token, FALSE, &entry));
- path = svn_path_canonicalize(path, pool);
+ path = svn_uri_canonicalize(path, pool);
SVN_CMD_ERR(ds->editor->delete_entry(path, rev, entry->baton, pool));
return SVN_NO_ERROR;
}
@@ -520,9 +520,9 @@ static svn_error_t *ra_svn_handle_add_di
&child_token, ©_path, ©_rev));
SVN_ERR(lookup_token(ds, token, FALSE, &entry));
subpool = svn_pool_create(entry->pool);
- path = svn_path_canonicalize(path, pool);
+ path = svn_uri_canonicalize(path, pool);
if (copy_path)
- copy_path = svn_path_canonicalize(copy_path, pool);
+ copy_path = svn_uri_canonicalize(copy_path, pool);
SVN_CMD_ERR(ds->editor->add_directory(path, entry->baton, copy_path,
copy_rev, subpool, &child_baton));
store_token(ds, child_baton, child_token, FALSE, subpool);
@@ -544,7 +544,7 @@ static svn_error_t *ra_svn_handle_open_d
&child_token, &rev));
SVN_ERR(lookup_token(ds, token, FALSE, &entry));
subpool = svn_pool_create(entry->pool);
- path = svn_path_canonicalize(path, pool);
+ path = svn_uri_canonicalize(path, pool);
SVN_CMD_ERR(ds->editor->open_directory(path, entry->baton, rev, subpool,
&child_baton));
store_token(ds, child_baton, child_token, FALSE, subpool);
@@ -618,9 +618,9 @@ static svn_error_t *ra_svn_handle_add_fi
&file_token, ©_path, ©_rev));
SVN_ERR(lookup_token(ds, token, FALSE, &entry));
ds->file_refs++;
- path = svn_path_canonicalize(path, pool);
+ path = svn_uri_canonicalize(path, pool);
if (copy_path)
- copy_path = svn_path_canonicalize(copy_path, pool);
+ copy_path = svn_uri_canonicalize(copy_path, pool);
file_entry = store_token(ds, NULL, file_token, TRUE, ds->file_pool);
SVN_CMD_ERR(ds->editor->add_file(path, entry->baton, copy_path, copy_rev,
ds->file_pool, &file_entry->baton));
@@ -640,7 +640,7 @@ static svn_error_t *ra_svn_handle_open_f
&file_token, &rev));
SVN_ERR(lookup_token(ds, token, FALSE, &entry));
ds->file_refs++;
- path = svn_path_canonicalize(path, pool);
+ path = svn_uri_canonicalize(path, pool);
file_entry = store_token(ds, NULL, file_token, TRUE, ds->file_pool);
SVN_CMD_ERR(ds->editor->open_file(path, entry->baton, rev, ds->file_pool,
&file_entry->baton));
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/internal_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/internal_auth.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/internal_auth.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/internal_auth.c Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
* Cyrus SASL isn't available.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/marshal.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/marshal.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* marshal.c : Marshalling routines for Subversion protocol
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/ra_svn.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/ra_svn.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/ra_svn.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* ra_svn.h : private declarations for the ra_svn module
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/streams.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/streams.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/streams.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/streams.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* streams.c : stream encapsulation routines for the ra_svn protocol
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/version.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/version.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/version.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* version.c: library version number
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/authz.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/authz.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/authz.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* authz.c : path-based access control
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/commit.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/commit.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* commit.c --- editor for committing changes to a filesystem.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/delta.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/delta.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/delta.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* delta.c: an editor driver for expressing differences between two trees
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/deprecated.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/deprecated.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/deprecated.c Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
* "we can't lose 'em, but we can shun 'em!"
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* dump.c --- writing filesystem contents into a portable 'dumpfile' format.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/fs-wrap.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/fs-wrap.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* fs-wrap.c --- filesystem interface wrappers.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/hooks.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/hooks.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/hooks.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/hooks.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* hooks.c : running repository hooks
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/load.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/load.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/load.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/load.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* load.c --- parsing a 'dumpfile'-formatted stream.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -234,10 +234,20 @@ prefix_mergeinfo_paths(svn_string_t **me
prefixed_mergeinfo = apr_hash_make(pool);
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- const char *path;
- const void *merge_source;
- apr_hash_this(hi, &merge_source, NULL, &rangelist);
- path = svn_path_join(parent_dir, (const char*)merge_source+1, pool);
+ const void *key;
+ const char *path, *merge_source;
+
+ apr_hash_this(hi, &key, NULL, &rangelist);
+ merge_source = key;
+
+ /* The svn:mergeinfo property syntax demands absolute repository
+ paths, so prepend a leading slash if PARENT_DIR lacks one. */
+ if (*parent_dir != '/')
+ path = svn_path_join_many(pool, "/", parent_dir,
+ merge_source + 1, NULL);
+ else
+ path = svn_path_join(parent_dir, merge_source + 1, pool);
+
apr_hash_set(prefixed_mergeinfo, path, APR_HASH_KEY_STRING, rangelist);
}
return svn_mergeinfo_to_string(mergeinfo_val, prefixed_mergeinfo, pool);
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/log.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/log.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* log.c --- retrieving log messages
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/node_tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/node_tree.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/node_tree.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/node_tree.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* node_tree.c: an editor for tracking repository deltas changes
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/obliterate.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/obliterate.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/obliterate.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/obliterate.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* obliterate.c: permanently delete history from the repository
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -26,6 +26,8 @@
#include "svn_error_codes.h"
#include "svn_fs.h"
#include "svn_repos.h"
+#include "svn_dirent_uri.h"
+
#include "repos.h"
#include "private/svn_repos_private.h"
#include "private/svn_fs_private.h"
@@ -40,10 +42,12 @@ svn_repos__obliterate_path_rev(svn_repos
apr_pool_t *pool)
{
svn_fs_t *fs = svn_repos_fs(repos);
- svn_fs_root_t *rev_root;
+ svn_fs_root_t *rev_root, *txn_root;
svn_fs_txn_t *txn;
const svn_fs_id_t *node_id;
+ SVN_ERR_ASSERT(path[0] == '/' && svn_relpath_is_canonical(path + 1, pool));
+
/* Sanity check: ensure the path exists in fs at the revision.
* ### TODO: May want to allow non-existent node as a no-op.
* ### This is an error for now to help catch wrong-node-reached bugs. */
@@ -58,9 +62,10 @@ svn_repos__obliterate_path_rev(svn_repos
/* Begin a new transaction, based on the revision we want to modify. */
SVN_ERR(svn_fs__begin_obliteration_txn(&txn, fs, revision, pool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
/* Make the required changes in this txn */
- /* ... */
+ SVN_ERR(svn_fs_delete(txn_root, path, pool));
/* Commit the new transaction in place of the old revision */
SVN_ERR(svn_fs__commit_obliteration_txn(revision, txn, pool));
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/replay.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/replay.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/replay.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/replay.c Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
* or transaction
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -670,6 +670,14 @@ svn_repos_replay2(svn_fs_root_t *root,
struct path_driver_cb_baton cb_baton;
size_t base_path_len;
+ /* Special-case r0, which we know is an empty revision; if we don't
+ special-case it we might end up trying to compare it to "r-1". */
+ if (svn_fs_is_revision_root(root) && svn_fs_revision_root_revision(root) == 0)
+ {
+ SVN_ERR(editor->set_target_revision(edit_baton, 0, pool));
+ return SVN_NO_ERROR;
+ }
+
/* Fetch the paths changed under ROOT. */
SVN_ERR(svn_fs_paths_changed2(&fs_changes, root, pool));
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* reporter.c : `reporter' vtable routines for updates.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* repos.c : repository creation; shared and exclusive repository locking
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* repos.h : interface to Subversion repository, private to libsvn_repos
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/rev_hunt.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/rev_hunt.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* their properties.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/atomic.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/atomic.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/atomic.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/atomic.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* atomic.c : perform atomic initialization
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/auth.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/auth.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/auth.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* auth.c: authentication support functions for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-inprocess.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-inprocess.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-inprocess.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-inprocess.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cache-inprocess.c: in-memory caching for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-memcache.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-memcache.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-memcache.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-memcache.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cache-memcache.c: memcached caching for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cache.c: cache interface for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cache.h: cache vtable interface
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/checksum.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/checksum.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/checksum.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/checksum.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* checksum.c: checksum routines
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cmdline.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cmdline.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* cmdline.c : Helpers for command-line programs.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -648,7 +648,7 @@ svn_cmdline__parse_config_option(apr_arr
{
config_option->value = apr_pstrndup(pool, equals_sign + 1,
opt_arg + len - equals_sign - 1);
- APR_ARRAY_PUSH(config_options, svn_cmdline__config_argument_t *)
+ APR_ARRAY_PUSH(config_options, svn_cmdline__config_argument_t *)
= config_option;
return SVN_NO_ERROR;
}
@@ -670,7 +670,7 @@ svn_cmdline__apply_config_options(apr_ha
for (i = 0; i < config_options->nelts; i++)
{
svn_config_t *cfg;
- svn_cmdline__config_argument_t *arg =
+ svn_cmdline__config_argument_t *arg =
APR_ARRAY_IDX(config_options, i,
svn_cmdline__config_argument_t *);
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/compat.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/compat.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/compat.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* compat.c : Wrappers and callbacks for compatibility.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* config.c : reading configuration information
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_auth.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_auth.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_auth.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* config_auth.c : authentication files in the user config area
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_file.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_file.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_file.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* config_file.c : parsing configuration files
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_impl.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_impl.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_impl.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_impl.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* config_impl.h : private header for the config file implementation.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_win.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_win.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_win.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_win.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* config_win.c : parsing configuration data from the registry
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/constructors.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/constructors.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/constructors.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/constructors.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* constructors.c : Constructors for various data structures.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ctype.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ctype.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ctype.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ctype.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* ctype.c: Character classification routines
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/date.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/date.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/date.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/date.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* date.c: date parsing for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/debug.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/debug.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/debug.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/debug.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* debug.c : small functions to help SVN developers
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
* "we can't lose 'em, but we can shun 'em!"
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* dirent_uri.c: a library to manipulate URIs and directory entries.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -162,7 +162,7 @@ canonicalize_to_upper(char c)
}
#endif
-/* Calculates the length of the dirent absolute or non absolute root in
+/* Calculates the length of the dirent absolute or non absolute root in
DIRENT, return 0 if dirent is not rooted */
static apr_size_t
dirent_root_length(const char *dirent, apr_size_t len)
@@ -195,7 +195,7 @@ dirent_root_length(const char *dirent, a
#endif
if (len >= 1 && dirent[0] == '/')
return 1;
-
+
return 0;
}
@@ -818,7 +818,7 @@ svn_dirent_is_root(const char *dirent, a
#if defined(WIN32) || defined(__CYGWIN__)
/* On Windows and Cygwin, 'H:' or 'H:/' (where 'H' is any letter)
are also root directories */
- if ((len == 2 || ((len == 3) && (dirent[2] == '/'))) &&
+ if ((len == 2 || ((len == 3) && (dirent[2] == '/'))) &&
(dirent[1] == ':') &&
((dirent[0] >= 'A' && dirent[0] <= 'Z') ||
(dirent[0] >= 'a' && dirent[0] <= 'z')))
@@ -1002,7 +1002,7 @@ char *svn_dirent_join_many(apr_pool_t *p
{
base = ""; /* Don't add base */
saved_lengths[0] = 0;
- }
+ }
add_separator = 1;
if (s[len - 1] == '/'
@@ -1540,6 +1540,8 @@ svn_dirent_get_absolute(const char **pab
apr_status_t apr_err;
const char *path_apr;
+ SVN_ERR_ASSERT(! svn_path_is_url(relative));
+
/* Merge the current working directory with the relative dirent. */
SVN_ERR(svn_path_cstring_from_utf8(&path_apr, relative, pool));
@@ -1561,19 +1563,19 @@ svn_dirent_get_absolute(const char **pab
const char *
svn_uri_canonicalize(const char *uri, apr_pool_t *pool)
{
- return canonicalize(type_uri, uri, pool);;
+ return canonicalize(type_uri, uri, pool);
}
const char *
svn_relpath_canonicalize(const char *relpath, apr_pool_t *pool)
{
- return canonicalize(type_relpath, relpath, pool);;
+ return canonicalize(type_relpath, relpath, pool);
}
const char *
svn_dirent_canonicalize(const char *dirent, apr_pool_t *pool)
{
- const char *dst = canonicalize(type_dirent, dirent, pool);;
+ const char *dst = canonicalize(type_dirent, dirent, pool);
#if defined(WIN32) || defined(__CYGWIN__)
/* Handle a specific case on Windows where path == "X:/". Here we have to
@@ -1982,7 +1984,7 @@ svn_uri_condense_targets(const char **pc
/* Find the pcommon argument by finding what is common in all of the
uris. NOTE: This is not as efficient as it could be. The calculation
- of the basedir could be done in the loop below, which would
+ of the basedir could be done in the loop below, which would
save some calls to svn_uri_get_longest_ancestor. I decided to do it
this way because I thought it would be simpler, since this way, we don't
even do the loop if we don't need to condense the targets. */
@@ -1997,7 +1999,7 @@ svn_uri_condense_targets(const char **pc
for (i = 1; i < targets->nelts; ++i)
{
const char *uri = svn_uri_canonicalize(
- APR_ARRAY_IDX(targets, i, const char *),
+ APR_ARRAY_IDX(targets, i, const char *),
scratch_pool);
APR_ARRAY_PUSH(uri_targets, const char *) = uri;
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dso.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dso.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dso.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dso.c Tue Aug 10 17:03:06 2010
@@ -1,9 +1,9 @@
/*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -107,7 +107,7 @@ svn_dso_load(apr_dso_handle_t **dso, con
{
#ifdef SVN_DEBUG
char buf[1024];
- SVN_DBG(("%s\n", apr_dso_error(*dso, buf, 1024)));
+ fprintf(stderr, "%s\n", apr_dso_error(*dso, buf, 1024));
#endif
*dso = NULL;
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/eol.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/eol.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/eol.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/eol.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* eol.c : generic eol/keyword routines
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -44,7 +44,7 @@ const char *
svn_eol__detect_eol(char *buf, char *endp)
{
const char *eol;
-
+
SVN_ERR_ASSERT_NO_RETURN(buf <= endp);
eol = svn_eol__find_eol_start(buf, endp - buf);
if (eol)
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/error.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/error.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/error.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/error.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/* error.c: common exception handling for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -336,7 +336,7 @@ static svn_boolean_t is_tracing_link(svn
svn_error_t *
svn_error_purge_tracing(svn_error_t *err)
{
-#ifdef SVN_ERR__TRACING
+#ifdef SVN_ERR__TRACING
svn_error_t *tmp_err = err;
svn_error_t *new_err = NULL, *new_err_leaf = NULL;
@@ -364,7 +364,7 @@ svn_error_purge_tracing(svn_error_t *err
/* Advance to the next link in the original chain. */
tmp_err = tmp_err->child;
}
-
+
/* If we get here, there had better be a real link in this error chain. */
SVN_ERR_ASSERT(new_err_leaf);
@@ -526,10 +526,6 @@ svn_handle_warning2(FILE *stream, svn_er
{
char buf[256];
- /* Skip over any trace records. */
- while (is_tracing_link(err))
- err = err->child;
-
svn_error_clear(svn_cmdline_fprintf
(stream, err->pool,
_("%swarning: %s\n"),
@@ -540,6 +536,9 @@ svn_handle_warning2(FILE *stream, svn_er
const char *
svn_err_best_message(svn_error_t *err, char *buf, apr_size_t bufsize)
{
+ /* Skip over any trace records. */
+ while (is_tracing_link(err))
+ err = err->child;
if (err->message)
return err->message;
else
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/genctype.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/genctype.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/genctype.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/genctype.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
"""getctype.py - Generate the svn_ctype character classification table.
"""
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/hash.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/hash.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/hash.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* hash.c : dumping and reading hash tables to/from files.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at