From: Marek Zawirski <marek.zawirski@gmail.com>
To: robin.rosenberg@dewire.com, spearce@spearce.org
Cc: git@vger.kernel.org, Marek Zawirski <marek.zawirski@gmail.com>
Subject: [JGIT PATCH 2/3] Add another delete method in RefUpdate, reusing RevWalk
Date: Thu, 28 Aug 2008 04:32:48 +0200 [thread overview]
Message-ID: <1219890769-20119-3-git-send-email-marek.zawirski@gmail.com> (raw)
In-Reply-To: <1219890769-20119-2-git-send-email-marek.zawirski@gmail.com>
This is similar to update() approach when caller has possiblity to
choose between providing RevWalk instance on its own or let RefUpdate
create one.
Signed-off-by: Marek Zawirski <marek.zawirski@gmail.com>
---
.../src/org/spearce/jgit/lib/RefUpdate.java | 22 ++++++++++++++++++-
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java
index c6536e3..e9c0e77 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java
@@ -325,11 +325,30 @@ public Result update(final RevWalk walk) throws IOException {
/**
* Delete the ref.
+ * <p>
+ * This is the same as:
+ *
+ * <pre>
+ * return delete(new RevWalk(repository));
+ * </pre>
*
* @return the result status of the delete.
* @throws IOException
*/
public Result delete() throws IOException {
+ return delete(new RevWalk(db.getRepository()));
+ }
+
+ /**
+ * Delete the ref.
+ *
+ * @param walk
+ * a RevWalk instance this delete command can borrow to perform
+ * the merge test. The walk will be reset to perform the test.
+ * @return the result status of the delete.
+ * @throws IOException
+ */
+ public Result delete(final RevWalk walk) throws IOException {
if (name.startsWith(Constants.R_HEADS)) {
final Ref head = db.readRef(Constants.HEAD);
if (head != null && name.equals(head.getName()))
@@ -337,8 +356,7 @@ public Result delete() throws IOException {
}
try {
- return updateImpl(new RevWalk(db.getRepository()),
- new DeleteStore());
+ return updateImpl(walk, new DeleteStore());
} catch (IOException x) {
result = Result.IO_FAILURE;
throw x;
--
1.5.6.3
next prev parent reply other threads:[~2008-08-28 2:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-28 2:32 [JGIT PATCH 0/3] Fix local tracking refs updates during push Marek Zawirski
2008-08-28 2:32 ` [JGIT PATCH 1/3] Fix push's RemoteRefUpdate to always force update local TrackingRefUpdate Marek Zawirski
2008-08-28 2:32 ` Marek Zawirski [this message]
2008-08-28 2:32 ` [JGIT PATCH 3/3] Fix RemoteRefUpdate to delete local tracking ref upon successful deletion Marek Zawirski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1219890769-20119-3-git-send-email-marek.zawirski@gmail.com \
--to=marek.zawirski@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).