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.

Diff.java 5.0KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140
  1. /*
  2. * Copyright (C) 2009, Johannes E. Schindelin
  3. * Copyright (C) 2009, Johannes Schindelin <johannes.schindelin@gmx.de>
  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.pgm;
  45. import java.io.IOException;
  46. import java.io.PrintStream;
  47. import java.util.ArrayList;
  48. import java.util.List;
  49. import org.kohsuke.args4j.Argument;
  50. import org.kohsuke.args4j.ExampleMode;
  51. import org.kohsuke.args4j.Option;
  52. import org.eclipse.jgit.diff.DiffFormatter;
  53. import org.eclipse.jgit.diff.MyersDiff;
  54. import org.eclipse.jgit.diff.RawText;
  55. import org.eclipse.jgit.lib.Constants;
  56. import org.eclipse.jgit.lib.FileMode;
  57. import org.eclipse.jgit.lib.ObjectId;
  58. import org.eclipse.jgit.lib.Ref;
  59. import org.eclipse.jgit.pgm.opt.CmdLineParser;
  60. import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler;
  61. import org.eclipse.jgit.treewalk.AbstractTreeIterator;
  62. import org.eclipse.jgit.treewalk.TreeWalk;
  63. import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
  64. import org.eclipse.jgit.treewalk.filter.TreeFilter;
  65. @Command(common = true, usage = "Show diffs")
  66. class Diff extends TextBuiltin {
  67. @Argument(index = 0, metaVar = "tree-ish", required = true)
  68. void tree_0(final AbstractTreeIterator c) {
  69. trees.add(c);
  70. }
  71. @Argument(index = 1, metaVar = "tree-ish", required = true)
  72. private final List<AbstractTreeIterator> trees = new ArrayList<AbstractTreeIterator>();
  73. @Option(name = "--", metaVar = "path", multiValued = true, handler = PathTreeFilterHandler.class)
  74. private TreeFilter pathFilter = TreeFilter.ALL;
  75. private DiffFormatter fmt = new DiffFormatter();
  76. @Override
  77. protected void run() throws Exception {
  78. final TreeWalk walk = new TreeWalk(db);
  79. walk.reset();
  80. walk.setRecursive(true);
  81. for (final AbstractTreeIterator i : trees)
  82. walk.addTree(i);
  83. walk.setFilter(AndTreeFilter.create(TreeFilter.ANY_DIFF, pathFilter));
  84. final int nTree = walk.getTreeCount();
  85. while (walk.next())
  86. outputDiff(System.out, walk.getPathString(),
  87. walk.getObjectId(0), walk.getFileMode(0),
  88. walk.getObjectId(1), walk.getFileMode(1));
  89. }
  90. protected void outputDiff(PrintStream out, String path,
  91. ObjectId id1, FileMode mode1, ObjectId id2, FileMode mode2) throws IOException {
  92. String name1 = "a/" + path;
  93. String name2 = "b/" + path;
  94. out.println("diff --git " + name1 + " " + name2);
  95. boolean isNew=false;
  96. boolean isDelete=false;
  97. if (id1.equals(id1.zeroId())) {
  98. out.println("new file mode " + mode2);
  99. isNew=true;
  100. } else if (id2.equals(id2.zeroId())) {
  101. out.println("deleted file mode " + mode1);
  102. isDelete=true;
  103. } else if (!mode1.equals(mode2)) {
  104. out.println("old mode " + mode1);
  105. out.println("new mode " + mode2);
  106. }
  107. out.println("index " + id1.abbreviate(db, 7).name()
  108. + ".." + id2.abbreviate(db, 7).name()
  109. + (mode1.equals(mode2) ? " " + mode1 : ""));
  110. out.println("--- " + (isNew ? "/dev/null" : name1));
  111. out.println("+++ " + (isDelete ? "/dev/null" : name2));
  112. RawText a = getRawText(id1);
  113. RawText b = getRawText(id2);
  114. MyersDiff diff = new MyersDiff(a, b);
  115. fmt.formatEdits(out, a, b, diff.getEdits());
  116. }
  117. private RawText getRawText(ObjectId id) throws IOException {
  118. if (id.equals(id.zeroId()))
  119. return new RawText(new byte[] { });
  120. return new RawText(db.openBlob(id).getCachedBytes());
  121. }
  122. }