def test_reset_handler_marker(self):
from fastimport import commands
[c1, c2] = build_commit_graph(self.repo.object_store, [[1], [2]])
self.processor.markers[b'10'] = c1.id
cmd = commands.ResetCommand(b"refs/heads/foo", b':10')
self.processor.reset_handler(cmd)
self.assertEqual(c1.id, self.repo.get_refs()[b"refs/heads/foo"])
def test_reset_handler(self):
from fastimport import commands
[c1] = build_commit_graph(self.repo.object_store, [[1]])
cmd = commands.ResetCommand(b"refs/heads/foo", c1.id)
self.processor.reset_handler(cmd)
self.assertEqual(c1.id, self.repo.get_refs()[b"refs/heads/foo"])
self.assertEqual(c1.id, self.processor.last_commit)
def test_commit_time(self):
c1, c2, c3 = build_commit_graph(self.store, [[1], [2, 1], [3, 2]],
attrs={1: {'commit_time': 124},
2: {'commit_time': 123}})
self.assertEqual(124, c1.commit_time)
self.assertEqual(123, c2.commit_time)
self.assertTrue(c2.commit_time < c1.commit_time < c3.commit_time)
def setUp(self):
super(MOFMergeForkRepoTest, self).setUp()
f1_1 = make_object(Blob, data='f1')
f1_2 = make_object(Blob, data='f1-2')
f1_4 = make_object(Blob, data='f1-4')
f1_7 = make_object(Blob, data='f1-2') # same data as in rev 2
f2_1 = make_object(Blob, data='f2')
f2_3 = make_object(Blob, data='f2-3')
f3_3 = make_object(Blob, data='f3')
f3_5 = make_object(Blob, data='f3-5')
commit_spec = [[1], [2, 1], [3, 2], [4, 2], [5, 3], [6, 3, 4], [7, 6]]
trees = {1: [('f1', f1_1), ('f2', f2_1)],
2: [('f1', f1_2), ('f2', f2_1)], # f1 changed
# f3 added, f2 changed
3: [('f1', f1_2), ('f2', f2_3), ('f3', f3_3)],
4: [('f1', f1_4), ('f2', f2_1)], # f1 changed
5: [('f1', f1_2), ('f3', f3_5)], # f2 removed, f3 changed
6: [('f1', f1_4), ('f2', f2_3), ('f3', f3_3)], # merged 3 and 4
# f1 changed to match rev2. f3 removed
7: [('f1', f1_7), ('f2', f2_3)]}
self.commits = build_commit_graph(self.store, commit_spec, trees)
self.f1_2_id = f1_2.id
self.f1_4_id = f1_4.id
self.f1_7_id = f1_7.id
self.f2_3_id = f2_3.id
self.f3_3_id = f3_3.id
self.assertEqual(f1_2.id, f1_7.id, "[sanity]")
def test_new_branch(self):
[c1] = build_commit_graph(self.repo.object_store, [[1]])
self.repo[b"HEAD"] = c1.id
porcelain.branch_create(self.repo, b"foo")
self.assertEqual(
set([b"master", b"foo"]),
set(porcelain.branch_list(self.repo)))
def test_simple(self):
[c1] = build_commit_graph(self.repo.object_store, [[1]])
self.repo[b"HEAD"] = c1.id
porcelain.branch_create(self.repo, b'foo')
self.assertTrue(b"foo" in porcelain.branch_list(self.repo))
porcelain.branch_delete(self.repo, b'foo')
self.assertFalse(b"foo" in porcelain.branch_list(self.repo))
def test_set_new_branch(self):
[c1] = build_commit_graph(self.repo.object_store, [[1]])
self.repo.refs[b"refs/heads/blah"] = c1.id
porcelain.update_head(self.repo, "blah", new_branch="bar")
self.assertEqual(c1.id, self.repo.head())
self.assertEqual(b'ref: refs/heads/bar',
self.repo.refs.read_ref(b'HEAD'))
def make_commits(self, commit_spec, **kwargs):
times = kwargs.pop('times', [])
attrs = kwargs.pop('attrs', {})
for i, t in enumerate(times):
attrs.setdefault(i + 1, {})['commit_time'] = t
return build_commit_graph(self.store, commit_spec, attrs=attrs,
**kwargs)
def test_max_entries(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
outstream = StringIO()
porcelain.log(self.repo.path, outstream=outstream, max_entries=1)
self.assertEqual(1, outstream.getvalue().count("-" * 50))
def setUp(self):
super(MOFLinearRepoTest, self).setUp()
# present in 1, removed in 3
f1_1 = make_object(Blob, data=b'f1')
# present in all revisions, changed in 2 and 3
f2_1 = make_object(Blob, data=b'f2')
f2_2 = make_object(Blob, data=b'f2-changed')
f2_3 = make_object(Blob, data=b'f2-changed-again')
# added in 2, left unmodified in 3
f3_2 = make_object(Blob, data=b'f3')
commit_spec = [[1], [2, 1], [3, 2]]
trees = {1: [(b'f1', f1_1), (b'f2', f2_1)],
2: [(b'f1', f1_1), (b'f2', f2_2), (b'f3', f3_2)],
3: [(b'f2', f2_3), (b'f3', f3_2)]}
# commit 1: f1 and f2
# commit 2: f3 added, f2 changed. Missing shall report commit id and a
# tree referenced by commit
# commit 3: f1 removed, f2 changed. Commit sha and root tree sha shall
# be reported as modified
self.commits = build_commit_graph(self.store, commit_spec, trees)
self.missing_1_2 = [self.cmt(2).id, self.cmt(2).tree, f2_2.id, f3_2.id]
self.missing_2_3 = [self.cmt(3).id, self.cmt(3).tree, f2_3.id]
self.missing_1_3 = [
self.cmt(2).id, self.cmt(3).id,
self.cmt(2).tree, self.cmt(3).tree,
f2_2.id, f3_2.id, f2_3.id]
def test_simple(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
outstream = StringIO()
porcelain.show(self.repo.path, objects=[c3.id], outstream=outstream)
self.assertTrue(outstream.getvalue().startswith("-" * 50))
def test_simple(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs[b"refs/heads/foo"] = c3.id
porcelain.update_server_info(self.repo.path)
self.assertTrue(os.path.exists(os.path.join(self.repo.controldir(),
'info', 'refs')))
def test_empty(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
outstream = BytesIO()
porcelain.diff_tree(self.repo.path, c2.tree, c3.tree, outstream=outstream)
self.assertEqual(outstream.getvalue(), b"")
def test_set_wrong_symbolic_ref(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs["HEAD"] = c3.id
outstream = StringIO()
self.assertRaises(ValueError, porcelain.symbolic_ref, self.repo.path, 'foobar')
def test_simple_local(self):
f1_1 = make_object(Blob, data=b'f1')
commit_spec = [[1], [2, 1], [3, 1, 2]]
trees = {1: [(b'f1', f1_1), (b'f2', f1_1)],
2: [(b'f1', f1_1), (b'f2', f1_1)],
3: [(b'f1', f1_1), (b'f2', f1_1)], }
c1, c2, c3 = build_commit_graph(self.repo.object_store,
commit_spec, trees)
self.repo.refs[b"refs/heads/master"] = c3.id
self.repo.refs[b"refs/tags/foo"] = c3.id
target_path = tempfile.mkdtemp()
errstream = BytesIO()
self.addCleanup(shutil.rmtree, target_path)
r = porcelain.clone(self.repo.path, target_path,
checkout=False, errstream=errstream)
self.addCleanup(r.close)
self.assertEqual(r.path, target_path)
target_repo = Repo(target_path)
self.assertEqual(0, len(target_repo.open_index()))
self.assertEqual(c3.id, target_repo.refs[b'refs/tags/foo'])
self.assertTrue(b'f1' not in os.listdir(target_path))
self.assertTrue(b'f2' not in os.listdir(target_path))
c = r.get_config()
encoded_path = self.repo.path
if not isinstance(encoded_path, bytes):
encoded_path = encoded_path.encode('utf-8')
self.assertEqual(encoded_path, c.get((b'remote', b'origin'), b'url'))
self.assertEqual(
b'+refs/heads/*:refs/remotes/origin/*',
c.get((b'remote', b'origin'), b'fetch'))
def test_simple(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs["HEAD"] = c3.id
outstream = BytesIO()
porcelain.log(self.repo.path, outstream=outstream)
self.assertEqual(3, outstream.getvalue().count("-" * 50))
def test_custom_author(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs[b"refs/heads/foo"] = c3.id
sha = porcelain.commit(self.repo.path, message=b"Some message",
author=b"Joe <*****@*****.**>", committer=b"Bob <*****@*****.**>")
self.assertTrue(isinstance(sha, bytes))
self.assertEqual(len(sha), 40)
def test_trees(self):
a1 = make_object(Blob, data=b'aaa1')
a2 = make_object(Blob, data=b'aaa2')
c1, c2 = build_commit_graph(self.store, [[1], [2, 1]],
trees={1: [(b'a', a1)],
2: [(b'a', a2, 0o100644)]})
self.assertEqual((0o100644, a1.id), self.store[c1.tree][b'a'])
self.assertEqual((0o100644, a2.id), self.store[c2.tree][b'a'])
def test_simple(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
outstream = BytesIO()
porcelain.rev_list(
self.repo.path, [c3.id], outstream=outstream)
self.assertEqual(
"%s\n%s\n%s\n" % (c3.id, c2.id, c1.id),
outstream.getvalue())
def test_empty(self):
store = MemoryObjectStore()
c1, c2, c3 = build_commit_graph(store, [[1], [2, 1], [3, 1, 2]])
tree = store[c3.tree]
stream = b''.join(tar_stream(store, tree, 10))
out = BytesIO(stream)
tf = tarfile.TarFile(fileobj=out)
self.addCleanup(tf.close)
self.assertEqual([], tf.getnames())
def test_linear(self):
c1, c2 = build_commit_graph(self.store, [[1], [2, 1]])
for obj_id in [c1.id, c2.id, c1.tree, c2.tree]:
self.assertTrue(obj_id in self.store)
self.assertEqual([], c1.parents)
self.assertEqual([c1.id], c2.parents)
self.assertEqual(c1.tree, c2.tree)
self.assertEqual([], self.store[c1.tree].items())
self.assertTrue(c2.commit_time > c1.commit_time)
def test_simple_local(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs["refs/heads/master"] = c3.id
target_path = tempfile.mkdtemp()
outstream = StringIO()
self.addCleanup(shutil.rmtree, target_path)
r = porcelain.clone(self.repo.path, target_path, outstream=outstream)
self.assertEquals(r.path, target_path)
self.assertEquals(Repo(target_path).head(), c3.id)
def test_set_force_wrong_symbolic_ref(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
porcelain.symbolic_ref(self.repo.path, b"force_foobar", force=True)
# test if we actually changed the file
with self.repo.get_named_file("HEAD") as f:
new_ref = f.read()
self.assertEqual(new_ref, b"ref: refs/heads/force_foobar\n")
def test_simple(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
self.repo.refs[b"refs/heads/master"] = c3.id
out = BytesIO()
err = BytesIO()
porcelain.archive(self.repo.path, b"refs/heads/master", outstream=out, errstream=err)
self.assertEqual(b"", err.getvalue())
tf = tarfile.TarFile(fileobj=out)
self.addCleanup(tf.close)
self.assertEqual([], tf.getnames())
def test_unannotated(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
porcelain.tag_create(self.repo.path, b"tryme", annotated=False)
tags = self.repo.refs.as_dict(b"refs/tags")
self.assertEqual(list(tags.keys()), [b"tryme"])
self.repo[b"refs/tags/tryme"]
self.assertEqual(list(tags.values()), [self.repo.head()])
def test_set_symbolic_ref_other_than_master(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]], attrs=dict(refs="develop"))
self.repo.refs[b"HEAD"] = c3.id
self.repo.refs[b"refs/heads/develop"] = c3.id
porcelain.symbolic_ref(self.repo.path, b"develop")
# test if we actually changed the file
with self.repo.get_named_file("HEAD") as f:
new_ref = f.read()
self.assertEqual(new_ref, b"ref: refs/heads/develop\n")
def test_empty(self):
if sys.version_info[:2] <= (2, 6):
self.skipTest("archive creation known failing on Python2.6")
store = MemoryObjectStore()
c1, c2, c3 = build_commit_graph(store, [[1], [2, 1], [3, 1, 2]])
tree = store[c3.tree]
stream = b''.join(tar_stream(store, tree, 10))
out = BytesIO(stream)
tf = tarfile.TarFile(fileobj=out)
self.addCleanup(tf.close)
self.assertEqual([], tf.getnames())
def test_no_checkout_with_bare(self):
f1_1 = make_object(Blob, data=b'f1')
commit_spec = [[1]]
trees = {1: [(b'f1', f1_1), (b'f2', f1_1)]}
(c1, ) = build_commit_graph(self.repo.object_store, commit_spec, trees)
self.repo.refs[b"refs/heads/master"] = c1.id
target_path = tempfile.mkdtemp()
errstream = BytesIO()
self.addCleanup(shutil.rmtree, target_path)
self.assertRaises(ValueError, porcelain.clone, self.repo.path,
target_path, checkout=True, bare=True, errstream=errstream)
def test_annotated(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
porcelain.tag_create(self.repo.path, b"tryme", b"foo <*****@*****.**>", b"bar", annotated=True)
tags = self.repo.refs.as_dict(b"refs/tags")
self.assertEqual(list(tags.keys()), [b"tryme"])
tag = self.repo[b"refs/tags/tryme"]
self.assertTrue(isinstance(tag, Tag))
self.assertEqual(b"foo <*****@*****.**>", tag.tagger)
self.assertEqual(b"bar", tag.message)
self.assertLess(time.time() - tag.tag_time, 5)
def test_simple(self):
# TODO(jelmer): Remove this once dulwich has its own implementation of archive.
require_git_version((1, 5, 0))
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
self.repo.refs["refs/heads/master"] = c3.id
out = BytesIO()
err = BytesIO()
porcelain.archive(self.repo.path, "refs/heads/master", outstream=out,
errstream=err)
self.assertEqual("", err.getvalue())
tf = tarfile.TarFile(fileobj=out)
self.addCleanup(tf.close)
self.assertEqual([], tf.getnames())
def test_simple_local_with_checkout(self):
f1_1 = make_object(Blob, data=b'f1')
commit_spec = [[1], [2, 1], [3, 1, 2]]
trees = {
1: [(b'f1', f1_1), (b'f2', f1_1)],
2: [(b'f1', f1_1), (b'f2', f1_1)],
3: [(b'f1', f1_1), (b'f2', f1_1)],
}
c1, c2, c3 = build_commit_graph(self.repo.object_store, commit_spec,
trees)
self.repo.refs[b"refs/heads/master"] = c3.id
target_path = tempfile.mkdtemp()
errstream = BytesIO()
self.addCleanup(shutil.rmtree, target_path)
with porcelain.clone(self.repo.path,
target_path,
checkout=True,
errstream=errstream) as r:
self.assertEqual(r.path, target_path)
with Repo(target_path) as r:
self.assertEqual(r.head(), c3.id)
self.assertTrue('f1' in os.listdir(target_path))
self.assertTrue('f2' in os.listdir(target_path))
def test_both_adds(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store,
[[1], [2, 1], [3, 1]])
self.assertEqual([c1.id],
find_merge_base(self.repo.object_store,
[c2.id, c3.id]))
def test_from_ref(self):
r = MemoryRepo()
c1, c2, c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
r.refs[b'refs/heads/foo'] = c1.id
self.assertEqual(r[c1.tree], parse_tree(r, b'foo'))
def test_merge(self):
c1, c2, c3, c4 = build_commit_graph(self.store,
[[1], [2, 1], [3, 1], [4, 2, 3]])
self.assertEqual([c2.id, c3.id], c4.parents)
self.assertTrue(c4.commit_time > c2.commit_time)
self.assertTrue(c4.commit_time > c3.commit_time)
def test_fast_forward(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store,
[[1], [2, 1], [3, 2]])
self.assertEqual([c2.id],
find_merge_base(self.repo.object_store,
[c2.id, c3.id]))
def test_branch_exists(self):
[c1] = build_commit_graph(self.repo.object_store, [[1]])
self.repo[b"HEAD"] = c1.id
porcelain.branch_create(self.repo, b"foo")
self.assertRaises(KeyError, porcelain.branch_create, self.repo, b"foo")
porcelain.branch_create(self.repo, b"foo", force=True)
def test_attrs(self):
c1, c2 = build_commit_graph(self.store, [[1], [2, 1]],
attrs={1: {'message': b'Hooray!'}})
self.assertEqual(b'Hooray!', c1.message)
self.assertEqual(b'Commit 2', c2.message)
def test_set_symbolic_ref(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
porcelain.symbolic_ref(self.repo.path, b'master')
def test_commit_by_sha(self):
r = MemoryRepo()
c1, c2, c3 = build_commit_graph(r.object_store, [[1], [2, 1],
[3, 1, 2]])
self.assertEqual([c1], list(parse_commit_range(r, c1.id)))
def test_from_commit(self):
r = MemoryRepo()
c1, c2, c3 = build_commit_graph(r.object_store,
[[1], [2, 1], [3, 1, 2]])
self.assertEqual(r[c1.tree], parse_tree(r, c1.id))
self.assertEqual(r[c1.tree], parse_tree(r, c1.tree))
def test_set_wrong_symbolic_ref(self):
c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
[3, 1, 2]])
self.repo.refs[b"HEAD"] = c3.id
self.assertRaises(ValueError, porcelain.symbolic_ref, self.repo.path, b'foobar')
def test_commit_by_short_sha(self):
r = MemoryRepo()
[c1] = build_commit_graph(r.object_store, [[1]])
self.assertEqual(c1, parse_commit(r, c1.id[:10]))
def test_new_branch(self):
[c1] = build_commit_graph(self.repo.object_store, [[1]])
self.repo[b"HEAD"] = c1.id
porcelain.branch_create(self.repo, b"foo")
self.assertEqual(set([b"master", b"foo"]),
set(porcelain.branch_list(self.repo)))
def test_set_to_commit_detached(self):
[c1] = build_commit_graph(self.repo.object_store, [[1]])
self.repo.refs[b"refs/heads/blah"] = c1.id
porcelain.update_head(self.repo, c1.id, detached=True)
self.assertEqual(c1.id, self.repo.head())
self.assertEqual(c1.id, self.repo.refs.read_ref(b'HEAD'))
def test_reset_handler_default(self):
from fastimport import commands
[c1, c2] = build_commit_graph(self.repo.object_store, [[1], [2]])
cmd = commands.ResetCommand(b"refs/heads/foo", None)
self.processor.reset_handler(cmd)
self.assertEqual(ZERO_SHA, self.repo.get_refs()[b"refs/heads/foo"])
def test_reset_handler(self):
from fastimport import commands
[c1] = build_commit_graph(self.repo.object_store, [[1]])
cmd = commands.ResetCommand("refs/heads/foo", c1.id)
self.processor.reset_handler(cmd)
self.assertEquals(c1.id, self.repo.get_refs()["refs/heads/foo"])
