From 2a0375b9a036d4baa96a00731f40c03103b52000 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 12 Aug 2007 23:18:31 +0200 Subject: [PATCH] Add more repository test data This is mostly for the commit walker Signed-off-by: Robin Rosenberg --- org.spearce.jgit/tst/create-second-pack | 128 +++++++++++++++++++++ .../org/spearce/jgit/lib/RepositoryTestCase.java | 7 +- ...ck-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idx | Bin 0 -> 2696 bytes ...k-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.pack | Bin 0 -> 5956 bytes org.spearce.jgit/tst/packed-refs | 7 ++ 5 files changed, 141 insertions(+), 1 deletion(-) create mode 100755 org.spearce.jgit/tst/create-second-pack create mode 100644 org.spearce.jgit/tst/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idx create mode 100644 org.spearce.jgit/tst/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.pack create mode 100644 org.spearce.jgit/tst/packed-refs diff --git a/org.spearce.jgit/tst/create-second-pack b/org.spearce.jgit/tst/create-second-pack new file mode 100755 index 00000000..e6ddbb71 --- /dev/null +++ b/org.spearce.jgit/tst/create-second-pack @@ -0,0 +1,128 @@ +#!/bin/bash -ex + +export GIT_COMMITTER_NAME="A U Thor" +export GIT_AUTHOR_NAME="A U Thor" +export GIT_COMMITTER_EMAIL="a.u.thor@example.com" +export GIT_AUTHOR_EMAIL="a.u.thor@example.com" + +test_tick () { + # from git/t/test-lib.sh + if test -z "${test_tick+set}" + then + test_tick=1112911993 + else + test_tick=$(($test_tick + 60)) + fi + GIT_COMMITTER_DATE="$test_tick -0700" + GIT_AUTHOR_DATE="$test_tick -0700" + export GIT_COMMITTER_DATE GIT_AUTHOR_DATE +} + +git_commit () { + test_tick + git commit "$@" +} + +git_merge () { + test_tick + git merge "$@" + +} + +test_tick +rm -rf .git *.txt ? +git init +echo "On master" >>master.txt +git add master.txt +git_commit -a -m "On master" + +echo "On master" >>master.txt +git_commit -a -m "On master again" + +git checkout -b a 6c8b137b1c652731597c89668f417b8695f28dd7 +mkdir a + +echo a1 >>a/a1.txt +git add a/a1.txt +git_commit -a -m "First a/a1" + +echo a2 >>a/a2.txt +git add a/a2.txt +git_commit -a -m "First a/a2" + +git merge master + +echo a1 >>a/a1.txt +git add a/a1.txt +git_commit -a -m "Second a/a1" + +echo a2 >>a/a2.txt +git add a/a2.txt +git_commit -a -m "Second a/a2" + +git checkout -b b 58be4659bb571194ed4562d04b359d26216f526e + +mkdir b +echo b1 >>b/b1.txt +git add b/b1.txt +git_commit -a -m "First b/b1" + +echo b2 >>b/b2.txt +git add b/b2.txt +git_commit -a -m "First b/b2" + +git merge a + +echo b1 >>b/b1.txt +git add b/b1.txt +git_commit -a -m "Second b/b1" + +echo b2 >>b/b2.txt +git add b/b2.txt +git_commit -a -m "Second b/b2" + +rm -rf a b c master.txt +mkdir c +rm -f ./git/index +echo ref: refs/heads/c >.git/HEAD + +echo c1 >>c/c1.txt +git add c/c1.txt +git_commit -a -m "First c/c1, no parent" + +echo c2 >>c/c2.txt +git add c/c2.txt +git_commit -a -m "First c/c2" + +git_merge a + +echo c1 >>c/c1.txt +git add c/c2.txt +git_commit -a -m "Second c/c1" + +echo c2 >>c/c2.txt +git add c/c2.txt +git_commit -a -m "Second c/c2" + +git_merge b + +git checkout -b d a + +echo "a1" >>a/a1 +git add a/a1 +git_commit -a -m "Third a/a1" + +git checkout -b e a + +echo "a1" >>a/a1 +git add a/a1 +git_commit -a -m "Fourth a/a1" + +git checkout master + +git_merge c d e + +git repack -a -d +git pack-refs --all + +qgit --all master diff --git a/org.spearce.jgit/tst/org/spearce/jgit/lib/RepositoryTestCase.java b/org.spearce.jgit/tst/org/spearce/jgit/lib/RepositoryTestCase.java index 7d4052e6..c3e855de 100644 --- a/org.spearce.jgit/tst/org/spearce/jgit/lib/RepositoryTestCase.java +++ b/org.spearce.jgit/tst/org/spearce/jgit/lib/RepositoryTestCase.java @@ -101,7 +101,10 @@ public abstract class RepositoryTestCase extends TestCase { db = new Repository(trash_git); db.create(); - final String[] packs = { "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f" }; + final String[] packs = { + "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f", + "pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371" + }; final File tst = new File("tst"); final File packDir = new File(db.getObjectsDirectory(), "pack"); for (int k = 0; k < packs.length; k++) { @@ -111,6 +114,8 @@ public abstract class RepositoryTestCase extends TestCase { packs[k] + ".idx")); } + copyFile(new File(tst, "packed-refs"), new File(trash_git,"packed-refs")); + db.scanForPacks(); } diff --git a/org.spearce.jgit/tst/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idx b/org.spearce.jgit/tst/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idx new file mode 100644 index 0000000000000000000000000000000000000000..2579301b8447e4d55480f65ae6c27fe1eb99bf4d GIT binary patch literal 2696 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 a!_XOa0@yv<