Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r4108 - trunk/svnant: . lib src/main/org/tigris/subversion/svnant/commands src/testcases/org/tigris/subversion/svnant

subclipse
Discussion topic

Back to topic list

svn commit: r4108 - trunk/svnant: . lib src/main/org/tigris/subversion/svnant/commands src/testcases/org/tigris/subversion/svnant

Author jfrank
Full name Joshua Frankamp
Date 2008-11-30 21:05:25 PST
Message Author: jfrank
Date: 2008-11-30 21:05:25-0800
New Revision: 4108

Modified:
   trunk/svnant/changelog.txt
   trunk/svnant/lib/svn​ClientAdapter.jar
   trunk/svnant/lib/svnjavahl.jar
   trunk/svnant/lib/svnkit.jar
   trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/commands/​Info.java
   trunk/svnant/src/tes​tcases/org/tigris/su​bversion/svnant/SvnT​est.java

Log:
fixed remote info path request, by assuming remoteness if it isn't a file
updated dependencies to latest svnkit and subversion
loosened up svntest for annotations that depended on a certain format for null lines

Modified: trunk/svnant/changelog.txt
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nant/changelog.txt?v​iew=diff&rev=410​8&p1=trunk/svnan​t/changelog.txt&​p2=trunk/svnant/chan​gelog.txt&r1=410​7&r2=4108
====================​====================​====================​==================
--- trunk/svnant/changelog.txt (original)
+++ trunk/svnant/changelog.txt 2008-11-30 21:05:25-0800
@@ -1,3 +1,8 @@
+* 1.2.1
+- Built against svnClientAdapter r4107, Subversion 1.5.x, SVNKit 1.2.x
+- fixed remote info bug
+- svnkit exists task
+
 * 1.2-rc1
 - Built against svnClientAdapter r3957, Subversion 1.5, SVNKit 1.20 beta4
 

Modified: trunk/svnant/lib/svn​ClientAdapter.jar
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nant/lib/svnClientAd​apter.jar?view=diff​&rev=4108&p1=​trunk/svnant/lib/svn​ClientAdapter.jar​&p2=trunk/svnant/li​b/svnClientAdapter.j​ar&r1=4107&r​2=4108
====================​====================​====================​==================
Binary files. No diff available.

Modified: trunk/svnant/lib/svnjavahl.jar
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nant/lib/svnjavahl.j​ar?view=diff&rev​=4108&p1=trunk/s​vnant/lib/svnjavahl.​jar&p2=trunk/svn​ant/lib/svnjavahl.ja​r&r1=4107&r2​=4108
====================​====================​====================​==================
Binary files. No diff available.

Modified: trunk/svnant/lib/svnkit.jar
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nant/lib/svnkit.jar?​view=diff&rev=41​08&p1=trunk/svna​nt/lib/svnkit.jar​&p2=trunk/svnant/li​b/svnkit.jar&r1=​4107&r2=4108
====================​====================​====================​==================
Binary files. No diff available.

Modified: trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/commands/​Info.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nant/src/main/org/ti​gris/subversion/svna​nt/commands/Info.jav​a?view=diff&rev=​4108&p1=trunk/sv​nant/src/main/org/ti​gris/subversion/svna​nt/commands/Info.jav​a&p2=trunk/svnan​t/src/main/org/tigri​s/subversion/svnant/​commands/Info.java​&r1=4107&r2=41​08
====================​====================​====================​==================
--- trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/commands/​Info.java (original)
+++ trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/commands/​Info.java 2008-11-30 21:05:25-0800
@@ -146,11 +146,17 @@
             value = this.info.getFile();
             if (value != null) {
                 value = ((File) value).getAbsolutePath();
+ } else {
+ // assume it's a remote info request; return last part of URL
+ value = this.info.getUrl().g​etLastPathSegment();​
             }
         } else if (FILE_PROP_NAMES[1].​equals(propName)) {
             value = this.info.getFile();
             if (value != null) {
                 value = ((File) value).getName();
+ } else {
+ // as above
+ value = this.info.getUrl().g​etLastPathSegment();​
             }
         } else if (FILE_PROP_NAMES[2].​equals(propName)) {
             value = this.info.getUrl();

Modified: trunk/svnant/src/tes​tcases/org/tigris/su​bversion/svnant/SvnT​est.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nant/src/testcases/o​rg/tigris/subversion​/svnant/SvnTest.java​?view=diff&rev=4​108&p1=trunk/svn​ant/src/testcases/or​g/tigris/subversion/​svnant/SvnTest.java​&p2=trunk/svnant/​src/testcases/org/ti​gris/subversion/svna​nt/SvnTest.java&​r1=4107&r2=4108
====================​====================​====================​==================
--- trunk/svnant/src/tes​tcases/org/tigris/su​bversion/svnant/SvnT​est.java (original)
+++ trunk/svnant/src/tes​tcases/org/tigris/su​bversion/svnant/SvnT​est.java 2008-11-30 21:05:25-0800
@@ -569,8 +569,7 @@
         File file = new File(WORKINGCOPY_DIR​+"/annotateTest/file​.txt");
         ISVNAnnotations annotations = svnClient.annotate(file,new SVNRevision.Number(2),new SVNRevision.Number(3));
         assertEquals(3,annot​ations.numberOfLines​());
- assertNull(annotatio​ns.getAuthor(0));
- assertEquals(-1,anno​tations.getRevision(​0));
+ assertEquals(0,annot​ations.getRevision(0​));
         assertEquals("user1"​,annotations.getAuth​or(1));
         assertEquals(2,annot​ations.getRevision(1​));
         assertEquals("line 2",annotations.getLine(1));

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r4108 - trunk/svnant: . lib src/main/org/tigris/subversion/svnant/commands src/testcases/org/tigris/subversion/svnant jfrank Joshua Frankamp 2008-11-30 21:05:25 PST
Messages per page: