Skip to content

Feature: Make commits with custom author_date and commit_date (closes #315) #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions git/index/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,8 @@ def move(self, items, skip_errors=False, **kwargs):

return out

def commit(self, message, parent_commits=None, head=True, author=None, committer=None):
def commit(self, message, parent_commits=None, head=True, author=None,
committer=None, author_date=None, commit_date=None):
"""Commit the current default index file, creating a commit object.
For more information on the arguments, see tree.commit.

Expand All @@ -932,7 +933,8 @@ def commit(self, message, parent_commits=None, head=True, author=None, committer
run_commit_hook('pre-commit', self)
tree = self.write_tree()
rval = Commit.create_from_tree(self.repo, tree, message, parent_commits,
head, author=author, committer=committer)
head, author=author, committer=committer,
author_date=author_date, commit_date=commit_date)
run_commit_hook('post-commit', self)
return rval

Expand Down
13 changes: 10 additions & 3 deletions git/objects/commit.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ def _iter_from_process_or_stream(cls, repo, proc_or_stream):
finalize_process(proc_or_stream)

@classmethod
def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False, author=None, committer=None):
def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False, author=None, committer=None,
author_date=None, commit_date=None):
"""Commit the given tree, creating a commit object.

:param repo: Repo object the commit should be part of
Expand All @@ -288,6 +289,8 @@ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False,
configuration is used to obtain this value.
:param committer: The name of the committer, optional. If unset, the
repository configuration is used to obtain this value.
:param author_date: The timestamp for the author field
:param commit_date: The timestamp for the committer field

:return: Commit object representing the new commit

Expand Down Expand Up @@ -327,14 +330,18 @@ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False,
offset = altzone

author_date_str = env.get(cls.env_author_date, '')
if author_date_str:
if author_date:
author_time, author_offset = parse_date(author_date)
elif author_date_str:
author_time, author_offset = parse_date(author_date_str)
else:
author_time, author_offset = unix_time, offset
# END set author time

committer_date_str = env.get(cls.env_committer_date, '')
if committer_date_str:
if commit_date:
committer_time, committer_offset = parse_date(commit_date)
elif committer_date_str:
committer_time, committer_offset = parse_date(committer_date_str)
else:
committer_time, committer_offset = unix_time, offset
Expand Down
11 changes: 11 additions & 0 deletions git/test/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,17 @@ def mixed_iterator():
assert cur_head.commit == commit_actor
assert cur_head.log()[-1].actor == my_committer

# commit with author_date and commit_date
cur_commit = cur_head.commit
commit_message = u"commit with dates by Avinash Sajjanshetty"

new_commit = index.commit(commit_message, author_date="2006-04-07T22:13:13", commit_date="2005-04-07T22:13:13")
assert cur_commit != new_commit
print(new_commit.authored_date, new_commit.committed_date)
assert new_commit.message == commit_message
assert new_commit.authored_date == 1144447993
assert new_commit.committed_date == 1112911993

# same index, no parents
commit_message = "index without parents"
commit_no_parents = index.commit(commit_message, parent_commits=list(), head=True)
Expand Down