Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3a0fb1b

Browse files
ByronByron
committed
change!: remote lock_mode from all methods dealing with reference edits. (#450)
It is now read from `core.filesRefLockTimeout` accordingly.
1 parent 1bb910e commit 3a0fb1b

11 files changed

Lines changed: 90 additions & 67 deletions

File tree

‎git-repository/src/config/cache/access.rs‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
use crate::config::Cache;
2+
use crate::{remote, repository::identity};
3+
use git_lock::acquire::Fail;
4+
use std::convert::TryInto;
5+
use std::time::Duration;
6+
7+
/// Access
8+
impl Cache {
9+
pub(crate) fn personas(&self) -> &identity::Personas {
10+
self.personas
11+
.get_or_init(|| identity::Personas::from_config_and_env(&self.resolved, self.git_prefix))
12+
}
13+
14+
pub(crate) fn url_rewrite(&self) -> &remote::url::Rewrite {
15+
self.url_rewrite
16+
.get_or_init(|| remote::url::Rewrite::from_config(&self.resolved, self.filter_config_section))
17+
}
18+
19+
#[cfg(any(feature = "blocking-network-client", feature = "async-network-client"))]
20+
pub(crate) fn url_scheme(
21+
&self,
22+
) -> Result<&remote::url::SchemePermission, remote::url::scheme_permission::init::Error> {
23+
self.url_scheme.get_or_try_init(|| {
24+
remote::url::SchemePermission::from_config(&self.resolved, self.git_prefix, self.filter_config_section)
25+
})
26+
}
27+
28+
/// Returns (file-timeout, pack-refs timeout)
29+
pub(crate) fn lock_timeout(
30+
&self,
31+
) -> Result<(git_lock::acquire::Fail, git_lock::acquire::Fail), git_config::value::Error> {
32+
enum Kind {
33+
RefFiles,
34+
RefPackFile,
35+
}
36+
let mut out: [git_lock::acquire::Fail; 2] = Default::default();
37+
38+
for (idx, kind) in [Kind::RefFiles, Kind::RefPackFile].iter().enumerate() {
39+
let (key, default_ms) = match kind {
40+
Kind::RefFiles => ("filesRefLockTimeout", 100),
41+
Kind::RefPackFile => ("packedRefsTimeout", 1000),
42+
};
43+
let mk_default = || Fail::AfterDurationWithBackoff(Duration::from_millis(default_ms));
44+
let mut fnp = self.filter_config_section;
45+
46+
let lock_mode = match self.resolved.integer_filter("core", None, key, &mut fnp) {
47+
Some(Ok(val)) if val < 0 => Fail::AfterDurationWithBackoff(Duration::from_secs(u64::MAX)),
48+
Some(Ok(val)) if val == 0 => Fail::Immediately,
49+
Some(Ok(val)) => Fail::AfterDurationWithBackoff(Duration::from_millis(
50+
val.try_into().expect("i64 can be repsented by u64"),
51+
)),
52+
Some(Err(_)) if self.lenient_config => mk_default(),
53+
Some(Err(err)) => return Err(err),
54+
None => mk_default(),
55+
};
56+
out[idx] = lock_mode;
57+
}
58+
Ok((out[0], out[1]))
59+
}
60+
}

‎git-repository/src/config/cache/init.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ impl Cache {
147147
excludes_file,
148148
xdg_config_home_env,
149149
home_env,
150+
lenient_config,
150151
personas: Default::default(),
151152
url_rewrite: Default::default(),
152153
#[cfg(any(feature = "blocking-network-client", feature = "async-network-client"))]

‎git-repository/src/config/cache/mod.rs‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use super::{Cache, Error};
2-
use crate::{remote, repository::identity};
32

43
mod incubate;
54
pub(crate) use incubate::StageOne;
@@ -12,27 +11,7 @@ impl std::fmt::Debug for Cache {
1211
}
1312
}
1413

15-
/// Access
16-
impl Cache {
17-
pub(crate) fn personas(&self) -> &identity::Personas {
18-
self.personas
19-
.get_or_init(|| identity::Personas::from_config_and_env(&self.resolved, self.git_prefix))
20-
}
21-
22-
pub(crate) fn url_rewrite(&self) -> &remote::url::Rewrite {
23-
self.url_rewrite
24-
.get_or_init(|| remote::url::Rewrite::from_config(&self.resolved, self.filter_config_section))
25-
}
26-
27-
#[cfg(any(feature = "blocking-network-client", feature = "async-network-client"))]
28-
pub(crate) fn url_scheme(
29-
&self,
30-
) -> Result<&remote::url::SchemePermission, remote::url::scheme_permission::init::Error> {
31-
self.url_scheme.get_or_try_init(|| {
32-
remote::url::SchemePermission::from_config(&self.resolved, self.git_prefix, self.filter_config_section)
33-
})
34-
}
35-
}
14+
mod access;
3615

3716
mod util;
3817
pub(crate) use util::interpolate_context;

‎git-repository/src/config/mod.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ pub struct Snapshot<'repo> {
1414
pub(crate) repo: &'repo Repository,
1515
}
1616

