Merge lp:~jelmer/brz/fix-datetime into lp:brz

[Jelmer Vernooij]

Fix date: in git repositories.

Fix date: in git repositories.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/revision.py'
--- breezy/revision.py	2021-07-04 18:04:19 +0000
+++ breezy/revision.py	2022-07-03 21:23:15 +0000
@@ -75,6 +75,11 @@
     def __repr__(self):
         return "<Revision id %s>" % self.revision_id
 
+    def datetime(self):
+        import datetime
+        # TODO: Handle timezone.
+        return datetime.datetime.fromtimestamp(self.timestamp)
+
     def __eq__(self, other):
         if not isinstance(other, Revision):
             return False
 
=== modified file 'breezy/revisionspec.py'
--- breezy/revisionspec.py	2022-07-02 11:03:41 +0000
+++ breezy/revisionspec.py	2022-07-03 21:23:15 +0000
@@ -25,6 +25,7 @@
     errors,
     lazy_regex,
     registry,
+    revision as _mod_revision,
     trace,
     )
 
@@ -641,13 +642,56 @@
 
     def __getitem__(self, index):
         """Get the date of the index'd item"""
-        import datetime
         r = self.branch.repository.get_revision(self.branch.get_rev_id(index))
-        # TODO: Handle timezone.
-        return datetime.datetime.fromtimestamp(r.timestamp)
-
-    def __len__(self):
-        return self.branch.revno()
+        return r.datetime()
+
+
+_date_regex = lazy_regex.lazy_compile(
+    r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
+    r'(,|T)?\s*'
+    r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
+    )
+
+
+def _parse_datespec(spec):
+    import datetime
+    #  XXX: This doesn't actually work
+    #  So the proper way of saying 'give me all entries for today' is:
+    #      -r date:yesterday..date:today
+    today = datetime.datetime.fromordinal(
+        datetime.date.today().toordinal())
+    if spec.lower() == 'yesterday':
+        return today - datetime.timedelta(days=1)
+    elif spec.lower() == 'today':
+        return today
+    elif spec.lower() == 'tomorrow':
+        return today + datetime.timedelta(days=1)
+    else:
+        m = _date_regex.match(spec)
+        if not m or (not m.group('date') and not m.group('time')):
+            raise ValueError
+
+        if m.group('date'):
+            year = int(m.group('year'))
+            month = int(m.group('month'))
+            day = int(m.group('day'))
+        else:
+            year = today.year
+            month = today.month
+            day = today.day
+
+        if m.group('time'):
+            hour = int(m.group('hour'))
+            minute = int(m.group('minute'))
+            if m.group('second'):
+                second = int(m.group('second'))
+            else:
+                second = 0
+        else:
+            hour, minute, second = 0, 0, 0
+
+        return datetime.datetime(year=year, month=month, day=day,
+                               hour=hour, minute=minute, second=second)
 
 
 class RevisionSpec_date(RevisionSpec):
@@ -671,11 +715,28 @@
                                    August 14th, 2006 at 5:10pm.
     """
     prefix = 'date:'
-    _date_regex = lazy_regex.lazy_compile(
-        r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
-        r'(,|T)?\s*'
-        r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
-        )
+
+    def _scan_backwards(self, branch, dt):
+        with branch.lock_read():
+            graph = branch.repository.get_graph()
+            last_match = None
+            for revid in graph.iter_lefthand_ancestry(
+                    branch.last_revision(), (_mod_revision.NULL_REVISION,)):
+                r = branch.repository.get_revision(revid)
+                if r.datetime() < dt:
+                    if last_match is None:
+                        raise InvalidRevisionSpec(self.user_spec, branch)
+                    return RevisionInfo(branch, None, last_match)
+                last_match = revid
+            return RevisionInfo(branch, None, last_match)
+
+    def _bisect_backwards(self, branch, dt, hi):
+        import bisect
+        with branch.lock_read():
+            rev = bisect.bisect(_RevListToTimestamps(branch), dt, 1, hi)
+        if rev == branch.revno():
+            raise InvalidRevisionSpec(self.user_spec, branch)
+        return RevisionInfo(branch, rev)
 
     def _match_on(self, branch, revs):
         """Spec for date revisions:
