You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/07/20 01:06:07 UTC
svn commit: r1148581 [2/12] - in
/subversion/branches/gpg-agent-password-store: ./ build/ build/ac-macros/
build/generator/ build/generator/templates/ contrib/hook-scripts/
contrib/hook-scripts/enforcer/ contrib/server-side/
contrib/server-side/fsfsfix...
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java Tue Jul 19 23:05:44 2011
@@ -26,7 +26,7 @@ package org.apache.subversion.javahl;
import org.apache.subversion.javahl.types.NodeKind;
/**
- * This class describes a item which will be commited.
+ * This class describes a item which will be committed.
*/
public class CommitItem implements java.io.Serializable
{
@@ -50,7 +50,7 @@ public class CommitItem implements java.
NodeKind nodeKind;
/**
- * the kind of change to be commited (See CommitItemStateFlages)
+ * the kind of change to be committed (See CommitItemStateFlages)
*/
int stateFlags;
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java Tue Jul 19 23:05:44 2011
@@ -25,7 +25,7 @@ package org.apache.subversion.javahl;
/**
* The constants in this interface describe the changes to an item to
- * be commited.
+ * be committed.
*/
public interface CommitItemStateFlags
{
Propchange: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java Tue Jul 19 23:05:44 2011
@@ -29,7 +29,7 @@ import org.apache.subversion.javahl.Comm
/**
* This is callback interface which has to implemented by the client
- * to receive which files will be commited and to enter the log
+ * to receive which files will be committed and to enter the log
* message.
*/
public interface CommitMessageCallback
@@ -37,8 +37,8 @@ public interface CommitMessageCallback
/**
* Retrieve a commit message from the user based on the items to
* be committed
- * @param elementsToBeCommited Array of elements to be commited
+ * @param elementsToBeCommitted Array of elements to be committed
* @return the log message of the commit.
*/
- String getLogMessage(Set<CommitItem> elementsToBeCommited);
+ String getLogMessage(Set<CommitItem> elementsToBeCommitted);
}
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java Tue Jul 19 23:05:44 2011
@@ -55,7 +55,7 @@ public class ChangePath implements java.
this.propMods = propMods;
}
- /** Path of commited item */
+ /** Path of committed item */
private String path;
/** Source revision of copy (if any). */
@@ -77,8 +77,8 @@ public class ChangePath implements java.
private Tristate propMods;
/**
- * Retrieve the path to the commited item
- * @return the path to the commited item
+ * Retrieve the path to the committed item
+ * @return the path to the committed item
*/
public String getPath()
{
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java Tue Jul 19 23:05:44 2011
@@ -145,7 +145,7 @@ public class Revision implements java.io
}
/**
- * last commited revision
+ * last committed revision
*/
public static final Revision HEAD = new Revision(Kind.head);
Propchange: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback3.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java Tue Jul 19 23:05:44 2011
@@ -72,7 +72,7 @@ public class ChangePath implements java.
return path.compareTo(((ChangePath)other).path);
}
- /** Path of commited item */
+ /** Path of committed item */
private String path;
/** Source revision of copy (if any). */
@@ -88,8 +88,8 @@ public class ChangePath implements java.
private int nodeKind;
/**
- * Retrieve the path to the commited item
- * @return the path to the commited item
+ * Retrieve the path to the committed item
+ * @return the path to the committed item
*/
public String getPath()
{
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java Tue Jul 19 23:05:44 2011
@@ -24,7 +24,7 @@
package org.tigris.subversion.javahl;
/**
- * This class describes a item which will be commited.
+ * This class describes a item which will be committed.
*/
public class CommitItem implements java.io.Serializable
{
@@ -48,7 +48,7 @@ public class CommitItem implements java.
int nodeKind;
/**
- * the kind of change to be commited (See CommitItemStateFlages)
+ * the kind of change to be committed (See CommitItemStateFlages)
*/
int stateFlags;
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java Tue Jul 19 23:05:44 2011
@@ -25,7 +25,7 @@ package org.tigris.subversion.javahl;
/**
* The constants in this interface describe the changes to an item to
- * be commited.
+ * be committed.
*/
public interface CommitItemStateFlags
{
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java Tue Jul 19 23:05:44 2011
@@ -25,7 +25,7 @@ package org.tigris.subversion.javahl;
/**
* This is callback interface which has to implemented by the client
- * to receive which files will be commited and to enter the log
+ * to receive which files will be committed and to enter the log
* message.
*/
public interface CommitMessage
@@ -33,8 +33,8 @@ public interface CommitMessage
/**
* Retrieve a commit message from the user based on the items to
* be committed
- * @param elementsToBeCommited Array of elements to be commited
+ * @param elementsToBeCommitted Array of elements to be committed
* @return the log message of the commit.
*/
- String getLogMessage(CommitItem[] elementsToBeCommited);
+ String getLogMessage(CommitItem[] elementsToBeCommitted);
}
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java Tue Jul 19 23:05:44 2011
@@ -177,7 +177,7 @@ public class Revision implements java.io
}
/**
- * last commited revision
+ * last committed revision
*/
public static final Revision HEAD = new Revision(Kind.head, true);
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java Tue Jul 19 23:05:44 2011
@@ -436,7 +436,7 @@ public interface SVNClientInterface
/**
* Sets the commit message handler. This allows more complex commit message
- * with the list of the elements to be commited as input.
+ * with the list of the elements to be committed as input.
* @param messageHandler callback for entering commit messages
* if this is set the message parameter is ignored.
* @since 1.0
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Tue Jul 19 23:05:44 2011
@@ -794,14 +794,14 @@ class SVNTests extends TestCase
{
/**
* Retrieve a commit message from the user based on the items
- * to be commited
- * @param elementsToBeCommited Array of elements to be commited
+ * to be committed
+ * @param elementsToBeCommitted Array of elements to be committed
* @return the log message of the commit.
*/
- public String getLogMessage(Set<CommitItem> elementsToBeCommited)
+ public String getLogMessage(Set<CommitItem> elementsToBeCommitted)
{
// check all received CommitItems are expected as received
- for (CommitItem commitItem : elementsToBeCommited)
+ for (CommitItem commitItem : elementsToBeCommitted)
{
// since imports do not provide a url, the key is either url or
// path
@@ -840,7 +840,7 @@ class SVNTests extends TestCase
*/
NodeKind myNodeKind;
/**
- * the reason why this item is commited (see CommitItemStateFlag)
+ * the reason why this item is committed (see CommitItemStateFlag)
*/
int myStateFlags;
/**
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java Tue Jul 19 23:05:44 2011
@@ -868,16 +868,16 @@ class SVNTests extends TestCase
{
/**
* Retrieve a commit message from the user based on the items
- * to be commited
- * @param elementsToBeCommited Array of elements to be commited
+ * to be committed
+ * @param elementsToBeCommitted Array of elements to be committed
* @return the log message of the commit.
*/
- public String getLogMessage(CommitItem[] elementsToBeCommited)
+ public String getLogMessage(CommitItem[] elementsToBeCommitted)
{
// check all received CommitItems are expected as received
- for (int i = 0; i < elementsToBeCommited.length; i++)
+ for (int i = 0; i < elementsToBeCommitted.length; i++)
{
- CommitItem commitItem = elementsToBeCommited[i];
+ CommitItem commitItem = elementsToBeCommitted[i];
// since imports do not provide a url, the key is either url or
// path
String key;
@@ -918,7 +918,7 @@ class SVNTests extends TestCase
*/
int myNodeKind;
/**
- * the reason why this item is commited (see CommitItemStateFlag)
+ * the reason why this item is committed (see CommitItemStateFlag)
*/
int myStateFlags;
/**
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Base.pm
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Base.pm?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Base.pm (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Base.pm Tue Jul 19 23:05:44 2011
@@ -55,8 +55,8 @@ sub import {
my (undef, $pkg, $prefix, @ignore) = @_;
no warnings 'uninitialized';
unless (${"SVN::_${pkg}::ISA"}[0] eq 'DynaLoader') {
- @{"SVN::_${pkg}::ISA"} = qw(DynaLoader);
- eval qq'
+ @{"SVN::_${pkg}::ISA"} = qw(DynaLoader);
+ eval qq'
package SVN::_$pkg;
require DynaLoader;
bootstrap SVN::_$pkg;
@@ -69,23 +69,23 @@ bootstrap SVN::_$pkg;
my $prefix_re = qr/(?i:$prefix)/;
my $ignore_re = join('|', @ignore);
for (keys %{"SVN::_${pkg}::"}) {
- my $name = $_;
- next unless s/^$prefix_re//;
- next if $ignore_re && m/$ignore_re/;
-
- # insert the accessor
- if (m/(.*)_get$/) {
- my $member = $1;
- *{"${caller}::$1"} = sub {
- &{"SVN::_${pkg}::${prefix}${member}_".
- (@_ > 1 ? 'set' : 'get')} (@_)
- }
- }
- elsif (m/(.*)_set$/) {
- }
- else {
- *{"${caller}::$_"} = ${"SVN::_${pkg}::"}{$name};
- }
+ my $name = $_;
+ next unless s/^$prefix_re//;
+ next if $ignore_re && m/$ignore_re/;
+
+ # insert the accessor
+ if (m/(.*)_get$/) {
+ my $member = $1;
+ *{"${caller}::$1"} = sub {
+ &{"SVN::_${pkg}::${prefix}${member}_".
+ (@_ > 1 ? 'set' : 'get')}(@_)
+ }
+ }
+ elsif (m/(.*)_set$/) {
+ }
+ else {
+ *{"${caller}::$_"} = ${"SVN::_${pkg}::"}{$name};
+ }
}
}
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Client.pm
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Client.pm?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Client.pm (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Client.pm Tue Jul 19 23:05:44 2011
@@ -46,8 +46,8 @@ SVN::Client - Subversion client function
SVN::Client::get_username_provider()]
);
- $ctx->cat (\*STDOUT, 'http://svn.apache.org/repos/asf/subversion/trunk/README',
- 'HEAD');
+ $ctx->cat(\*STDOUT, 'http://svn.apache.org/repos/asf/subversion/trunk/README',
+ 'HEAD');
sub simple_prompt {
my $cred = shift;
@@ -197,7 +197,7 @@ sub new
my $self = bless {}, $class;
my %args = @_;
- $self->{'ctx'} = SVN::_Client::svn_client_create_context ();
+ $self->{'ctx'} = SVN::_Client::svn_client_create_context();
if (defined($args{'auth'}))
{
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Core.pm
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Core.pm?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Core.pm (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Core.pm Tue Jul 19 23:05:44 2011
@@ -20,10 +20,10 @@ SVN::Core - Core module of the subversio
sub something {
# create a subpool of the current default pool
my $pool = SVN::Pool->new_default_sub;
- # some svn operations...
+ # some svn operations...
- # $pool gets destroyed and the previous default pool
- # is restored when $pool's lexical scope ends
+ # $pool gets destroyed and the previous default pool
+ # is restored when $pool's lexical scope ends
}
# svn_stream_t as native perl io handle
@@ -155,7 +155,7 @@ sub CLOSE
{
my $self = shift;
*$self->{svn_stream}->close
- if *$self->{svn_stream};
+ if *$self->{svn_stream};
undef *$self->{svn_stream};
}
@@ -170,7 +170,7 @@ sub GETC
sub print
{
my $self = shift;
- $self->WRITE ($_[0], length ($_[0]));
+ $self->WRITE($_[0], length($_[0]));
}
sub PRINT
@@ -178,7 +178,7 @@ sub PRINT
my $self = shift;
if (defined $\) {
if (defined $,) {
- $self->print(join($,, @_).$\);
+ $self->print(join($,, @_).$\);
} else {
$self->print(join("",@_).$\);
}
@@ -201,8 +201,8 @@ sub PRINTF
sub getline
{
my $self = shift;
- *$self->{pool} ||= SVN::Core::pool_create (undef);
- my ($buf, $eof) = *$self->{svn_stream}->readline ($/, *$self->{pool});
+ *$self->{pool} ||= SVN::Core::pool_create(undef);
+ my ($buf, $eof) = *$self->{svn_stream}->readline($/, *$self->{pool});
return undef if $eof && !length($buf);
return $eof ? $buf : $buf.$/;
}
@@ -220,16 +220,16 @@ sub READLINE
{
my $self = shift;
unless (defined $/) {
- my $buf = '';
- while (length( my $chunk = *$self->{svn_stream}->read
- ($SVN::Core::STREAM_CHUNK_SIZE)) ) {
- $buf .= $chunk;
- }
- return $buf;
+ my $buf = '';
+ while (length( my $chunk = *$self->{svn_stream}->read
+ ($SVN::Core::STREAM_CHUNK_SIZE)) ) {
+ $buf .= $chunk;
+ }
+ return $buf;
}
elsif (ref $/) {
- my $buf = *$self->{svn_stream}->read (${$/});
- return length($buf) ? $buf : undef;
+ my $buf = *$self->{svn_stream}->read(${$/});
+ return length($buf) ? $buf : undef;
}
return wantarray ? $self->getlines : $self->getline;
}
@@ -238,9 +238,9 @@ sub READ {
my $self = shift;
my $len = $_[1];
if (@_ > 2) { # read offset
- substr($_[0],$_[2]) = *$self->{svn_stream}->read ($len);
+ substr($_[0],$_[2]) = *$self->{svn_stream}->read($len);
} else {
- $_[0] = *$self->{svn_stream}->read ($len);
+ $_[0] = *$self->{svn_stream}->read($len);
}
return $len;
}
@@ -263,7 +263,7 @@ sub WRITE {
my $rem = $slen - $off;
$len = $rem if $rem < $len;
}
- *$self->{svn_stream}->write (substr ($_[0], $off, $len));
+ *$self->{svn_stream}->write(substr($_[0], $off, $len));
}
return $len;
}
@@ -285,7 +285,7 @@ my %WRAPPED;
sub default {
my ($pool) = @_;
- my $pobj = SVN::Pool->_wrap ($$pool);
+ my $pobj = SVN::Pool->_wrap($$pool);
$WRAPPED{$pool} = $pobj;
$pobj->default;
}
@@ -315,11 +315,11 @@ also use $pool-E<gt>default to make it t
=over 4
-=item new ([$parent])
+=item new([$parent])
Create a new pool. The pool is a root pool if $parent is not supplied.
-=item new_default ([$parent])
+=item new_default([$parent])
Create a new pool. The pool is a root pool if $parent is not supplied.
Set the new pool as default pool.
@@ -355,14 +355,14 @@ my @POOLSTACK;
sub new {
my ($class, $parent) = @_;
- $parent = $$parent if ref ($parent) eq 'SVN::Pool';
- my $self = bless \create ($parent), $class;
+ $parent = $$parent if ref($parent) eq 'SVN::Pool';
+ my $self = bless \create($parent), $class;
return $self;
}
sub new_default_sub {
- my $parent = ref ($_[0]) ? ${+shift} : $SVN::_Core::current_pool;
- my $self = SVN::Pool->new_default ($parent);
+ my $parent = ref($_[0]) ? ${+shift} : $SVN::_Core::current_pool;
+ my $self = SVN::Pool->new_default($parent);
return $self;
}
@@ -375,13 +375,13 @@ sub new_default {
sub default {
my $self = shift;
push @POOLSTACK, $SVN::_Core::current_pool
- unless $$SVN::_Core::current_pool == 0;
+ unless $$SVN::_Core::current_pool == 0;
$SVN::_Core::current_pool = $$self;
}
sub clear {
my $self = shift;
- apr_pool_clear ($$self);
+ apr_pool_clear($$self);
}
my $globaldestroy;
@@ -419,7 +419,7 @@ sub DESTROY {
delete $WRAPPOOL{$self};
}
else {
- apr_pool_destroy ($$self)
+ apr_pool_destroy($$self)
}
}
@@ -427,28 +427,28 @@ package _p_svn_error_t;
use SVN::Base qw(Core svn_error_t_);
sub strerror {
- return SVN::Error::strerror($_[$[]->apr_err());
+ return SVN::Error::strerror($_[$[]->apr_err());
}
sub handle_error {
- return SVN::Error::handle_error(@_);
+ return SVN::Error::handle_error(@_);
}
sub expanded_message {
- return SVN::Error::expanded_message(@_);
+ return SVN::Error::expanded_message(@_);
}
sub handle_warning {
- # need to swap parameter order.
- return SVN::Error::handle_warning($_[$[+1],$_[$[]);
+ # need to swap parameter order.
+ return SVN::Error::handle_warning($_[$[+1],$_[$[]);
}
foreach my $function (qw(compose clear quick_wrap)) {
no strict 'refs';
my $real_function = \&{"SVN::_Core::svn_error_$function"};
*{"_p_svn_error_t::$function"} = sub {
- return $real_function->(@_);
- }
+ return $real_function->(@_);
+ }
}
package SVN::Error;
@@ -457,8 +457,8 @@ use SVN::Base qw(Core SVN_ERR_);
use Carp;
our @CARP_NOT = qw(SVN::Base SVN::Client SVN::Core SVN::Delta
SVN::Delta::Editor SVN::Error SVN::Fs SVN::Node
- SVN::Pool SVN::Ra SVN::Ra::Callbacks SVN::Ra::Reporter
- SVN::Repos SVN::Stream SVN::TxDelta SVN::Wc);
+ SVN::Pool SVN::Ra SVN::Ra::Callbacks SVN::Ra::Reporter
+ SVN::Repos SVN::Stream SVN::TxDelta SVN::Wc);
=head2 svn_error_t - SVN::Error
@@ -560,9 +560,9 @@ our $handler = \&croak_on_error;
foreach my $function (qw(handle_error handle_warning strerror)) {
no strict 'refs';
my $real_function = \&{"SVN::_Core::svn_$function"};
- *{"SVN::Error::$function"} = sub {
- return $real_function->(@_);
- }
+ *{"SVN::Error::$function"} = sub {
+ return $real_function->(@_);
+ }
}
=item SVN::Error::expanded_message($svn_error_t) or $svn_error_t-E<gt>expanded_message()
@@ -574,17 +574,18 @@ exception handlers get their error messa
=cut
sub expanded_message {
- my $svn_error = shift;
+ my $svn_error = shift;
unless (is_error($svn_error)) {
- return undef;
- }
+ return undef;
+ }
- my $error_message = $svn_error->strerror();
- while ($svn_error) {
- $error_message .= ': ' . $svn_error->message();
- $svn_error = $svn_error->child();
- }
- return $error_message;
+ my $error_message = $svn_error->strerror();
+ while ($svn_error) {
+ my $msg = $svn_error->message();
+ $error_message .= ": $msg" if $msg;
+ $svn_error = $svn_error->child();
+ }
+ return $error_message;
}
@@ -597,7 +598,7 @@ an error.
=cut
sub is_error {
- return (ref($_[$[]) eq '_p_svn_error_t');
+ return (ref($_[$[]) eq '_p_svn_error_t');
}
=item SVN::Error::croak_on_error
@@ -620,16 +621,16 @@ unchanged.
=cut
sub croak_on_error {
- unless (is_error($_[$[])) {
- return @_;
- }
+ unless (is_error($_[$[])) {
+ return @_;
+ }
my $svn_error = shift;
- my $error_message = $svn_error->expanded_message();
+ my $error_message = $svn_error->expanded_message();
- $svn_error->clear();
+ $svn_error->clear();
- croak($error_message);
+ croak($error_message);
}
=item SVN::Error::confess_on_error
@@ -641,16 +642,16 @@ This is useful when you are doing develo
=cut
sub confess_on_error {
- unless (is_error($_[$[])) {
- return @_;
- }
+ unless (is_error($_[$[])) {
+ return @_;
+ }
my $svn_error = shift;
- my $error_message = $svn_error->expanded_message();
+ my $error_message = $svn_error->expanded_message();
- $svn_error->clear();
+ $svn_error->clear();
- confess($error_message);
+ confess($error_message);
}
=item SVN::Error::ignore_error
@@ -665,11 +666,11 @@ clears it. It then returns all the othe
sub ignore_error {
if (is_error($_[$[])) {
- my $svn_error = shift;
- $svn_error->clear();
- }
+ my $svn_error = shift;
+ $svn_error->clear();
+ }
- return @_;
+ return @_;
}
package _p_svn_log_changed_path_t;
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Delta.pm
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Delta.pm?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Delta.pm (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Delta.pm Tue Jul 19 23:05:44 2011
@@ -17,21 +17,21 @@ SVN::Delta - Subversion delta functions
# driving an editor
my $editor = SVN::Delta::Editor->
new(SVN::Repos::get_commit_editor($repos, "file://$repospath",
- '/', 'root', 'FOO', \&committed));
+ '/', 'root', 'FOO', \&committed));
my $rootbaton = $editor->open_root(0);
- my $fbaton = $editor->add_file ('filea', $rootbaton,
- undef, -1);
+ my $fbaton = $editor->add_file('filea', $rootbaton,
+ undef, -1);
- my $ret = $editor->apply_textdelta ($fbaton, undef);
+ my $ret = $editor->apply_textdelta($fbaton, undef);
SVN::TxDelta::send_string("FILEA CONTENT", @$ret);
# implement an editor in perl
SVN::Repos::dir_delta($root1, $path, undef,
- $root2, $path,
- SVN::Delta::Editor->new(_debug=>1),
- 1, 1, 0, 1
+ $root2, $path,
+ SVN::Delta::Editor->new(_debug=>1),
+ 1, 1, 0, 1
=head1 DESCRIPTION
@@ -56,11 +56,11 @@ use and its method calls will be relayed
If you want to implement an editor, subclass SVN::Delta::Editor and
implement the editors callbacks. see the METHODS section below.
-=head2 CONSTRUCTOR - new (...)
+=head2 CONSTRUCTOR - new(...)
=over
-=item new ($editor, $editor_baton)
+=item new($editor, $editor_baton)
Link to the native editor
@@ -106,9 +106,9 @@ use SVN::Base qw(Delta svn_txdelta_ appl
# in Perl land.
sub apply {
if (@_ == 5 || (@_ == 4 && ref($_[-1]) ne 'SVN::Pool' && ref($_[-1]) ne '_p_apr_pool_t')) {
- splice(@_, 3, 1);
- my @ret = SVN::_Delta::svn_txdelta_apply(@_);
- return @ret[1,2];
+ splice(@_, 3, 1);
+ my @ret = SVN::_Delta::svn_txdelta_apply(@_);
+ return @ret[1,2];
}
goto \&SVN::_Delta::svn_txdelta_apply;
}
@@ -127,10 +127,10 @@ use SVN::Base qw(Delta svn_delta_editor_
sub convert_editor {
my $self = shift;
$self->{_editor} = $_[0], return 1
- if UNIVERSAL::isa ($_[0], __PACKAGE__);
+ if UNIVERSAL::isa($_[0], __PACKAGE__);
if (ref($_[0]) && $_[0]->isa('_p_svn_delta_editor_t')) {
- @{$self}{qw/_editor _baton/} = @_;
- return 1;
+ @{$self}{qw/_editor _baton/} = @_;
+ return 1;
}
return 0;
}
@@ -140,9 +140,9 @@ sub new {
my $self = bless {}, $class;
unless ($self->convert_editor(@_)) {
- %$self = @_;
- $self->convert_editor (@{$self->{_editor}})
- if $self->{_editor};
+ %$self = @_;
+ $self->convert_editor(@{$self->{_editor}})
+ if $self->{_editor};
}
return $self;
@@ -160,18 +160,18 @@ sub AUTOLOAD {
return unless $func =~ m/[^A-Z]/;
my %ebaton = ( set_target_revision => 1,
- open_root => 1,
- close_edit => 1,
- abort_edit => 1,
- );
+ open_root => 1,
+ close_edit => 1,
+ abort_edit => 1,
+ );
my $self = shift;
no strict 'refs';
- my @ret = UNIVERSAL::isa ($self->{_editor}, __PACKAGE__) ?
- $self->{_editor}->$func (@_) :
+ my @ret = UNIVERSAL::isa($self->{_editor}, __PACKAGE__) ?
+ $self->{_editor}->$func(@_) :
eval { &{"invoke_$func"}($self->{_editor},
- $ebaton{$func} ? $self->{_baton} : (), @_) };
+ $ebaton{$func} ? $self->{_baton} : (), @_) };
die $@ if $@;
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Fs.pm
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Fs.pm?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Fs.pm (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Fs.pm Tue Jul 19 23:05:44 2011
@@ -166,10 +166,10 @@ The oldest revision in any filesystem is
=cut
-our @methods = qw/youngest_rev revision_root revision_prop revision_proplist
- change_rev_prop list_transactions open_txn begin_txn
- get_uuid set_uuid set_access get_access
- lock unlock get_lock get_locks generate_lock_token path/;
+our @methods = qw/ youngest_rev revision_root revision_prop revision_proplist
+ change_rev_prop list_transactions open_txn begin_txn
+ get_uuid set_uuid set_access get_access
+ lock unlock get_lock get_locks generate_lock_token path /;
for (@methods) {
no strict 'refs';
@@ -270,14 +270,14 @@ For transaction roots, returns C<$SVN::C
=cut
-our @methods = qw/apply_textdelta apply_text change_node_prop
- check_path close_root copied_from copy
- dir_entries delete file_contents closest_copy
- file_length file_md5_checksum is_dir is_file
- is_revision_root is_txn_root make_dir make_file
- node_created_rev node_history node_id node_prop
- node_proplist paths_changed revision_link
- revision_root_revision/;
+our @methods = qw/ apply_textdelta apply_text change_node_prop
+ check_path close_root copied_from copy
+ dir_entries delete file_contents closest_copy
+ file_length file_md5_checksum is_dir is_file
+ is_revision_root is_txn_root make_dir make_file
+ node_created_rev node_history node_id node_prop
+ node_proplist paths_changed revision_link
+ revision_root_revision /;
*fs = *SVN::Fs::root_fs;
*txn_name = *_p_svn_fs_txn_t::root_name;
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Makefile.PL.in
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Makefile.PL.in?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Makefile.PL.in (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Makefile.PL.in Tue Jul 19 23:05:44 2011
@@ -52,7 +52,7 @@ my $apu_cflags = '@SVN_APRUTIL_INCLUDES@
# According to the log of r7937, the flags guarded by the conditional break
# the build on FreeBSD if not conditionalized.
-my $apr_ldflags = '@SVN_APR_LIBS@'
+my $apr_ldflags = '@SVN_APR_LIBS@'
if $^O eq 'darwin' or $^O eq 'cygwin';
chomp $apr_shlib_path_var;
@@ -60,8 +60,8 @@ chomp $apr_shlib_path_var;
my %config = (
ABSTRACT => 'Perl bindings for Subversion',
DEFINE => $cppflags,
- CCFLAGS => $cflags,
- INC => join(' ',$apr_cflags, $apu_cflags,
+ CCFLAGS => join(' ', $cflags, $Config{ccflags}),
+ INC => join(' ',$apr_cflags, $apu_cflags,
" -I$swig_srcdir/perl/libsvn_swig_perl",
" -I$svnlib_srcdir/include",
" -I$svnlib_builddir",
@@ -104,8 +104,8 @@ for (@modules) {
# the dependencies need to be fixed
sub MY::postamble {
- my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
- my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+ my $module_c_files = join(' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
my $fullperlrun = "$apr_shlib_path_var=" .
join(':', "\$($apr_shlib_path_var)", @ldpaths);
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Ra.pm
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Ra.pm?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Ra.pm (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Ra.pm Tue Jul 19 23:05:44 2011
@@ -505,7 +505,7 @@ sub new {
# If the auth is already set to a auth_baton ignore it
# otherwise make an auth_baton and store the callbacks
my ($auth_baton, $auth_callbacks) =
- SVN::Core::auth_open_helper($self->{auth});
+ SVN::Core::auth_open_helper($self->{auth});
$self->{auth} = $auth_baton;
$self->{auth_provider_callbacks} = $auth_callbacks;
}
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Repos.pm
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Repos.pm?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Repos.pm (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Repos.pm Tue Jul 19 23:05:44 2011
@@ -71,7 +71,7 @@ Example:
use SVN::Core;
use SVN::Repos;
- my $repos = SVN::Repos::open ('/repo/sandbox');
+ my $repos = SVN::Repos::open('/repo/sandbox');
open my $fh, ">/tmp/tmp.dump" or die "Cannot open file: $!\n";
@@ -124,7 +124,7 @@ Example:
use SVN::Core;
use SVN::Repos;
- my $repos = SVN::Repos::open ('/repo/test_repo');
+ my $repos = SVN::Repos::open('/repo/test_repo');
open my $fh, "/repo/sandbox.dump" or die "Cannot open file: $!\n";
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/compile_all.pl
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/compile_all.pl?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/compile_all.pl (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/compile_all.pl Tue Jul 19 23:05:44 2011
@@ -19,5 +19,5 @@
use strict;
for my $file qw( Client.pm Core.pm Delta.pm Fs.pm Ra.pm Repos.pm Wc.pm ) {
- system("$^X -Mblib scripts/fast_svnbase.pl $file > blib/lib/SVN/${file}c");
+ system("$^X -Mblib scripts/fast_svnbase.pl $file > blib/lib/SVN/${file}c");
}
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/fast_svnbase.pl
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/fast_svnbase.pl?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/fast_svnbase.pl (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/fast_svnbase.pl Tue Jul 19 23:05:44 2011
@@ -72,21 +72,21 @@ sub _compile_import {
my @subs;
no strict 'refs';
for (keys %{"SVN::_${pkg}::"}) {
- my $name = $_;
- next unless s/^$prefix_re//;
- next if $ignore_re && m/$ignore_re/;
+ my $name = $_;
+ next unless s/^$prefix_re//;
+ next if $ignore_re && m/$ignore_re/;
- # insert the accessor
- if (m/(.*)_get$/) {
- my $member = $1;
- push @subs, qq!*$member = sub { &{"SVN::_${pkg}::${prefix}${member}_".
- (\@_ > 1 ? 'set' : 'get')}(\@_)} !;
- }
- elsif (m/(.*)_set$/) {
- }
- else {
- push @subs, qq!*$_ = \$SVN::_${pkg}::{$name}!;
- }
+ # insert the accessor
+ if (m/(.*)_get$/) {
+ my $member = $1;
+ push @subs, qq!*$member = sub { &{"SVN::_${pkg}::${prefix}${member}_".
+ (\@_ > 1 ? 'set' : 'get')}(\@_)} !;
+ }
+ elsif (m/(.*)_set$/) {
+ }
+ else {
+ push @subs, qq!*$_ = \$SVN::_${pkg}::{$name}!;
+ }
}
return "{ no strict 'refs';\n ". join(";\n ", @subs, '')."}\n";
}
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/1repos.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/1repos.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/1repos.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/1repos.t Tue Jul 19 23:05:44 2011
@@ -46,15 +46,15 @@ sub committed {
my $editor = SVN::Delta::Editor->
new(SVN::Repos::get_commit_editor($repos, "file://$repospath",
- '/', 'root', 'FOO', \&committed));
+ '/', 'root', 'FOO', \&committed));
my $rootbaton = $editor->open_root(0);
-my $dirbaton = $editor->add_directory ('trunk', $rootbaton, undef, 0);
+my $dirbaton = $editor->add_directory('trunk', $rootbaton, undef, 0);
-my $fbaton = $editor->add_file ('trunk/filea', $dirbaton, undef, -1);
+my $fbaton = $editor->add_file('trunk/filea', $dirbaton, undef, -1);
-my $ret = $editor->apply_textdelta ($fbaton, undef);
+my $ret = $editor->apply_textdelta($fbaton, undef);
SVN::TxDelta::send_string("FILEA CONTENT", @$ret);
@@ -63,13 +63,13 @@ $editor->close_edit();
cmp_ok($fs->youngest_rev, '==', 1);
{
$editor = SVN::Delta::Editor->
- new (SVN::Repos::get_commit_editor($repos, "file://$repospath",
- '/', 'root', 'FOO', \&committed));
+ new(SVN::Repos::get_commit_editor($repos, "file://$repospath",
+ '/', 'root', 'FOO', \&committed));
my $rootbaton = $editor->open_root(1);
-my $dirbaton = $editor->add_directory ('tags', $rootbaton, undef, 1);
-my $subdirbaton = $editor->add_directory ('tags/foo', $dirbaton,
- "file://$repospath/trunk", 1);
+my $dirbaton = $editor->add_directory('tags', $rootbaton, undef, 1);
+my $subdirbaton = $editor->add_directory('tags/foo', $dirbaton,
+ "file://$repospath/trunk", 1);
$editor->close_edit();
}
@@ -77,27 +77,27 @@ cmp_ok($fs->youngest_rev, '==', 2);
my @history;
-SVN::Repos::history ($fs, 'tags/foo/filea',
- sub {push @history, [@_[0,1]]}, 0, 2, 1);
+SVN::Repos::history($fs, 'tags/foo/filea',
+ sub {push @history, [@_[0,1]]}, 0, 2, 1);
-is_deeply (\@history, [['/tags/foo/filea',2],['/trunk/filea',1]],
- 'repos_history');
+is_deeply(\@history, [['/tags/foo/filea',2],['/trunk/filea',1]],
+ 'repos_history');
{
my $pool = SVN::Pool->new_default;
my $something = bless {}, 'something';
$editor = SVN::Delta::Editor->
- new (SVN::Repos::get_commit_editor($repos, "file://$repospath",
- '/', 'root', 'FOO', sub {committed(@_);
- $something;
- }));
+ new(SVN::Repos::get_commit_editor($repos, "file://$repospath",
+ '/', 'root', 'FOO', sub {committed(@_);
+ $something;
+ }));
my $rootbaton = $editor->open_root(2);
$editor->delete_entry('tags', 2, $rootbaton);
$editor->close_edit();
}
-ok ($main::something_destroyed, 'callback properly destroyed');
+ok($main::something_destroyed, 'callback properly destroyed');
cmp_ok($fs->youngest_rev, '==', 3);
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/2fs.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/2fs.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/2fs.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/2fs.t Tue Jul 19 23:05:44 2011
@@ -80,7 +80,7 @@ ok($root->is_file($path), 'is_file');
my $stream = $root->file_contents($path);
local $/;
is(<$stream>, $text, 'content verified');
- is($root->file_md5_checksum ($path), 'dd2314129f81675e95b940ff94ddc935',
+ is($root->file_md5_checksum($path), 'dd2314129f81675e95b940ff94ddc935',
'md5 verified');
}
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/3client.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/3client.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/3client.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/3client.t Tue Jul 19 23:05:44 2011
@@ -26,7 +26,7 @@ use strict;
# shut up about variables that are only used once.
# these come from constants and variables used
# by the bindings but not elsewhere in perl space.
-no warnings 'once';
+no warnings 'once';
use_ok('SVN::Core');
use_ok('SVN::Repos');
@@ -74,7 +74,7 @@ ok(SVN::Client::uuid_from_url($reposurl,
ok(SVN::Client::uuid_from_url($reposurl,$ctx->{'ctx'}),
'Valid return from uuid_from_url function form with _p_svn_client_ctx object');
-
+
my ($ci_dir1) = $ctx->mkdir(["$reposurl/dir1"]);
isa_ok($ci_dir1,'_p_svn_client_commit_info_t');
$current_rev++;
@@ -133,8 +133,8 @@ is($ctx->add("$wcpath/dir1/new",0),undef
'Returned undef from add schedule operation');
# test the log_msg callback
-$ctx->log_msg(
- sub
+$ctx->log_msg(
+ sub
{
my ($log_msg,$tmp_file,$commit_items,$pool) = @_;
isa_ok($log_msg,'SCALAR','log_msg param to callback is a SCALAR');
@@ -202,11 +202,11 @@ is($ctx->info("$wcpath/dir1/new", undef,
my $svn_error = $ctx->info("$wcpath/dir1/newxyz", undef, 'WORKING', sub {}, 0);
isa_ok($svn_error, '_p_svn_error_t',
'info should return _p_svn_error_t for a nonexistent file');
-$svn_error->clear(); #don't leak this
+$svn_error->clear(); #don't leak this
# test getting the log
is($ctx->log("$reposurl/dir1/new",$current_rev,$current_rev,1,0,
- sub
+ sub
{
my ($changed_paths,$revision,
$author,$date,$message,$pool) = @_;
@@ -239,7 +239,7 @@ is($ctx->update($wcpath,'HEAD',1),$curre
'Return from update is the current rev');
# no return so we should get undef as the result
-# we will get a _p_svn_error_t if there is an error.
+# we will get a _p_svn_error_t if there is an error.
is($ctx->propset('perl-test','test-val',"$wcpath/dir1",0),undef,
'propset on a working copy path returns undef');
@@ -248,7 +248,7 @@ isa_ok($ph,'HASH','propget returns a has
is($ph->{"$wcpath/dir1"},'test-val','perl-test property has the correct value');
# No revnum for the working copy so we should get INVALID_REVNUM
-is($ctx->status($wcpath, undef, sub {
+is($ctx->status($wcpath, undef, sub {
my ($path,$wc_status) = @_;
is($path,"$wcpath/dir1",
'path param to status callback is' .
@@ -390,21 +390,21 @@ SKIP: {
# one command to run to test it. If you want to use this you need
# to change the usernames, passwords, and paths to the client cert.
# It assumes that there is a repo running on localhost port 443 at
- # via SSL. The repo cert should trip a client trust issue. The
+ # via SSL. The repo cert should trip a client trust issue. The
# client cert should be encrypted and require a pass to use it.
# Finally uncomment the skip line below.
- # Before shipping make sure the following line is uncommented.
+ # Before shipping make sure the following line is uncommented.
skip 'Impossible to test without external effort to setup https', 7;
-
+
sub simple_prompt {
my $cred = shift;
my $realm = shift;
my $username_passed = shift;
- my $may_save = shift;
+ my $may_save = shift;
my $pool = shift;
-
- ok(1,'simple_prompt called');
+
+ ok(1,'simple_prompt called');
$cred->username('breser');
$cred->password('foo');
}
@@ -416,7 +416,7 @@ SKIP: {
my $cert_info = shift;
my $may_save = shift;
my $pool = shift;
-
+
ok(1,'ssl_server_trust_prompt called');
$cred->may_save(0);
$cred->accepted_failures($failures);
@@ -436,10 +436,10 @@ SKIP: {
my $cred = shift;
my $may_save = shift;
my $pool = shift;
-
+
ok(1,'ssl_client_cert_pw_prompt called');
$cred->password('test');
- }
+ }
my $oldauthbaton = $ctx->auth();
@@ -453,9 +453,9 @@ SKIP: {
\&ssl_client_cert_pw_prompt,2)
),'_p_svn_auth_baton_t',
'auth() accessor returns _p_svn_auth_baton');
-
- # if this doesn't work we will get an svn_error_t so by
- # getting a hash we know it worked.
+
+ # if this doesn't work we will get an svn_error_t so by
+ # getting a hash we know it worked.
my ($dirents) = $ctx->ls('https://localhost/svn/test','HEAD',1);
isa_ok($dirents,'HASH','ls returns a HASH');
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/4pool.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/4pool.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/4pool.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/4pool.t Tue Jul 19 23:05:44 2011
@@ -28,7 +28,7 @@ use File::Temp qw(tempdir);
# shut up about variables that are only used once.
# these come from constants and variables used
# by the bindings but not elsewhere in perl space.
-no warnings 'once';
+no warnings 'once';
require SVN::Core;
require SVN::Repos;
@@ -41,14 +41,14 @@ our @ISA = qw(SVN::Delta::Editor);
sub add_directory {
my ($self, $path, undef, undef, undef, $pool) = @_;
$pool->default;
- main::is_pool_default ($pool, 'default pool from c calls');
+ main::is_pool_default($pool, 'default pool from c calls');
}
package main;
sub is_pool_default {
my ($pool, $text) = @_;
- is (ref ($pool) eq 'SVN::Pool' ? $$$pool : $$pool,
- $$SVN::_Core::current_pool, $text);
+ is(ref($pool) eq 'SVN::Pool' ? $$$pool : $$pool,
+ $$SVN::_Core::current_pool, $text);
}
my $repospath = tempdir('svn-perl-test-XXXXXX', TMPDIR => 1, CLEANUP => 1);
@@ -62,16 +62,16 @@ my $fs = $repos->fs;
my $pool = SVN::Pool->new_default;
-is_pool_default ($pool, 'default pool');
+is_pool_default($pool, 'default pool');
{
my $spool = SVN::Pool->new_default_sub;
- is_pool_default ($spool, 'lexical default pool default');
+ is_pool_default($spool, 'lexical default pool default');
}
-is_pool_default ($pool, 'lexical default pool destroyed');
+is_pool_default($pool, 'lexical default pool destroyed');
-my $root = $fs->revision_root (0);
+my $root = $fs->revision_root(0);
my $txn = $fs->begin_txn(0);
@@ -80,13 +80,13 @@ $txn->root->make_dir('trunk');
$txn->commit;
-SVN::Repos::dir_delta ($root, '', '',
- $fs->revision_root (1), '',
- TestEditor->new(),
- undef, 1, 1, 0, 1);
+SVN::Repos::dir_delta($root, '', '',
+ $fs->revision_root(1), '',
+ TestEditor->new(),
+ undef, 1, 1, 0, 1);
-is_pool_default ($pool, 'default pool from c calls destroyed');
+is_pool_default($pool, 'default pool from c calls destroyed');
END {
diag('cleanup');
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta-compat.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta-compat.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta-compat.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta-compat.t Tue Jul 19 23:05:44 2011
@@ -31,13 +31,13 @@ open my $source, '<', \$srctext;
open my $target, '<', \$tgttext;
open my $aresult, '>', \$result;
-my $txstream = SVN::TxDelta::new ($source, $target);
+my $txstream = SVN::TxDelta::new($source, $target);
-isa_ok ($txstream, '_p_svn_txdelta_stream_t');
+isa_ok($txstream, '_p_svn_txdelta_stream_t');
open my $asource, '<', \$srctext;
-my $handle = [SVN::TxDelta::apply ($asource, $aresult, undef, undef)];
+my $handle = [SVN::TxDelta::apply($asource, $aresult, undef, undef)];
-SVN::TxDelta::send_txstream ($txstream, @$handle);
+SVN::TxDelta::send_txstream($txstream, @$handle);
-is ($result, $tgttext, 'delta self test');
+is($result, $tgttext, 'delta self test');
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta.t Tue Jul 19 23:05:44 2011
@@ -31,14 +31,14 @@ open my $source, '<', \$srctext;
open my $target, '<', \$tgttext;
open my $aresult, '>', \$result;
-my $txstream = SVN::TxDelta::new ($source, $target);
+my $txstream = SVN::TxDelta::new($source, $target);
-isa_ok ($txstream, '_p_svn_txdelta_stream_t');
+isa_ok($txstream, '_p_svn_txdelta_stream_t');
open my $asource, '<', \$srctext;
-my ($md5, @handle) = SVN::TxDelta::apply ($asource, $aresult, undef);
+my ($md5, @handle) = SVN::TxDelta::apply($asource, $aresult, undef);
-SVN::TxDelta::send_txstream ($txstream, @handle);
+SVN::TxDelta::send_txstream($txstream, @handle);
-is ($result, $tgttext, 'delta self test');
+is($result, $tgttext, 'delta self test');
is("$md5", 'a22b3dadcbddac48d2f1eae3ec5fb86a', 'md5 matched');
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/7editor.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/7editor.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/7editor.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/7editor.t Tue Jul 19 23:05:44 2011
@@ -48,21 +48,21 @@ sub committed {
my $editor = SVN::Delta::Editor->
new(SVN::Repos::get_commit_editor($repos, "file://$repospath",
- '/', 'root', 'FOO', \&committed));
+ '/', 'root', 'FOO', \&committed));
my $rootbaton = $editor->open_root(0);
-my $dirbaton = $editor->add_directory ('trunk', $rootbaton, undef, 0);
-my $fbaton = $editor->add_file ('trunk/filea', $dirbaton, undef, -1);
-my $ret = $editor->apply_textdelta ($fbaton, undef);
+my $dirbaton = $editor->add_directory('trunk', $rootbaton, undef, 0);
+my $fbaton = $editor->add_file('trunk/filea', $dirbaton, undef, -1);
+my $ret = $editor->apply_textdelta($fbaton, undef);
SVN::TxDelta::send_string("FILEA CONTENT", @$ret);
$editor->close_edit();
eval {
my $pool = SVN::Pool->new_default;
-SVN::Repos::dir_delta ($fs->revision_root (0), '/', '',
- $fs->revision_root (1), '/',
- MyEditor->new (crap => bless {}, 'something'),
- undef, 1, 1, 0, 0);
+SVN::Repos::dir_delta($fs->revision_root(0), '/', '',
+ $fs->revision_root(1), '/',
+ MyEditor->new(crap => bless {}, 'something'),
+ undef, 1, 1, 0, 0);
};
-ok ($main::something_destroyed, 'editor');
+ok($main::something_destroyed, 'editor');
package something;
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/8lock.t
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/8lock.t?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/8lock.t (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/8lock.t Tue Jul 19 23:05:44 2011
@@ -43,7 +43,7 @@ ok($repos = SVN::Repos::create("$repospa
my $fs = $repos->fs;
my $acc = SVN::Fs::create_access('foo');
-is ($acc->get_username, 'foo');
+is($acc->get_username, 'foo');
$fs->set_access($acc);
my $txn = $fs->begin_txn($fs->youngest_rev);
@@ -54,18 +54,18 @@ print $stream 'orz';
}
$txn->commit;
-$fs->lock ('/testfile', 'hate software', 'we hate software', 0, 0, $fs->youngest_rev, 0);
+$fs->lock('/testfile', 'hate software', 'we hate software', 0, 0, $fs->youngest_rev, 0);
ok(my $lock = $fs->get_lock('/testfile'));
-is ($lock->token, 'hate software');
-is ($lock->owner, 'foo');
+is($lock->token, 'hate software');
+is($lock->owner, 'foo');
$acc = SVN::Fs::create_access('fnord');
-is ($acc->get_username, 'fnord');
+is($acc->get_username, 'fnord');
$fs->set_access($acc);
eval {
-$fs->lock ('/testfile', 'hate software', 'we hate software', 0, 0, $fs->youngest_rev, 0);
+$fs->lock('/testfile', 'hate software', 'we hate software', 0, 0, $fs->youngest_rev, 0);
};
like($@, qr/already locked/);
Propchange: subversion/branches/gpg-agent-password-store/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 19 23:05:44 2011
@@ -31,6 +31,7 @@
/subversion/branches/py-tests-as-modules/subversion/libsvn_diff/diff.h:956579-1033052
/subversion/branches/ra_serf-digest-authn/subversion/libsvn_diff/diff.h:875693-876404
/subversion/branches/reintegrate-improvements/subversion/libsvn_diff/diff.h:873853-874164
+/subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h:1143907,1143971,1144017,1144568,1146145
/subversion/branches/subtree-mergeinfo/subversion/libsvn_diff/diff.h:876734-878766
/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_diff/diff.h:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements/subversion/libsvn_diff/diff.h:918519-934609
@@ -43,3 +44,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008
+/subversion/trunk/subversion/include/private/svn_adler32.h:1005036-1148548
Propchange: subversion/branches/gpg-agent-password-store/subversion/include/private/svn_io_private.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/gpg-agent-password-store/subversion/include/private/svn_opt_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/private/svn_opt_private.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/private/svn_opt_private.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/private/svn_opt_private.h Tue Jul 19 23:05:44 2011
@@ -67,7 +67,7 @@ svn_opt__split_arg_at_peg_revision(const
* valid URL:
* - escape IRI characters and some other non-URI characters
* - check that no back-path ("..") components are present
- * - canonicalize the separator ("/") characters
+ * - call svn_uri_canonicalize()
* URL_IN is in UTF-8 encoding and has no peg revision specifier.
* Set *URL_OUT to the result, allocated from POOL.
*/
@@ -84,6 +84,7 @@ svn_opt__arg_canonicalize_url(const char
* - If the path does not exist (which is valid) the given capitalization
* is used.
* - canonicalize the separator ("/") characters
+ * - call svn_dirent_canonicalize()
* PATH_IN is in UTF-8 encoding and has no peg revision specifier.
* Set *PATH_OUT to the result, allocated from POOL.
*/
Propchange: subversion/branches/gpg-agent-password-store/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 19 23:05:44 2011
@@ -39,6 +39,7 @@
/subversion/branches/py-tests-as-modules/subversion/include/svn_string.h:956579-1033052
/subversion/branches/ra_serf-digest-authn/subversion/include/svn_string.h:875693-876404
/subversion/branches/reintegrate-improvements/subversion/include/svn_string.h:873853-874164
+/subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h:1143907,1143971,1144017,1144568,1146145
/subversion/branches/subtree-mergeinfo/subversion/include/svn_string.h:876734-878766
/subversion/branches/svn-mergeinfo-enhancements/subversion/include/svn_string.h:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements/subversion/include/svn_string.h:918519-934609
@@ -52,3 +53,4 @@
/subversion/branches/tree-conflicts/subversion/include/svn_string.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/include/svn_string.h:873926-874008
/subversion/branches/uris-as-urls/subversion/include/svn_string.h:1060426-1064427
+/subversion/trunk/subversion/include/private/svn_string_private.h:1005036-1148548
Propchange: subversion/branches/gpg-agent-password-store/subversion/include/private/svn_temp_serializer.h
('svn:mergeinfo' removed)
Modified: subversion/branches/gpg-agent-password-store/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/private/svn_wc_private.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/private/svn_wc_private.h Tue Jul 19 23:05:44 2011
@@ -310,7 +310,7 @@ svn_wc__status2_from_3(svn_wc_status2_t
* absolute paths.
*
* Include children that are scheduled for deletion. Iff @a show_hidden
- * is true, also include children that are 'excluded' or 'absent' or
+ * is true, also include children that are 'excluded' or 'server-excluded' or
* 'not-present'.
*
* Return every path that refers to a child of the working node at
@@ -875,18 +875,20 @@ svn_wc__has_switched_subtrees(svn_boolea
const char *trail_url,
apr_pool_t *scratch_pool);
-/* Set @a *absent_subtrees to a hash mapping <tt>const char *</tt> local
- * absolute paths to <tt>const char *</tt> local absolute paths for every
- * path at or under @a local_abspath in @a wc_ctx which are absent (excluded
- * by authz). If no absent paths are found then @a *absent_subtrees is set
- * to @c NULL. Allocate the hash and all items therein from @a result_pool.
+/* Set @a *server_excluded_subtrees to a hash mapping <tt>const char *</tt>
+ * local * absolute paths to <tt>const char *</tt> local absolute paths for
+ * every path at or under @a local_abspath in @a wc_ctx which are excluded
+ * by the server (e.g. because of authz).
+ * If no server-excluded paths are found then @a *server_excluded_subtrees
+ * is set to @c NULL.
+ * Allocate the hash and all items therein from @a result_pool.
*/
svn_error_t *
-svn_wc__get_absent_subtrees(apr_hash_t **absent_subtrees,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_wc__get_server_excluded_subtrees(apr_hash_t **server_excluded_subtrees,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Indicate in @a *is_modified whether the working copy has local
* modifications, using context @a wc_ctx.
@@ -978,7 +980,7 @@ svn_wc__get_not_present_descendants(cons
* direct parent does not exist or is deleted return _state_obstructed. When
* a node doesn't exist but should exist return svn_wc_notify_state_missing.
*
- * A node is also obstructed if it is marked excluded or absent or when
+ * A node is also obstructed if it is marked excluded or server-excluded or when
* an unversioned file or directory exists. And if NO_WCROOT_CHECK is FALSE,
* the root of a working copy is also obstructed; this to allow detecting
* obstructing working copies.
@@ -1077,14 +1079,19 @@ typedef svn_error_t *(*svn_wc__info_rece
/* Walk the children of LOCAL_ABSPATH and push svn_wc__info2_t's through
RECEIVER/RECEIVER_BATON. Honor DEPTH while crawling children, and
- filter the pushed items against CHANGELISTS. */
+ filter the pushed items against CHANGELISTS.
+
+ If FETCH_EXCLUDED is TRUE, also fetch excluded nodes.
+ If FETCH_ACTUAL_ONLY is TRUE, also fetch actual-only nodes. */
svn_error_t *
svn_wc__get_info(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_depth_t depth,
+ svn_boolean_t fetch_excluded,
+ svn_boolean_t fetch_actual_only,
+ const apr_array_header_t *changelists,
svn_wc__info_receiver2_t receiver,
void *receiver_baton,
- const apr_array_header_t *changelists,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool);
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_client.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_client.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_client.h Tue Jul 19 23:05:44 2011
@@ -356,8 +356,9 @@ typedef struct svn_client_proplist_item_
/**
* The callback invoked by svn_client_proplist3(). Each invocation
- * describes the property specified by @a item. Use @a pool for all
- * temporary allocation.
+ * provides the regular properties of @a path which is either a WC path or
+ * a URL. @a prop_hash maps property names (char *) to property
+ values (svn_string_t *). Use @a pool for all temporary allocation.
*
* @since New in 1.5.
*/
@@ -476,6 +477,7 @@ typedef struct svn_client_commit_item3_t
/**
* When processing the commit this contains the relative path for
* the commit session. #NULL until the commit item is preprocessed.
+ * @since New in 1.7.
*/
const char *session_relpath;
} svn_client_commit_item3_t;
@@ -2115,6 +2117,9 @@ typedef struct svn_client_status_t
/** The URL of the repository root. */
const char *repos_root_url;
+ /** The UUID of the repository */
+ const char *repos_uuid;
+
/** The in-repository path relative to the repository root. */
const char *repos_relpath;
@@ -2279,7 +2284,7 @@ typedef svn_error_t *(*svn_client_status
*
* If @a path is an absolute path then the @c path parameter passed in each
* call to @a status_func will be an absolute path.
- *
+ *
* All temporary allocations are performed in @a scratch_pool.
*
* @since New in 1.7.
@@ -5384,10 +5389,10 @@ typedef struct svn_client_info2_t
const char *last_changed_author;
/** An exclusive lock, if present. Could be either local or remote. */
- svn_lock_t *lock;
+ const svn_lock_t *lock;
- /* Possible information about the working copy, NULL if not valid. */
- struct svn_wc_info_t *wc_info;
+ /** Possible information about the working copy, NULL if not valid. */
+ const svn_wc_info_t *wc_info;
} svn_client_info2_t;
@@ -5448,6 +5453,11 @@ typedef svn_error_t *(*svn_client_info_r
* recurse fully, invoking @a receiver on @a abspath_or_url and
* everything beneath it.
*
+ * If @a fetch_excluded is TRUE, also also send excluded nodes in the working
+ * copy to @a receiver, otherwise these are skipped. If @a fetch_actual_only
+ * is TRUE also send nodes that don't exist as versioned but are still
+ * tree conflicted.
+ *
* @a changelists is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items whose info is
* reported; that is, don't report info about any item unless
@@ -5460,10 +5470,12 @@ svn_error_t *
svn_client_info3(const char *abspath_or_url,
const svn_opt_revision_t *peg_revision,
const svn_opt_revision_t *revision,
- svn_client_info_receiver2_t receiver,
- void *receiver_baton,
svn_depth_t depth,
+ svn_boolean_t fetch_excluded,
+ svn_boolean_t fetch_actual_only,
const apr_array_header_t *changelists,
+ svn_client_info_receiver2_t receiver,
+ void *receiver_baton,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool);
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_dav.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_dav.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_dav.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_dav.h Tue Jul 19 23:05:44 2011
@@ -266,6 +266,11 @@ extern "C" {
*/
#define SVN_DAV_NS_DAV_SVN_MERGEINFO SVN_DAV_PROP_NS_DAV "svn/mergeinfo"
+/** Similar SVN_DAV_NS_DAV_SVN_MERGEINFO but indicates that the server
+ * knows how to handle requests to validate inherited mergeinfo. */
+#define SVN_DAV_NS_DAV_SVN_MERGEINFO_VALIDATION \
+ SVN_DAV_PROP_NS_DAV "svn/mergeinfo-validation"
+
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to send
* custom revprops in log responses. */
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_dirent_uri.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_dirent_uri.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_dirent_uri.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_dirent_uri.h Tue Jul 19 23:05:44 2011
@@ -575,6 +575,9 @@ svn_uri__is_child(const char *parent_uri
* the same as @a parent_dirent, it is not considered a child, so the result
* is @c NULL; an empty string is never returned.
*
+ * ### TODO: Deprecate, as the semantics are trivially
+ * obtainable from *_skip_ancestor().
+ *
* @since New in 1.6.
*/
const char *
@@ -594,6 +597,9 @@ svn_relpath__is_child(const char *parent
/** Return TRUE if @a parent_dirent is an ancestor of @a child_dirent or
* the dirents are equal, and FALSE otherwise.
*
+ * ### TODO: Deprecate, as the semantics are trivially
+ * obtainable from *_skip_ancestor().
+ *
* @since New in 1.6.
*/
svn_boolean_t
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_error.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_error.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_error.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_error.h Tue Jul 19 23:05:44 2011
@@ -383,14 +383,15 @@ svn_error_t *svn_error_purge_tracing(svn
* Return TRUE if @a err is an error specifically related to locking a
* path in the repository, FALSE otherwise.
*
- * SVN_ERR_FS_OUT_OF_DATE is in here because it's a non-fatal error
- * that can be thrown when attempting to lock an item.
+ * SVN_ERR_FS_OUT_OF_DATE and SVN_ERR_FS_NOT_FOUND are in here because it's a
+ * non-fatal error that can be thrown when attempting to lock an item.
*
* @since New in 1.2.
*/
#define SVN_ERR_IS_LOCK_ERROR(err) \
(err->apr_err == SVN_ERR_FS_PATH_ALREADY_LOCKED || \
- err->apr_err == SVN_ERR_FS_OUT_OF_DATE) \
+ err->apr_err == SVN_ERR_FS_NOT_FOUND || \
+ err->apr_err == SVN_ERR_FS_OUT_OF_DATE)
/**
* Return TRUE if @a err is an error specifically related to unlocking
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_error_codes.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_error_codes.h Tue Jul 19 23:05:44 2011
@@ -383,7 +383,9 @@ SVN_ERROR_START
/** @deprecated Provided for backward compatibility with the 1.6 API.
* Use #SVN_ERR_WC_NOT_WORKING_COPY. */
-#define SVN_ERR_WC_NOT_DIRECTORY SVN_ERR_WC_NOT_WORKING_COPY
+ SVN_ERRDEF(SVN_ERR_WC_NOT_DIRECTORY,
+ SVN_ERR_WC_NOT_WORKING_COPY,
+ "Path is not a working copy directory")
SVN_ERRDEF(SVN_ERR_WC_NOT_FILE,
SVN_ERR_WC_CATEGORY_START + 8,
@@ -520,12 +522,18 @@ SVN_ERROR_START
/** @since New in 1.7. */
SVN_ERRDEF(SVN_ERR_WC_CLEANUP_REQUIRED,
SVN_ERR_WC_CATEGORY_START + 37,
- "Previous operation was interrupted; run 'svn cleanup'")
+ "Previous operation has not finished; "
+ "run 'cleanup' if it was interrupted")
/** @since New in 1.7. */
SVN_ERRDEF(SVN_ERR_WC_INVALID_OPERATION_DEPTH,
SVN_ERR_WC_CATEGORY_START + 38,
- "This operation can not be performed with just this depth.")
+ "The operation cannot be performed with the specified depth")
+
+ /** @since New in 1.7. */
+ SVN_ERRDEF(SVN_ERR_WC_PATH_ACCESS_DENIED,
+ SVN_ERR_WC_CATEGORY_START + 39,
+ "Couldn't open a working copy file because access was denied")
/* fs errors */
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_fs.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_fs.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_fs.h Tue Jul 19 23:05:44 2011
@@ -113,13 +113,6 @@ typedef struct svn_fs_t svn_fs_t;
* @since New in 1.6.
*/
#define SVN_FS_CONFIG_PRE_1_6_COMPATIBLE "pre-1.6-compatible"
-
-/** Create repository format compatible with Subversion versions
- * earlier than 1.7.
- *
- * @since New in 1.7.
- */
-#define SVN_FS_CONFIG_PRE_1_7_COMPATIBLE "pre-1.7-compatible"
/** @} */
@@ -253,6 +246,23 @@ svn_fs_upgrade(const char *path,
apr_pool_t *pool);
/**
+ * Perform backend-specific data consistency and correctness validations
+ * to the Subversion filesystem located in the directory @a path.
+ * Use @a pool for necessary allocations.
+ *
+ * @note You probably don't want to use this directly. Take a look at
+ * svn_repos_verify_fs2() instead, which does non-backend-specific
+ * verifications as well.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs_verify(const char *path,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
+
+/**
* Return, in @a *fs_type, a string identifying the back-end type of
* the Subversion filesystem located in @a path. Allocate @a *fs_type
* in @a pool.
@@ -944,7 +954,7 @@ svn_fs_change_txn_prop(svn_fs_txn_t *txn
/** Change, add, and/or delete transaction property values in
* transaction @a txn. @a props is an array of <tt>svn_prop_t</tt>
- * elements. This is equivalent to calling svn_fs_change_txp_prop()
+ * elements. This is equivalent to calling svn_fs_change_txn_prop()
* multiple times with the @c name and @c value fields of each
* successive <tt>svn_prop_t</tt>, but may be more efficient.
* (Properties not mentioned are left alone.) Do any necessary
@@ -2023,7 +2033,7 @@ svn_fs_get_uuid(svn_fs_t *fs,
/** If not @c NULL, associate @a *uuid with @a fs. Otherwise (if @a
* uuid is @c NULL), generate a new UUID for @a fs. Use @a pool for
- * any scratchwork.
+ * any scratch work.
*/
svn_error_t *
svn_fs_set_uuid(svn_fs_t *fs,
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_opt.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_opt.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_opt.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_opt.h Tue Jul 19 23:05:44 2011
@@ -616,7 +616,7 @@ svn_opt_parse_all_args(apr_array_header_
apr_pool_t *pool);
/**
- * Parse a working-copy or URL in @a path, extracting any trailing
+ * Parse a working-copy path or URL in @a path, extracting any trailing
* revision specifier of the form "@rev" from the last component of
* the path.
*
@@ -632,14 +632,14 @@ svn_opt_parse_all_args(apr_array_header_
* - "http://a/b@%7B1999-12-31%7D" -> "http://a/b", (date, 1999-12-31)
* - "foo/bar@1:2" -> error
* - "foo/bar@baz" -> error
- * - "foo/bar@" -> "foo/bar", (base)
- * - "foo/@bar@" -> "foo/@bar", (base)
+ * - "foo/bar@" -> "foo/bar", (unspecified)
+ * - "foo/@bar@" -> "foo/@bar", (unspecified)
* - "foo/bar/@13" -> "foo/bar/", (number, 13)
* - "foo/bar@@13" -> "foo/bar@", (number, 13)
* - "foo/@bar@HEAD" -> "foo/@bar", (head)
* - "foo@/bar" -> "foo@/bar", (unspecified)
* - "foo@HEAD/bar" -> "foo@HEAD/bar", (unspecified)
- * - "@foo/bar" -> error
+ * - "@foo/bar" -> "@foo/bar", (unspecified)
* - "@foo/bar@" -> "@foo/bar", (unspecified)
*
* [*] Syntactically valid but probably not semantically useful.
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_ra.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_ra.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_ra.h Tue Jul 19 23:05:44 2011
@@ -1017,13 +1017,11 @@ svn_ra_get_dir(svn_ra_session_t *session
* @a inherit indicates whether explicit, explicit or inherited, or
* only inherited mergeinfo for @a paths is retrieved.
*
- * If the mergeinfo for any path is inherited and
- * @a *validate_inherited_mergeinfo is TRUE, then request that the server
+ * If server supports the #SVN_RA_CAPABILITY_VALIDATE_INHERITED_MERGEINFO
+ * capability, the mergeinfo for any path is inherited, and
+ * @a validate_inherited_mergeinfo is TRUE, then request that the server
* validate the mergeinfo in @a *catalog, so it contains only merge source
- * path-revisions that actually exist in repository. If validation is
- * requested and the server supports it, then set
- * @a *validate_inherited_mergeinfo to TRUE on return. Set it to FALSE
- * in all other cases.
+ * path-revisions that actually exist in repository.
*
* If @a include_descendants is TRUE, then additionally return the
* mergeinfo for any descendant of any element of @a paths which has
@@ -1049,7 +1047,7 @@ svn_ra_get_mergeinfo2(svn_ra_session_t *
const apr_array_header_t *paths,
svn_revnum_t revision,
svn_mergeinfo_inheritance_t inherit,
- svn_boolean_t *validate_inherited_mergeinfo,
+ svn_boolean_t validate_inherited_mergeinfo,
svn_boolean_t include_descendants,
apr_pool_t *pool);
@@ -1982,6 +1980,15 @@ svn_ra_has_capability(svn_ra_session_t *
*/
#define SVN_RA_CAPABILITY_ATOMIC_REVPROPS "atomic-revprops"
+/**
+ * The capability of validating inherited mergeinfo in
+ * svn_ra_get_mergeinfo2().
+ *
+ * @since New in 1.7.
+ */
+#define SVN_RA_CAPABILITY_VALIDATE_INHERITED_MERGEINFO \
+ "validate-inherited-mergeinfo"
+
/* *** PLEASE READ THIS IF YOU ADD A NEW CAPABILITY ***
*
* RA layers generally fetch all capabilities when asked about any
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_ra_svn.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_ra_svn.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_ra_svn.h Tue Jul 19 23:05:44 2011
@@ -54,6 +54,9 @@ extern "C" {
#define SVN_RA_SVN_CAP_COMMIT_REVPROPS "commit-revprops"
/* maps to SVN_RA_CAPABILITY_MERGEINFO: */
#define SVN_RA_SVN_CAP_MERGEINFO "mergeinfo"
+/* maps to SVN_RA_CAPABILITY_VALIDATE_INHERITED_MERGEINFO: */
+#define SVN_RA_SVN_CAP_VALIDATE_INHERITED_MERGEINFO \
+ "validate-inherited-mergeinfo"
/* maps to SVN_RA_CAPABILITY_DEPTH: */
#define SVN_RA_SVN_CAP_DEPTH "depth"
/* maps to SVN_RA_CAPABILITY_LOG_REVPROPS */
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_repos.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_repos.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_repos.h Tue Jul 19 23:05:44 2011
@@ -300,10 +300,10 @@ typedef struct svn_repos_notify_t
#svn_repos_notify_pack_shard_end_revprop, the shard processed. */
apr_int64_t shard;
- /** For #svn_repos_notify_load_commited_rev, the revision committed. */
+ /** For #svn_repos_notify_load_committed_rev, the revision committed. */
svn_revnum_t new_revision;
- /** For #svn_repos_notify_load_commited_rev, the source revision, if
+ /** For #svn_repos_notify_load_committed_rev, the source revision, if
different from @a new_revision, otherwise #SVN_INVALID_REVNUM.
For #svn_repos_notify_load_txn_start, the source revision. */
svn_revnum_t old_revision;
@@ -1625,7 +1625,7 @@ svn_repos_node_location_segments(svn_rep
* If @a include_merged_revisions is set, log information for revisions
* which have been merged to @a paths will also be returned, unless these
* revisions are already part of @a start to @a end in @a repos's
- * filesystem, as limted by @a paths. In the latter case those revisions
+ * filesystem, as limited by @a paths. In the latter case those revisions
* are skipped and @a receiver is not invoked.
*
* If @a revprops is NULL, retrieve all revprops; else, retrieve only the
Modified: subversion/branches/gpg-agent-password-store/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/include/svn_types.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/include/svn_types.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/include/svn_types.h Tue Jul 19 23:05:44 2011
@@ -131,7 +131,7 @@ typedef struct svn_error_t
} svn_error_t;
-/* See svn_version.h.
+/* See svn_version.h.
Defined here to avoid including svn_version.h from all public headers. */
typedef struct svn_version_t svn_version_t;