17-
/// A platform to access configuration values and modify them in memory, while making them available when this platform is dropped.
17+
/// A platform to access configuration values and modify them in memory, while making them available when this platform is dropped
18+
/// as form of auto-commit.
1819
/// Note that the values will only affect this instance of the parent repository, and not other clones that may exist.
1920
///
2021
/// Note that these values won't update even if the underlying file(s) change.
2122
///
2223
/// Use [`forget()`][Self::forget()] to not apply any of the changes.
2324
// TODO: make it possible to load snapshots with reloading via .config() and write mutated snapshots back to disk which should be the way
24-
// to affect all instances of a repo.
25+
// to affect all instances of a repo, probably via `config_mut()` and `config_mut_at()`.
2526
pub struct SnapshotMut<'repo> {
2627
pub(crate) repo: &'repo mut Repository,
2728
pub(crate) config: git_config::File<'static>,
@@ -86,6 +87,9 @@ pub(crate) struct Cache {
8687
pub ignore_case: bool,
8788
/// The path to the user-level excludes file to ignore certain files in the worktree.
8889
pub excludes_file: Option<std::path::PathBuf>,
90+
/// If true, we should default what's possible if something is misconfigured, on case by case basis, to be more resilient.
91+
/// Also available in options! Keep in sync!
92+
pub lenient_config: bool,
8993
/// Define how we can use values obtained with `xdg_config(…)` and its `XDG_CONFIG_HOME` variable.
9094
xdg_config_home_env: git_sec::Permission,
9195
/// Define how we can use values obtained with `xdg_config(…)`. and its `HOME` variable.

‎git-repository/src/reference/edits.rs‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,23 @@ pub mod delete {
5555

5656
use crate::Reference;
5757

58-
mod error {
59-
/// The error returned by [`Reference::delete()`][super::Reference::delete()].
60-
#[derive(Debug, thiserror::Error)]
61-
#[allow(missing_docs)]
62-
pub enum Error {
63-
#[error(transparent)]
64-
ReferenceEdit(#[from] crate::reference::edit::Error),
65-
}
66-
}
67-
pub use error::Error;
68-
use git_lock::acquire::Fail;
69-
7058
impl<'repo> Reference<'repo> {
7159
/// Delete this reference or fail if it was changed since last observed.
7260
/// Note that this instance remains available in memory but probably shouldn't be used anymore.
73-
pub fn delete(&self) -> Result<(), Error> {
74-
self.repo.edit_reference(
75-
RefEdit {
76-
change: Change::Delete {
77-
expected: PreviousValue::MustExistAndMatch(self.inner.target.clone()),
78-
log: RefLog::AndReference,
61+
pub fn delete(&self) -> Result<(), crate::reference::edit::Error> {
62+
self.repo
63+
.edit_reference(
64+
RefEdit {
65+
change: Change::Delete {
66+
expected: PreviousValue::MustExistAndMatch(self.inner.target.clone()),
67+
log: RefLog::AndReference,
68+
},
69+
name: self.inner.name.clone(),
70+
deref: false,
7971
},
80-
name: self.inner.name.clone(),
81-
deref: false,
82-
},
83-
Fail::Immediately,
84-
self.repo.committer_or_default(),
85-
)?;
86-
Ok(())
72+
self.repo.committer_or_default(),
73+
)
74+
.map(|_| ())
8775
}
8876
}
8977
}

‎git-repository/src/reference/errors.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ pub mod edit {
1111
FileTransactionCommit(#[from] git_ref::file::transaction::commit::Error),
1212
#[error(transparent)]
1313
NameValidation(#[from] git_validate::reference::name::Error),
14+
#[error("Could not interpret core.filesRefLockTimeout or core.packedRefsTimeout, it must be the number in milliseconds to wait for locks or negative to wait forever")]
15+
LockTimeoutConfiguration(#[from] git_config::value::Error),
1416
}
1517
}
1618

‎git-repository/src/remote/connection/fetch/update_refs/mod.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ pub(crate) fn update(
9090
}
9191

9292
let edits = match dry_run {
93-
fetch::DryRun::No => {
94-
repo.edit_references(edits, git_lock::acquire::Fail::Immediately, repo.committer_or_default())?
95-
}
93+
fetch::DryRun::No => repo.edit_references(edits, repo.committer_or_default())?,
9694
fetch::DryRun::Yes => edits,
9795
};
9896

‎git-repository/src/repository/object.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ impl crate::Repository {
195195
name: reference,
196196
deref: true,
197197
},
198-
git_lock::acquire::Fail::Immediately,
199198
commit.committer.to_ref(),
200199
)?;
201200
Ok(commit_id)

‎git-repository/src/repository/reference.rs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ use std::convert::TryInto;
22

33
use git_actor as actor;
44
use git_hash::ObjectId;
5-
use git_lock as lock;
65
use git_ref::{
76
transaction::{Change, LogChange, PreviousValue, RefEdit, RefLog},
87
FullName, PartialNameRef, Target,
98
};
109

1110
use crate::{bstr::BString, ext::ReferenceExt, reference, Reference};
1211

13-
const DEFAULT_LOCK_MODE: git_lock::acquire::Fail = git_lock::acquire::Fail::Immediately;
14-
1512
/// Obtain and alter references comfortably
1613
impl crate::Repository {
1714
/// Create a lightweight tag with given `name` (and without `refs/tags/` prefix) pointing to the given `target`, and return it as reference.
@@ -35,7 +32,6 @@ impl crate::Repository {
3532
name: format!("refs/tags/{}", name.as_ref()).try_into()?,
3633
deref: false,
3734
},
38-
DEFAULT_LOCK_MODE,
3935
self.committer_or_default(),
4036
)?;
4137
assert_eq!(edits.len(), 1, "reference splits should ever happen");
@@ -109,7 +105,6 @@ impl crate::Repository {
109105
name,
110106
deref: false,
111107
},
112-
DEFAULT_LOCK_MODE,
113108
self.committer_or_default(),
114109
)?;
115110
assert_eq!(
@@ -126,33 +121,30 @@ impl crate::Repository {
126121
.attach(self))
127122
}
128123

129-
/// Edit a single reference as described in `edit`, handle locks via `lock_mode` and write reference logs as `log_committer`.
124+
/// Edit a single reference as described in `edit`, and write reference logs as `log_committer`.
130125
///
131126
/// One or more `RefEdit`s are returned - symbolic reference splits can cause more edits to be performed. All edits have the previous
132127
/// reference values set to the ones encountered at rest after acquiring the respective reference's lock.
133128
pub fn edit_reference(
134129
&self,
135130
edit: RefEdit,
136-
lock_mode: lock::acquire::Fail,
137131
log_committer: actor::SignatureRef<'_>,
138132
) -> Result<Vec<RefEdit>, reference::edit::Error> {
139-
self.edit_references(Some(edit), lock_mode, log_committer)
133+
self.edit_references(Some(edit), log_committer)
140134
}
141135

142-
/// Edit one or more references as described by their `edits`, with `lock_mode` deciding on how to handle competing
143-
/// transactions. `log_committer` is the name appearing in reference logs.
136+
/// Edit one or more references as described by their `edits`. `log_committer` is the name appearing in reference logs.
144137
///
145138
/// Returns all reference edits, which might be more than where provided due the splitting of symbolic references, and
146139
/// whose previous (_old_) values are the ones seen on in storage after the reference was locked.
147140
pub fn edit_references(
148141
&self,
149142
edits: impl IntoIterator<Item = RefEdit>,
150-
lock_mode: lock::acquire::Fail,
151143
log_committer: actor::SignatureRef<'_>,
152144
) -> Result<Vec<RefEdit>, reference::edit::Error> {
153145
self.refs
154146
.transaction()
155-
.prepare(edits, lock_mode)?
147+
.prepare(edits, self.config.lock_timeout()?.0)?
156148
.commit(log_committer)
157149
.map_err(Into::into)
158150
}

‎git-repository/tests/repository/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod worktree;
1010

1111
#[test]
1212
fn size_in_memory() {
13-
let expected = [760, 800];
13+
let expected = [768, 808];
1414
let actual_size = std::mem::size_of::<Repository>();
1515
assert!(
1616
expected.contains(&actual_size),

0 commit comments

Comments
 (0)