You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2012/10/02 23:30:28 UTC
[25/34] git commit: [#4938] ticket:173 changed committed.date and
added a test
[#4938] ticket:173 changed committed.date and added a test
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b1cb2f5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b1cb2f5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b1cb2f5a
Branch: refs/heads/db/4968
Commit: b1cb2f5a93d0081f415554d1159fb6bf5812c4a4
Parents: 3d4da82
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Mon Sep 24 14:31:12 2012 +0400
Committer: Dave Brondsema <db...@geek.net>
Committed: Fri Sep 28 14:51:00 2012 +0000
----------------------------------------------------------------------
ForgeGit/forgegit/model/git_repo.py | 6 ++----
ForgeHg/forgehg/model/hg.py | 2 +-
ForgeHg/forgehg/tests/model/test_repository.py | 1 +
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b1cb2f5a/ForgeGit/forgegit/model/git_repo.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index 90df532..70ecbb7 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -191,13 +191,11 @@ class GitImplementation(M.RepositoryImplementation):
committed = Object(
name=h.really_unicode(ci.committer.name),
email=h.really_unicode(ci.committer.email),
- date=datetime.utcfromtimestamp(
- ci.committed_date-ci.committer_tz_offset)),
+ date=datetime.utcfromtimestamp(ci.committed_date)),
authored = Object(
name=h.really_unicode(ci.author.name),
email=h.really_unicode(ci.author.email),
- date=datetime.utcfromtimestamp(
- ci.authored_date-ci.author_tz_offset)),
+ date=datetime.utcfromtimestamp(ci.authored_date)),
message=h.really_unicode(ci.message or ''),
child_ids=[],
parent_ids = [ p.hexsha for p in ci.parents ])
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b1cb2f5a/ForgeHg/forgehg/model/hg.py
----------------------------------------------------------------------
diff --git a/ForgeHg/forgehg/model/hg.py b/ForgeHg/forgehg/model/hg.py
index a36b262..a99ea85 100644
--- a/ForgeHg/forgehg/model/hg.py
+++ b/ForgeHg/forgehg/model/hg.py
@@ -212,7 +212,7 @@ class HgImplementation(M.RepositoryImplementation):
user = Object(
name=h.really_unicode(user_name),
email=h.really_unicode(user_email),
- date=datetime.utcfromtimestamp(sum(obj.date())))
+ date=datetime.utcfromtimestamp(obj.date()[0]))
fake_tree = self._tree_from_changectx(obj)
args = dict(
tree_id=fake_tree.hex(),
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b1cb2f5a/ForgeHg/forgehg/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeHg/forgehg/tests/model/test_repository.py b/ForgeHg/forgehg/tests/model/test_repository.py
index f3154a3..d240f85 100644
--- a/ForgeHg/forgehg/tests/model/test_repository.py
+++ b/ForgeHg/forgehg/tests/model/test_repository.py
@@ -167,6 +167,7 @@ class TestHgRepo(unittest.TestCase, RepoImplTestBase):
entry = self.repo.commit('tip')
assert entry.committed.email == 'rick446@usa.net'
assert entry.message
+ assert str(entry.committed.date) == "2012-08-29 13:34:26"
# Test that sha1s for named refs are looked up in cache first, instead
# of from disk.
with mock.patch('forgehg.model.hg.M.repo.Commit.query') as q: