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.

Commit.java 4.7KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121
  1. /*
  2. * Copyright (C) 2010, 2012 Christian Halstrick <christian.halstrick@sap.com> and
  3. * other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available under the
  6. * terms of the Eclipse Distribution License v1.0 which accompanies this
  7. * distribution, is reproduced below, and is available at
  8. * 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 without
  13. * modification, are permitted provided that the following conditions are met:
  14. *
  15. * - Redistributions of source code must retain the above copyright notice, this
  16. * list of conditions and the following disclaimer.
  17. *
  18. * - Redistributions in binary form must reproduce the above copyright notice,
  19. * this list of conditions and the following disclaimer in the documentation
  20. * and/or other materials provided with the distribution.
  21. *
  22. * - Neither the name of the Eclipse Foundation, Inc. nor the names of its
  23. * contributors may be used to endorse or promote products derived from this
  24. * software without specific prior written permission.
  25. *
  26. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  27. * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  28. * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  29. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
  30. * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  31. * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  32. * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  33. * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  34. * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  35. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  36. * POSSIBILITY OF SUCH DAMAGE.
  37. */
  38. package org.eclipse.jgit.pgm;
  39. import java.util.ArrayList;
  40. import java.util.List;
  41. import org.eclipse.jgit.api.CommitCommand;
  42. import org.eclipse.jgit.api.Git;
  43. import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
  44. import org.eclipse.jgit.api.errors.JGitInternalException;
  45. import org.eclipse.jgit.api.errors.NoHeadException;
  46. import org.eclipse.jgit.api.errors.NoMessageException;
  47. import org.eclipse.jgit.lib.Constants;
  48. import org.eclipse.jgit.lib.Ref;
  49. import org.eclipse.jgit.pgm.internal.CLIText;
  50. import org.eclipse.jgit.revwalk.RevCommit;
  51. import org.eclipse.jgit.util.RawParseUtils;
  52. import org.kohsuke.args4j.Argument;
  53. import org.kohsuke.args4j.Option;
  54. @Command(common = true, usage = "usage_recordChangesToRepository")
  55. class Commit extends TextBuiltin {
  56. // I don't support setting the committer, because also the native git
  57. // command doesn't allow this.
  58. @Option(name = "--author", metaVar = "metaVar_author", usage = "usage_CommitAuthor")
  59. private String author;
  60. @Option(name = "--message", aliases = { "-m" }, metaVar = "metaVar_message", usage = "usage_CommitMessage", required = true)
  61. private String message;
  62. @Option(name = "--only", aliases = { "-o" }, usage = "usage_CommitOnly")
  63. private boolean only;
  64. @Option(name = "--all", aliases = { "-a" }, usage = "usage_CommitAll")
  65. private boolean all;
  66. @Option(name = "--amend", usage = "usage_CommitAmend")
  67. private boolean amend;
  68. @Argument(metaVar = "metaVar_commitPaths", usage = "usage_CommitPaths")
  69. private List<String> paths = new ArrayList<>();
  70. @Override
  71. protected void run() throws NoHeadException, NoMessageException,
  72. ConcurrentRefUpdateException, JGitInternalException, Exception {
  73. try (Git git = new Git(db)) {
  74. CommitCommand commitCmd = git.commit();
  75. if (author != null)
  76. commitCmd.setAuthor(RawParseUtils.parsePersonIdent(author));
  77. if (message != null)
  78. commitCmd.setMessage(message);
  79. if (only && paths.isEmpty())
  80. throw die(CLIText.get().pathsRequired);
  81. if (only && all)
  82. throw die(CLIText.get().onlyOneOfIncludeOnlyAllInteractiveCanBeUsed);
  83. if (!paths.isEmpty())
  84. for (String p : paths)
  85. commitCmd.setOnly(p);
  86. commitCmd.setAmend(amend);
  87. commitCmd.setAll(all);
  88. Ref head = db.exactRef(Constants.HEAD);
  89. if (head == null) {
  90. throw die(CLIText.get().onBranchToBeBorn);
  91. }
  92. RevCommit commit;
  93. try {
  94. commit = commitCmd.call();
  95. } catch (JGitInternalException e) {
  96. throw die(e.getMessage());
  97. }
  98. String branchName;
  99. if (!head.isSymbolic())
  100. branchName = CLIText.get().branchDetachedHEAD;
  101. else {
  102. branchName = head.getTarget().getName();
  103. if (branchName.startsWith(Constants.R_HEADS))
  104. branchName = branchName.substring(Constants.R_HEADS.length());
  105. }
  106. outw.println("[" + branchName + " " + commit.name() + "] " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
  107. + commit.getShortMessage());
  108. }
  109. }
  110. }