You commit this to the wrong location. The tree-conflicts branch
should be dead.
On Thu, Mar 19, 2009 at 5:04 PM, Stephen Elsemore <selsemore_at_collab.net> wrote:
> Author: selsemore
> Date: 2009-03-19 14:04:56-0700
> New Revision: 4360
>
> Modified:
> Â branches/tree-conflicts/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java
> Â trunk/svnClientAdapter/src/javahl/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java
>
> Log:
> Expose recursive info call.
>
> Modified: branches/tree-conflicts/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java
> Url: http://subclipse.tigris.org/source/browse/subclipse/branches/tree-conflicts/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java?view=diff&pathrev=4360&r1=4359&r2=4360
> ==============================================================================
> --- branches/tree-conflicts/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java   (original)
> +++ branches/tree-conflicts/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java   2009-03-19 14:04:56-0700
> @@ -1408,6 +1408,16 @@
> Â Â Â Â * @throws SVNClientException
> Â Â Â Â */
> Â Â Â Â public ISVNInfo getInfo(File file) throws SVNClientException;
> +
> + Â Â Â /**
> + Â Â Â Â * Get information about a file or directory.
> + Â Â Â Â * Uses info2() call which contacts the repository
> + Â Â Â Â * @param file
> + Â Â Â Â * @param descend get recursive information
> + Â Â Â Â * @return information about a file or directory.
> + Â Â Â Â * @throws SVNClientException
> + Â Â Â Â */
> + Â Â Â public ISVNInfo[] getInfo(File file, boolean descend) throws SVNClientException;
>
> Â Â Â Â /**
> Â Â Â Â * Get information about an URL.
>
> Modified: trunk/svnClientAdapter/src/javahl/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java
> Url: http://subclipse.tigris.org/source/browse/subclipse/trunk/svnClientAdapter/src/javahl/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java?view=diff&pathrev=4360&r1=4359&r2=4360
> ==============================================================================
> --- trunk/svnClientAdapter/src/javahl/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java    (original)
> +++ trunk/svnClientAdapter/src/javahl/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java    2009-03-19 14:04:56-0700
> @@ -1808,6 +1808,38 @@
> Â Â Â Â }
>
> Â Â Â Â /* (non-Javadoc)
> + Â Â Â Â * @see org.tigris.subversion.svnclientadapter.ISVNClientAdapter#getInfo(java.io.File, boolean)
> + Â Â Â Â */
> + Â Â Â public ISVNInfo[] getInfo(File path, boolean descend) throws SVNClientException {
> + Â Â Â Â Â Â Â try {
> + Â Â Â Â Â Â Â Â Â Â Â notificationHandler.setCommand(ISVNNotifyListener.Command.INFO);
> + Â Â Â Â Â Â Â Â Â Â Â String target = fileToSVNPath(path, false);
> + Â Â Â Â Â Â Â Â Â Â Â if (descend) notificationHandler.logCommandLine("info " + target + " --depth=infinity");
> + Â Â Â Â Â Â Â Â Â Â Â else notificationHandler.logCommandLine("info " + target);
> + Â Â Â Â Â Â Â Â Â Â Â notificationHandler.setBaseDir(SVNBaseDir.getBaseDir(path));
> + Â Â Â Â Â Â Â Â Â Â Â List infoList = new ArrayList();
> + Â Â Â Â Â Â Â Â Â Â Â Info info = svnClient.info(target);
> + Â Â Â Â Â Â Â Â Â Â Â if (info == null) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â infoList.add(new SVNInfoUnversioned(path));
> + Â Â Â Â Â Â Â Â Â Â Â } else {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Info2[] infos = svnClient.info2(target, null, null, true);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (infos == null || infos.length == 0) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â infoList.add(new SVNInfoUnversioned(path));
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â } else {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â for (int i = 0; i < infos.length; i++)
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â infoList.add(new JhlInfo2(path,infos[i]));
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
> + Â Â Â Â Â Â Â Â Â Â Â }
> + Â Â Â Â Â Â Â Â Â Â Â ISVNInfo[] infoArray = new ISVNInfo[infoList.size()];
> + Â Â Â Â Â Â Â Â Â Â Â infoList.toArray(infoArray);
> + Â Â Â Â Â Â Â Â Â Â Â return infoArray;
> + Â Â Â Â Â Â Â } catch (ClientException e) {
> + Â Â Â Â Â Â Â Â Â Â Â notificationHandler.logException(e);
> + Â Â Â Â Â Â Â Â Â Â Â throw new SVNClientException(e);
> + Â Â Â Â Â Â Â }
> + Â Â Â }
> +
> + Â Â Â /* (non-Javadoc)
> Â Â Â Â * @see org.tigris.subversion.svnclientadapter.ISVNClientAdapter#getInfo(org.tigris.subversion.svnclientadapter.SVNUrl)
> Â Â Â Â */
> Â Â Â Â public ISVNInfo getInfo(SVNUrl url, SVNRevision revision, SVNRevision peg) throws SVNClientException {
>
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=3541&dsMessageId=1357948
>
> To unsubscribe from this discussion, please e-mail [unsubscribeURL]
>
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=1357991
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_subclipse.tigris.org].
Received on 2009-03-19 22:18:18 CET