From: Robin Rosenberg <robin.rosenberg@dewire.com>
To: spearce@spearce.org
Cc: git@vger.kernel.org, Robin Rosenberg <robin.rosenberg@dewire.com>
Subject: [EGIT PATCH 01/10] Make sure we get the right storage for loose/pack/loose and packed refs
Date: Thu, 28 May 2009 00:08:48 +0200 [thread overview]
Message-ID: <1243462137-24133-2-git-send-email-robin.rosenberg@dewire.com> (raw)
In-Reply-To: <1243462137-24133-1-git-send-email-robin.rosenberg@dewire.com>
Also adds a few some more test for refs, though not complete.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
.../tst/org/spearce/jgit/lib/RefTest.java | 75 ++++++++++++++++++++
.../src/org/spearce/jgit/lib/RefDatabase.java | 26 +++++--
2 files changed, 95 insertions(+), 6 deletions(-)
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RefTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RefTest.java
index cae5143..440686d 100644
--- a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RefTest.java
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RefTest.java
@@ -36,8 +36,14 @@
*/
package org.spearce.jgit.lib;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.Map;
+import org.spearce.jgit.lib.Ref.Storage;
+import org.spearce.jgit.lib.RefUpdate.Result;
+
/**
* Misc tests for refs. A lot of things are tested elsewhere so not having a
* test for a ref related method, does not mean it is untested.
@@ -69,4 +75,73 @@ public void testReadAllIncludingSymrefs() throws Exception {
assertFalse(refmaster.isPeeled());
assertNull(refmaster.getPeeledObjectId());
}
+
+ public void testReadSymRefToPacked() throws IOException {
+ db.writeSymref("HEAD", "refs/heads/b");
+ Ref ref = db.getRef("HEAD");
+ assertEquals(Ref.Storage.LOOSE_PACKED, ref.getStorage());
+ }
+
+ public void testReadSymRefToLoosePacked() throws IOException {
+ ObjectId pid = db.resolve("refs/heads/master^");
+ RefUpdate updateRef = db.updateRef("refs/heads/master");
+ updateRef.setNewObjectId(pid);
+ updateRef.setForceUpdate(true);
+ Result update = updateRef.update();
+ assertEquals(Result.FORCED, update); // internal
+
+ db.writeSymref("HEAD", "refs/heads/master");
+ Ref ref = db.getRef("HEAD");
+ assertEquals(Ref.Storage.LOOSE_PACKED, ref.getStorage());
+ }
+
+ public void testReadLooseRef() throws IOException {
+ RefUpdate updateRef = db.updateRef("ref/heads/new");
+ updateRef.setNewObjectId(db.resolve("refs/heads/master"));
+ Result update = updateRef.update();
+ assertEquals(Result.NEW, update);
+ Ref ref = db.getRef("ref/heads/new");
+ assertEquals(Storage.LOOSE, ref.getStorage());
+ }
+
+ /**
+ * Let an "outsider" create a loose ref with the same name as a packed one
+ *
+ * @throws IOException
+ * @throws InterruptedException
+ */
+ public void testReadLoosePackedRef() throws IOException,
+ InterruptedException {
+ Ref ref = db.getRef("refs/heads/master");
+ assertEquals(Storage.PACKED, ref.getStorage());
+ FileOutputStream os = new FileOutputStream(new File(db.getDirectory(),
+ "refs/heads/master"));
+ os.write(ref.getObjectId().name().getBytes());
+ os.write('\n');
+ os.close();
+
+ ref = db.getRef("refs/heads/master");
+ assertEquals(Storage.LOOSE_PACKED, ref.getStorage());
+ }
+
+ /**
+ * Modify a packed ref using the API. This creates a loose ref too, ie.
+ * LOOSE_PACKED
+ *
+ * @throws IOException
+ */
+ public void testReadSimplePackedRefSameRepo() throws IOException {
+ Ref ref = db.getRef("refs/heads/master");
+ ObjectId pid = db.resolve("refs/heads/master^");
+ assertEquals(Storage.PACKED, ref.getStorage());
+ RefUpdate updateRef = db.updateRef("refs/heads/master");
+ updateRef.setNewObjectId(pid);
+ updateRef.setForceUpdate(true);
+ Result update = updateRef.update();
+ assertEquals(Result.FORCED, update);
+
+ ref = db.getRef("refs/heads/master");
+ assertEquals(Storage.LOOSE_PACKED, ref.getStorage());
+ }
+
}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java
index 8a47412..869d012 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java
@@ -283,8 +283,14 @@ private synchronized Ref readRefBasic(final String origName,
final long mtime = loose.lastModified();
if (ref != null) {
Long cachedlastModified = looseRefsMTime.get(name);
- if (cachedlastModified != null && cachedlastModified == mtime)
- return ref;
+ if (cachedlastModified != null && cachedlastModified == mtime) {
+ if (packedRefs.containsKey(origName))
+ return new Ref(Storage.LOOSE_PACKED, origName, ref
+ .getObjectId(), ref.getPeeledObjectId(), ref
+ .isPeeled());
+ else
+ return ref;
+ }
looseRefs.remove(origName);
looseRefsMTime.remove(origName);
}
@@ -349,12 +355,20 @@ private synchronized Ref readRefBasic(final String origName,
throw new IOException("Not a ref: " + name + ": " + line);
}
- ref = new Ref(Ref.Storage.LOOSE, origName, name, id);
-
- looseRefs.put(origName, ref);
- ref = new Ref(Ref.Storage.LOOSE, origName, id);
+ Storage storage;
+ if (packedRefs.containsKey(name))
+ storage = Ref.Storage.LOOSE_PACKED;
+ else
+ storage = Ref.Storage.LOOSE;
+ ref = new Ref(storage, name, id);
looseRefs.put(name, ref);
looseRefsMTime.put(name, mtime);
+
+ if (!origName.equals(name)) {
+ ref = new Ref(Ref.Storage.LOOSE, origName, name, id);
+ looseRefs.put(origName, ref);
+ }
+
return ref;
}
--
1.6.3.dirty
next prev parent reply other threads:[~2009-05-27 22:09 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-06 23:32 [EGIT PATCH 0/3] Rename refs Robin Rosenberg
2009-05-06 23:32 ` [EGIT PATCH 1/3] Add ref rename support to JGit Robin Rosenberg
2009-05-06 23:33 ` [EGIT PATCH 2/3] Use Constants.R_* in Branch dialog Robin Rosenberg
2009-05-06 23:33 ` [EGIT PATCH 3/3] Add ref rename support to the branch dialog Robin Rosenberg
2009-05-07 15:51 ` [EGIT PATCH 1/3] Add ref rename support to JGit Shawn O. Pearce
2009-05-19 23:13 ` [EGIT PATCH 0/6] Ref rename Robin Rosenberg
2009-05-19 23:13 ` [EGIT PATCH 1/6] Make sure we get the right storage for loose/pack/loose and packed refs Robin Rosenberg
2009-05-19 23:13 ` [EGIT PATCH 2/6] Add ref rename support to JGit Robin Rosenberg
2009-05-19 23:13 ` [EGIT PATCH 3/6] Add ref rename support to the branch dialog Robin Rosenberg
2009-05-19 23:13 ` [EGIT PATCH 4/6] Allow non-ASCII ref names when writing the packed-refs file Robin Rosenberg
2009-05-19 23:13 ` [EGIT PATCH 5/6] Use Constants.PACKED_REFS in RefWriter Robin Rosenberg
2009-05-19 23:13 ` [EGIT PATCH 6/6] Improve error reporting in the branch dialog Robin Rosenberg
2009-05-20 22:16 ` [EGIT PATCH 2/6] Add ref rename support to JGit Shawn O. Pearce
2009-05-27 22:08 ` [EGIT PATCH 00/10] Rename support Robin Rosenberg
2009-05-27 22:08 ` Robin Rosenberg [this message]
2009-05-27 22:08 ` [EGIT PATCH 02/10] Add a toString for debugging to RemoteRefUpdate Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 03/10] Add a toString to LockFile Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 04/10] Add more tests for RefUpdate Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 05/10] Do not write to the reflog unless the refupdate logmessage is set Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 06/10] Add a utility method for shortening long ref names to short ones Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 07/10] Set a nice reflog message in the branch command Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 08/10] Add ref rename support to JGit Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 09/10] Add ref rename support to the branch dialog Robin Rosenberg
2009-05-27 22:08 ` [EGIT PATCH 10/10] Improve error reporting in " Robin Rosenberg
2009-06-03 16:43 ` [EGIT PATCH 08/10] Add ref rename support to JGit Shawn O. Pearce
2009-06-03 15:41 ` [EGIT PATCH 05/10] Do not write to the reflog unless the refupdate logmessage is set Shawn O. Pearce
2009-06-07 22:27 ` Robin Rosenberg
2009-06-07 22:44 ` Shawn O. Pearce
2009-05-20 21:43 ` [EGIT PATCH 1/6] Make sure we get the right storage for loose/pack/loose and packed refs Shawn O. Pearce
2009-05-21 15:22 ` Robin Rosenberg
2009-05-21 15:48 ` Shawn O. Pearce
2009-06-10 21:22 ` [EGIT PATCH v5 0/7] Ref rename support again Robin Rosenberg
2009-06-10 21:22 ` [EGIT PATCH v5 1/7] Add methods to RawParseUtils for scanning backwards Robin Rosenberg
2009-06-10 21:22 ` [EGIT PATCH v5 2/7] Add a ref log reader class Robin Rosenberg
2009-06-10 21:22 ` [EGIT PATCH v5 3/7] Do not write to the reflog unless the refupdate logmessage is set Robin Rosenberg
2009-06-10 21:22 ` [EGIT PATCH v5 4/7] Add ref rename support to JGit Robin Rosenberg
2009-06-10 21:22 ` [EGIT PATCH v5 5/7] Add ref rename support to the branch dialog Robin Rosenberg
2009-06-10 21:22 ` [EGIT PATCH v5 6/7] Improve error reporting in " Robin Rosenberg
2009-06-10 21:22 ` [EGIT PATCH v5 7/7] Remove a TAB from the message Egit generates into the reflog on commit Robin Rosenberg
2009-06-12 20:02 ` [EGIT PATCH v5 5/7] Add ref rename support to the branch dialog Shawn O. Pearce
2009-06-14 19:47 ` [EGIT PATCH v6 5a/7] Warn for unlocalized string literals in ui plugin Robin Rosenberg
2009-06-14 19:47 ` [EGIT PATCH v6 5b/6] Add ref rename support to the branch dialog Robin Rosenberg
2009-06-14 19:47 ` [EGIT PATCH v6 6/7] Improve error reporting in " Robin Rosenberg
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1243462137-24133-2-git-send-email-robin.rosenberg@dewire.com \
--to=robin.rosenberg@dewire.com \
--cc=git@vger.kernel.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).