-
Notifications
You must be signed in to change notification settings - Fork 344
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
revset: add author_date and committer_date revset functions
Author dates and committer dates can be filtered like so:
committer_date(before:"1 hour ago") # more than 1 hour ago
committer_date(after:"1 hour ago") # 1 hour ago or less
committer_date("1 hour ago") # 1 hour ago or less ("after" is the default)
A date range can be created by combining revsets. For example, to see any
revisions committed yesterday:
committer_date(after:"yesterday") & committer_date(before:"today")- Loading branch information
Showing
8 changed files
with
276 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ use std::ops::Range; | |
| use std::rc::Rc; | ||
| use std::sync::Arc; | ||
|
|
||
| use chrono::{DateTime, FixedOffset, NaiveDateTime, Offset, TimeZone}; | ||
| use itertools::Itertools; | ||
| use once_cell::sync::Lazy; | ||
| use thiserror::Error; | ||
|
|
@@ -43,6 +44,7 @@ pub use crate::revset_parser::{ | |
| }; | ||
| use crate::store::Store; | ||
| use crate::str_util::StringPattern; | ||
| use crate::time_pattern::TimePattern; | ||
| use crate::{dsl_util, revset_parser}; | ||
|
|
||
| /// Error occurred during symbol resolution. | ||
|
|
@@ -131,6 +133,10 @@ pub enum RevsetFilterPredicate { | |
| Author(StringPattern), | ||
| /// Commits with committer's name or email containing the needle. | ||
| Committer(StringPattern), | ||
| /// Commits authored after the given date. | ||
| AuthorDate(TimePattern), | ||
| /// Commits committed after the given date. | ||
| CommitterDate(TimePattern), | ||
| /// Commits modifying the paths specified by the fileset. | ||
| File(FilesetExpression), | ||
| /// Commits with conflicts | ||
|
|
@@ -685,6 +691,13 @@ static BUILTIN_FUNCTION_MAP: Lazy<HashMap<&'static str, RevsetFunction>> = Lazy: | |
| pattern, | ||
| ))) | ||
| }); | ||
| map.insert("author_date", |function, context| { | ||
| let [arg] = function.expect_exact_arguments()?; | ||
| let pattern = expect_time_pattern(arg, context.now().to_owned())?; | ||
| Ok(RevsetExpression::filter(RevsetFilterPredicate::AuthorDate( | ||
| pattern, | ||
| ))) | ||
| }); | ||
| map.insert("mine", |function, context| { | ||
| function.expect_no_arguments()?; | ||
| Ok(RevsetExpression::filter(RevsetFilterPredicate::Author( | ||
|
|
@@ -698,6 +711,13 @@ static BUILTIN_FUNCTION_MAP: Lazy<HashMap<&'static str, RevsetFunction>> = Lazy: | |
| pattern, | ||
| ))) | ||
| }); | ||
| map.insert("committer_date", |function, context| { | ||
| let [arg] = function.expect_exact_arguments()?; | ||
| let pattern = expect_time_pattern(arg, context.now().to_owned())?; | ||
| Ok(RevsetExpression::filter( | ||
| RevsetFilterPredicate::CommitterDate(pattern), | ||
| )) | ||
| }); | ||
| map.insert("empty", |function, _context| { | ||
| function.expect_no_arguments()?; | ||
| Ok(RevsetExpression::is_empty()) | ||
|
|
@@ -749,6 +769,24 @@ pub fn expect_string_pattern(node: &ExpressionNode) -> Result<StringPattern, Rev | |
| revset_parser::expect_pattern_with("string pattern", node, parse_pattern) | ||
| } | ||
|
|
||
| fn expect_time_pattern<Tz: TimeZone>( | ||
| node: &ExpressionNode, | ||
| now: DateTime<Tz>, | ||
| ) -> Result<TimePattern, RevsetParseError> | ||
| where | ||
| Tz::Offset: Copy, | ||
| { | ||
| revset_parser::expect_pattern_with("time expression", node, |value, kind| { | ||
| TimePattern::from_str_kind(value, kind, now).map_err(|err| { | ||
| RevsetParseError::expression( | ||
| format!("Unable to parse time expression: {err}"), | ||
| node.span, | ||
| ) | ||
| .with_source(err) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| /// Resolves function call by using the given function map. | ||
| fn lower_function_call( | ||
| function: &FunctionCallNode, | ||
|
|
@@ -1977,20 +2015,29 @@ impl RevsetExtensions { | |
| pub struct RevsetParseContext<'a> { | ||
| aliases_map: &'a RevsetAliasesMap, | ||
| user_email: String, | ||
| /// The current local time when the revset expression was written. | ||
| now: NaiveDateTime, | ||
| /// The offset from UTC at the time the revset expression was written. TODO: | ||
| /// It would be better if this was the TimeZone so times could be computed | ||
| /// correctly across DST shifts. | ||
| offset: FixedOffset, | ||
| extensions: &'a RevsetExtensions, | ||
| workspace: Option<RevsetWorkspaceContext<'a>>, | ||
| } | ||
|
|
||
| impl<'a> RevsetParseContext<'a> { | ||
| pub fn new( | ||
| pub fn new<Tz: TimeZone>( | ||
| aliases_map: &'a RevsetAliasesMap, | ||
| user_email: String, | ||
| now: DateTime<Tz>, | ||
| extensions: &'a RevsetExtensions, | ||
| workspace: Option<RevsetWorkspaceContext<'a>>, | ||
| ) -> Self { | ||
| Self { | ||
| aliases_map, | ||
| user_email, | ||
| now: now.naive_local(), | ||
| offset: now.offset().fix(), | ||
| extensions, | ||
| workspace, | ||
| } | ||
|
|
@@ -2004,6 +2051,10 @@ impl<'a> RevsetParseContext<'a> { | |
| &self.user_email | ||
| } | ||
|
|
||
| pub fn now(&self) -> DateTime<FixedOffset> { | ||
| DateTime::from_naive_utc_and_offset(self.now, self.offset) | ||
| } | ||
|
|
||
| pub fn symbol_resolvers(&self) -> &[impl AsRef<dyn SymbolResolverExtension>] { | ||
| self.extensions.symbol_resolvers() | ||
| } | ||
|
|
@@ -2047,6 +2098,7 @@ mod tests { | |
| let context = RevsetParseContext::new( | ||
| &aliases_map, | ||
| "[email protected]".to_string(), | ||
| chrono::Utc::now(), | ||
| &extensions, | ||
| None, | ||
| ); | ||
|
|
@@ -2076,6 +2128,7 @@ mod tests { | |
| let context = RevsetParseContext::new( | ||
| &aliases_map, | ||
| "[email protected]".to_string(), | ||
| chrono::Utc::now(), | ||
| &extensions, | ||
| Some(workspace_ctx), | ||
| ); | ||
|
|
@@ -2101,6 +2154,7 @@ mod tests { | |
| let context = RevsetParseContext::new( | ||
| &aliases_map, | ||
| "[email protected]".to_string(), | ||
| chrono::Utc::now(), | ||
| &extensions, | ||
| None, | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.