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 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 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 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 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 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 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 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 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 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 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 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 _create_commit(self):
commit = Commit()
commit.author = commit.committer = self._author
commit.commit_time = commit.author_time = int(time())
commit.commit_timezone = commit.author_timezone = self._time_zone
commit.encoding = self._encoding
return commit
def _create_commit(tree, reason='', branch=False, parents=None, request=None):
""" Creates a new commit based on the provided information. """
commit = Commit()
if request and 'flatpages.git.author_name' in request.registry.settings:
author = request.registry.settings['flatpages.git.author_name']
else:
author = 'Anonymous'
if request and 'flatpages.git.author_email' in request.registry.settings:
author_email = request.registry.settings['flatpages.git.author_email']
author = '{0} <{1}>'.format(author, author_email)
else:
if request:
author = '{0} <anonymous@{0}>'.format(request.host)
else:
author = '{0} <anonymous@{0}example.com>'
# TODO: Right now, all times are in UTC time. Even though everything should
# use UTC time in a perfect world - this isn't the case in the real world.
commit.commit_timezone = commit.author_timezone = parse_timezone('0000')[0]
commit.commit_time = commit.author_time = int(time.time())
commit.author = commit.committer = author
commit.tree = tree.id
commit.encoding = 'UTF-8'
commit.message = reason
if parents:
commit.parents = parents
return commit
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 _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 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 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 create_commit(data, marker=b"Default", blob=None):
if not blob:
blob = Blob.from_string(b"The blob content " + marker)
tree = Tree()
tree.add(b"thefile_" + marker, 0o100644, blob.id)
cmt = Commit()
if data:
assert isinstance(data[-1], Commit)
cmt.parents = [data[-1].id]
cmt.tree = tree.id
author = b"John Doe " + marker + b" <*****@*****.**>"
cmt.author = cmt.committer = author
tz = parse_timezone(b"-0200")[0]
cmt.commit_time = cmt.author_time = int(time())
cmt.commit_timezone = cmt.author_timezone = tz
cmt.encoding = b"UTF-8"
cmt.message = b"The commit message " + marker
tag = Tag()
tag.tagger = b"*****@*****.**"
tag.message = b"Annotated tag"
tag.tag_timezone = parse_timezone(b"-0200")[0]
tag.tag_time = cmt.author_time
tag.object = (Commit, cmt.id)
tag.name = b"v_" + marker + b"_0.1"
return blob, tree, tag, cmt
def _do_commit(self, index, author, message, ctime, parent_rev=None):
committer = b'%s <>' % author.encode('utf8')
commit = Commit()
commit.tree = index.commit(self.repo.object_store)
commit.author = commit.committer = committer
commit.commit_time = commit.author_time = ctime
commit.encoding = b'UTF-8'
commit.commit_timezone = commit.author_timezone = 0
commit.message = message.encode('utf8')
try:
curr_head = self.repo.head()
commit.parents = [curr_head]
# if parent_rev and len(parent_rev) == 40:
# commit.parents.append(parent_rev.encode('ascii'))
except KeyError:
curr_head = None
self.repo.object_store.add_object(commit)
self.repo.refs.set_if_equals(b'HEAD',
curr_head,
commit.id,
message=b"commit: " + commit.message,
committer=commit.committer,
timestamp=ctime,
timezone=0)
index.write()
def commit(self,
name,
email='*****@*****.**',
message='wip',
parents=None):
if not self.is_head:
return False
# initial-commit
if not self.snapshot_commit:
parents = []
elif not parents:
parents = [self.snapshot_commit.id]
if not self.snapshot_commit or self.root_node.git_object.id != self.snapshot_commit.tree:
c = Commit()
c.tree = self.root_node.git_object.id
c.parents = parents
c.author = c.committer = '%s <%s>' % (name.encode('utf-8'),
email.encode('utf-8'))
c.commit_time = c.author_time = int(time())
c.commit_timezone = c.author_timezone = 0
c.encoding = "UTF-8"
c.message = message
self.repo.object_store.add_object(c)
self.repo.refs[self.ref] = c.id
return c
return False
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 create_commit(repo,
files=None,
tree=None,
parent=None,
author=AUTHOR,
message="No message given"):
object_store = repo.object_store
if not tree:
tree = Tree()
for f in files:
blob = Blob.from_string(f[2])
object_store.add_object(blob)
tree.add(f[0], f[1], blob.id)
commit = Commit()
if parent:
commit.parents = [parent]
else:
commit.parents = []
# Check that we have really updated the tree
if parent:
parent_commit = repo.get_object(parent)
if parent_commit.tree == tree.id:
raise NoChangesException()
commit.tree = tree.id
commit.author = commit.committer = author
commit.commit_time = commit.author_time = get_ts()
tz = parse_timezone('+0100')[0]
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = message
object_store.add_object(tree)
object_store.add_object(commit)
return commit
def _create_commit(self):
commit = Commit()
commit.author = commit.committer = self._author
commit.commit_time = commit.author_time = int(time())
commit.commit_timezone = commit.author_timezone = self._time_zone
commit.encoding = self._encoding
return commit
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 __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 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 determine_wants(refs):
return {b'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 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 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 _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_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 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 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 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 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 _create_top_commit(self):
# get the top commit, create empty one if it does not exist
commit = Commit()
# commit metadata
author = self.AUTHOR.encode('utf8')
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time.time())
if self.TIMEZONE is not None:
tz = self.TIMEZONE
else:
tz = time.timezone if (time.localtime().tm_isdst) else time.altzone
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = b'UTF-8'
return commit
def _create_top_commit(self):
# get the top commit, create empty one if it does not exist
commit = Commit()
# commit metadata
author = self.AUTHOR.encode('utf8')
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time.time())
if self.TIMEZONE is not None:
tz = self.TIMEZONE
else:
tz = time.timezone if (time.localtime().tm_isdst) else time.altzone
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = b'UTF-8'
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 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 to_commit(self):
new_commit = Commit()
new_commit.parents = self.parent_ids
new_commit.tree = self.tree.id
new_commit.author = self.author
new_commit.committer = self.committer
new_commit.author_time = self.author_time
new_commit.commit_time = self.commit_time
new_commit.commit_timezone = self.commit_timezone
new_commit.author_timezone = self.author_timezone
new_commit.encoding = self.encoding
new_commit.message = self.message.encode(self.encoding)
return new_commit
def _dulwich_tag(self, tag, author, message=None):
""" Creates a tag in git via dulwich calls:
**tag** - string :: "<project>-[start|sync]-<timestamp>"
**author** - string :: "Your Name <*****@*****.**>"
"""
if not message:
message = tag
# Open the repo
_repo = Repo(self.config['top_dir'])
master_branch = 'master'
# Build the commit object
blob = Blob.from_string("empty")
tree = Tree()
tree.add(tag, 0100644, blob.id)
commit = Commit()
commit.tree = tree.id
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time())
tz = parse_timezone('-0200')[0]
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = 'Tagging repo for deploy: ' + message
# Add objects to the repo store instance
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_branch] = commit.id
# Build the tag object and tag
tag = Tag()
tag.tagger = author
tag.message = message
tag.name = tag
tag.object = (Commit, commit.id)
tag.tag_time = commit.author_time
tag.tag_timezone = tz
object_store.add_object(tag)
_repo['refs/tags/' + tag] = tag.id
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 _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_explicit_encoding(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("iso8859-1")
c.encoding = b"iso8859-1"
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.assertEqual("iso8859-1", rev.properties[u"git-explicit-encoding"])
self.assertTrue(u"git-implicit-encoding" not in rev.properties)
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 new(self, repo):
"""
Create a new version of a repo.Local object.
:param repo: Instance of repo.Local.
:return: New Version instance.
"""
#TODO: subclass Commit, pass parent as init param
try:
# create new commit instance and set metadata
commit = Commit()
author = os.environ.get('USER')
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time())
tz = parse_timezone('-0200')[0]
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = "UTF-8"
commit.message = ''
# set previous version as parent to this one
parent = repo.versions(-1)
if parent:
commit.parents = [parent.id]
# create new tree, add entries from previous version
tree = Tree()
curr = repo.versions(-1)
if curr:
for item in curr.items():
tree.addItem(item)
commit.tree = tree.id
# create new version, and add tree
version = Version(repo=repo, commit=commit, tree=tree)
return version
except Exception, e:
traceback.print_exc()
return VersionError(e)
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 determine_wants(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'/', determine_wants, 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 _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(self, data):
commit = Commit()
# commit metadata
author = b"tinydb"
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time.time())
tz = time.timezone if (time.localtime().tm_isdst) else time.altzone
commit.commit_timezone = commit.author_timezone = tz
commit.encoding = b'UTF-8'
commit.message = (
'Updated by tinydb-git {}'.format(__version__).encode('utf8'))
# prepare blob
blob = Blob.from_string(self._serialize(data))
try:
parent_commit = self.repo[self._refname]
except KeyError:
# branch does not exist, start with an empty tree
tree = Tree()
else:
commit.parents = [parent_commit.id]
tree = self.repo[parent_commit.tree]
# no subdirs in filename, add directly to tree
tree.add(self.filename, 0o100644, blob.id)
commit.tree = tree.id
# add objects
self.repo.object_store.add_object(blob)
self.repo.object_store.add_object(tree)
self.repo.object_store.add_object(commit)
# update refs
self.repo.refs[self._refname] = commit.id
def commit(self, message, author=None):
commit = Commit()
commit.tree = self.tree.id
if author is None:
config = self.repo.get_config_stack()
author = self.repo._get_user_identity(config)
else:
author = author.encode(self.encoding)
commit.author = commit.committer = author
commit.commit_time = commit.author_time = int(time())
tz = timezone
commit.commit_timezone = commit.author_timezone = tz
commit.message = message.encode(self.encoding)
commit.encoding = self.encoding.encode('ascii')
if self.org_commit_id:
commit.parents = [self.org_commit_id]
commit_id = commit.id
self.changed_objects[commit_id] = commit
self.repo.object_store.add_objects([
(obj, None) for obj in self.changed_objects.values()
])
self.repo.refs.set_if_equals(self.branch, self.org_commit_id,
commit_id)
if hasattr(self.repo, 'has_index') and self.repo.has_index():
# Apply patch to working tree.
try:
subprocess.call(
['git', 'cherry-pick', commit_id, '--no-commit'],
cwd=self.repo.path)
except Exception:
logging.getLogger(__name__).exception(
'Error updating working tree:')
self.reset()
for entry in tree.items():
item = repo[entry.sha]
if isinstance(item, Tree):
new_tree.add(entry.path, entry.mode, render_tree(item, path+(entry.path,)))
elif isinstance(item, Blob):
if entry.path.startswith(".") or ("." not in entry.path) or entry.path.endswith(".py") or entry.path.endswith(".html") or entry.path.startswith("mnist.") or entry.path.endswith(".model"):
continue
if not entry.path.endswith(".rst"):
new_tree.add(entry.path, entry.mode, entry.sha)
else:
name = "index.html" if entry.path == 'README.rst' else (entry.path[:-4]+".html")
new_tree.add(name, entry.mode, render_rst(item, os.path.join(*(path +(name,)))))
store.add_object(new_tree)
return new_tree.id
new_commit = Commit()
new_commit.author = commit.author
new_commit.committer = commit.committer
new_commit.author_time = commit.author_time
new_commit.commit_time = commit.commit_time
new_commit.author_timezone = commit.author_timezone
new_commit.commit_timezone = commit.commit_timezone
new_commit.encoding = commit.encoding
new_commit.message = commit.message
new_commit.tree = render_tree(repo[commit.tree], ('.',))
store.add_object(new_commit)
repo['refs/heads/gh-pages'] = new_commit.id
def do_commit(self, message=None, committer=None,
author=None, commit_timestamp=None,
commit_timezone=None, author_timestamp=None,
author_timezone=None, tree=None, encoding=None,
ref=b'HEAD', merge_heads=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).
:param encoding: Encoding
:param ref: Optional ref to commit to (defaults to current branch)
:param merge_heads: Merge heads (defaults to .git/MERGE_HEADS)
:return: New commit SHA1
"""
import time
c = Commit()
if tree is None:
index = self.open_index()
c.tree = index.commit(self.object_store)
else:
if len(tree) != 40:
raise ValueError("tree must be a 40-byte hex sha string")
c.tree = tree
try:
self.hooks['pre-commit'].execute()
except HookError as e:
raise CommitError(e)
except KeyError: # no hook defined, silent fallthrough
pass
if merge_heads is None:
# FIXME: Read merge heads from .git/MERGE_HEADS
merge_heads = []
if committer is None:
# FIXME: Support GIT_COMMITTER_NAME/GIT_COMMITTER_EMAIL environment
# variables
committer = self._get_user_identity()
c.committer = committer
if commit_timestamp is None:
# FIXME: Support GIT_COMMITTER_DATE environment variable
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:
# FIXME: Support GIT_AUTHOR_NAME/GIT_AUTHOR_EMAIL environment
# variables
author = committer
c.author = author
if author_timestamp is None:
# FIXME: Support GIT_AUTHOR_DATE environment variable
author_timestamp = commit_timestamp
c.author_time = int(author_timestamp)
if author_timezone is None:
author_timezone = commit_timezone
c.author_timezone = author_timezone
if encoding is not None:
c.encoding = encoding
if message is None:
# FIXME: Try to read commit message from .git/MERGE_MSG
raise ValueError("No commit message specified")
try:
c.message = self.hooks['commit-msg'].execute(message)
if c.message is None:
c.message = message
except HookError as e:
raise CommitError(e)
except KeyError: # no hook defined, message not modified
c.message = message
if ref is None:
# Create a dangling commit
c.parents = merge_heads
self.object_store.add_object(c)
else:
try:
old_head = self.refs[ref]
c.parents = [old_head] + merge_heads
self.object_store.add_object(c)
ok = self.refs.set_if_equals(ref, old_head, c.id)
except KeyError:
c.parents = merge_heads
self.object_store.add_object(c)
ok = self.refs.add_if_new(ref, c.id)
if not ok:
# Fail if the atomic compare-and-swap failed, leaving the
# commit and all its objects as garbage.
raise CommitError("%s changed during commit" % (ref,))
try:
self.hooks['post-commit'].execute()
except HookError as e: # silent failure
warnings.warn("post-commit hook failed: %s" % e, UserWarning)
except KeyError: # no hook defined, silent fallthrough
pass
return c.id
