def test_send_pack_no_sideband64k_with_update_ref_error(self):
# No side-bank-64k reported by server shouldn't try to parse
# side band data
pkts = [b'55dcc6bf963f922e1ed5c4bbaaefcfacef57b1d7 capabilities^{}'
b'\x00 report-status delete-refs ofs-delta\n',
b'',
b"unpack ok",
b"ng refs/foo/bar pre-receive hook declined",
b'']
for pkt in pkts:
if pkt == b'':
self.rin.write(b"0000")
else:
self.rin.write(("%04x" % (len(pkt)+4)).encode('ascii') + pkt)
self.rin.seek(0)
tree = Tree()
commit = Commit()
commit.tree = tree
commit.parents = []
commit.author = commit.committer = b'test user'
commit.commit_time = commit.author_time = 1174773719
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = b'UTF-8'
commit.message = b'test message'
def update_refs(refs):
return {b'refs/foo/bar': commit.id, }
def generate_pack_data(have, want, ofs_delta=False):
return pack_objects_to_data([(commit, None), (tree, ''), ])
self.assertRaises(UpdateRefsError,
self.client.send_pack, "blah",
update_refs, generate_pack_data)
def _update_file(self, name, subdir, filename, data, commit_msg):
# first, create a new blob for the data
blob = Blob.from_string(data.encode('utf-8'))
# fetch the old tree object, add new page
try:
subdir_tree = _walk_git_repo_tree(self.repo, self.current_tree, subdir)
except KeyError:
# we need to create the subdir_tree as well, since it does not exist
# yet
subdir_tree = Tree()
subdir_tree.add(_git_default_file_mode, filename, blob.id)
# create new root tree
tree = self.current_tree
tree.add(stat.S_IFDIR, subdir, subdir_tree.id)
# create commit
commit = Commit()
commit.parents = [self.current_commit.id]
commit.tree = tree.id
commit.author = commit.committer = self.wiki_user
commit.commit_time = commit.author_time = int(time.time())
commit.commit_timezone = commit.author_timezone = parse_timezone(time.timezone)[0]
commit.encoding = 'UTF-8'
commit.message = commit_msg.encode('utf-8')
# store all objects
self.repo.object_store.add_object(blob)
self.repo.object_store.add_object(subdir_tree)
self.repo.object_store.add_object(tree)
self.repo.object_store.add_object(commit)
# update the branch
self.repo.refs[self.head] = commit.id
def write(files):
repo = Repo(repo_path)
blobs = {}
dirs = {}
def add_to_dirs(path):
dirname = os.path.dirname(path)
if path == '':
return
add_to_dirs(dirname)
names = dirs.get(dirname, [])
if path not in names:
names.append(path)
dirs[dirname] = names
def savedir(dirname):
tree = Tree()
names = dirs[dirname]
for name in names:
basename = os.path.basename(name)
sha = blobs.get(name, None)
if sha is not None:
tree.add(basename.encode('utf-8'), 0100644, sha)
continue
subtree = savedir(name)
tree.add(basename.encode('utf-8'), 040000, subtree.id)
repo.object_store.add_object(tree)
return tree
for metadata in files:
blob = Blob.from_string(metadata.content)
repo.object_store.add_object(blob)
blobs[metadata.path[1:]] = blob.id
add_to_dirs(metadata.path[1:])
tree = savedir('')
commit = Commit()
commit.tree = tree.id
commit.author = author.encode('utf-8')
commit.author_time = author_time
commit.author_timezone = author_timezone
commit.committer = committer.encode('utf-8')
commit.commit_time = commit_time
commit.commit_timezone = commit_timezone
commit.encoding = encoding.encode('utf-8')
commit.message = message.encode('utf-8')
repo.object_store.add_object(commit)
repo[ref] = commit.id
def _commit(tree_dict, message):
head = _get_current_head()
tree = _get_current_tree()
for name, contents in list(tree_dict.items()):
if contents is None:
del tree[name]
else:
blob = Blob.from_string(contents)
_repo.object_store.add_object(blob)
tree[name] = (0o100644, blob.id)
commit = Commit()
commit.parents = [head.id] if head else []
commit.tree = tree.id
commit.author = commit.committer = "{0} <{1}>".format(_config.get("user", "name"), _config.get("user", "email"))
commit.author_time = commit.commit_time = int(time())
commit.author_timezone = commit.commit_timezone = 0
commit.encoding = "UTF-8"
commit.message = message
_repo.object_store.add_object(tree)
_repo.object_store.add_object(commit)
_repo["refs/heads/clask"] = commit.id
def __init_code__():
# initialize the repo if it doesn't exists, or load it if it does
if not path.exists(LOGS_PATH):
print "creating folder "+ LOGS_PATH
mkdir(LOGS_PATH)
repo = Repo.init(LOGS_PATH)
blob = Blob.from_string("data")
tree =Tree()
tree.add(0100644, "initfile", blob.id)
c = Commit()
c.tree = tree.id
author = "Writer [email protected]"
c.author=c.committer=author
c.commit_time=c.author_time=int(time())
tz = parse_timezone('+0200')
c.commit_timezone=c.author_timezone=tz
c.encoding="UTF-8"
c.message="initial commit"
store = repo.object_store
store.add_object(blob)
store.add_object(tree)
store.add_object(c)
repo.refs['refs/heads/master'] = c.id
repo.refs['HEAD'] = 'ref: refs/heads/master'
print "success!"
else:
#this is how to create a Repo object from an existing repository
from dulwich.errors import NotGitRepository
try:
repo = Repo(LOGS_PATH)
except NotGitRepository as e:
raise GitFileError("Error: the path %s exists but is not a git repository."%LOGS_PATH)
return repo
def delete_file(self, subdir, filename, commit_msg):
try:
subdir_tree = _walk_git_repo_tree(self.repo, self.current_tree, subdir)
except KeyError:
raise FileNotFoundException('No subdir named %r' % subdir)
if not filename in subdir_tree: raise FileNotFoundException('%r not in %s' % (filename, subdir))
del subdir_tree[filename]
# create new root tree
tree = self.current_tree
tree.add(stat.S_IFDIR, subdir, subdir_tree.id)
# create commit
# FIXME: factor this out!
commit = Commit()
commit.parents = [self.current_commit.id]
commit.tree = tree.id
commit.author = commit.committer = self.wiki_user
commit.commit_time = commit.author_time = int(time.time())
commit.commit_timezone = commit.author_timezone = parse_timezone(time.timezone)[0]
commit.encoding = 'UTF-8'
commit.message = commit_msg.encode('utf-8')
# store all objects
self.repo.object_store.add_object(subdir_tree)
self.repo.object_store.add_object(tree)
self.repo.object_store.add_object(commit)
# update the branch
self.repo.refs[self.head] = commit.id
def create_commit(metadata, parents, tree_id): """Create a new Git commit object, and add it to the object store. Args: metadata: Dictionary containing metadata to construct the commit, including commit message and author data. parents: The parents of this commit. tree: The tree of files to use for this commit. Returns: New commit object. """ commit = Commit() commit.tree = tree_id commit.author = "%s <%s>" % (metadata["GIT_AUTHOR_NAME"], metadata["GIT_AUTHOR_EMAIL"]) commit.author_time = \ utc_time_from_string(metadata["GIT_AUTHOR_DATE"]) commit.author_timezone = 0 commit.committer = "%s <%s>" % (metadata["GIT_COMMITTER_NAME"], metadata["GIT_COMMITTER_EMAIL"]) commit.commit_time = \ utc_time_from_string(metadata["GIT_COMMITTER_DATE"]) commit.commit_timezone = 0 commit.encoding = "UTF-8" commit.message = metadata["MESSAGE"] commit.parents = parents gitrepo.object_store.add_object(commit) return commit
def git_repo_init(gitdir):
os.mkdir(gitdir)
repo = Repo.init_bare(gitdir)
blob = Blob.from_string("""Why, Hello there!
This is your friendly Legislation tracker, Billy here.
This is a git repo full of everything I write to the DB. This isn't super
useful unless you're debugging production issues.
Fondly,
Bill, your local Billy instance.""")
tree = Tree()
tree.add("README", 0100644, blob.id)
commit = Commit()
commit.tree = tree.id
author = "Billy <billy@localhost>"
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time())
tz = parse_timezone('-0400')[0]
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = "Initial commit"
repo.object_store.add_object(blob)
repo.object_store.add_object(tree)
repo.object_store.add_object(commit)
repo.refs['refs/heads/master'] = commit.id
def create_commit(data, marker='Default', blob=None):
if not blob:
blob = Blob.from_string('The blob content %s' % marker)
tree = Tree()
tree.add("thefile_%s" % marker, 0o100644, blob.id)
cmt = Commit()
if data:
assert isinstance(data[-1], Commit)
cmt.parents = [data[-1].id]
cmt.tree = tree.id
author = "John Doe %s <*****@*****.**>" % marker
cmt.author = cmt.committer = author
tz = parse_timezone('-0200')[0]
cmt.commit_time = cmt.author_time = int(time())
cmt.commit_timezone = cmt.author_timezone = tz
cmt.encoding = "UTF-8"
cmt.message = "The commit message %s" % marker
tag = Tag()
tag.tagger = "*****@*****.**"
tag.message = "Annotated tag"
tag.tag_timezone = parse_timezone('-0200')[0]
tag.tag_time = cmt.author_time
tag.object = (Commit, cmt.id)
tag.name = "v_%s_0.1" % marker
return blob, tree, tag, cmt
def commit_handler(self, cmd):
"""Process a CommitCommand."""
commit = Commit()
if cmd.author is not None:
author = cmd.author
else:
author = cmd.committer
(author_name, author_email, author_timestamp, author_timezone) = author
(committer_name, committer_email, commit_timestamp, commit_timezone) = cmd.committer
commit.author = "%s <%s>" % (author_name, author_email)
commit.author_timezone = author_timezone
commit.author_time = int(author_timestamp)
commit.committer = "%s <%s>" % (committer_name, committer_email)
commit.commit_timezone = commit_timezone
commit.commit_time = int(commit_timestamp)
commit.message = cmd.message
commit.parents = []
contents = {}
commit.tree = commit_tree(
self.repo.object_store, ((path, hexsha, mode) for (path, (mode, hexsha)) in contents.iteritems())
)
if self.last_commit is not None:
commit.parents.append(self.last_commit)
commit.parents += cmd.merges
self.repo.object_store.add_object(commit)
self.repo[cmd.ref] = commit.id
self.last_commit = commit.id
if cmd.mark:
self.markers[cmd.mark] = commit.id
def init_the_git(config):
path = config.get('Local', 'path')
repo = Repo.init(path)
blob = Blob.from_string(open(os.path.join(path, '.git-dropbox.cnf')).read())
tree = Tree()
tree.add(".git-dropbox.cnf", 0100644, blob.id)
commit = Commit()
commit.tree = tree.id
commit.author = config.get('Local', 'user')
commit.committer = 'Git-dropbox'
commit.commit_time = int(time())
commit.author_time = os.path.getctime(os.path.join(path, '.git-dropbox.cnf'))
commit.commit_timezone = commit.author_timezone = parse_timezone('-0200')[0]
commit.encoding = 'UTF-8'
commit.message = 'Initial commit'
object_store = repo.object_store
object_store.add_object(blob)
object_store.add_object(tree)
object_store.add_object(commit)
repo.refs['refs/heads/master'] = commit.id
def update_content(self, new_content, author, email, message):
new_content = new_content.encode('UTF-8')
author = author.encode('UTF-8')
message = message.encode('UTF-8')
email = email.encode('UTF-8')
# create blob, add to existing tree
blob = Blob.from_string(new_content)
self.tree[self.title] = (0100644, blob.id)
# commit
commit = Commit()
commit.tree = self.tree.id
commit.parents = [self.head.id]
commit.author = commit.committer = "%s <%s>" % (author, email)
commit.commit_time = commit.author_time = int(time())
tz = parse_timezone('+0100')[0] # FIXME: get proper timezone
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = 'UTF-8'
commit.message = message
# save everything
object_store = self.repo.object_store
object_store.add_object(blob)
object_store.add_object(self.tree)
object_store.add_object(commit)
self.repo.refs['refs/heads/master'] = commit.id
def do_commit(self, message, committer=None,
author=None, commit_timestamp=None,
commit_timezone=None, author_timestamp=None,
author_timezone=None, tree=None):
"""Create a new commit.
:param message: Commit message
:param committer: Committer fullname
:param author: Author fullname (defaults to committer)
:param commit_timestamp: Commit timestamp (defaults to now)
:param commit_timezone: Commit timestamp timezone (defaults to GMT)
:param author_timestamp: Author timestamp (defaults to commit timestamp)
:param author_timezone: Author timestamp timezone
(defaults to commit timestamp timezone)
:param tree: SHA1 of the tree root to use (if not specified the current index will be committed).
:return: New commit SHA1
"""
import time
c = Commit()
if tree is None:
index = self.open_index()
c.tree = index.commit(self.object_store)
else:
c.tree = tree
# TODO: Allow username to be missing, and get it from .git/config
if committer is None:
raise ValueError("committer not set")
c.committer = committer
if commit_timestamp is None:
commit_timestamp = time.time()
c.commit_time = int(commit_timestamp)
if commit_timezone is None:
# FIXME: Use current user timezone rather than UTC
commit_timezone = 0
c.commit_timezone = commit_timezone
if author is None:
author = committer
c.author = author
if author_timestamp is None:
author_timestamp = commit_timestamp
c.author_time = int(author_timestamp)
if author_timezone is None:
author_timezone = commit_timezone
c.author_timezone = author_timezone
c.message = message
try:
old_head = self.refs["HEAD"]
c.parents = [old_head]
self.object_store.add_object(c)
ok = self.refs.set_if_equals("HEAD", old_head, c.id)
except KeyError:
c.parents = []
self.object_store.add_object(c)
ok = self.refs.add_if_new("HEAD", c.id)
if not ok:
# Fail if the atomic compare-and-swap failed, leaving the commit and
# all its objects as garbage.
raise CommitError("HEAD changed during commit")
return c.id
def test_simple_bytesio(self):
f = BytesIO()
c = Commit()
c.committer = c.author = b"Jelmer <*****@*****.**>"
c.commit_time = c.author_time = 1271350201
c.commit_timezone = c.author_timezone = 0
c.message = b"This is the first line\nAnd this is the second line.\n"
c.tree = Tree().id
write_commit_patch(f, c, b"CONTENTS", (1, 1), version="custom")
f.seek(0)
lines = f.readlines()
self.assertTrue(lines[0].startswith(b"From 0b0d34d1b5b596c928adc9a727a4b9e03d025298"))
self.assertEqual(lines[1], b"From: Jelmer <*****@*****.**>\n")
self.assertTrue(lines[2].startswith(b"Date: "))
self.assertEqual(
[
b"Subject: [PATCH 1/1] This is the first line\n",
b"And this is the second line.\n",
b"\n",
b"\n",
b"---\n",
],
lines[3:8],
)
self.assertEqual([b"CONTENTS-- \n", b"custom\n"], lines[-2:])
if len(lines) >= 12:
# diffstat may not be present
self.assertEqual(lines[8], b" 0 files changed\n")
def test_send_pack_no_sideband64k_with_update_ref_error(self):
# No side-bank-64k reported by server shouldn't try to parse
# side band data
pkts = ['55dcc6bf963f922e1ed5c4bbaaefcfacef57b1d7 capabilities^{}'
'\x00 report-status delete-refs ofs-delta\n',
'',
"unpack ok",
"ng refs/foo/bar pre-receive hook declined",
'']
for pkt in pkts:
if pkt == '':
self.rin.write("0000")
else:
self.rin.write("%04x%s" % (len(pkt)+4, pkt))
self.rin.seek(0)
tree = Tree()
commit = Commit()
commit.tree = tree
commit.parents = []
commit.author = commit.committer = 'test user'
commit.commit_time = commit.author_time = 1174773719
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = 'UTF-8'
commit.message = 'test message'
def determine_wants(refs):
return {'refs/foo/bar': commit.id, }
def generate_pack_contents(have, want):
return [(commit, None), (tree, ''), ]
self.assertRaises(UpdateRefsError,
self.client.send_pack, "blah",
determine_wants, generate_pack_contents)
def oldcreate(self, name):
"""
create a new repo
:param name: the name to give the new repo
:type name: string
"""
repo = Repo.init_bare(name)
from dulwich.objects import Tree
tree = Tree()
from dulwich.objects import Commit, parse_timezone
from time import time
commit = Commit()
commit.tree = tree.id #is the tree.id the sha1 of the files contained in tree
author = "New Project Wizard <wizard@host>"
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time())
tz = parse_timezone('+1000')[0]
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = "New Project."
object_store = repo.object_store
#then add the tree
object_store.add_object(tree)
#then add the commit
object_store.add_object(commit)
repo.refs['refs/heads/master'] = commit.id
return {"success":"%s.git created" % name}
def test_emit_commit(self):
b = Blob()
b.data = "FOO"
t = Tree()
t.add(stat.S_IFREG | 0644, "foo", b.id)
c = Commit()
c.committer = c.author = "Jelmer <jelmer@host>"
c.author_time = c.commit_time = 1271345553
c.author_timezone = c.commit_timezone = 0
c.message = "msg"
c.tree = t.id
self.store.add_objects([(b, None), (t, None), (c, None)])
self.fastexporter.emit_commit(c, "refs/heads/master")
self.assertEquals("""blob
mark :1
data 3
FOO
commit refs/heads/master
mark :2
author Jelmer <jelmer@host> 1271345553 +0000
committer Jelmer <jelmer@host> 1271345553 +0000
data 3
msg
M 644 1 foo
""", self.stream.getvalue())
def git_am_patch_split(f):
"""Parse a git-am-style patch and split it up into bits.
:param f: File-like object to parse
:return: Tuple with commit object, diff contents and git version
"""
msg = rfc822.Message(f)
c = Commit()
c.author = msg["from"]
c.committer = msg["from"]
if msg["subject"].startswith("[PATCH"):
subject = msg["subject"].split("]", 1)[1][1:]
else:
subject = msg["subject"]
c.message = subject
for l in f:
if l == "---\n":
break
c.message += l
diff = ""
for l in f:
if l == "-- \n":
break
diff += l
version = f.next().rstrip("\n")
return c, diff, version
def export_hg_commit(self, rev):
self.ui.note(_("converting revision %s\n") % hex(rev))
oldenc = self.swap_out_encoding()
ctx = self.repo.changectx(rev)
extra = ctx.extra()
commit = Commit()
(time, timezone) = ctx.date()
commit.author = self.get_git_author(ctx)
commit.author_time = int(time)
commit.author_timezone = -timezone
if 'committer' in extra:
# fixup timezone
(name, timestamp, timezone) = extra['committer'].rsplit(' ', 2)
commit.committer = name
commit.commit_time = timestamp
# work around a timezone format change
if int(timezone) % 60 != 0: #pragma: no cover
timezone = parse_timezone(timezone)
# Newer versions of Dulwich return a tuple here
if isinstance(timezone, tuple):
timezone, neg_utc = timezone
commit._commit_timezone_neg_utc = neg_utc
else:
timezone = -int(timezone)
commit.commit_timezone = timezone
else:
commit.committer = commit.author
commit.commit_time = commit.author_time
commit.commit_timezone = commit.author_timezone
commit.parents = []
for parent in self.get_git_parents(ctx):
hgsha = hex(parent.node())
git_sha = self.map_git_get(hgsha)
if git_sha:
commit.parents.append(git_sha)
commit.message = self.get_git_message(ctx)
if 'encoding' in extra:
commit.encoding = extra['encoding']
tree_sha = commit_tree(self.git.object_store, self.iterblobs(ctx))
commit.tree = tree_sha
self.git.object_store.add_object(commit)
self.map_set(commit.id, ctx.hex())
self.swap_out_encoding(oldenc)
return commit.id
def commit_handler(self, cmd):
"""Process a CommitCommand."""
commit = Commit()
if cmd.author is not None:
author = cmd.author
else:
author = cmd.committer
(author_name, author_email, author_timestamp, author_timezone) = author
(committer_name, committer_email, commit_timestamp,
commit_timezone) = cmd.committer
commit.author = author_name + b" <" + author_email + b">"
commit.author_timezone = author_timezone
commit.author_time = int(author_timestamp)
commit.committer = committer_name + b" <" + committer_email + b">"
commit.commit_timezone = commit_timezone
commit.commit_time = int(commit_timestamp)
commit.message = cmd.message
commit.parents = []
if cmd.from_:
cmd.from_ = self.lookup_object(cmd.from_)
self._reset_base(cmd.from_)
for filecmd in cmd.iter_files():
if filecmd.name == b"filemodify":
if filecmd.data is not None:
blob = Blob.from_string(filecmd.data)
self.repo.object_store.add(blob)
blob_id = blob.id
else:
blob_id = self.lookup_object(filecmd.dataref)
self._contents[filecmd.path] = (filecmd.mode, blob_id)
elif filecmd.name == b"filedelete":
del self._contents[filecmd.path]
elif filecmd.name == b"filecopy":
self._contents[filecmd.dest_path] = self._contents[
filecmd.src_path]
elif filecmd.name == b"filerename":
self._contents[filecmd.new_path] = self._contents[
filecmd.old_path]
del self._contents[filecmd.old_path]
elif filecmd.name == b"filedeleteall":
self._contents = {}
else:
raise Exception("Command %s not supported" % filecmd.name)
commit.tree = commit_tree(
self.repo.object_store,
((path, hexsha, mode) for (path, (mode, hexsha)) in
self._contents.items()))
if self.last_commit != ZERO_SHA:
commit.parents.append(self.last_commit)
for merge in cmd.merges:
commit.parents.append(self.lookup_object(merge))
self.repo.object_store.add_object(commit)
self.repo[cmd.ref] = commit.id
self.last_commit = commit.id
if cmd.mark:
self.markers[cmd.mark] = commit.id
def _do_commit(self, tree, parents, author, timezone, message):
commit = Commit()
commit.tree = tree if type(tree) in (str, unicode) else tree.id
commit.parents = parents
commit.author = commit.committer = author.encode(self._encoding)
commit.commit_time = commit.author_time = int(time())
commit.commit_timezone = commit.author_timezone = timezone
commit.encoding = self._encoding
commit.message = message
self._repo.object_store.add_object(commit)
return commit.id
def test_commit_extra(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer <Committer>"
c.commit_time = 4
c.commit_timezone = -60 * 3
c.author_time = 5
c.author_timezone = 60 * 2
c.author = b"Author <author>"
c._extra = [(b"HG:rename-source", b"hg")]
self.assertRoundtripCommit(c)
def test_commit_zero_utc_timezone(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer <Committer>"
c.commit_time = 4
c.commit_timezone = 0
c._commit_timezone_neg_utc = True
c.author_time = 5
c.author_timezone = 60 * 2
c.author = b"Author <author>"
self.assertRoundtripCommit(c)
def create_commit(marker=None):
blob = Blob.from_string('The blob content %s' % marker)
tree = Tree()
tree.add("thefile %s" % marker, 0o100644, blob.id)
cmt = Commit()
cmt.tree = tree.id
cmt.author = cmt.committer = "John Doe <*****@*****.**>"
cmt.message = "%s" % marker
tz = parse_timezone('-0200')[0]
cmt.commit_time = cmt.author_time = int(time.time())
cmt.commit_timezone = cmt.author_timezone = tz
return cmt, tree, blob
def test_commit_encoding(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer <Committer>"
c.encoding = b'iso8859-1'
c.commit_time = 4
c.commit_timezone = -60 * 3
c.author_time = 5
c.author_timezone = 60 * 2
c.author = b"Author <author>"
self.assertRoundtripCommit(c)
def create_commit(marker=None):
blob = Blob.from_string('The blob content %s' % marker)
tree = Tree()
tree.add("thefile %s" % marker, 0o100644, blob.id)
cmt = Commit()
cmt.tree = tree.id
cmt.author = cmt.committer = "John Doe <*****@*****.**>"
cmt.message = "%s" % marker
tz = parse_timezone('-0200')[0]
cmt.commit_time = cmt.author_time = int(time.time())
cmt.commit_timezone = cmt.author_timezone = tz
return cmt, tree, blob
def make_base(self):
c = Commit()
c.tree = 'd80c186a03f423a81b39df39dc87fd269736ca86'
c.parents = ['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd', '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6']
c.author = 'James Westby <*****@*****.**>'
c.committer = 'James Westby <*****@*****.**>'
c.commit_time = 1174773719
c.author_time = 1174773719
c.commit_timezone = 0
c.author_timezone = 0
c.message = 'Merge ../b\n'
return c
def test_commit_double_negative_timezone(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer <Committer>"
c.commit_time = 4
(c.commit_timezone,
c._commit_timezone_neg_utc) = parse_timezone(b"--700")
c.author_time = 5
c.author_timezone = 60 * 2
c.author = b"Author <author>"
self.assertRoundtripCommit(c)
def commit(self):
# XXX: evidence for the rest of
# this functions is supposed not to exist
# yes, its that
# XXX: generate all objects at once and
# add them as pack instead of legacy objects
r = self.repo.repo
store = r.object_store
new_objects = []
names = sorted(self.contents)
nametree = defaultdict(list)
for name in names:
base = name.strip('/')
while base:
nbase = os.path.dirname(base)
nametree[nbase].append(base)
base = nbase
if self.base_commit:
tree = r.tree(self.base_commit.commit.tree)
tree._ensure_parsed()
print tree._entries
else:
tree = Tree()
for src, dest in self.renames:
src = src.strip('/')
dest = dest.strip('/')
tree[dest] = tree[src]
del tree[src]
for name in names:
blob = Blob()
blob.data = self.contents[name]
new_objects.append((blob, name))
tree.add(0555, os.path.basename(name), blob.id)
new_objects.append((tree, ''))
commit = Commit()
if self.base_commit:
commit.parents = [self.base_commit.commit.id]
commit.tree = tree.id
commit.message = self.extra['message']
commit.committer = self.author
commit.commit_time = int(self.time_unix)
commit.commit_timezone = self.time_offset
commit.author = self.author
commit.author_time = int(self.time_unix)
commit.author_timezone = self.time_offset
new_objects.append((commit, ''))
store.add_objects(new_objects)
self.repo.repo.refs['HEAD'] = commit.id
def test_invalid_utf8(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message \xc1"
c.committer = b"Committer"
c.commit_time = 4
c.author_time = 5
c.commit_timezone = 60 * 5
c.author_timezone = 60 * 3
c.author = b"Author"
mapping = BzrGitMappingv1()
self.assertEqual(mapping.revision_id_foreign_to_bzr(c.id),
mapping.get_revision_id(c))
def add_blob(self, gc, name, contents):
b = Blob.from_string(contents)
t = Tree()
t.add(name.encode('utf-8'), 0o644 | stat.S_IFREG, b.id)
c = Commit()
c.tree = t.id
c.committer = c.author = b'Somebody <*****@*****.**>'
c.commit_time = c.author_time = 800000
c.commit_timezone = c.author_timezone = 0
c.message = b'do something'
gc.repo.object_store.add_objects([(b, None), (t, None), (c, None)])
gc.repo[gc.ref] = c.id
return b.id.decode('ascii')
def commit_handler(self, cmd):
"""Process a CommitCommand."""
commit = Commit()
if cmd.author is not None:
author = cmd.author
else:
author = cmd.committer
(author_name, author_email, author_timestamp, author_timezone) = author
(committer_name, committer_email, commit_timestamp, commit_timezone) = cmd.committer
commit.author = "%s <%s>" % (author_name, author_email)
commit.author_timezone = author_timezone
commit.author_time = int(author_timestamp)
commit.committer = "%s <%s>" % (committer_name, committer_email)
commit.commit_timezone = commit_timezone
commit.commit_time = int(commit_timestamp)
commit.message = cmd.message
commit.parents = []
if cmd.from_:
self._reset_base(cmd.from_)
for filecmd in cmd.iter_files():
if filecmd.name == "filemodify":
if filecmd.data is not None:
blob = Blob.from_string(filecmd.data)
self.repo.object_store.add(blob)
blob_id = blob.id
else:
assert filecmd.dataref[0] == ":", "non-marker refs not supported yet"
blob_id = self.markers[filecmd.dataref[1:]]
self._contents[filecmd.path] = (filecmd.mode, blob_id)
elif filecmd.name == "filedelete":
del self._contents[filecmd.path]
elif filecmd.name == "filecopy":
self._contents[filecmd.dest_path] = self._contents[filecmd.src_path]
elif filecmd.name == "filerename":
self._contents[filecmd.new_path] = self._contents[filecmd.old_path]
del self._contents[filecmd.old_path]
elif filecmd.name == "filedeleteall":
self._contents = {}
else:
raise Exception("Command %s not supported" % filecmd.name)
commit.tree = commit_tree(self.repo.object_store,
((path, hexsha, mode) for (path, (mode, hexsha)) in
self._contents.iteritems()))
if self.last_commit is not None:
commit.parents.append(self.last_commit)
commit.parents += cmd.merges
self.repo.object_store.add_object(commit)
self.repo[cmd.ref] = commit.id
self.last_commit = commit.id
if cmd.mark:
self.markers[cmd.mark] = commit.id
def commit(self, message):
self._validate_unicode_text(message, 'commit message')
c = Commit()
c.parents = [
self.repository.lookup_bzr_revision_id(revid)[0]
for revid in self.parents
]
c.tree = commit_tree(self.store, self._iterblobs())
encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
c.encoding = encoding.encode('ascii')
c.committer = fix_person_identifier(self._committer.encode(encoding))
try:
author = self._revprops.pop('author')
except KeyError:
try:
authors = self._revprops.pop('authors').splitlines()
except KeyError:
author = self._committer
else:
if len(authors) > 1:
raise Exception("Unable to convert multiple authors")
elif len(authors) == 0:
author = self._committer
else:
author = authors[0]
c.author = fix_person_identifier(author.encode(encoding))
bugstext = self._revprops.pop('bugs', None)
if bugstext is not None:
message += "\n"
for url, status in bugtracker.decode_bug_urls(bugstext):
if status == bugtracker.FIXED:
message += "Fixes: %s\n" % url
elif status == bugtracker.RELATED:
message += "Bug: %s\n" % url
else:
raise bugtracker.InvalidBugStatus(status)
if self._revprops:
raise NotImplementedError(self._revprops)
c.commit_time = int(self._timestamp)
c.author_time = int(self._timestamp)
c.commit_timezone = self._timezone
c.author_timezone = self._timezone
c.message = message.encode(encoding)
if (self._config_stack.get('create_signatures') ==
_mod_config.SIGN_ALWAYS):
strategy = gpg.GPGStrategy(self._config_stack)
c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
self.store.add_object(c)
self.repository.commit_write_group()
self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
return self._new_revision_id
def test_unknown_extra(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer"
c.commit_time = 4
c.author_time = 5
c.commit_timezone = 60 * 5
c.author_timezone = 60 * 3
c.author = b"Author"
c._extra.append((b"iamextra", b"foo"))
mapping = BzrGitMappingv1()
self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
mapping.revision_id_foreign_to_bzr)
def do_commit(repo, tree, blobs, message, author, ref="master"):
commit = Commit()
commit.tree = tree.id
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time.time())
tz = time.timezone if (time.daylight == 0) else time.altzone
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = message
for blob in blobs:
repo.object_store.add_object(blob)
repo.object_store.add_object(tree)
repo.object_store.add_object(commit)
repo.refs['refs/heads/%s' % ref] = commit.id
def do_commit(repo, tree, blobs, message, author, ref = "master"):
commit = Commit()
commit.tree = tree.id
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time.time())
tz = time.timezone if (time.daylight == 0) else time.altzone
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = message
for blob in blobs:
repo.object_store.add_object(blob)
repo.object_store.add_object(tree)
repo.object_store.add_object(commit)
repo.refs['refs/heads/%s' % ref] = commit.id
def do_commit(self, message, committer=None,
author=None, commit_timestamp=None,
commit_timezone=None, author_timestamp=None,
author_timezone=None, tree=None):
"""Create a new commit.
:param message: Commit message
:param committer: Committer fullname
:param author: Author fullname (defaults to committer)
:param commit_timestamp: Commit timestamp (defaults to now)
:param commit_timezone: Commit timestamp timezone (defaults to GMT)
:param author_timestamp: Author timestamp (defaults to commit timestamp)
:param author_timezone: Author timestamp timezone
(defaults to commit timestamp timezone)
:param tree: SHA1 of the tree root to use (if not specified the current index will be committed).
:return: New commit SHA1
"""
import time
index = self.open_index()
c = Commit()
if tree is None:
c.tree = index.commit(self.object_store)
else:
c.tree = tree
# TODO: Allow username to be missing, and get it from .git/config
if committer is None:
raise ValueError("committer not set")
c.committer = committer
if commit_timestamp is None:
commit_timestamp = time.time()
c.commit_time = int(commit_timestamp)
if commit_timezone is None:
# FIXME: Use current user timezone rather than UTC
commit_timezone = 0
c.commit_timezone = commit_timezone
if author is None:
author = committer
c.author = author
if author_timestamp is None:
author_timestamp = commit_timestamp
c.author_time = int(author_timestamp)
if author_timezone is None:
author_timezone = commit_timezone
c.author_timezone = author_timezone
c.message = message
self.object_store.add_object(c)
self.refs["HEAD"] = c.id
return c.id
def test_unknown_hg_fields(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer"
c.commit_time = 4
c.author_time = 5
c.commit_timezone = 60 * 5
c.author_timezone = 60 * 3
c.author = b"Author"
c._extra = [(b"HG:extra", b"bla:Foo")]
mapping = BzrGitMappingv1()
self.assertRaises(UnknownMercurialCommitExtra, mapping.import_commit,
c, mapping.revision_id_foreign_to_bzr)
self.assertEqual(mapping.revision_id_foreign_to_bzr(c.id),
mapping.get_revision_id(c))
def create_log(repo, contents, filename, overwrite=False): """creates a log with the specified content. This function creates a log file in the git repository specified by LOGS_PATH in settings.py. If a file with name filename exists, False is returned, unless overwrite=True. Arguments: contents the contents of the log, as a simple string filename the specific filename to use. overwrite whether or not to overwrite existing files. defaults to False, does change behavior when filename=None. Returns: False on failure, the filename to which the log was saved on success. Raises: GitFileError when the file exists while overwrite is False """ if not filename: return "Error: empty filename" if not contents: return "Error: empty contents" if type(contents) is list: contents=''.join(contents) if path.exists(path.join(LOGS_PATH, filename)) and not overwrite: return "Error: file exists, overwrite not specified" #create file blob = Blob.from_string(contents) tree = get_latest_tree(repo) tree[filename]=(default_perms, blob.id) commit = Commit() commit.tree=tree.id commit.parents=[repo.head()] commit.author = commit.committer = "Logwriter [email protected]" commit.commit_time = commit.author_time = int(time()) commit.commit_timezone = commit.author_timezone = parse_timezone('+0100') commit.encoding = "UTF-8" commit.message = "Writing log file %s"%(filename) store=repo.object_store store.add_object(blob) store.add_object(tree) store.add_object(commit) repo.refs['refs/heads/master'] = commit.id return True
def commit(self):
# FIXME: this breaks if git repository just got initialized and no
# inital commit has been done before.
# FIXME: the working copy/tree has to be updated as well otherwise the
# newly commited file will be out of sync with the working copy
# (maybe we have to add the file to the index/stage? check how
# RabbitVCS does it.)
# TODO: maybe commit should be a method of the file object so that one
# could write:
# fh = open("file", 'w')
# fh.write("blabla")
# fh.close()
# fh.commit()
if self.opened:
blob = Blob.from_raw_chunks(Blob.type_num, self._fh.readlines())
else:
raise FileNotOpenError
# FIXME: get mode from physical file
mode = 0100644
head = self.repo.refs['refs/heads/' + self.branch]
# head = self.repo.head()
prev_commit = self.repo[head]
tree = self.repo[prev_commit.tree]
tree[self.path] = (mode, blob.id)
# populate Git commit object
commit = Commit()
commit.tree = tree.id
commit.parents = [head]
commit.author = commit.committer = self.author
commit.commit_time = commit.author_time = int(time.time())
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = "UTF-8"
# FIXME: create useful commit message
commit.message = "Committing %s" % self.path
self.repo.object_store.add_object(blob)
self.repo.object_store.add_object(tree)
self.repo.object_store.add_object(commit)
self.repo.refs['refs/heads/' + self.branch] = commit.id
def commit(self):
# FIXME: this breaks if git repository just got initialized and no
# inital commit has been done before.
# FIXME: the working copy/tree has to be updated as well otherwise the
# newly commited file will be out of sync with the working copy
# (maybe we have to add the file to the index/stage? check how
# RabbitVCS does it.)
# TODO: maybe commit should be a method of the file object so that one
# could write:
# fh = open("file", 'w')
# fh.write("blabla")
# fh.close()
# fh.commit()
if self.opened:
blob = Blob.from_raw_chunks(Blob.type_num, self._fh.readlines())
else:
raise FileNotOpenError
# FIXME: get mode from physical file
mode = 0100644
head = self.repo.refs['refs/heads/' + self.branch]
# head = self.repo.head()
prev_commit = self.repo[head]
tree = self.repo[prev_commit.tree]
tree[self.path] = (mode, blob.id)
# populate Git commit object
commit = Commit()
commit.tree = tree.id
commit.parents = [head]
commit.author = commit.committer = self.author
commit.commit_time = commit.author_time = int(time.time())
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = "UTF-8"
# FIXME: create useful commit message
commit.message = "Committing %s" % self.path
self.repo.object_store.add_object(blob)
self.repo.object_store.add_object(tree)
self.repo.object_store.add_object(commit)
self.repo.refs['refs/heads/' + self.branch] = commit.id
def make_commit(repo, tree_id, message):
"""Build a commit object on the same pattern. Only changing values are
required as parameters.
"""
commit = Commit()
try:
commit.parents = [repo.head()]
except KeyError:
# The initial commit has no parent
pass
commit.tree = tree_id
commit.message = message
commit.author = commit.committer = AUTHOR
commit.commit_time = commit.author_time = int(time())
commit.commit_timezone = commit.author_timezone = TZ
commit.encoding = ENCODING
return commit
def parse_patch_message(msg, encoding=None):
"""Extract a Commit object and patch from an e-mail message.
Args:
msg: An email message (email.message.Message)
encoding: Encoding to use to encode Git commits
Returns: Tuple with commit object, diff contents and git version
"""
c = Commit()
c.author = msg["from"].encode(encoding)
c.committer = msg["from"].encode(encoding)
try:
patch_tag_start = msg["subject"].index("[PATCH")
except ValueError:
subject = msg["subject"]
else:
close = msg["subject"].index("] ", patch_tag_start)
subject = msg["subject"][close + 2:]
c.message = (subject.replace("\n", "") + "\n").encode(encoding)
first = True
body = msg.get_payload(decode=True)
lines = body.splitlines(True)
line_iter = iter(lines)
for line in line_iter:
if line == b"---\n":
break
if first:
if line.startswith(b"From: "):
c.author = line[len(b"From: "):].rstrip()
else:
c.message += b"\n" + line
first = False
else:
c.message += line
diff = b""
for line in line_iter:
if line == b"-- \n":
break
diff += line
try:
version = next(line_iter).rstrip(b"\n")
except StopIteration:
version = None
return c, diff, version
def make_commit(repo, tree, message, author, timezone, encoding="UTF-8"):
"""build a Commit object"""
commit = Commit()
try:
commit.parents = [repo.head()]
except KeyError:
#the initial commit has no parent
pass
if isinstance(tree, dulwich.objects.Tree): tree_id = tree.id
elif isinstance(tree, str): tree_id = tree
commit.tree = tree_id
commit.message = message
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time())
commit.commit_timezone = commit.author_timezone = parse_timezone(timezone)
commit.encoding = encoding
return commit
def setup_app(command, conf, vars):
"""Place any commands to setup kekswiki here"""
# Don't reload the app if it was loaded under the testing environment
if not pylons.test.pylonsapp:
load_environment(conf.global_conf, conf.local_conf)
# create repository directory
try:
mkdir("wiki")
except OSError:
pass
# create repository
try:
repo = Repo.init("wiki")
except OSError:
repo = Repo("wiki")
# create blob
blob = Blob.from_string("Kekswiki is a collaborative hypertext editing system.\n")
# add blob to tree
tree = Tree()
tree.add(0100644, "Kekswiki", blob.id)
# commit
commit = Commit()
commit.tree = tree.id
author = "Anonymous <*****@*****.**>"
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time())
tz = parse_timezone('+0100')[0] # FIXME: get proper timezone
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = "Initial commit"
# save everything
object_store = repo.object_store
object_store.add_object(blob)
object_store.add_object(tree)
object_store.add_object(commit)
# create master branch, set it as current
repo.refs.add_if_new('refs/heads/master', commit.id)
repo.refs.set_symbolic_ref('HEAD', 'refs/heads/master')
def test_commit_mergetag(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer <Committer>"
c.commit_time = 4
c.commit_timezone = -60 * 3
c.author_time = 5
c.author_timezone = 60 * 2
c.author = b"Author <author>"
tag = make_object(Tag,
tagger=b'Jelmer Vernooij <*****@*****.**>',
name=b'0.1', message=None,
object=(
Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
tag_time=423423423, tag_timezone=0)
c.mergetag = [tag]
self.assertRoundtripCommit(c)
def test_implicit_encoding_utf8(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer"
c.commit_time = 4
c.author_time = 5
c.commit_timezone = 60 * 5
c.author_timezone = 60 * 3
c.author = u"Authér".encode("utf-8")
mapping = BzrGitMappingv1()
rev, roundtrip_revid, verifiers = mapping.import_commit(
c, mapping.revision_id_foreign_to_bzr)
self.assertEqual(None, roundtrip_revid)
self.assertEqual({}, verifiers)
self.assertEqual(u"Authér", rev.properties[u'author'])
self.assertTrue(u"git-explicit-encoding" not in rev.properties)
self.assertTrue(u"git-implicit-encoding" not in rev.properties)
def git_am_patch_split(f):
"""Parse a git-am-style patch and split it up into bits.
:param f: File-like object to parse
:return: Tuple with commit object, diff contents and git version
"""
parser = email.parser.Parser()
msg = parser.parse(f)
c = Commit()
c.author = msg["from"]
c.committer = msg["from"]
try:
patch_tag_start = msg["subject"].index("[PATCH")
except ValueError:
subject = msg["subject"]
else:
close = msg["subject"].index("] ", patch_tag_start)
subject = msg["subject"][close+2:]
c.message = subject.replace("\n", "") + "\n"
first = True
body = BytesIO(msg.get_payload())
for l in body:
if l == "---\n":
break
if first:
if l.startswith("From: "):
c.author = l[len("From: "):].rstrip()
else:
c.message += "\n" + l
first = False
else:
c.message += l
diff = ""
for l in body:
if l == "-- \n":
break
diff += l
try:
version = next(body).rstrip("\n")
except StopIteration:
version = None
return c, diff, version
def reset_repo(self):
# ensure head exists
tree = Tree()
commit = Commit()
commit.tree = tree.id
commit.author = commit.committer = self.wiki_user
commit.commit_time = commit.author_time = int(time.time())
commit.commit_timezone = commit.author_timezone = parse_timezone(
time.timezone)[0]
commit.encoding = 'UTF-8'
commit.message = u'Automatic initalization by qwapp.'.encode('utf-8')
# store all objects
self.repo.object_store.add_object(tree)
self.repo.object_store.add_object(commit)
# update the branch
self.repo.refs[self.head] = commit.id
def test_send_pack_new_ref(self):
self.rin.write(
b'0064310ca9477129b8586fa2afc779c1f57cf64bba6c '
b'refs/heads/master\x00 report-status delete-refs ofs-delta\n'
b'0000000eunpack ok\n'
b'0019ok refs/heads/blah12\n'
b'0000')
self.rin.seek(0)
tree = Tree()
commit = Commit()
commit.tree = tree
commit.parents = []
commit.author = commit.committer = b'test user'
commit.commit_time = commit.author_time = 1174773719
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = b'UTF-8'
commit.message = b'test message'
def update_refs(refs):
return {
b'refs/heads/blah12': commit.id,
b'refs/heads/master':
b'310ca9477129b8586fa2afc779c1f57cf64bba6c'
}
def generate_pack_data(have, want, ofs_delta=False):
return pack_objects_to_data([
(commit, None),
(tree, b''),
])
f = BytesIO()
write_pack_data(f, *generate_pack_data(None, None))
self.client.send_pack(b'/', update_refs, generate_pack_data)
self.assertIn(self.rout.getvalue(), [
b'007f0000000000000000000000000000000000000000 ' + commit.id +
b' refs/heads/blah12\x00report-status ofs-delta0000' +
f.getvalue(), b'007f0000000000000000000000000000000000000000 ' +
commit.id + b' refs/heads/blah12\x00ofs-delta report-status0000' +
f.getvalue()
])
def test_send_pack_new_ref(self):
self.rin.write(
'0064310ca9477129b8586fa2afc779c1f57cf64bba6c '
'refs/heads/master\x00 report-status delete-refs ofs-delta\n'
'0000000eunpack ok\n'
'0019ok refs/heads/blah12\n'
'0000')
self.rin.seek(0)
tree = Tree()
commit = Commit()
commit.tree = tree
commit.parents = []
commit.author = commit.committer = 'test user'
commit.commit_time = commit.author_time = 1174773719
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = 'UTF-8'
commit.message = 'test message'
def determine_wants(refs):
return {
'refs/heads/blah12': commit.id,
'refs/heads/master': '310ca9477129b8586fa2afc779c1f57cf64bba6c'
}
def generate_pack_contents(have, want):
return [
(commit, None),
(tree, ''),
]
f = BytesIO()
write_pack_objects(f, generate_pack_contents(None, None))
self.client.send_pack('/', determine_wants, generate_pack_contents)
self.assertIn(self.rout.getvalue(), [
'007f0000000000000000000000000000000000000000 %s '
'refs/heads/blah12\x00report-status ofs-delta0000%s' %
(commit.id, f.getvalue()),
'007f0000000000000000000000000000000000000000 %s '
'refs/heads/blah12\x00ofs-delta report-status0000%s' %
(commit.id, f.getvalue())
])
def _commit(self, tree):
"""
commit a tree used only by the init
``tree``
tree to commit
"""
commit = Commit()
commit.tree = tree.id
commit.encoding = "UTF-8"
commit.committer = commit.author = 'debexpo <%s>' % (
pylons.config['debexpo.email'])
commit.commit_time = commit.author_time = int(time())
tz = parse_timezone('-0200')[0]
commit.commit_timezone = commit.author_timezone = tz
commit.message = " "
self.repo.object_store.add_object(tree)
self.repo.object_store.add_object(commit)
self.repo.refs["HEAD"] = commit.id
log.debug('commiting')
return commit.id
def test_git_submodule_exists(self):
repo_dir = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, repo_dir)
with Repo.init(repo_dir) as repo:
filea = Blob.from_string(b'file alalala')
subtree = Tree()
subtree[b'a'] = (stat.S_IFREG | 0o644, filea.id)
c = Commit()
c.tree = subtree.id
c.committer = c.author = b'Somebody <*****@*****.**>'
c.commit_time = c.author_time = 42342
c.commit_timezone = c.author_timezone = 0
c.parents = []
c.message = b'Subcommit'
tree = Tree()
tree[b'c'] = (S_IFGITLINK, c.id)
os.mkdir(os.path.join(repo_dir, 'c'))
repo.object_store.add_objects(
[(o, None) for o in [tree]])
build_index_from_tree(
repo.path, repo.index_path(), repo.object_store, tree.id)
# Verify index entries
index = repo.open_index()
self.assertEqual(len(index), 1)
# filea
apath = os.path.join(repo.path, 'c/a')
self.assertFalse(os.path.exists(apath))
# dir c
cpath = os.path.join(repo.path, 'c')
self.assertTrue(os.path.isdir(cpath))
self.assertEqual(index[b'c'][4], S_IFGITLINK) # mode
self.assertEqual(index[b'c'][8], c.id) # sha
def test_mergetag(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer"
c.commit_time = 4
c.author_time = 5
c.commit_timezone = 60 * 5
c.author_timezone = 60 * 3
c.author = b"Author"
tag = make_object(Tag,
tagger=b'Jelmer Vernooij <*****@*****.**>',
name=b'0.1', message=None,
object=(
Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
tag_time=423423423, tag_timezone=0)
c.mergetag = [tag]
mapping = BzrGitMappingv1()
rev, roundtrip_revid, verifiers = mapping.import_commit(
c, mapping.revision_id_foreign_to_bzr)
self.assertEqual(
rev.properties[u'git-mergetag-0'], tag.as_raw_string())
def test_send_pack_no_sideband64k_with_update_ref_error(self):
# No side-bank-64k reported by server shouldn't try to parse
# side band data
pkts = [
'55dcc6bf963f922e1ed5c4bbaaefcfacef57b1d7 capabilities^{}'
'\x00 report-status delete-refs ofs-delta\n', '', "unpack ok",
"ng refs/foo/bar pre-receive hook declined", ''
]
for pkt in pkts:
if pkt == '':
self.rin.write("0000")
else:
self.rin.write("%04x%s" % (len(pkt) + 4, pkt))
self.rin.seek(0)
tree = Tree()
commit = Commit()
commit.tree = tree
commit.parents = []
commit.author = commit.committer = 'test user'
commit.commit_time = commit.author_time = 1174773719
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = 'UTF-8'
commit.message = 'test message'
def determine_wants(refs):
return {
'refs/foo/bar': commit.id,
}
def generate_pack_contents(have, want):
return [
(commit, None),
(tree, ''),
]
self.assertRaises(UpdateRefsError, self.client.send_pack, "blah",
determine_wants, generate_pack_contents)
def test_send_pack_no_sideband64k_with_update_ref_error(self):
# No side-bank-64k reported by server shouldn't try to parse
# side band data
pkts = [
b'55dcc6bf963f922e1ed5c4bbaaefcfacef57b1d7 capabilities^{}'
b'\x00 report-status delete-refs ofs-delta\n', b'', b"unpack ok",
b"ng refs/foo/bar pre-receive hook declined", b''
]
for pkt in pkts:
if pkt == b'':
self.rin.write(b"0000")
else:
self.rin.write(("%04x" % (len(pkt) + 4)).encode('ascii') + pkt)
self.rin.seek(0)
tree = Tree()
commit = Commit()
commit.tree = tree
commit.parents = []
commit.author = commit.committer = b'test user'
commit.commit_time = commit.author_time = 1174773719
commit.commit_timezone = commit.author_timezone = 0
commit.encoding = b'UTF-8'
commit.message = b'test message'
def update_refs(refs):
return {
b'refs/foo/bar': commit.id,
}
def generate_pack_data(have, want, ofs_delta=False):
return pack_objects_to_data([
(commit, None),
(tree, ''),
])
self.assertRaises(UpdateRefsError, self.client.send_pack, "blah",
update_refs, generate_pack_data)
def test_simple_bytesio(self):
f = BytesIO()
c = Commit()
c.committer = c.author = b"Jelmer <*****@*****.**>"
c.commit_time = c.author_time = 1271350201
c.commit_timezone = c.author_timezone = 0
c.message = b"This is the first line\nAnd this is the second line.\n"
c.tree = Tree().id
write_commit_patch(f, c, b"CONTENTS", (1, 1), version="custom")
f.seek(0)
lines = f.readlines()
self.assertTrue(lines[0].startswith(
b"From 0b0d34d1b5b596c928adc9a727a4b9e03d025298"))
self.assertEqual(lines[1], b"From: Jelmer <*****@*****.**>\n")
self.assertTrue(lines[2].startswith(b"Date: "))
self.assertEqual([
b"Subject: [PATCH 1/1] This is the first line\n",
b"And this is the second line.\n", b"\n", b"\n", b"---\n"
], lines[3:8])
self.assertEqual([b"CONTENTS-- \n", b"custom\n"], lines[-2:])
if len(lines) >= 12:
# diffstat may not be present
self.assertEqual(lines[8], b" 0 files changed\n")
def step_impl_given(context):
context.test_git_repo_dir = tempfile.mkdtemp('paasta_tools_deployments_json_itest')
context.test_git_repo = Repo.init(context.test_git_repo_dir)
print 'Temp repo in %s' % context.test_git_repo_dir
blob = Blob.from_string("My file content\n")
tree = Tree()
tree.add("spam", 0100644, blob.id)
commit = Commit()
commit.author = commit.committer = "itest author"
commit.commit_time = commit.author_time = int(time())
commit.commit_timezone = commit.author_timezone = parse_timezone('-0200')[0]
commit.message = "Initial commit"
commit.tree = tree.id
object_store = context.test_git_repo.object_store
object_store.add_object(blob)
object_store.add_object(tree)
object_store.add_object(commit)
context.test_git_repo.refs['refs/heads/paasta-test_cluster.test_instance'] = commit.id
context.expected_commit = commit.id
def test_commit(self):
c = Commit()
c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
c.message = b"Some message"
c.committer = b"Committer"
c.commit_time = 4
c.author_time = 5
c.commit_timezone = 60 * 5
c.author_timezone = 60 * 3
c.author = b"Author"
mapping = BzrGitMappingv1()
rev, roundtrip_revid, verifiers = mapping.import_commit(
c, mapping.revision_id_foreign_to_bzr)
self.assertEqual(None, roundtrip_revid)
self.assertEqual({}, verifiers)
self.assertEqual(u"Some message", rev.message)
self.assertEqual(u"Committer", rev.committer)
self.assertEqual(u"Author", rev.properties[u'author'])
self.assertEqual(300, rev.timezone)
self.assertEqual([], rev.parent_ids)
self.assertEqual("5", rev.properties[u'author-timestamp'])
self.assertEqual("180", rev.properties[u'author-timezone'])
self.assertEqual(b"git-v1:" + c.id, rev.revision_id)
