This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11402

rust-revset: support explicit `.` revision
ClosedPublic

Authored by Alphare on Sep 10 2021, 6:10 PM.

Details

Reviewers
SimonSapin
Group Reviewers
hg-reviewers
Commits
rHG3da7bf75fdb2: rust-revset: support explicit `.` revision
Summary

This is basically the same thing as not specifying a revision, except this is
done in the revset resolution function.

This allows calls like rhg cat some-file -r . to work without falling back.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Sep 10 2021, 6:10 PM
Alphare planned changes to this revision.Sep 13 2021, 8:21 AM

Turns out there is a small problem with git subrepos, I'll fix that.

Alphare updated this revision to Diff 30219.Sep 13 2021, 11:39 AM
SimonSapin accepted this revision.Sep 14 2021, 11:13 AM
martinvonz added a subscriber: martinvonz.Sep 30 2021, 7:33 PM
martinvonz added inline comments.
rust/hg-core/src/revset.rs
24

I've changed this to rev_for_node to account for D11415 getting queued since you sent this.

martinvonz added a comment.Oct 1 2021, 1:46 AM

I pushed this series to hg-committed many hours ago. I thought that used to close the review, but it's still open here. Any idea why?

Alphare added a comment.Oct 1 2021, 3:33 AM
In D11402#176576, @martinvonz wrote:

I pushed this series to hg-committed many hours ago. I thought that used to close the review, but it's still open here. Any idea why?

Looks like some of the infra is broken because of bad Let's Encrypt certificates, which unfortunately includes this as well as the Heptapod sync. I'll try to look into it.

rust/hg-core/src/revset.rs
24

Thanks!

Alphare added a commit: rHG3da7bf75fdb2: rust-revset: support explicit `.` revision.Oct 1 2021, 9:23 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3da7bf75fdb2: rust-revset: support explicit `.` revision (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/revset.rs (4 lines)

Diff 30495

rust/hg-core/src/revset.rs

/// Only some of the revset language is implemented yet. /// Only some of the revset language is implemented yet.
pub fn resolve_single( pub fn resolve_single(
input: &str, input: &str,
repo: &Repo, repo: &Repo,
) -> Result<Revision, RevlogError> { ) -> Result<Revision, RevlogError> {
let changelog = repo.changelog()?; let changelog = repo.changelog()?;
match input { match input {
"." => {
let p1 = repo.dirstate_parents()?.p1;
return Ok(changelog.revlog.rev_from_node(p1.into())?);
martinvonzUnsubmitted
Not Done

I've changed this to rev_for_node to account for D11415 getting queued since you sent this.

martinvonz: I've changed this to `rev_for_node` to account for D11415 getting queued since you sent this.
AlphareAuthorUnsubmitted
Done

Thanks!

Alphare: Thanks!
}
"null" => return Ok(NULL_REVISION), "null" => return Ok(NULL_REVISION),
_ => {} _ => {}
} }
match resolve_rev_number_or_hex_prefix(input, &changelog.revlog) { match resolve_rev_number_or_hex_prefix(input, &changelog.revlog) {
Err(RevlogError::InvalidRevision) => { Err(RevlogError::InvalidRevision) => {
// TODO: support for the rest of the language here. // TODO: support for the rest of the language here.
let msg = format!("cannot parse revset '{}'", input); let msg = format!("cannot parse revset '{}'", input);