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 9.4KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277
  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 static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
  46. import static org.eclipse.jgit.lib.FileMode.GITLINK;
  47. import static org.eclipse.jgit.lib.FileMode.TYPE_TREE;
  48. import java.io.IOException;
  49. import java.io.InputStream;
  50. import java.util.Collection;
  51. import java.util.LinkedList;
  52. import org.eclipse.jgit.api.errors.FilterFailedException;
  53. import org.eclipse.jgit.api.errors.GitAPIException;
  54. import org.eclipse.jgit.api.errors.JGitInternalException;
  55. import org.eclipse.jgit.api.errors.NoFilepatternException;
  56. import org.eclipse.jgit.dircache.DirCache;
  57. import org.eclipse.jgit.dircache.DirCacheBuildIterator;
  58. import org.eclipse.jgit.dircache.DirCacheBuilder;
  59. import org.eclipse.jgit.dircache.DirCacheEntry;
  60. import org.eclipse.jgit.dircache.DirCacheIterator;
  61. import org.eclipse.jgit.internal.JGitText;
  62. import org.eclipse.jgit.lib.FileMode;
  63. import org.eclipse.jgit.lib.ObjectId;
  64. import org.eclipse.jgit.lib.ObjectInserter;
  65. import org.eclipse.jgit.lib.Repository;
  66. import org.eclipse.jgit.treewalk.FileTreeIterator;
  67. import org.eclipse.jgit.treewalk.NameConflictTreeWalk;
  68. import org.eclipse.jgit.treewalk.TreeWalk.OperationType;
  69. import org.eclipse.jgit.treewalk.WorkingTreeIterator;
  70. import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
  71. /**
  72. * A class used to execute a {@code Add} command. It has setters for all
  73. * supported options and arguments of this command and a {@link #call()} method
  74. * to finally execute the command. Each instance of this class should only be
  75. * used for one invocation of the command (means: one call to {@link #call()})
  76. *
  77. * @see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html"
  78. * >Git documentation about Add</a>
  79. */
  80. public class AddCommand extends GitCommand<DirCache> {
  81. private Collection<String> filepatterns;
  82. private WorkingTreeIterator workingTreeIterator;
  83. private boolean update = false;
  84. /**
  85. *
  86. * @param repo
  87. */
  88. public AddCommand(Repository repo) {
  89. super(repo);
  90. filepatterns = new LinkedList<String>();
  91. }
  92. /**
  93. * Add a path to a file/directory whose content should be added.
  94. * <p>
  95. * A directory name (e.g. <code>dir</code> to add <code>dir/file1</code> and
  96. * <code>dir/file2</code>) can also be given to add all files in the
  97. * directory, recursively. Fileglobs (e.g. *.c) are not yet supported.
  98. *
  99. * @param filepattern
  100. * repository-relative path of file/directory to add (with
  101. * <code>/</code> as separator)
  102. * @return {@code this}
  103. */
  104. public AddCommand addFilepattern(String filepattern) {
  105. checkCallable();
  106. filepatterns.add(filepattern);
  107. return this;
  108. }
  109. /**
  110. * Allow clients to provide their own implementation of a FileTreeIterator
  111. * @param f
  112. * @return {@code this}
  113. */
  114. public AddCommand setWorkingTreeIterator(WorkingTreeIterator f) {
  115. workingTreeIterator = f;
  116. return this;
  117. }
  118. /**
  119. * Executes the {@code Add} command. Each instance of this class should only
  120. * be used for one invocation of the command. Don't call this method twice
  121. * on an instance.
  122. *
  123. * @return the DirCache after Add
  124. */
  125. public DirCache call() throws GitAPIException, NoFilepatternException {
  126. if (filepatterns.isEmpty())
  127. throw new NoFilepatternException(JGitText.get().atLeastOnePatternIsRequired);
  128. checkCallable();
  129. DirCache dc = null;
  130. boolean addAll = filepatterns.contains("."); //$NON-NLS-1$
  131. try (ObjectInserter inserter = repo.newObjectInserter();
  132. NameConflictTreeWalk tw = new NameConflictTreeWalk(repo)) {
  133. tw.setOperationType(OperationType.CHECKIN_OP);
  134. dc = repo.lockDirCache();
  135. DirCacheBuilder builder = dc.builder();
  136. tw.addTree(new DirCacheBuildIterator(builder));
  137. if (workingTreeIterator == null)
  138. workingTreeIterator = new FileTreeIterator(repo);
  139. workingTreeIterator.setDirCacheIterator(tw, 0);
  140. tw.addTree(workingTreeIterator);
  141. if (!addAll)
  142. tw.setFilter(PathFilterGroup.createFromStrings(filepatterns));
  143. byte[] lastAdded = null;
  144. while (tw.next()) {
  145. DirCacheIterator c = tw.getTree(0, DirCacheIterator.class);
  146. WorkingTreeIterator f = tw.getTree(1, WorkingTreeIterator.class);
  147. if (c == null && f != null && f.isEntryIgnored()) {
  148. // file is not in index but is ignored, do nothing
  149. continue;
  150. } else if (c == null && update) {
  151. // Only update of existing entries was requested.
  152. continue;
  153. }
  154. DirCacheEntry entry = c != null ? c.getDirCacheEntry() : null;
  155. if (entry != null && entry.getStage() > 0
  156. && lastAdded != null
  157. && lastAdded.length == tw.getPathLength()
  158. && tw.isPathPrefix(lastAdded, lastAdded.length) == 0) {
  159. // In case of an existing merge conflict the
  160. // DirCacheBuildIterator iterates over all stages of
  161. // this path, we however want to add only one
  162. // new DirCacheEntry per path.
  163. continue;
  164. }
  165. if (tw.isSubtree() && !tw.isDirectoryFileConflict()) {
  166. tw.enterSubtree();
  167. continue;
  168. }
  169. if (f == null) { // working tree file does not exist
  170. if (entry != null
  171. && (!update || GITLINK == entry.getFileMode())) {
  172. builder.add(entry);
  173. }
  174. continue;
  175. }
  176. if (entry != null && entry.isAssumeValid()) {
  177. // Index entry is marked assume valid. Even though
  178. // the user specified the file to be added JGit does
  179. // not consider the file for addition.
  180. builder.add(entry);
  181. continue;
  182. }
  183. if (f.getEntryRawMode() == TYPE_TREE) {
  184. // Index entry exists and is symlink, gitlink or file,
  185. // otherwise the tree would have been entered above.
  186. // Replace the index entry by diving into tree of files.
  187. tw.enterSubtree();
  188. continue;
  189. }
  190. byte[] path = tw.getRawPath();
  191. if (entry == null || entry.getStage() > 0) {
  192. entry = new DirCacheEntry(path);
  193. }
  194. FileMode mode = f.getIndexFileMode(c);
  195. entry.setFileMode(mode);
  196. if (GITLINK != mode) {
  197. entry.setLength(f.getEntryLength());
  198. entry.setLastModified(f.getEntryLastModified());
  199. long len = f.getEntryContentLength();
  200. try (InputStream in = f.openEntryStream()) {
  201. ObjectId id = inserter.insert(OBJ_BLOB, len, in);
  202. entry.setObjectId(id);
  203. }
  204. } else {
  205. entry.setLength(0);
  206. entry.setLastModified(0);
  207. entry.setObjectId(f.getEntryObjectId());
  208. }
  209. builder.add(entry);
  210. lastAdded = path;
  211. }
  212. inserter.flush();
  213. builder.commit();
  214. setCallable(false);
  215. } catch (IOException e) {
  216. Throwable cause = e.getCause();
  217. if (cause != null && cause instanceof FilterFailedException)
  218. throw (FilterFailedException) cause;
  219. throw new JGitInternalException(
  220. JGitText.get().exceptionCaughtDuringExecutionOfAddCommand, e);
  221. } finally {
  222. if (dc != null)
  223. dc.unlock();
  224. }
  225. return dc;
  226. }
  227. /**
  228. * @param update
  229. * If set to true, the command only matches {@code filepattern}
  230. * against already tracked files in the index rather than the
  231. * working tree. That means that it will never stage new files,
  232. * but that it will stage modified new contents of tracked files
  233. * and that it will remove files from the index if the
  234. * corresponding files in the working tree have been removed.
  235. * In contrast to the git command line a {@code filepattern} must
  236. * exist also if update is set to true as there is no
  237. * concept of a working directory here.
  238. *
  239. * @return {@code this}
  240. */
  241. public AddCommand setUpdate(boolean update) {
  242. this.update = update;
  243. return this;
  244. }
  245. /**
  246. * @return is the parameter update is set
  247. */
  248. public boolean isUpdate() {
  249. return update;
  250. }
  251. }