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 [6/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/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/LogMessageCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/MessageReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/MessageReceiver.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Notify.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Notify.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Notify2.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify2.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify2.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify2.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Notify2.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify2.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify2.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify2.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Outputer.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Outputer.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Path.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Path.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Path.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Path.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Path.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Path.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Path.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Path.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Pool.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Pool.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Pool.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Pool.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Pool.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Pool.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Pool.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Pool.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/ProgressListener.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProgressListener.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProgressListener.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProgressListener.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/ProgressListener.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProgressListener.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProgressListener.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProgressListener.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Prompter.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/ProplistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProplistCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProplistCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProplistCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/ProplistCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProplistCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProplistCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProplistCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Revision.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Revision.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Revision.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Revision.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Revision.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Revision.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Revision.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Revision.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevisionRange.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevisionRange.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/RevisionRange.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevisionRange.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevisionRange.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevisionRange.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/RevpropTable.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevpropTable.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevpropTable.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevpropTable.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/RevpropTable.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevpropTable.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevpropTable.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevpropTable.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/SVNAdmin.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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
@@ -64,12 +64,12 @@ void SVNAdmin::create(const char *path,
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
if (configPath != NULL)
- configPath = svn_path_internal_style(configPath, requestPool.pool());
+ configPath = svn_dirent_internal_style(configPath, requestPool.pool());
svn_repos_t *repos;
apr_hash_t *config;
- apr_hash_t *fs_config = apr_hash_make (requestPool.pool());;
+ apr_hash_t *fs_config = apr_hash_make (requestPool.pool());
apr_hash_set (fs_config, SVN_FS_CONFIG_BDB_TXN_NOSYNC,
APR_HASH_KEY_STRING,
@@ -93,7 +93,7 @@ void SVNAdmin::deltify(const char *path,
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
svn_fs_t *fs;
svn_revnum_t start = SVN_INVALID_REVNUM, end = SVN_INVALID_REVNUM;
@@ -157,7 +157,7 @@ void SVNAdmin::dump(const char *path, Ou
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
svn_fs_t *fs;
svn_revnum_t lower = SVN_INVALID_REVNUM, upper = SVN_INVALID_REVNUM;
@@ -219,8 +219,8 @@ void SVNAdmin::hotcopy(const char *path,
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
SVN_JNI_NULL_PTR_EX(targetPath, "targetPath", );
- path = svn_path_internal_style(path, requestPool.pool());
- targetPath = svn_path_internal_style(targetPath, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
+ targetPath = svn_dirent_internal_style(targetPath, requestPool.pool());
SVN_JNI_ERR(svn_repos_hotcopy(path, targetPath, cleanLogs,
requestPool.pool()), );
}
@@ -230,7 +230,7 @@ list_dblogs (const char *path, MessageRe
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
apr_array_header_t *logfiles;
int i;
SVN_JNI_ERR(svn_repos_db_logfiles(&logfiles, path, only_unused,
@@ -242,10 +242,10 @@ list_dblogs (const char *path, MessageRe
for (i = 0; i < logfiles->nelts; ++i)
{
const char *log_utf8;
- log_utf8 = svn_path_join(path,
- APR_ARRAY_IDX(logfiles, i, const char *),
- requestPool.pool());
- log_utf8 = svn_path_local_style (log_utf8, requestPool.pool());
+ log_utf8 = svn_dirent_join(path,
+ APR_ARRAY_IDX(logfiles, i, const char *),
+ requestPool.pool());
+ log_utf8 = svn_dirent_local_style (log_utf8, requestPool.pool());
receiver.receiveMessage(log_utf8);
}
}
@@ -272,7 +272,7 @@ void SVNAdmin::load(const char *path,
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
enum svn_repos_load_uuid uuid_action = svn_repos_load_uuid_default;
if (ignoreUUID)
@@ -292,7 +292,7 @@ void SVNAdmin::lstxns(const char *path,
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
svn_fs_t *fs;
apr_array_header_t *txns;
@@ -315,7 +315,7 @@ jlong SVNAdmin::recover(const char *path
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", -1);
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_revnum_t youngest_rev;
svn_repos_t *repos;
@@ -337,7 +337,7 @@ void SVNAdmin::rmtxns(const char *path,
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
svn_fs_t *fs;
svn_fs_txn_t *txn;
@@ -396,7 +396,7 @@ void SVNAdmin::setRevProp(const char *pa
/* Open the filesystem. */
svn_repos_t *repos;
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
SVN_JNI_ERR(svn_repos_open(&repos, path, requestPool.pool()), );
/* If we are bypassing the hooks system, we just hit the filesystem
@@ -457,7 +457,7 @@ void SVNAdmin::verify(const char *path,
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
svn_revnum_t lower = SVN_INVALID_REVNUM, upper = SVN_INVALID_REVNUM;
svn_revnum_t youngest;
@@ -502,7 +502,7 @@ jobjectArray SVNAdmin::lslocks(const cha
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", NULL);
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
svn_fs_t *fs;
apr_hash_t *locks;
@@ -556,7 +556,7 @@ void SVNAdmin::rmlocks(const char *path,
SVN::Pool requestPool;
apr_pool_t *pool = requestPool.pool();
SVN_JNI_NULL_PTR_EX(path, "path", );
- path = svn_path_internal_style(path, requestPool.pool());
+ path = svn_dirent_internal_style(path, requestPool.pool());
svn_repos_t *repos;
svn_fs_t *fs;
svn_fs_access_t *access;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/SVNBase.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNBase.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNBase.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNBase.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/SVNBase.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNBase.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNBase.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNBase.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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
@@ -59,7 +59,7 @@
#include "svn_diff.h"
#include "svn_config.h"
#include "svn_io.h"
-#include "svn_path.h"
+#include "svn_dirent_uri.h"
#include "svn_utf.h"
#include "svn_private_config.h"
#include "../include/org_tigris_subversion_javahl_Revision.h"
@@ -181,7 +181,7 @@ SVNClient::status(const char *path, svn_
rev.kind = svn_opt_revision_unspecified;
- SVN_JNI_ERR(svn_client_status4(&youngest, checkedPath.c_str(),
+ SVN_JNI_ERR(svn_client_status5(&youngest, checkedPath.c_str(),
&rev, StatusCallback::callback,
callback,
depth,
@@ -442,7 +442,7 @@ jlong SVNClient::commit(Targets &targets
void SVNClient::copy(CopySources ©Sources, const char *destPath,
const char *message, bool copyAsChild, bool makeParents,
- RevpropTable &revprops)
+ bool ignoreExternals, RevpropTable &revprops)
{
SVN::Pool requestPool;
@@ -462,8 +462,8 @@ void SVNClient::copy(CopySources ©So
return;
svn_commit_info_t *commit_info;
- SVN_JNI_ERR(svn_client_copy4(&commit_info, srcs, destinationPath.c_str(),
- copyAsChild, makeParents,
+ SVN_JNI_ERR(svn_client_copy5(&commit_info, srcs, destinationPath.c_str(),
+ copyAsChild, makeParents, ignoreExternals,
revprops.hash(requestPool), ctx,
requestPool.pool()), );
}
@@ -852,6 +852,7 @@ void SVNClient::getMergeinfoLog(int type
const char *mergeSourceURL,
Revision &srcPegRevision,
bool discoverChangedPaths,
+ svn_depth_t depth,
StringArray &revProps,
LogMessageCallback *callback)
{
@@ -869,36 +870,18 @@ void SVNClient::getMergeinfoLog(int type
Path srcURL(mergeSourceURL);
SVN_JNI_ERR(srcURL.error_occured(), );
- switch (type)
- {
- case 0:
- SVN_JNI_ERR(
- svn_client_mergeinfo_log_eligible(urlPath.c_str(),
- pegRevision.revision(),
- srcURL.c_str(),
- srcPegRevision.revision(),
- LogMessageCallback::callback,
- callback,
- discoverChangedPaths,
- revProps.array(requestPool),
- ctx,
- requestPool.pool()), );
- return;
-
- case 1:
- SVN_JNI_ERR(
- svn_client_mergeinfo_log_merged(urlPath.c_str(),
- pegRevision.revision(),
- srcURL.c_str(),
- srcPegRevision.revision(),
- LogMessageCallback::callback,
- callback,
- discoverChangedPaths,
- revProps.array(requestPool),
- ctx,
- requestPool.pool()), );
- return;
- }
+ SVN_JNI_ERR(svn_client_mergeinfo_log(urlPath.c_str(),
+ type == 1 ? true : false,
+ pegRevision.revision(),
+ srcURL.c_str(),
+ srcPegRevision.revision(),
+ LogMessageCallback::callback,
+ callback,
+ discoverChangedPaths,
+ depth,
+ revProps.array(requestPool),
+ ctx,
+ requestPool.pool()), );
return;
}
@@ -999,12 +982,13 @@ void SVNClient::diff(const char *target1
Revision *pegRevision, const char *relativeToDir,
const char *outfileName, svn_depth_t depth,
StringArray &changelists,
- bool ignoreAncestry, bool noDiffDelete, bool force)
+ bool ignoreAncestry, bool noDiffDelete, bool force,
+ bool showCopiesAsAdds)
{
svn_error_t *err;
SVN::Pool requestPool;
const char *c_relToDir = relativeToDir ?
- svn_path_canonicalize(relativeToDir, requestPool.pool()) :
+ svn_dirent_canonicalize(relativeToDir, requestPool.pool()) :
relativeToDir;
SVN_JNI_NULL_PTR_EX(target1, "target", );
@@ -1023,7 +1007,8 @@ void SVNClient::diff(const char *target1
apr_file_t *outfile = NULL;
apr_status_t rv =
apr_file_open(&outfile,
- svn_path_internal_style(outfileName, requestPool.pool()),
+ svn_dirent_internal_style(outfileName,
+ requestPool.pool()),
APR_CREATE|APR_WRITE|APR_TRUNCATE , APR_OS_DEFAULT,
requestPool.pool());
if (rv != APR_SUCCESS)
@@ -1038,7 +1023,7 @@ void SVNClient::diff(const char *target1
if (pegRevision)
{
- err = svn_client_diff_peg4(diffOptions,
+ err = svn_client_diff_peg5(diffOptions,
path1.c_str(),
pegRevision->revision(),
revision1.revision(),
@@ -1047,6 +1032,7 @@ void SVNClient::diff(const char *target1
depth,
ignoreAncestry,
noDiffDelete,
+ showCopiesAsAdds,
force,
SVN_APR_LOCALE_CHARSET,
outfile,
@@ -1068,7 +1054,7 @@ void SVNClient::diff(const char *target1
SVN_JNI_ERR(err, );
}
- err = svn_client_diff4(diffOptions,
+ err = svn_client_diff5(diffOptions,
path1.c_str(),
revision1.revision(),
path2.c_str(),
@@ -1077,6 +1063,7 @@ void SVNClient::diff(const char *target1
depth,
ignoreAncestry,
noDiffDelete,
+ showCopiesAsAdds,
force,
SVN_APR_LOCALE_CHARSET,
outfile,
@@ -1103,21 +1090,24 @@ void SVNClient::diff(const char *target1
const char *target2, Revision &revision2,
const char *relativeToDir, const char *outfileName,
svn_depth_t depth, StringArray &changelists,
- bool ignoreAncestry, bool noDiffDelete, bool force)
+ bool ignoreAncestry, bool noDiffDelete, bool force,
+ bool showCopiesAsAdds)
{
diff(target1, revision1, target2, revision2, NULL, relativeToDir,
- outfileName, depth, changelists, ignoreAncestry, noDiffDelete, force);
+ outfileName, depth, changelists, ignoreAncestry, noDiffDelete, force,
+ showCopiesAsAdds);
}
void SVNClient::diff(const char *target, Revision &pegRevision,
Revision &startRevision, Revision &endRevision,
const char *relativeToDir, const char *outfileName,
svn_depth_t depth, StringArray &changelists,
- bool ignoreAncestry, bool noDiffDelete, bool force)
+ bool ignoreAncestry, bool noDiffDelete, bool force,
+ bool showCopiesAsAdds)
{
diff(target, startRevision, NULL, endRevision, &pegRevision,
relativeToDir, outfileName, depth, changelists,
- ignoreAncestry, noDiffDelete, force);
+ ignoreAncestry, noDiffDelete, force, showCopiesAsAdds);
}
void
@@ -1489,8 +1479,9 @@ jobject SVNClient::revProperty(jobject j
const char *URL;
svn_string_t *propval;
svn_revnum_t set_rev;
- SVN_JNI_ERR(svn_client_url_from_path(&URL, intPath.c_str(),
- requestPool.pool()),
+ SVN_JNI_ERR(svn_client_url_from_path2(&URL, intPath.c_str(), ctx,
+ requestPool.pool(),
+ requestPool.pool()),
NULL);
if (URL == NULL)
@@ -1549,7 +1540,7 @@ void SVNClient::blame(const char *path,
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_blame4(intPath.c_str(), pegRevision.revision(),
+ SVN_JNI_ERR(svn_client_blame5(intPath.c_str(), pegRevision.revision(),
revisionStart.revision(),
revisionEnd.revision(),
svn_diff_file_options_create(pool),
@@ -1675,8 +1666,9 @@ void SVNClient::setRevProperty(jobject j
return;
const char *URL;
- SVN_JNI_ERR(svn_client_url_from_path(&URL, intPath.c_str(),
- requestPool.pool()), );
+ SVN_JNI_ERR(svn_client_url_from_path2(&URL, intPath.c_str(), ctx,
+ requestPool.pool(),
+ requestPool.pool()), );
if (URL == NULL)
{
@@ -1706,7 +1698,7 @@ struct version_status_baton
svn_boolean_t modified; /* is anything modified? */
svn_boolean_t committed; /* examine last committed revisions */
svn_boolean_t done; /* note completion of our task. */
- const char *wc_path; /* path whose URL we're looking for. */
+ const char *wc_abspath; /* path whose URL we're looking for. */
const char *wc_url; /* URL for the path whose URL we're looking for. */
apr_pool_t *pool; /* pool in which to store alloc-needy things. */
};
@@ -1722,12 +1714,12 @@ cancel(void *baton)
return SVN_NO_ERROR;
}
-/* An svn_wc_status_func3_t callback function for analyzing status
+/* An svn_wc_status_func4_t callback function for analyzing status
* structures. */
static svn_error_t *
analyze_status(void *baton,
- const char *path,
- svn_wc_status2_t *status,
+ const char *local_abspath,
+ const svn_wc_status2_t *status,
apr_pool_t *pool)
{
struct version_status_baton *sb = (version_status_baton *)baton;
@@ -1757,9 +1749,9 @@ analyze_status(void *baton,
sb->modified |= (status->prop_status != svn_wc_status_normal
&& status->prop_status != svn_wc_status_none);
- if (sb->wc_path
+ if (sb->wc_abspath
&& (! sb->wc_url)
- && (strcmp(path, sb->wc_path) == 0)
+ && (strcmp(local_abspath, sb->wc_abspath) == 0)
&& (status->entry))
sb->wc_url = apr_pstrdup(sb->pool, status->entry->url);
@@ -1795,7 +1787,7 @@ jstring SVNClient::getVersionInfo(const
sb.committed = FALSE;
sb.min_rev = SVN_INVALID_REVNUM;
sb.max_rev = SVN_INVALID_REVNUM;
- sb.wc_path = NULL;
+ sb.wc_abspath = NULL;
sb.wc_url = NULL;
sb.done = FALSE;
sb.pool = requestPool.pool();
@@ -1807,8 +1799,8 @@ jstring SVNClient::getVersionInfo(const
svn_client_ctx_t *ctx = getContext(NULL);
if (ctx == NULL)
return NULL;
- SVN_JNI_ERR(svn_wc_check_wc(intPath.c_str(), &wc_format,
- requestPool.pool()),
+ SVN_JNI_ERR(svn_wc_check_wc2(&wc_format, ctx->wc_ctx, intPath.c_str(),
+ requestPool.pool()),
NULL);
if (! wc_format)
@@ -1830,12 +1822,12 @@ jstring SVNClient::getVersionInfo(const
}
}
- sb.wc_path = path;
+ sb.wc_abspath = intPath.c_str();
svn_opt_revision_t rev;
rev.kind = svn_opt_revision_unspecified;
svn_error_t *err;
- err = svn_client_status4(NULL, intPath.c_str(), &rev, analyze_status,
+ err = svn_client_status5(NULL, intPath.c_str(), &rev, analyze_status,
&sb, svn_depth_infinity, TRUE, FALSE, FALSE,
FALSE, NULL, ctx, requestPool.pool());
if (err && (err->apr_err == SVN_ERR_CANCELLED))
@@ -1876,6 +1868,21 @@ jstring SVNClient::getVersionInfo(const
return JNIUtil::makeJString(value.str().c_str());
}
+void SVNClient::upgrade(const char *path)
+{
+ SVN::Pool requestPool;
+ SVN_JNI_NULL_PTR_EX(path, "path", );
+
+ svn_client_ctx_t *ctx = getContext(NULL);
+ if (ctx == NULL)
+ return;
+
+ Path checkedPath(path);
+ SVN_JNI_ERR(checkedPath.error_occured(), );
+
+ SVN_JNI_ERR(svn_client_upgrade(path, ctx, requestPool.pool()), );
+}
+
jobjectArray SVNClient::revProperties(jobject jthis, const char *path,
Revision &revision)
{
@@ -1885,13 +1892,14 @@ jobjectArray SVNClient::revProperties(jo
Path intPath(path);
SVN_JNI_ERR(intPath.error_occured(), NULL);
+ svn_client_ctx_t *ctx = getContext(NULL);
const char *URL;
svn_revnum_t set_rev;
- SVN_JNI_ERR(svn_client_url_from_path(&URL, intPath.c_str(),
- requestPool.pool()),
+ SVN_JNI_ERR(svn_client_url_from_path2(&URL, intPath.c_str(), ctx,
+ requestPool.pool(),
+ requestPool.pool()),
NULL);
- svn_client_ctx_t *ctx = getContext(NULL);
if (ctx == NULL)
return NULL;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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
@@ -98,8 +98,9 @@ class SVNClient :public SVNBase
jobject getMergeinfo(const char *target, Revision &pegRevision);
void getMergeinfoLog(int type, const char *pathOrURL,
Revision &pegRevision, const char *mergeSourceURL,
- Revision &srcPegREvision, bool discoverChangedPaths,
- StringArray &revProps, LogMessageCallback *callback);
+ Revision &srcPegRevision, bool discoverChangedPaths,
+ svn_depth_t depth, StringArray &revProps,
+ LogMessageCallback *callback);
jobjectArray suggestMergeSources(const char *path, Revision &pegRevision);
void merge(const char *path1, Revision &revision1, const char *path2,
Revision &revision2, const char *localPath, bool force,
@@ -132,7 +133,7 @@ class SVNClient :public SVNBase
bool makeParents, RevpropTable &revprops);
void copy(CopySources ©Sources, const char *destPath,
const char *message, bool copyAsChild, bool makeParents,
- RevpropTable &revprops);
+ bool ignoreExternals, RevpropTable &revprops);
jlong commit(Targets &targets, const char *message, svn_depth_t depth,
bool noUnlock, bool keepChangelist,
StringArray &changelists, RevpropTable &revprops);
@@ -181,18 +182,21 @@ class SVNClient :public SVNBase
const char *original_value, bool force);
jstring getVersionInfo(const char *path, const char *trailUrl,
bool lastChanged);
+ void upgrade(const char *path);
jobject propertyGet(jobject jthis, const char *path, const char *name,
Revision &revision, Revision &pegRevision);
void diff(const char *target1, Revision &revision1,
const char *target2, Revision &revision2,
const char *relativeToDir, const char *outfileName,
svn_depth_t depth, StringArray &changelists,
- bool ignoreAncestry, bool noDiffDelete, bool force);
+ bool ignoreAncestry, bool noDiffDelete, bool force,
+ bool showCopiesAsAdds);
void diff(const char *target, Revision &pegevision,
Revision &startRevision, Revision &endRevision,
const char *relativeToDir, const char *outfileName,
svn_depth_t depth, StringArray &changelists,
- bool ignoreAncestry, bool noDiffDelete, bool force);
+ bool ignoreAncestry, bool noDiffDelete, bool force,
+ bool showCopiesAsAdds);
void diffSummarize(const char *target1, Revision &revision1,
const char *target2, Revision &revision2,
svn_depth_t depth, StringArray &changelists,
@@ -222,7 +226,8 @@ class SVNClient :public SVNBase
const char *target2, Revision &revision2,
Revision *pegRevision, const char *relativeToDir,
const char *outfileName, svn_depth_t depth, StringArray &changelists,
- bool ignoreAncestry, bool noDiffDelete, bool force);
+ bool ignoreAncestry, bool noDiffDelete, bool force,
+ bool showCopiesAsAdds);
Notify *m_notify;
Notify2 *m_notify2;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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
@@ -53,12 +53,12 @@ StatusCallback::~StatusCallback()
svn_error_t *
StatusCallback::callback(void *baton,
- const char *path,
- svn_wc_status2_t *status,
+ const char *local_abspath,
+ const svn_wc_status2_t *status,
apr_pool_t *pool)
{
if (baton)
- return ((StatusCallback *)baton)->doStatus(path, status);
+ return ((StatusCallback *)baton)->doStatus(local_abspath, status);
return SVN_NO_ERROR;
}
@@ -67,7 +67,8 @@ StatusCallback::callback(void *baton,
* Callback called for a single status item.
*/
svn_error_t *
-StatusCallback::doStatus(const char *path, svn_wc_status2_t *status)
+StatusCallback::doStatus(const char *local_abspath,
+ const svn_wc_status2_t *status)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -90,7 +91,7 @@ StatusCallback::doStatus(const char *pat
return SVN_NO_ERROR;
}
- jobject jStatus = createJavaStatus(path, status);
+ jobject jStatus = createJavaStatus(local_abspath, status);
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -105,8 +106,8 @@ StatusCallback::doStatus(const char *pat
}
jobject
-StatusCallback::createJavaStatus(const char *path,
- svn_wc_status2_t *status)
+StatusCallback::createJavaStatus(const char *local_abspath,
+ const svn_wc_status2_t *status)
{
JNIEnv *env = JNIUtil::getEnv();
jclass clazz = env->FindClass(JAVA_PACKAGE"/Status");
@@ -129,7 +130,7 @@ StatusCallback::createJavaStatus(const c
if (JNIUtil::isJavaExceptionThrown())
return NULL;
}
- jstring jPath = JNIUtil::makeJString(path);
+ jstring jPath = JNIUtil::makeJString(local_abspath);
if (JNIUtil::isJavaExceptionThrown())
return NULL;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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
@@ -41,12 +41,13 @@ class StatusCallback
~StatusCallback();
static svn_error_t* callback(void *baton,
- const char *path,
- svn_wc_status2_t *status,
+ const char *local_abspath,
+ const svn_wc_status2_t *status,
apr_pool_t *pool);
protected:
- svn_error_t *doStatus(const char *path, svn_wc_status2_t *status);
+ svn_error_t *doStatus(const char *local_abspath,
+ const svn_wc_status2_t *status);
private:
/**
@@ -54,8 +55,8 @@ class StatusCallback
*/
jobject m_callback;
- jobject createJavaStatus(const char *path,
- svn_wc_status2_t *status);
+ jobject createJavaStatus(const char *local_abspath,
+ const svn_wc_status2_t *status);
};
#endif // STATUSCALLBACK_H
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/StringArray.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Targets.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Targets.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Targets.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Targets.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/Targets.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Targets.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Targets.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Targets.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/libsvnjavahl.la.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/libsvnjavahl.la.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/libsvnjavahl.la.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/libsvnjavahl.la.c Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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
@@ -574,7 +574,7 @@ JNIEXPORT void JNICALL
Java_org_tigris_subversion_javahl_SVNClient_copy
(JNIEnv *env, jobject jthis, jobjectArray jcopySources, jstring jdestPath,
jstring jmessage, jboolean jcopyAsChild, jboolean jmakeParents,
- jobject jrevpropTable)
+ jboolean jignoreExternals, jobject jrevpropTable)
{
JNIEntry(SVNClient, copy);
@@ -599,7 +599,8 @@ Java_org_tigris_subversion_javahl_SVNCli
return;
cl->copy(copySources, destPath, message, jcopyAsChild ? true : false,
- jmakeParents ? true : false, revprops);
+ jmakeParents ? true : false, jignoreExternals ? true : false,
+ revprops);
}
JNIEXPORT void JNICALL
@@ -1157,7 +1158,7 @@ Java_org_tigris_subversion_javahl_SVNCli
JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_getMergeinfoLog
(JNIEnv *env, jobject jthis, jint jkind, jstring jpathOrUrl,
jobject jpegRevision, jstring jmergeSourceUrl, jobject jsrcPegRevision,
- jboolean jdiscoverChangedPaths, jobjectArray jrevProps,
+ jboolean jdiscoverChangedPaths, jint jdepth, jobjectArray jrevProps,
jobject jlogMessageCallback)
{
JNIEntry(SVNClient, getMergeinfoLog);
@@ -1192,15 +1193,16 @@ JNIEXPORT void JNICALL Java_org_tigris_s
cl->getMergeinfoLog((int)jkind, pathOrUrl, pegRevision, mergeSourceUrl,
srcPegRevision, jdiscoverChangedPaths ? true : false,
- revProps, &callback);
+ (svn_depth_t)jdepth, revProps, &callback);
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZ
+Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1,
jstring jtarget2, jobject jrevision2, jstring jrelativeToDir,
jstring joutfileName, jint jdepth, jobjectArray jchangelists,
- jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce)
+ jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce,
+ jboolean jcopiesAsAdds)
{
JNIEntry(SVNClient, diff);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1240,15 +1242,17 @@ Java_org_tigris_subversion_javahl_SVNCli
cl->diff(target1, revision1, target2, revision2, relativeToDir, outfileName,
(svn_depth_t)jdepth, changelists,
jignoreAncestry ? true:false,
- jnoDiffDeleted ? true:false, jforce ? true:false);
+ jnoDiffDeleted ? true:false, jforce ? true:false,
+ jcopiesAsAdds ? true:false);
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZ
+Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget, jobject jpegRevision,
jobject jstartRevision, jobject jendRevision, jstring jrelativeToDir,
jstring joutfileName, jint jdepth, jobjectArray jchangelists,
- jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce)
+ jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce,
+ jboolean jcopiesAsAdds)
{
JNIEntry(SVNClient, diff);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1288,7 +1292,8 @@ Java_org_tigris_subversion_javahl_SVNCli
cl->diff(target, pegRevision, startRevision, endRevision, relativeToDir,
outfileName, (svn_depth_t) jdepth, changelists,
jignoreAncestry ? true:false,
- jnoDiffDeleted ? true:false, jforce ? true:false);
+ jnoDiffDeleted ? true:false, jforce ? true:false,
+ jcopiesAsAdds ? true:false);
}
JNIEXPORT void JNICALL
@@ -1448,6 +1453,23 @@ Java_org_tigris_subversion_javahl_SVNCli
return cl->getVersionInfo(path, trailUrl, jlastChanged ? true:false);
}
+JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_upgrade
+ (JNIEnv *env, jobject jthis, jstring jpath)
+{
+ JNIEntry(SVNClient, upgrade);
+ SVNClient *cl = SVNClient::getCppObject(jthis);
+ if (cl == NULL)
+ {
+ JNIUtil::throwError(_("bad C++ this"));
+ return;
+ }
+ JNIStringHolder path(jpath);
+ if (JNIUtil::isExceptionThrown())
+ return;
+
+ cl->upgrade(path);
+}
+
JNIEXPORT void JNICALL
Java_org_tigris_subversion_javahl_SVNClient_enableLogging
(JNIEnv *env, jclass jclazz, jint jlogLevel, jstring jpath)
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/native/version.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/version.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/version.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/version.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * 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