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.

DiffCommand.java 5.8KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189
  1. /*
  2. * Copyright (C) 2011, Tomasz Zarna <Tomasz.Zarna@pl.ibm.com>
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. */
  43. package org.eclipse.jgit.api;
  44. import static org.eclipse.jgit.lib.Constants.HEAD;
  45. import java.io.IOException;
  46. import java.util.List;
  47. import org.eclipse.jgit.JGitText;
  48. import org.eclipse.jgit.api.errors.GitAPIException;
  49. import org.eclipse.jgit.api.errors.NoHeadException;
  50. import org.eclipse.jgit.diff.DiffEntry;
  51. import org.eclipse.jgit.diff.DiffFormatter;
  52. import org.eclipse.jgit.dircache.DirCacheIterator;
  53. import org.eclipse.jgit.lib.ObjectId;
  54. import org.eclipse.jgit.lib.ObjectReader;
  55. import org.eclipse.jgit.lib.Repository;
  56. import org.eclipse.jgit.treewalk.AbstractTreeIterator;
  57. import org.eclipse.jgit.treewalk.CanonicalTreeParser;
  58. import org.eclipse.jgit.treewalk.FileTreeIterator;
  59. import org.eclipse.jgit.treewalk.filter.TreeFilter;
  60. /**
  61. * Show changes between commits, commit and working tree, etc.
  62. *
  63. * @see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html"
  64. * >Git documentation about diff</a>
  65. */
  66. public class DiffCommand extends GitCommand<List<DiffEntry>> {
  67. private AbstractTreeIterator oldTree;
  68. private AbstractTreeIterator newTree;
  69. private boolean cached;
  70. private TreeFilter pathFilter = TreeFilter.ALL;
  71. // TODO: fixed to true for now
  72. private boolean showNameAndStatusOnly = true;
  73. /**
  74. * @param repo
  75. */
  76. protected DiffCommand(Repository repo) {
  77. super(repo);
  78. }
  79. /**
  80. * Executes the {@code Diff} command with all the options and parameters
  81. * collected by the setter methods (e.g. {@link #setCached(boolean)} of this
  82. * class. Each instance of this class should only be used for one invocation
  83. * of the command. Don't call this method twice on an instance.
  84. *
  85. * @return a DiffEntry for each path which is different
  86. */
  87. public List<DiffEntry> call() throws GitAPIException, IOException {
  88. final DiffFormatter diffFmt = new DiffFormatter(null);
  89. diffFmt.setRepository(repo);
  90. try {
  91. if (cached) {
  92. if (oldTree == null) {
  93. ObjectId head = repo.resolve(HEAD + "^{tree}");
  94. if (head == null)
  95. throw new NoHeadException(JGitText.get().cannotReadTree);
  96. CanonicalTreeParser p = new CanonicalTreeParser();
  97. ObjectReader reader = repo.newObjectReader();
  98. try {
  99. p.reset(reader, head);
  100. } finally {
  101. reader.release();
  102. }
  103. oldTree = p;
  104. }
  105. newTree = new DirCacheIterator(repo.readDirCache());
  106. } else {
  107. if (oldTree == null)
  108. oldTree = new DirCacheIterator(repo.readDirCache());
  109. if (newTree == null)
  110. newTree = new FileTreeIterator(repo);
  111. }
  112. diffFmt.setPathFilter(pathFilter);
  113. if (showNameAndStatusOnly) {
  114. return diffFmt.scan(oldTree, newTree);
  115. } else {
  116. // TODO: not implemented yet
  117. throw new UnsupportedOperationException();
  118. }
  119. } finally {
  120. diffFmt.release();
  121. }
  122. }
  123. /**
  124. *
  125. * @param cached
  126. * whether to view the changes you staged for the next commit
  127. * @return this instance
  128. */
  129. public DiffCommand setCached(boolean cached) {
  130. this.cached = cached;
  131. return this;
  132. }
  133. /**
  134. * @param pathFilter
  135. * parameter, used to limit the diff to the named path
  136. * @return this instance
  137. */
  138. public DiffCommand setPathFilter(TreeFilter pathFilter) {
  139. this.pathFilter = pathFilter;
  140. return this;
  141. }
  142. /**
  143. * @param oldTree
  144. * the previous state
  145. * @return this instance
  146. */
  147. public DiffCommand setOldTree(AbstractTreeIterator oldTree) {
  148. this.oldTree = oldTree;
  149. return this;
  150. }
  151. /**
  152. * @param newTree
  153. * the updated state
  154. * @return this instance
  155. */
  156. public DiffCommand setNewTree(AbstractTreeIterator newTree) {
  157. this.newTree = newTree;
  158. return this;
  159. }
  160. /**
  161. * @param showNameAndStatusOnly
  162. * whether to return only names and status of changed files
  163. * @return this instance
  164. */
  165. public DiffCommand setShowNameAndStatusOnly(boolean showNameAndStatusOnly) {
  166. // TODO: not implemented yet
  167. if (!showNameAndStatusOnly)
  168. throw new UnsupportedOperationException();
  169. this.showNameAndStatusOnly = showNameAndStatusOnly;
  170. return this;
  171. }
  172. }