From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Koeberle Subject: [JGIT PATCH v4 18/24] Added WorkTree class which can be constructed over Repository. Date: Fri, 13 Jun 2008 20:35:15 +0200 Message-ID: <1213382121-19786-18-git-send-email-florianskarten@web.de> References: <4852BCCA.4030404@web.de> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Florian Koeberle To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jun 13 20:38:40 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1K7EAO-0005zA-UM for gcvg-git-2@gmane.org; Fri, 13 Jun 2008 20:38:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753022AbYFMSfz (ORCPT ); Fri, 13 Jun 2008 14:35:55 -0400 X-Warning: Original message contained 8-bit characters, however during the SMTP transport session the receiving system did not announce capability of receiving 8-bit SMTP (RFC 1651-1653), and as this message does not have MIME headers (RFC 2045-2049) to enable encoding change, we had very little choice. X-Warning: We ASSUME it is less harmful to add the MIME headers, and convert the text to Quoted-Printable, than not to do so, and to strip the message to 7-bits.. (RFC 1428 Appendix A) X-Warning: We don't know what character set the user used, thus we had to write these MIME-headers with our local system default value. Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752238AbYFMSfy (ORCPT ); Fri, 13 Jun 2008 14:35:54 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:43479 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752289AbYFMSfd (ORCPT ); Fri, 13 Jun 2008 14:35:33 -0400 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate02.web.de (Postfix) with ESMTP id 7A354E184F1A for ; Fri, 13 Jun 2008 20:35:32 +0200 (CEST) Received: from [84.150.79.9] (helo=localhost.localdomain) by smtp08.web.de with asmtp (WEB.DE 4.109 #226) id 1K7E7Y-0000eI-00; Fri, 13 Jun 2008 20:35:32 +0200 X-Mailer: git-send-email 1.5.5.1 In-Reply-To: <4852BCCA.4030404@web.de> In-Reply-To: <4852BCCA.4030404@web.de> References: <4852BCCA.4030404@web.de> X-Sender: florianskarten@web.de X-Provags-ID: V01U2FsdGVkX1/eOTIeXzjZw8+483ASAo9EQlw9Fzlp7uHSd8H8 7EZms0pk15AQVJERRfjB7jgHGaMieZAXPrq1CtUaukoxhHE6bH u7g89NW12yzGJhhjssRQ== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Florian Koeberle --- .../src/org/spearce/jgit/lib/Repository.java | 31 ++++++++ .../src/org/spearce/jgit/lib/WorkTree.java | 81 ++++++++++++= ++++++++ 2 files changed, 112 insertions(+), 0 deletions(-) create mode 100644 org.spearce.jgit/src/org/spearce/jgit/lib/WorkTree.= java diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java = b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java index 3efe60b..5a21c6e 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java @@ -986,4 +986,35 @@ public class Repository { public File getWorkDir() { return getDirectory().getParentFile(); } + + /** + * Creates a new {@link WorkTree} and initialize a repository for it. + *=20 + * @param workTreeDirectory + * the directory with the project files. + * @return a new {@link WorkTree} with a new and open {@link Reposito= ry}. + * @throws IOException + * thrown by {@link Repository#create()} + */ + public static WorkTree createWorkTree(File workTreeDirectory) + throws IOException { + final File gitDirectory =3D new File(workTreeDirectory, + Constants.REPOSITORY_DIRECTORY_NAME); + if (gitDirectory.exists()) { + throw new IllegalArgumentException( + "Repository exists in given project directory."); + } + final Repository repository =3D new Repository(gitDirectory); + try { + repository.create(); + return new WorkTree(workTreeDirectory, repository); + } catch (RuntimeException e) { + repository.close(); + throw e; + } catch (IOException e) { + repository.close(); + throw e; + } + } + } diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/WorkTree.java b/= org.spearce.jgit/src/org/spearce/jgit/lib/WorkTree.java new file mode 100644 index 0000000..0040954 --- /dev/null +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/WorkTree.java @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2008, Florian K=C3=B6berle + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Git Development Community nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.spearce.jgit.lib; + +import java.io.File; + +/** + * Represents a work tree controlled by git. Use {@link Repository} in= order to + * create an object of this class. + *=20 + */ +public class WorkTree { + private final File directory; + + private final Repository repository; + + /** + * This constructor should be only used by the class {@link Repositor= y}. + *=20 + * @param directory + * defines the value of the directory field. + * @param repository + * defines the value of the repository field. + */ + WorkTree(File directory, Repository repository) { + this.directory =3D directory; + this.repository =3D repository; + } + + /** + *=20 + * @return the directory which contains the files of the project. Usu= ally + * this directory contain a .git directory with the repositor= y. + */ + public File getDirectory() { + return directory; + } + + /** + * @return the {@link Repository} object of the project. + */ + public Repository getRepository() { + return repository; + } + +} --=20 1.5.4.3