Skip to content

Commit e9b92f0

Browse files
committed
Use the name state() instead of in_progress_operation() (#393)
It seems less descriptive, but then again, people are coming from `git2` and might appreciate familiarity. Maybe this can be merged into something more descriptive in a future `status()` platform, like `status().in_progress()`.
1 parent 6540869 commit e9b92f0

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

git-repository/src/repository/state.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ use crate::state;
33
impl crate::Repository {
44
/// Returns the status of an in progress operation on a repository or [`None`]
55
/// if no operation is currently in progress.
6-
pub fn in_progress_operation(&self) -> Option<state::InProgress> {
6+
///
7+
/// Note to be confused with the repositories 'status'.
8+
pub fn state(&self) -> Option<state::InProgress> {
79
let git_dir = self.path();
810

911
// This is modeled on the logic from wt_status_get_state in git's wt-status.c and

git-repository/tests/repository/state.rs

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn apply_mailbox() -> Result {
66
let repo = named_repo("make_am_repo.sh")?;
77

88
assert_eq!(repo.head_name()?.unwrap().shorten(), "main");
9-
assert_eq!(repo.in_progress_operation(), Some(git::state::InProgress::ApplyMailbox));
9+
assert_eq!(repo.state(), Some(git::state::InProgress::ApplyMailbox));
1010
Ok(())
1111
}
1212

@@ -15,7 +15,7 @@ fn bisect() -> Result {
1515
let repo = named_repo("make_bisect_repo.sh")?;
1616

1717
assert_eq!(repo.head_name()?.unwrap().shorten(), "main");
18-
assert_eq!(repo.in_progress_operation(), Some(git::state::InProgress::Bisect));
18+
assert_eq!(repo.state(), Some(git::state::InProgress::Bisect));
1919

2020
Ok(())
2121
}
@@ -25,7 +25,7 @@ fn cherry_pick() -> Result {
2525
let repo = named_repo("make_cherry_pick_repo.sh")?;
2626

2727
assert_eq!(repo.head_name()?.unwrap().shorten(), "main");
28-
assert_eq!(repo.in_progress_operation(), Some(git::state::InProgress::CherryPick));
28+
assert_eq!(repo.state(), Some(git::state::InProgress::CherryPick));
2929
Ok(())
3030
}
3131

@@ -34,10 +34,7 @@ fn cherry_pick_sequence() -> Result {
3434
let repo = named_repo("make_cherry_pick_sequence_repo.sh")?;
3535

3636
assert_eq!(repo.head_name()?.unwrap().shorten(), "main");
37-
assert_eq!(
38-
repo.in_progress_operation(),
39-
Some(git::state::InProgress::CherryPickSequence)
40-
);
37+
assert_eq!(repo.state(), Some(git::state::InProgress::CherryPickSequence));
4138

4239
Ok(())
4340
}
@@ -47,7 +44,7 @@ fn merge() -> Result {
4744
let repo = named_repo("make_merge_repo.sh")?;
4845

4946
assert_eq!(repo.head_name()?.unwrap().shorten(), "main");
50-
assert_eq!(repo.in_progress_operation(), Some(git::state::InProgress::Merge));
47+
assert_eq!(repo.state(), Some(git::state::InProgress::Merge));
5148

5249
Ok(())
5350
}
@@ -57,10 +54,7 @@ fn rebase_interactive() -> Result {
5754
let repo = named_repo("make_rebase_i_repo.sh")?;
5855

5956
assert!(repo.head()?.is_detached());
60-
assert_eq!(
61-
repo.in_progress_operation(),
62-
Some(git::state::InProgress::RebaseInteractive)
63-
);
57+
assert_eq!(repo.state(), Some(git::state::InProgress::RebaseInteractive));
6458

6559
Ok(())
6660
}
@@ -70,7 +64,7 @@ fn revert() -> Result {
7064
let repo = named_repo("make_revert_repo.sh")?;
7165

7266
assert_eq!(repo.head_name()?.unwrap().shorten(), "main");
73-
assert_eq!(repo.in_progress_operation(), Some(git::state::InProgress::Revert));
67+
assert_eq!(repo.state(), Some(git::state::InProgress::Revert));
7468

7569
Ok(())
7670
}
@@ -80,10 +74,7 @@ fn revert_sequence() -> Result {
8074
let repo = named_repo("make_revert_sequence_repo.sh")?;
8175

8276
assert_eq!(repo.head_name()?.unwrap().shorten(), "main");
83-
assert_eq!(
84-
repo.in_progress_operation(),
85-
Some(git::state::InProgress::RevertSequence)
86-
);
77+
assert_eq!(repo.state(), Some(git::state::InProgress::RevertSequence));
8778

8879
Ok(())
8980
}

0 commit comments

Comments
 (0)