You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

AddCommand.java 7.8KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236
  1. /*
  2. * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com>
  3. * Copyright (C) 2010, Stefan Lay <stefan.lay@sap.com>
  4. * and other copyright owners as documented in the project's IP log.
  5. *
  6. * This program and the accompanying materials are made available
  7. * under the terms of the Eclipse Distribution License v1.0 which
  8. * accompanies this distribution, is reproduced below, and is
  9. * available at http://www.eclipse.org/org/documents/edl-v10.php
  10. *
  11. * All rights reserved.
  12. *
  13. * Redistribution and use in source and binary forms, with or
  14. * without modification, are permitted provided that the following
  15. * conditions are met:
  16. *
  17. * - Redistributions of source code must retain the above copyright
  18. * notice, this list of conditions and the following disclaimer.
  19. *
  20. * - Redistributions in binary form must reproduce the above
  21. * copyright notice, this list of conditions and the following
  22. * disclaimer in the documentation and/or other materials provided
  23. * with the distribution.
  24. *
  25. * - Neither the name of the Eclipse Foundation, Inc. nor the
  26. * names of its contributors may be used to endorse or promote
  27. * products derived from this software without specific prior
  28. * written permission.
  29. *
  30. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  31. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  32. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  33. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  34. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  35. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  36. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  37. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  38. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  39. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  40. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  41. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  42. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  43. */
  44. package org.eclipse.jgit.api;
  45. import java.io.IOException;
  46. import java.io.InputStream;
  47. import java.util.Collection;
  48. import java.util.LinkedList;
  49. import org.eclipse.jgit.JGitText;
  50. import org.eclipse.jgit.api.errors.JGitInternalException;
  51. import org.eclipse.jgit.api.errors.NoFilepatternException;
  52. import org.eclipse.jgit.dircache.DirCache;
  53. import org.eclipse.jgit.dircache.DirCacheBuildIterator;
  54. import org.eclipse.jgit.dircache.DirCacheBuilder;
  55. import org.eclipse.jgit.dircache.DirCacheEntry;
  56. import org.eclipse.jgit.dircache.DirCacheIterator;
  57. import org.eclipse.jgit.lib.Constants;
  58. import org.eclipse.jgit.lib.ObjectInserter;
  59. import org.eclipse.jgit.lib.Repository;
  60. import org.eclipse.jgit.treewalk.FileTreeIterator;
  61. import org.eclipse.jgit.treewalk.TreeWalk;
  62. import org.eclipse.jgit.treewalk.WorkingTreeIterator;
  63. import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
  64. /**
  65. * A class used to execute a {@code Add} command. It has setters for all
  66. * supported options and arguments of this command and a {@link #call()} method
  67. * to finally execute the command. Each instance of this class should only be
  68. * used for one invocation of the command (means: one call to {@link #call()})
  69. *
  70. * @see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html"
  71. * >Git documentation about Add</a>
  72. */
  73. public class AddCommand extends GitCommand<DirCache> {
  74. private Collection<String> filepatterns;
  75. private WorkingTreeIterator workingTreeIterator;
  76. private boolean update = false;
  77. /**
  78. *
  79. * @param repo
  80. */
  81. public AddCommand(Repository repo) {
  82. super(repo);
  83. filepatterns = new LinkedList<String>();
  84. }
  85. /**
  86. * @param filepattern
  87. * File to add content from. Also a leading directory name (e.g.
  88. * dir to add dir/file1 and dir/file2) can be given to add all
  89. * files in the directory, recursively. Fileglobs (e.g. *.c) are
  90. * not yet supported.
  91. * @return {@code this}
  92. */
  93. public AddCommand addFilepattern(String filepattern) {
  94. checkCallable();
  95. filepatterns.add(filepattern);
  96. return this;
  97. }
  98. /**
  99. * Allow clients to provide their own implementation of a FileTreeIterator
  100. * @param f
  101. * @return {@code this}
  102. */
  103. public AddCommand setWorkingTreeIterator(WorkingTreeIterator f) {
  104. workingTreeIterator = f;
  105. return this;
  106. }
  107. /**
  108. * Executes the {@code Add} command. Each instance of this class should only
  109. * be used for one invocation of the command. Don't call this method twice
  110. * on an instance.
  111. *
  112. * @return the DirCache after Add
  113. */
  114. public DirCache call() throws NoFilepatternException {
  115. if (filepatterns.isEmpty())
  116. throw new NoFilepatternException(JGitText.get().atLeastOnePatternIsRequired);
  117. checkCallable();
  118. DirCache dc = null;
  119. boolean addAll = false;
  120. if (filepatterns.contains("."))
  121. addAll = true;
  122. ObjectInserter inserter = repo.newObjectInserter();
  123. try {
  124. dc = repo.lockDirCache();
  125. DirCacheIterator c;
  126. DirCacheBuilder builder = dc.builder();
  127. final TreeWalk tw = new TreeWalk(repo);
  128. tw.reset();
  129. tw.addTree(new DirCacheBuildIterator(builder));
  130. if (workingTreeIterator == null)
  131. workingTreeIterator = new FileTreeIterator(repo);
  132. tw.addTree(workingTreeIterator);
  133. tw.setRecursive(true);
  134. if (!addAll)
  135. tw.setFilter(PathFilterGroup.createFromStrings(filepatterns));
  136. String lastAddedFile = null;
  137. while (tw.next()) {
  138. String path = tw.getPathString();
  139. WorkingTreeIterator f = tw.getTree(1, WorkingTreeIterator.class);
  140. if (tw.getTree(0, DirCacheIterator.class) == null &&
  141. f != null && f.isEntryIgnored()) {
  142. // file is not in index but is ignored, do nothing
  143. }
  144. // In case of an existing merge conflict the
  145. // DirCacheBuildIterator iterates over all stages of
  146. // this path, we however want to add only one
  147. // new DirCacheEntry per path.
  148. else if (!(path.equals(lastAddedFile))) {
  149. if (!(update && tw.getTree(0, DirCacheIterator.class) == null)) {
  150. c = tw.getTree(0, DirCacheIterator.class);
  151. if (f != null) { // the file exists
  152. long sz = f.getEntryLength();
  153. DirCacheEntry entry = new DirCacheEntry(path);
  154. if (c == null || c.getDirCacheEntry() == null
  155. || !c.getDirCacheEntry().isAssumeValid()) {
  156. entry.setLength(sz);
  157. entry.setLastModified(f.getEntryLastModified());
  158. entry.setFileMode(f.getEntryFileMode());
  159. InputStream in = f.openEntryStream();
  160. try {
  161. entry.setObjectId(inserter.insert(
  162. Constants.OBJ_BLOB, sz, in));
  163. } finally {
  164. in.close();
  165. }
  166. builder.add(entry);
  167. lastAddedFile = path;
  168. } else {
  169. builder.add(c.getDirCacheEntry());
  170. }
  171. } else if (!update){
  172. builder.add(c.getDirCacheEntry());
  173. }
  174. }
  175. }
  176. }
  177. inserter.flush();
  178. builder.commit();
  179. setCallable(false);
  180. } catch (IOException e) {
  181. throw new JGitInternalException(
  182. JGitText.get().exceptionCaughtDuringExecutionOfAddCommand, e);
  183. } finally {
  184. inserter.release();
  185. if (dc != null)
  186. dc.unlock();
  187. }
  188. return dc;
  189. }
  190. /**
  191. * @param update
  192. * If set to true, the command only matches {@code filepattern}
  193. * against already tracked files in the index rather than the
  194. * working tree. That means that it will never stage new files,
  195. * but that it will stage modified new contents of tracked files
  196. * and that it will remove files from the index if the
  197. * corresponding files in the working tree have been removed.
  198. * In contrast to the git command line a {@code filepattern} must
  199. * exist also if update is set to true as there is no
  200. * concept of a working directory here.
  201. *
  202. * @return {@code this}
  203. */
  204. public AddCommand setUpdate(boolean update) {
  205. this.update = update;
  206. return this;
  207. }
  208. /**
  209. * @return is the parameter update is set
  210. */
  211. public boolean isUpdate() {
  212. return update;
  213. }
  214. }