| @@ -202,7 +202,7 @@ fn repo(name: &str) -> crate::Result<git::Repository> { · 201 unmodified lines |
| 202 | | 202 | |
| 203 | mod ambiguous { | 203 | mod ambiguous { |
| 204 | use super::repo; | 204 | use super::repo; |
| 205 | use crate::rev_spec::from_bytes::{ | 205 | use crate::revision::spec::from_bytes::{ |
| 206 | parse_spec, parse_spec_better_than_baseline, parse_spec_no_baseline, parse_spec_no_baseline_opts, | 206 | parse_spec, parse_spec_better_than_baseline, parse_spec_no_baseline, parse_spec_no_baseline_opts, |
| 207 | parse_spec_opts, rev_parse, | 207 | parse_spec_opts, rev_parse, |
| 208 | }; | 208 | }; |
| @@ -272,7 +272,7 @@ mod ambiguous { · 63 unmodified lines |
| 272 | parse_spec("0000000000", &repo).unwrap_err().to_string(), | 272 | parse_spec("0000000000", &repo).unwrap_err().to_string(), |
| 273 | "Short id 0000000000 is ambiguous. Candidates are:\n\t0000000000e commit 1112911993 -0700 \"a2onsxbvj\"\n\t0000000000c tree\n\t0000000000b blob", | 273 | "Short id 0000000000 is ambiguous. Candidates are:\n\t0000000000e commit 1112911993 -0700 \"a2onsxbvj\"\n\t0000000000c tree\n\t0000000000b blob", |
| 274 | "in theory one could disambiguate with 0000000000^{{tree}} (which works in git) or 0000000000^{{blob}} which doesn't work for some reason." | 274 | "in theory one could disambiguate with 0000000000^{{tree}} (which works in git) or 0000000000^{{blob}} which doesn't work for some reason." |
| 275 | ); | 275 | ); |
| 276 | | 276 | |
| 277 | assert_eq!( | 277 | assert_eq!( |
| 278 | parse_spec("0000000000cdc^{tree}", &repo).unwrap(), | 278 | parse_spec("0000000000cdc^{tree}", &repo).unwrap(), |
| @@ -375,8 +375,8 @@ mod ambiguous { · 96 unmodified lines |
| 375 | &repo, | 375 | &repo, |
| 376 | opts_ref_hint(RefsHint::Fail) | 376 | opts_ref_hint(RefsHint::Fail) |
| 377 | ) | 377 | ) |
| 378 | .unwrap_err() | 378 | .unwrap_err() |
| 379 | .to_string(), | 379 | .to_string(), |
| 380 | "The short hash 0000000000e4f9fbd19cf1e932319e5ad0d1d00b matched both the reference refs/heads/0000000000e4f9fbd19cf1e932319e5ad0d1d00b and at least one object" | 380 | "The short hash 0000000000e4f9fbd19cf1e932319e5ad0d1d00b matched both the reference refs/heads/0000000000e4f9fbd19cf1e932319e5ad0d1d00b and at least one object" |
| 381 | ); | 381 | ); |
| 382 | } | 382 | } |
| @@ -521,7 +521,7 @@ fn access_blob_through_tree() { · 138 unmodified lines |
| 521 | } | 521 | } |
| 522 | | 522 | |
| 523 | mod regex { | 523 | mod regex { |
| 524 | use crate::rev_spec::from_bytes::{parse_spec_no_baseline, repo}; | 524 | use crate::revision::spec::from_bytes::{parse_spec_no_baseline, repo}; |
| 525 | use git_repository::prelude::ObjectIdExt; | 525 | use git_repository::prelude::ObjectIdExt; |
| 526 | use git_repository::RevSpec; | 526 | use git_repository::RevSpec; |
| 527 | use git_testtools::hex_to_id; | 527 | use git_testtools::hex_to_id; |