From: mr.gaffo@gmail.com
To: git@vger.kernel.org
Cc: "mike.gaffney" <mike.gaffney@asolutions.com>
Subject: [PATCH JGit 12/19] moved info/packs into a constant
Date: Sun, 13 Sep 2009 13:44:28 -0500 [thread overview]
Message-ID: <1252867475-858-13-git-send-email-mr.gaffo@gmail.com> (raw)
In-Reply-To: <1252867475-858-12-git-send-email-mr.gaffo@gmail.com>
From: mike.gaffney <mike.gaffney@asolutions.com>
---
.../org/spearce/jgit/lib/ObjectDirectoryTest.java | 5 ++---
.../src/org/spearce/jgit/lib/Constants.java | 3 +++
.../src/org/spearce/jgit/lib/ObjectDirectory.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ObjectDirectoryTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ObjectDirectoryTest.java
index 4ac62fa..b27f2f8 100644
--- a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ObjectDirectoryTest.java
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ObjectDirectoryTest.java
@@ -79,7 +79,7 @@ public void testListLocalPacksWhenThereIsAPack() throws Exception {
assertEquals(TEST_PACK.getName(), localPacks.get(0).getPackFile().getName());
}
- public void testUpdateInfoCacheCreatesPacksFile() throws Exception {
+ public void testUpdateInfoCacheCreatesPacksAndRefsFile() throws Exception {
createSamplePacksDir();
ObjectDirectory od = new ObjectDirectory(testDir);
@@ -87,7 +87,7 @@ public void testUpdateInfoCacheCreatesPacksFile() throws Exception {
od.updateInfoCache();
String expectedContents = new PacksFileContentsCreator(od.listLocalPacks()).toString();
- File packsFile = new File(od.getDirectory(), "info/packs");
+ File packsFile = new File(od.getDirectory(), Constants.CACHED_PACKS_FILE);
assertTrue(packsFile.exists());
assertEquals(expectedContents, JGitTestUtil.readFileAsString(packsFile));
@@ -103,7 +103,6 @@ public boolean deleteDir(File dir) {
}
}
}
-
// The directory is now empty so delete it
return dir.delete();
}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java
index 9afea67..2d78dda 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java
@@ -224,6 +224,9 @@
/** Info refs folder */
public static final String INFO_REFS = "info/refs";
+
+ /** cached packs file */
+ public static final String CACHED_PACKS_FILE = "info/packs";
/** Packed refs file */
public static final String PACKED_REFS = "packed-refs";
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectDirectory.java b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectDirectory.java
index 71536c9..f4251c1 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectDirectory.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectDirectory.java
@@ -517,6 +517,6 @@ boolean tryAgain(final long currLastModified) {
@Override
public void updateInfoCache() throws IOException {
- new UpdateDirectoryBasedPacksInfoCache(this.listLocalPacks(), new File(this.infoDirectory, "packs")).execute();
+ new UpdateDirectoryBasedPacksInfoCache(this.listLocalPacks(), new File(this.getDirectory(), Constants.CACHED_PACKS_FILE)).execute();
}
}
--
1.6.4.2
next prev parent reply other threads:[~2009-09-13 18:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-13 18:44 [PATCH JGit] Adding update-server-info functionality mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 01/19] adding tests for ObjectDirectory mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 02/19] Create abstract method on ObjectDatabase for accessing the list of local pack files mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 03/19] Add abstract method for updating the object db's info cache Implemented passthrough on Alternate for the update of infocache mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 04/19] added utility that generates the contents of the objects/info/packs file as a string from a list of PackFiles mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 05/19] Made tests for listLocalPacks function on ObjectDirectory and made them pass mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 06/19] added utility for reading the contents of a file as a string mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 07/19] implemented the packs file update functionality mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 08/19] changed signature to allow a IOException mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 09/19] Didn't like the old name, this is more specific to it just updating the packs info cache mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 10/19] moved test up to a higher level to test actual functionality mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 11/19] removed unused import mr.gaffo
2009-09-13 18:44 ` mr.gaffo [this message]
2009-09-13 18:44 ` [PATCH JGit 13/19] made the call update the object database's info cache mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 14/19] pulled out some helper functions that will be useful for other tests mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 15/19] Adding in a InfoDatabase like ObjectDatabase and and implementation based upon a directory mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 16/19] added tests for the file based info cache update and made pass mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 17/19] added call to update the info refs file mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 18/19] Added Copyright Notices mr.gaffo
2009-09-13 18:44 ` [PATCH JGit 19/19] changed \r to \n per compliance with real git mr.gaffo
2009-09-15 19:23 ` [PATCH JGit 09/19] Didn't like the old name, this is more specific to it just updating the packs info cache Robin Rosenberg
2009-09-15 19:23 ` [PATCH JGit 07/19] implemented the packs file update functionality Robin Rosenberg
2009-09-15 16:13 ` [PATCH JGit 05/19] Made tests for listLocalPacks function on ObjectDirectory and made them pass Robin Rosenberg
2009-09-15 15:35 ` [PATCH JGit 04/19] added utility that generates the contents of the objects/info/packs file as a string from a list of PackFiles Robin Rosenberg
2009-09-15 15:38 ` [PATCH JGit 01/19] adding tests for ObjectDirectory 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=1252867475-858-13-git-send-email-mr.gaffo@gmail.com \
--to=mr.gaffo@gmail.com \
--cc=git@vger.kernel.org \
--cc=mike.gaffney@asolutions.com \
/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).