Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > subclipse commit: r1437 - in trunk: subclipse/core/src/org/tigris/subversion/subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl svnClientAdapter/src/testcases/org/tigris/subversion/svnclientadapter/basictests svnant/src/main/org/tigris/subversion/svnant

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

subclipse commit: r1437 - in trunk: subclipse/core/src/org/tigris/subversion/subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl svnClientAdapter/src/testcases/org/tigris/subversion/svnclientadapter/basictests svnant/src/main/org/tigris/subversion/svnant

Reply

Author markphip
Full name Mark Phippard
Date 2005-07-08 08:50:23 PDT
Message Author: markphip
Date: Fri Jul 8 10:50:17 2005
New Revision: 1437

Modified:
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/SVNTeamProviderTyp​e.java
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/OperationMa​nager.java
   trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java
   trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java
   trunk/svnClientAdapt​er/src/testcases/org​/tigris/subversion/s​vnclientadapter/basi​ctests/CleanupTest.j​ava
   trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/Ignore.ja​va

Log:
Change all hard-coded references to .svn folder to use
SVNConstants.SVN_DIRNAME

Patch from Marc Sherman

Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/SVNTeamProviderTyp​e.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/SVNTeamProviderTyp​e.java?rev=1437&​p1=trunk/subclipse/c​ore/src/org/tigris/s​ubversion/subclipse/​core/SVNTeamProvider​Type.java&p2=tru​nk/subclipse/core/sr​c/org/tigris/subvers​ion/subclipse/core/S​VNTeamProviderType.j​ava&r1=1436&​r2=1437
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/SVNTeamProviderTyp​e.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/SVNTeamProviderTyp​e.java Fri Jul 8 10:50:17 2005
@@ -35,6 +35,7 @@
 import org.eclipse.team.cor​e.TeamException;
 import org.tigris.subversio​n.subclipse.core.res​ources.SVNWorkspaceR​oot;
 import org.tigris.subversio​n.svnclientadapter.I​SVNClientAdapter;
