mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-25 07:56:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

view: replace .tags().get(name) with .get_tag(name)

Browse source
This commit is contained in:
Yuya Nishihara 2023-07-18 20:17:11 +09:00
parent bf46eb5ad2
commit 84f0c96c8f
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/src/revset.rs
View file

@ -1792,7 +1792,8 @@ impl SymbolResolver for DefaultSymbolResolver<'_> {
Err(RevsetResolutionError::EmptyString)
} else {
// Try to resolve as a tag
if let Some(target) = self.repo.view().tags().get(symbol) {
let target = self.repo.view().get_tag(symbol);
if target.is_present() {
return Ok(target.added_ids().cloned().collect());
}

7
lib/tests/test_git.rs
View file

@ -27,7 +27,7 @@ use jj_lib::commit_builder::CommitBuilder;
use jj_lib::git;
use jj_lib::git::{GitFetchError, GitPushError, GitRefUpdate, SubmoduleConfig};
use jj_lib::git_backend::GitBackend;
use jj_lib::op_store::{BranchTarget, RefTarget, RefTargetMap, RefTargetOptionExt as _};
use jj_lib::op_store::{BranchTarget, RefTarget, RefTargetMap};
use jj_lib::repo::{MutableRepo, ReadonlyRepo, Repo};
use jj_lib::settings::{GitSettings, UserSettings};
use jj_lib::view::RefName;
@ -142,10 +142,7 @@ fn test_import_refs() {
Some(expected_feature3_branch).as_ref()
);
assert_eq!(
view.tags().get("v1.0").flatten(),
&RefTarget::normal(jj_id(&commit5))
);
assert_eq!(view.get_tag("v1.0"), &RefTarget::normal(jj_id(&commit5)));
assert_eq!(view.git_refs().len(), 6);
assert_eq!(