This is an archive of the discontinued Mercurial Phabricator instance.

Differential D196

age: add age revsetpredicate extension
ClosedPublic

Authored by mbthomas on Jul 28 2017, 1:53 PM.
Tags
None
Subscribers
None

Details

Reviewers
stash
Group Reviewers
Restricted Project
Commits
rFBHGXe3035f301441: age: add age revsetpredicate extension
Summary

Adds a new revsetpredicate: age(), which matches changesets that are
older or younger than a certain age.

Test Plan

Add new unit test for the predicate.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

mbthomas created this revision.Jul 28 2017, 1:53 PM
mbthomas updated this revision to Diff 447.Jul 28 2017, 1:55 PM

Remove unnecessary lines from test.

stash edited edge metadata.EditedJul 28 2017, 4:01 PM

Why not extend date() revset? Do you want to do it because it's faster?

stash accepted this revision.Jul 31 2017, 6:06 AM

Discussed offline - @mbthomas will create a task to make the changes to upstream date revset.

@mbthomas I'm accepting the diff but please address my comments before landing.

hgext3rd/age.py
2

Let's add a comment explaining the difference from date(...).

13–20

Please remove unused imports

34

No need to use unfiltered repo

36–37

Do you think it worth compiling this regex only once?

37

I think there shouldn't be ? after s, should it?

This revision is now accepted and ready to land.Jul 31 2017, 6:06 AM
mbthomas added inline comments.Jul 31 2017, 8:54 AM
hgext3rd/age.py
37

Actually I made "seconds" the default unit, but forgot to document it. Will fix up the doc comment.

mbthomas updated this revision to Diff 450.Jul 31 2017, 10:06 AM

Rebase and apply review markups

mbthomas marked 6 inline comments as done.Jul 31 2017, 11:27 AM
mbthomas closed this revision.Aug 2 2017, 5:28 AM

Revision Contents
Changeset List

PathPackages
AMhgext3rd/age.py (66 lines)
AMtests/test-age.t (87 lines)

Diff 450

hgext3rd/age.py

  • This file was added.
# age.py
#
stashUnsubmitted
Done

Let's add a comment explaining the difference from date(...).

stash: Let's add a comment explaining the difference from `date(...)`.
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""
a revset predicate for filtering by changeset age.
Adds the `age()` revset predicate.
This revset predicate differs from the built-in `date` by providing a more
granular way of considering relative time rather than absolute time.
The built-in `date()` predicate does provide full day resolution, so
`age("<Xd")` is equivalent to `date("-X")`.
"""
from __future__ import absolute_import
import time
stashUnsubmitted
Done

Please remove unused imports

stash: Please remove unused imports
import re
from mercurial import (
error,
registrar,
revsetlang,
)
revsetpredicate = registrar.revsetpredicate()
_rangeparser = re.compile(
r'^([<>])(?:(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s?)?$')
@revsetpredicate('age(string)')
stashUnsubmitted
Done

No need to use unfiltered repo

stash: No need to use unfiltered repo
def age(repo, subset, x):
"""Changesets that are older or newer than a specific age.
stashUnsubmitted
Done

I think there shouldn't be ? after s, should it?

stash: I think there shouldn't be `?` after `s`, should it?
mbthomasAuthorUnsubmitted
Done

Actually I made "seconds" the default unit, but forgot to document it. Will fix up the doc comment.

mbthomas: Actually I made "seconds" the default unit, but forgot to document it. Will fix up the doc…
stashUnsubmitted
Done

Do you think it worth compiling this regex only once?

stash: Do you think it worth compiling this regex only once?
The age range can be specified in days, hours, minutes or seconds:
- ``<30d`` : Newer than 30 days old
- ``>4h30m``: Older than 4 hours 30 minutes old
- ``<15s`` : Newer than 15 seconds old
If no unit is specified, seconds are assumed.
"""
agerange = revsetlang.getstring(x, 'age requires an age range')
m = _rangeparser.match(agerange)
if not m:
raise error.ParseError('invalid age range for age predicate')
dirn, days, hours, minutes, seconds = m.groups()
cutoff = time.time()
cutoff -= int(days or 0) * 60 * 60 * 24
cutoff -= int(hours or 0) * 60 * 60
cutoff -= int(minutes or 0) * 60
cutoff -= int(seconds or 0)
def newer(x):
return repo[x].date()[0] > cutoff
def older(x):
return repo[x].date()[0] < cutoff
if dirn == '<':
return subset.filter(newer, condrepr=('<age %r>', agerange))
else:
return subset.filter(older, condrepr=('<age %r>', agerange))

tests/test-age.t

  • This file was added.
$ cat << EOF >> $HGRCPATH
> [extensions]
> age=$TESTDIR/../hgext3rd/age.py
> EOF
Setup repo
$ hg init repo
$ cd repo
$ now=`date +%s`
$ touch file1
$ hg add file1
$ for delta in 31536000 86401 86369 3800 420 5
> do
> commit_time=`expr $now - $delta`
> echo "$delta" > file1
> hg commit -d "$commit_time 0" -m "Changeset $delta seconds ago"
> done
Check age ranges
$ hg log -T '{rev} {desc}\n' -r 'age("<30")'
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("<7m30s")'
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("<1h4m")'
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("<1d")'
2 Changeset 86369 seconds ago
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("<364d23h59m")'
1 Changeset 86401 seconds ago
2 Changeset 86369 seconds ago
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age(">1s")'
0 Changeset 31536000 seconds ago
1 Changeset 86401 seconds ago
2 Changeset 86369 seconds ago
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age(">1m")'
0 Changeset 31536000 seconds ago
1 Changeset 86401 seconds ago
2 Changeset 86369 seconds ago
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age(">1h")'
0 Changeset 31536000 seconds ago
1 Changeset 86401 seconds ago
2 Changeset 86369 seconds ago
3 Changeset 3800 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age(">1d")'
0 Changeset 31536000 seconds ago
1 Changeset 86401 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age(">365d")'
0 Changeset 31536000 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("<64m")'
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("<60m500s")'
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("<1h500s")'
3 Changeset 3800 seconds ago
4 Changeset 420 seconds ago
5 Changeset 5 seconds ago
$ hg log -T '{rev} {desc}\n' -r 'age("invalid")'
hg: parse error: invalid age range for age predicate
[255]
$ hg log -T '{rev} {desc}\n' -r 'age("1h")'
hg: parse error: invalid age range for age predicate
[255]
$ hg log -T '{rev} {desc}\n' -r 'age("<3m2h")'
hg: parse error: invalid age range for age predicate
[255]
$ hg log -T '{rev} {desc}\n' -r 'age(">3h2h")'
hg: parse error: invalid age range for age predicate
[255]