+import org.tigris.subversio​n.svnclientadapter.S​VNConstants;
 
 
 /**
@@ -249,10 +250,10 @@
             if (!isProject && container.getType() == IContainer.PROJECT)
                 isProject = true;
             
- if (container.getName()​.equals(".svn")) { //$NON-NLS-1$
+ if (container.getName()​.equals(SVNConstants​.SVN_DIRNAME)) { //$NON-NLS-1$
                 svnDir = container;
             } else {
- IResource resource = container.findMember(".svn"); //$NON-NLS-1$
+ IResource resource = container.findMember​(SVNConstants.SVN_DI​RNAME); //$NON-NLS-1$
                 if (resource != null && resource.getType() != IResource.FILE) {
                     svnDir = (IContainer)resource;
                 }
@@ -268,17 +269,19 @@
         if (!isProject)
             return; // Nothing more to do, all remaining operations are on projects
 
- // Somehow sometimes it doesn't work using project.findMember(".svn") here, this
- // could be due to timing issue with workspace addition, so use trusty File instead.
+ // Somehow sometimes it doesn't work using project.findMember(S​VNConstants.SVN_DIRN​AME)
+ // here, this could be due to timing issue with workspace addition, so use trusty File
+ // instead.
         
- File svnDir = project.getLocation(​).append(".svn").toF​ile(); //$NON-NLS-1$
+ File svnDir = project.getLocation(​).append(SVNConstant​s.SVN_DIRNAME).toFil​e(); //$NON-NLS-1$
         
         if (svnDir != null && svnDir.exists() && svnDir.isDirectory()) {
             // It's a project and has toplevel .svn directory, lets share it!
             getAutoShareJob().sh​are(project);
         } else {
             // It's a project and doesn't have .svn dir, let's see if we can add it!
- File parentSvnDir = project.getLocation(​).append("../.svn").​toFile(); //$NON-NLS-1$
+ File parentSvnDir = project.getLocation(​).append("../" + SVNConstants.SVN_DIRNAME).
+ toFile(); //$NON-NLS-1$
             
             if (parentSvnDir != null && parentSvnDir.exists()
                     && parentSvnDir.isDirectory()) {

Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/OperationMa​nager.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/OperationMa​nager.java?rev=1437​&p1=trunk/subclip​se/core/src/org/tigr​is/subversion/subcli​pse/core/client/Oper​ationManager.java​&p2=trunk/subclipse​/core/src/org/tigris​/subversion/subclips​e/core/client/Operat​ionManager.java&​r1=1436&r2=1437
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/OperationMa​nager.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/OperationMa​nager.java Fri Jul 8 10:50:17 2005
@@ -106,7 +106,7 @@
                         // be refreshed later (@see SyncFileChangeListener)
                         resource.refreshLoca​l(IResource.DEPTH_IN​FINITE,new NullProgressMonitor());
                         if(Policy.DEBUG_META​FILE_CHANGES) {
- System.out.println("[svn] .svn dir refreshed : " + resource.getFullPath()); //$NON-NLS-1$
+ System.out.println("[svn]" + SVNConstants.SVN_DIRNAME + " dir refreshed : " + resource.getFullPath()); //$NON-NLS-1$
                         }
                     } catch (CoreException e) {
                         throw SVNException.wrapException(e);

Modified: trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java?rev=1437​&p1=trunk/svnClient​Adapter/src/main/org​/tigris/subversion/s​vnclientadapter/comm​andline/CmdLineClien​tAdapter.java&p2​=trunk/svnClientAdap​ter/src/main/org/tig​ris/subversion/svncl​ientadapter/commandl​ine/CmdLineClientAda​pter.java&r1=143​6&r2=1437
====================​====================​====================​==================
--- trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java (original)
+++ trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java Fri Jul 8 10:50:17 2005
@@ -37,6 +37,7 @@
 import org.tigris.subversio​n.svnclientadapter.I​SVNStatus;
 import org.tigris.subversio​n.svnclientadapter.S​VNBaseDir;
 import org.tigris.subversio​n.svnclientadapter.S​VNClientException;
+import org.tigris.subversio​n.svnclientadapter.S​VNConstants;
 import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
 import org.tigris.subversio​n.svnclientadapter.S​VNStatusUnversioned;​
 import org.tigris.subversio​n.svnclientadapter.S​VNUrl;
@@ -114,7 +115,7 @@
     }
 
     private boolean isManagedDir(File dir) {
- File entries = new File(dir,".svn/entries");
+ File entries = new File(dir, SVNConstants.SVN_DIRNAME + "/entries");
         return entries.exists();
     }
 

Modified: trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java?​rev=1437&p1=trun​k/svnClientAdapter/s​rc/main/org/tigris/s​ubversion/svnclienta​dapter/javahl/JhlCli​entAdapter.java&​p2=trunk/svnClientAd​apter/src/main/org/t​igris/subversion/svn​clientadapter/javahl​/JhlClientAdapter.ja​va&r1=1436&r​2=1437
====================​====================​====================​==================
--- trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java (original)
+++ trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java Fri Jul 8 10:50:17 2005
@@ -44,6 +44,7 @@
 import org.tigris.subversio​n.svnclientadapter.I​SVNStatus;
 import org.tigris.subversio​n.svnclientadapter.S​VNBaseDir;
 import org.tigris.subversio​n.svnclientadapter.S​VNClientException;
+import org.tigris.subversio​n.svnclientadapter.S​VNConstants;
 import org.tigris.subversio​n.svnclientadapter.S​VNInfoUnversioned;
 import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
 import org.tigris.subversio​n.svnclientadapter.S​VNStatusUnversioned;​
@@ -1066,7 +1067,8 @@
                 // svn should not contact the repository when we want to get base
                 // file but it does.
                 // Until this is corrected, we get the file directly if we can
- File file = new File(path.getParentF​ile(),".svn/text-bas​e/"+path.getName()+"​.svn-base");
+ File file = new File(path.getParentFile(),
+ SVNConstants.SVN_DIRNAME + "/text-base/"+path.g​etName()+".svn-base"​);
                 try {
                     FileInputStream in = new FileInputStream(file);
                     return in;

Modified: trunk/svnClientAdapt​er/src/testcases/org​/tigris/subversion/s​vnclientadapter/basi​ctests/CleanupTest.j​ava
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/svnClientAdapt​er/src/testcases/org​/tigris/subversion/s​vnclientadapter/basi​ctests/CleanupTest.j​ava?rev=1437&p1=​trunk/svnClientAdapt​er/src/testcases/org​/tigris/subversion/s​vnclientadapter/basi​ctests/CleanupTest.j​ava&p2=trunk/svn​ClientAdapter/src/te​stcases/org/tigris/s​ubversion/svnclienta​dapter/basictests/Cl​eanupTest.java&r​1=1436&r2=1437
====================​====================​====================​==================
--- trunk/svnClientAdapt​er/src/testcases/org​/tigris/subversion/s​vnclientadapter/basi​ctests/CleanupTest.j​ava (original)
+++ trunk/svnClientAdapt​er/src/testcases/org​/tigris/subversion/s​vnclientadapter/basi​ctests/CleanupTest.j​ava Fri Jul 8 10:50:17 2005
@@ -4,6 +4,8 @@
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
 
+import org.tigris.subversio​n.svnclientadapter.S​VNConstants;
+
 /**
  * @author Brock Janiczak
  */