@@ -684,55 +745,16 @@
           matches the first entry after a given date (either at midnight or
           at a specified time).
         """
-        import bisect
-        import datetime
-        #  XXX: This doesn't actually work
-        #  So the proper way of saying 'give me all entries for today' is:
-        #      -r date:yesterday..date:today
-        today = datetime.datetime.fromordinal(
-            datetime.date.today().toordinal())
-        if self.spec.lower() == 'yesterday':
-            dt = today - datetime.timedelta(days=1)
-        elif self.spec.lower() == 'today':
-            dt = today
-        elif self.spec.lower() == 'tomorrow':
-            dt = today + datetime.timedelta(days=1)
+        try:
+            dt = _parse_datespec(self.spec)
+        except ValueError:
+            raise InvalidRevisionSpec(
+                self.user_spec, branch, 'invalid date')
+        revno = branch.revno()
+        if revno is None:
+            return self._scan_backwards(branch, dt)
         else:
-            m = self._date_regex.match(self.spec)
-            if not m or (not m.group('date') and not m.group('time')):
-                raise InvalidRevisionSpec(
-                    self.user_spec, branch, 'invalid date')
-
-            try:
-                if m.group('date'):
-                    year = int(m.group('year'))
-                    month = int(m.group('month'))
-                    day = int(m.group('day'))
-                else:
-                    year = today.year
-                    month = today.month
-                    day = today.day
-
-                if m.group('time'):
-                    hour = int(m.group('hour'))
-                    minute = int(m.group('minute'))
-                    if m.group('second'):
-                        second = int(m.group('second'))
-                    else:
-                        second = 0
-                else:
-                    hour, minute, second = 0, 0, 0
-            except ValueError:
-                raise InvalidRevisionSpec(
-                    self.user_spec, branch, 'invalid date')
-
-            dt = datetime.datetime(year=year, month=month, day=day,
-                                   hour=hour, minute=minute, second=second)
-        with branch.lock_read():
-            rev = bisect.bisect(_RevListToTimestamps(branch), dt, 1)
-        if rev == branch.revno():
-            raise InvalidRevisionSpec(self.user_spec, branch)
-        return RevisionInfo(branch, rev)
+            return self._bisect_backwards(branch, dt, revno)
 
 
 class RevisionSpec_ancestor(RevisionSpec):
 
=== modified file 'breezy/tests/test_revisionspec.py'
--- breezy/tests/test_revisionspec.py	2020-07-28 02:11:05 +0000
+++ breezy/tests/test_revisionspec.py	2022-07-03 21:23:15 +0000
@@ -517,10 +517,10 @@
         super(TestRevisionSpec, self).setUp()
 
         new_tree = self.make_branch_and_tree('new_tree')
-        new_tree.commit('Commit one', rev_id=b'new_r1',
-                        timestamp=time.time() - 60 * 60 * 24)
-        new_tree.commit('Commit two', rev_id=b'new_r2')
-        new_tree.commit('Commit three', rev_id=b'new_r3')
+        self.revid1 = new_tree.commit(
+            'Commit one', timestamp=time.time() - 60 * 60 * 24)
+        self.revid2 = new_tree.commit('Commit two')
+        self.revid3 = new_tree.commit('Commit three')
 
         self.tree = new_tree
 
@@ -528,11 +528,11 @@
         self.assertInvalid('date:tomorrow')
 
     def test_today(self):
-        self.assertInHistoryIs(2, b'new_r2', 'date:today')
-        self.assertInHistoryIs(1, b'new_r1', 'before:date:today')
+        self.assertInHistoryIs(2, self.revid2, 'date:today')
+        self.assertInHistoryIs(1, self.revid1, 'before:date:today')
 
     def test_yesterday(self):
-        self.assertInHistoryIs(1, b'new_r1', 'date:yesterday')
+        self.assertInHistoryIs(1, self.revid1, 'date:yesterday')
 
     def test_invalid(self):
         self.assertInvalid('date:foobar', extra='\ninvalid date')
@@ -543,11 +543,27 @@
 
     def test_day(self):
         now = datetime.datetime.now()
-        self.assertInHistoryIs(2, b'new_r2',
+        self.assertInHistoryIs(2, self.revid2,
                                'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
 
     def test_as_revision_id(self):
-        self.assertAsRevisionId(b'new_r2', 'date:today')
+        self.assertAsRevisionId(self.revid2, 'date:today')
+
+
+class TestRevisionSpec_date_no_revno(TestRevisionSpec_date):
+
+    # some formats don't implement .revno(), so it triggers a different codepath
+
+    def get_in_history(self, revision_spec):
+        old_revno = self.overrideAttr(self.tree.branch, 'revno', lambda: None)
+        try:
+            return spec_in_history(revision_spec, self.tree.branch)
+        finally:
+            self.tree.branch.revno = old_revno
+
+    def test_today(self):
+        self.assertInHistoryIs(2, self.revid2, 'date:today')
+        # Drop before: since it messes with our monkeypatching of Branch.revno.
 
 
 class TestRevisionSpec_ancestor(TestRevisionSpec):