From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Koeberle Subject: [JGIT PATCH v2 24/24] Added a "add" command to the git like command line tool. Date: Mon, 12 May 2008 22:13:42 +0200 Message-ID: <1210623222-24908-25-git-send-email-florianskarten@web.de> References: <1210623222-24908-1-git-send-email-florianskarten@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 Mon May 12 22:22:08 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 1JveQH-0006mx-SM for gcvg-git-2@gmane.org; Mon, 12 May 2008 22:15:02 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754686AbYELUON (ORCPT ); Mon, 12 May 2008 16:14:13 -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 S1758283AbYELUOM (ORCPT ); Mon, 12 May 2008 16:14:12 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:40199 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757987AbYELUN5 (ORCPT ); Mon, 12 May 2008 16:13:57 -0400 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate01.web.de (Postfix) with ESMTP id D5787DECFCCE for ; Mon, 12 May 2008 22:13:56 +0200 (CEST) Received: from [84.150.98.143] (helo=localhost.localdomain) by smtp05.web.de with asmtp (WEB.DE 4.109 #226) id 1JvePE-00016x-00; Mon, 12 May 2008 22:13:56 +0200 X-Mailer: git-send-email 1.5.5.1 In-Reply-To: <1210623222-24908-1-git-send-email-florianskarten@web.de> X-Sender: florianskarten@web.de X-Provags-ID: V01U2FsdGVkX18duX2tpdM+A0YXvt+soWSD2F803Q+3J8/r6KJL rIHQTXQ2YUL9ntJ44/zyip8RtIJECk4KWrvwWdnWUQUJTq8d63 O2rgF1rCwoTs7GERC9ag== 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/pgm/AddCommand.java | 97 ++++++++++++= ++++++++ .../src/org/spearce/jgit/pgm/MainProgram.java | 1 + 2 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 org.spearce.jgit/src/org/spearce/jgit/pgm/AddComman= d.java diff --git a/org.spearce.jgit/src/org/spearce/jgit/pgm/AddCommand.java = b/org.spearce.jgit/src/org/spearce/jgit/pgm/AddCommand.java new file mode 100644 index 0000000..6d0a0d6 --- /dev/null +++ b/org.spearce.jgit/src/org/spearce/jgit/pgm/AddCommand.java @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2008 Florian K=C3=B6berle + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License, version 2, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Softwar= e + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 021= 10-1301 + */ +package org.spearce.jgit.pgm; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + +import org.spearce.jgit.errors.InvalidPatternException; +import org.spearce.jgit.lib.GitIndex; +import org.spearce.jgit.lib.Repository; + +import static org.spearce.jgit.lib.Repository.findWorkTree; +import org.spearce.jgit.lib.WorkTree; +import org.spearce.jgit.lib.GitIndex.Entry; +import org.spearce.jgit.treewalk.LightFileTreeIterable; +import org.spearce.jgit.treewalk.rules.AddRulesFactory; +import org.spearce.jgit.treewalk.rules.Rules; + +/** + * The {@link #execute} method of this class is used to add files to t= he index. + * This class is immutable. + *=20 + */ +public class AddCommand implements Command { + /** + * Use this instance instead of creating a new ${link AddCommand}. Yo= u don't + * need to create an instance of this class as it is immutable and no= t + * configurable. + */ + public static AddCommand INSTANCE =3D new AddCommand(); + + private AddRulesFactory addRulesFactory =3D new AddRulesFactory(); + + /** + * Adds the specified files to the index. + *=20 + * @param args + * can contain "*.Suffix" patterns, files and directories. + */ + public void execute(String... args) throws IOException { + final WorkTree workTree =3D findWorkTree(); + final Repository repository =3D workTree.getRepository(); + try { + final GitIndex gitIndex =3D repository.getIndex(); + final File projectDirectory =3D workTree.getDirectory(); + final String workingDirectoryString =3D System + .getProperty("user.dir"); + if (workingDirectoryString =3D=3D null) { + throw new UnableToDetermineWorkingDirectory(); + } + final File workingDirectory =3D new File(workingDirectoryString); + final Rules rules =3D addRulesFactory.createRules(workTree + .getDirectory(), workingDirectory, Arrays.asList(args)); + final Iterable fileIterable =3D new LightFileTreeIterable( + workTree.getDirectory(), rules, false); + for (File path : fileIterable) { + if (path.isFile()) { + final Entry entry =3D gitIndex.add(projectDirectory, path); + entry.setAssumeValid(false); + } + } + gitIndex.write(); + } catch (UnableToDetermineWorkingDirectory e) { + System.err.println("Unable to determine working directory"); + System.exit(1); + } catch (InvalidPatternException e) { + System.err.printf("The pattern '%s' is invalid: %s", + e.getMessage(), e.getPattern()); + System.exit(1); + } finally { + repository.close(); + } + } + + public String getShortDescription() { + return "Adds one or more files to the index."; + } + + private static class UnableToDetermineWorkingDirectory extends Except= ion { + private static final long serialVersionUID =3D -4229647819515644868L= ; + } +} diff --git a/org.spearce.jgit/src/org/spearce/jgit/pgm/MainProgram.java= b/org.spearce.jgit/src/org/spearce/jgit/pgm/MainProgram.java index 1ade91b..d9dafa3 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/pgm/MainProgram.java +++ b/org.spearce.jgit/src/org/spearce/jgit/pgm/MainProgram.java @@ -33,6 +33,7 @@ public class MainProgram { =20 static { final Map commands =3D new HashMap= (); + commands.put("add", AddCommand.INSTANCE); commands.put("init", InitCommand.INSTANCE); commands.put("help", HelpCommand.INSTANCE); commandNameToObjectMap =3D Collections.unmodifiableMap(commands); --=20 1.5.4.3