@@ -19,21 +21,21 @@
         OneTest thisTest = new OneTest("basicCleanup", getGreekTestConfig());
 
         // create a lock file in A/B
- File adminLock = new File(thisTest.getWor​kingCopy(),"A/B/.svn​/lock");
+ File adminLock = new File(thisTest.getWor​kingCopy(),"A/B/" + SVNConstants.SVN_DIRNAME + "/lock");
         PrintWriter pw = new PrintWriter(new FileOutputStream(adminLock));
         pw.print("stop looking!");
         pw.close();
         thisTest.getExpected​WC().setItemIsLocked​("A/B", true);
 
         // create a lock file in A/D/G
- adminLock = new File(thisTest.getWor​kingCopy(),"A/D/G/.s​vn/lock");
+ adminLock = new File(thisTest.getWor​kingCopy(),"A/D/G/" + SVNConstants.SVN_DIRNAME + "/lock");
         pw = new PrintWriter(new FileOutputStream(adminLock));
         pw.print("stop looking!");
         pw.close();
         thisTest.getExpected​WC().setItemIsLocked​("A/D/G", true);
 
         // create a lock file in A/C
- adminLock = new File(thisTest.getWor​kingCopy(),"A/C/.svn​/lock");
+ adminLock = new File(thisTest.getWor​kingCopy(),"A/C/" + SVNConstants.SVN_DIRNAME + "/lock");
         pw = new PrintWriter(new FileOutputStream(adminLock));
         pw.print("stop looking!");
         pw.close();

Modified: trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/Ignore.ja​va
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/Ignore.ja​va?rev=1437&p1=t​runk/svnant/src/main​/org/tigris/subversi​on/svnant/Ignore.jav​a&p2=trunk/svnan​t/src/main/org/tigri​s/subversion/svnant/​Ignore.java&r1=1​436&r2=1437
====================​====================​====================​==================
--- trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/Ignore.ja​va (original)
+++ trunk/svnant/src/mai​n/org/tigris/subvers​ion/svnant/Ignore.ja​va Fri Jul 8 10:50:17 2005
@@ -60,6 +60,7 @@
 import org.apache.tools.ant​.BuildException;
 import org.tigris.subversio​n.svnclientadapter.I​SVNClientAdapter;
 import org.tigris.subversio​n.svnclientadapter.S​VNClientException;
+import org.tigris.subversio​n.svnclientadapter.S​VNConstants;
 
 /**
  * Ignore. put patterns to svn:ignore property
@@ -164,7 +165,7 @@
         if (recursive) {
             File file[] = dir.listFiles( new FileFilter() {
                 public boolean accept(File pathname) {
- return pathname.isDirectory() && !pathname.getName().​equals(".svn");
+ return pathname.isDirectory() && !pathname.getName().​equals(SVNConstants.​SVN_DIRNAME);
                 }
             });
             for (int i = 0; i < file.length;i++) {

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

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
subclipse commit: r1437 - in trunk: subclipse/core/src/org/tigris/subversion/subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline svnClientAdapter/src/main/org/t... markphip Mark Phippard 2005-07-08 08:50:23 PDT
Messages per page: