Reversed order of events in git repository on timeline

[Jun Omae]

The changesets in git repository might have the same commit timestamp. That sometimes occurs by git rebase command and its resolution is 1s. Timeline view shows those events in reversed-order.

• timeline:2014-01-13T15:55:05Z
• log:rjollos.git:t11056.3

GitRepository.get_changesets currently return its changesets from oldest to newest. It should return from newest to oldest to fix.

The issue would be fixed by the following patch. But, if [git] cached_repository is enabled, the issue still occurs.

tracopt/versioncontrol/git/PyGIT.py

@@ -968 +968 @@
 
     def history_timerange(self, start, stop):
         return [ rev.strip() for rev in \
-                     self.repo.rev_list('--reverse',
+                     self.repo.rev_list('--date-order',
                                         '--max-age=%d' % start,
                                         '--min-age=%d' % stop,
                                         '--all').splitlines() ]

[Jun Omae]

Proposed changes are in jomae.git@t11467. It fixes even if cached_repository is enabled.

[Jun Omae]

In [3d20a9b0/jomae.git], I revised the patch. If cached_repository is enabled, don't use git rev-list via self.repos.git.history_timerange().

Also, I found off-by-one error on GitRepository.get_changesets(). [1cd360a6d/jomae.git] is proposed changes for it.

I'll push the changes soon.

[Jun Omae]

Committed in [12503-12504] and merged to trunk in [12505].

[Jun Omae]

Oops. The unit tests pass with git 1.8.2.1. But, if git 1.7.1, the tests fail.

$ git --version
git version 1.7.1
$ TZ=Asia/Tokyo make python=26 test=tracopt/versioncontrol/git/tests/git_fs.py
Python version: Python 2.6.6
figleaf:
coverage: /home/jun66j5/bin/coverage
PYTHONPATH=.:
TRAC_TEST_DB_URI=
server-options= -p 3000 -a '*,/home/jun66j5/src/trac-htdigest.txt,auth' -s -r -e
python tracopt/versioncontrol/git/tests/git_fs.py
.......FF
======================================================================
FAIL: test_with_cache (__main__.HistoryTimeRangeTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tracopt/versioncontrol/git/tests/git_fs.py", line 163, in test_with_cache
    self._test_timerange('enabled')
  File "tracopt/versioncontrol/git/tests/git_fs.py", line 191, in _test_timerange
    self.assertEqual(1, len(csets))
AssertionError: 1 != 4

======================================================================
FAIL: test_without_cache (__main__.HistoryTimeRangeTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tracopt/versioncontrol/git/tests/git_fs.py", line 160, in test_without_cache
    self._test_timerange('disabled')
  File "tracopt/versioncontrol/git/tests/git_fs.py", line 191, in _test_timerange
    self.assertEqual(1, len(csets))
AssertionError: 1 != 4

----------------------------------------------------------------------
Ran 9 tests in 0.590s

FAILED (failures=2)
make: *** [all] Error 1

It seems that git 1.7.1 ignores timezone of date format in GIT_COMMITTER_DATE and GIT_AUTHOR_DATE.

$ TZ=UTC make python=26 test=tracopt/versioncontrol/git/tests/git_fs.py
Python version: Python 2.6.6
figleaf:
coverage: /home/jun66j5/bin/coverage
PYTHONPATH=.:
TRAC_TEST_DB_URI=
server-options= -p 3000 -a '*,/home/jun66j5/src/trac-htdigest.txt,auth' -s -r -e
python tracopt/versioncontrol/git/tests/git_fs.py
.........
----------------------------------------------------------------------
Ran 9 tests in 0.673s

OK

It would be fixed to use Git internal date format, e.g. <unixtime> <tzoffset>, instead of iso 8601 format.

-        env['GIT_COMMITTER_DATE'] = ts.isoformat()
-        env['GIT_AUTHOR_DATE'] = ts.isoformat()
+        env['GIT_COMMITTER_DATE'] = '%d +0000' % to_timestamp(ts)
+        env['GIT_AUTHOR_DATE'] = '%d +0000' % to_timestamp(ts)

[Jun Omae]

Committed and merged in [12518-12519], fixed again.