Skip to content

Commit c15ceeb

Browse files
committed
CmdLineClientAdapter.isManaged does not support working copy format >= SVN 1.7 #29
1 parent 8c08309 commit c15ceeb

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

cmdline/src/main/java/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,18 +168,15 @@ public SVNNotificationHandler getNotificationHandler() {
168168
}
169169

170170
private boolean isManaged(File file) {
171-
if (file.isDirectory()) {
172-
return isManagedDir(file.getParentFile()) || isManagedDir(file);
173-
} else {
174-
return isManagedDir(file.getParentFile());
175-
}
176-
}
171+
return file.isDirectory() && isManagedDir(file)
172+
|| file.getParentFile() != null && isManagedDir(file.getParentFile());
173+
}
177174

178-
private boolean isManagedDir(File dir) {
179-
// all directories that do not have a .svn dir are not versioned
180-
File entries = new File(dir, getAdminDirectoryName() + "/entries");
181-
return entries.exists();
182-
}
175+
private boolean isManagedDir(File dir) {
176+
// a directory that has a .svn dir or that has a parent directory with a .svn dir is versioned
177+
File entries = new File(dir, getAdminDirectoryName() + "/entries");
178+
return entries.exists() || dir.getParentFile() != null && isManagedDir(dir.getParentFile());
179+
}
183180

184181
/* (non-Javadoc)
185182
* @see org.tigris.subversion.subclipse.client.ISVNClientAdapter#getStatus(java.io.File[])

0 commit comments

Comments
 (0)