Compare commits
No commits in common. "674329dfee554ddd653eee3b725e7898c8e5f225" and "e0d9d45a6a85567cd796e2c751d97eb28794909a" have entirely different histories.
674329dfee
...
e0d9d45a6a
5 changed files with 77 additions and 168 deletions
|
|
@ -84,12 +84,6 @@ enum Commands {
|
||||||
#[arg(allow_hyphen_values = true)]
|
#[arg(allow_hyphen_values = true)]
|
||||||
tag: Option<String>,
|
tag: Option<String>,
|
||||||
},
|
},
|
||||||
|
|
||||||
// Set the `done_time` of the Issue.
|
|
||||||
DoneTime {
|
|
||||||
issue_id: String,
|
|
||||||
done_time: Option<String>,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_command(
|
fn handle_command(
|
||||||
|
|
@ -152,7 +146,7 @@ fn handle_command(
|
||||||
these_uuids.sort_by(|a_id, b_id| {
|
these_uuids.sort_by(|a_id, b_id| {
|
||||||
let a = issues.issues.get(*a_id).unwrap();
|
let a = issues.issues.get(*a_id).unwrap();
|
||||||
let b = issues.issues.get(*b_id).unwrap();
|
let b = issues.issues.get(*b_id).unwrap();
|
||||||
a.creation_time.cmp(&b.creation_time)
|
a.timestamp.cmp(&b.timestamp)
|
||||||
});
|
});
|
||||||
println!("{:?}:", state);
|
println!("{:?}:", state);
|
||||||
for uuid in these_uuids {
|
for uuid in these_uuids {
|
||||||
|
|
@ -197,10 +191,8 @@ fn handle_command(
|
||||||
}
|
}
|
||||||
|
|
||||||
Commands::New { description } => {
|
Commands::New { description } => {
|
||||||
let issues_database = entomologist::database::make_issues_database(
|
let issues_database =
|
||||||
issues_database_source,
|
entomologist::database::make_issues_database(issues_database_source, entomologist::database::IssuesDatabaseAccess::ReadWrite)?;
|
||||||
entomologist::database::IssuesDatabaseAccess::ReadWrite,
|
|
||||||
)?;
|
|
||||||
match entomologist::issue::Issue::new(&issues_database.dir, description) {
|
match entomologist::issue::Issue::new(&issues_database.dir, description) {
|
||||||
Err(entomologist::issue::IssueError::EmptyDescription) => {
|
Err(entomologist::issue::IssueError::EmptyDescription) => {
|
||||||
println!("no new issue created");
|
println!("no new issue created");
|
||||||
|
|
@ -217,10 +209,8 @@ fn handle_command(
|
||||||
}
|
}
|
||||||
|
|
||||||
Commands::Edit { uuid } => {
|
Commands::Edit { uuid } => {
|
||||||
let issues_database = entomologist::database::make_issues_database(
|
let issues_database =
|
||||||
issues_database_source,
|
entomologist::database::make_issues_database(issues_database_source, entomologist::database::IssuesDatabaseAccess::ReadWrite)?;
|
||||||
entomologist::database::IssuesDatabaseAccess::ReadWrite,
|
|
||||||
)?;
|
|
||||||
let mut issues = entomologist::issues::Issues::new_from_dir(&issues_database.dir)?;
|
let mut issues = entomologist::issues::Issues::new_from_dir(&issues_database.dir)?;
|
||||||
if let Some(issue) = issues.get_mut_issue(uuid) {
|
if let Some(issue) = issues.get_mut_issue(uuid) {
|
||||||
match issue.edit_description() {
|
match issue.edit_description() {
|
||||||
|
|
@ -259,10 +249,7 @@ fn handle_command(
|
||||||
Some(issue) => {
|
Some(issue) => {
|
||||||
println!("issue {}", issue_id);
|
println!("issue {}", issue_id);
|
||||||
println!("author: {}", issue.author);
|
println!("author: {}", issue.author);
|
||||||
println!("creation_time: {}", issue.creation_time);
|
println!("timestamp: {}", issue.timestamp);
|
||||||
if let Some(done_time) = &issue.done_time {
|
|
||||||
println!("done_time: {}", done_time);
|
|
||||||
}
|
|
||||||
println!("state: {:?}", issue.state);
|
println!("state: {:?}", issue.state);
|
||||||
if let Some(dependencies) = &issue.dependencies {
|
if let Some(dependencies) = &issue.dependencies {
|
||||||
println!("dependencies: {:?}", dependencies);
|
println!("dependencies: {:?}", dependencies);
|
||||||
|
|
@ -276,7 +263,7 @@ fn handle_command(
|
||||||
println!("");
|
println!("");
|
||||||
println!("comment: {}", comment.uuid);
|
println!("comment: {}", comment.uuid);
|
||||||
println!("author: {}", comment.author);
|
println!("author: {}", comment.author);
|
||||||
println!("creation_time: {}", comment.creation_time);
|
println!("timestamp: {}", comment.timestamp);
|
||||||
println!("");
|
println!("");
|
||||||
println!("{}", comment.description);
|
println!("{}", comment.description);
|
||||||
}
|
}
|
||||||
|
|
@ -292,10 +279,8 @@ fn handle_command(
|
||||||
new_state,
|
new_state,
|
||||||
} => match new_state {
|
} => match new_state {
|
||||||
Some(new_state) => {
|
Some(new_state) => {
|
||||||
let issues_database = entomologist::database::make_issues_database(
|
let issues_database =
|
||||||
issues_database_source,
|
entomologist::database::make_issues_database(issues_database_source, entomologist::database::IssuesDatabaseAccess::ReadWrite)?;
|
||||||
entomologist::database::IssuesDatabaseAccess::ReadWrite,
|
|
||||||
)?;
|
|
||||||
let mut issues = entomologist::issues::Issues::new_from_dir(&issues_database.dir)?;
|
let mut issues = entomologist::issues::Issues::new_from_dir(&issues_database.dir)?;
|
||||||
match issues.issues.get_mut(issue_id) {
|
match issues.issues.get_mut(issue_id) {
|
||||||
Some(issue) => {
|
Some(issue) => {
|
||||||
|
|
@ -327,10 +312,8 @@ fn handle_command(
|
||||||
issue_id,
|
issue_id,
|
||||||
description,
|
description,
|
||||||
} => {
|
} => {
|
||||||
let issues_database = entomologist::database::make_issues_database(
|
let issues_database =
|
||||||
issues_database_source,
|
entomologist::database::make_issues_database(issues_database_source, entomologist::database::IssuesDatabaseAccess::ReadWrite)?;
|
||||||
entomologist::database::IssuesDatabaseAccess::ReadWrite,
|
|
||||||
)?;
|
|
||||||
let mut issues = entomologist::issues::Issues::new_from_dir(&issues_database.dir)?;
|
let mut issues = entomologist::issues::Issues::new_from_dir(&issues_database.dir)?;
|
||||||
let Some(issue) = issues.get_mut_issue(issue_id) else {
|
let Some(issue) = issues.get_mut_issue(issue_id) else {
|
||||||
return Err(anyhow::anyhow!("issue {} not found", issue_id));
|
return Err(anyhow::anyhow!("issue {} not found", issue_id));
|
||||||
|
|
@ -355,13 +338,9 @@ fn handle_command(
|
||||||
}
|
}
|
||||||
|
|
||||||
Commands::Sync { remote } => {
|
Commands::Sync { remote } => {
|
||||||
if let entomologist::database::IssuesDatabaseSource::Branch(branch) =
|
if let entomologist::database::IssuesDatabaseSource::Branch(branch) = issues_database_source {
|
||||||
issues_database_source
|
let issues_database =
|
||||||
{
|
entomologist::database::make_issues_database(issues_database_source, entomologist::database::IssuesDatabaseAccess::ReadWrite)?;
|
||||||
let issues_database = entomologist::database::make_issues_database(
|
|
||||||
issues_database_source,
|
|
||||||
entomologist::database::IssuesDatabaseAccess::ReadWrite,
|
|
||||||
)?;
|
|
||||||
entomologist::git::sync(&issues_database.dir, remote, branch)?;
|
entomologist::git::sync(&issues_database.dir, remote, branch)?;
|
||||||
println!("synced {:?} with {:?}", branch, remote);
|
println!("synced {:?} with {:?}", branch, remote);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -448,38 +427,6 @@ fn handle_command(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Commands::DoneTime {
|
|
||||||
issue_id,
|
|
||||||
done_time,
|
|
||||||
} => {
|
|
||||||
let issues = entomologist::database::read_issues_database(issues_database_source)?;
|
|
||||||
let Some(issue) = issues.issues.get(issue_id) else {
|
|
||||||
return Err(anyhow::anyhow!("issue {} not found", issue_id));
|
|
||||||
};
|
|
||||||
match done_time {
|
|
||||||
Some(done_time) => {
|
|
||||||
// Add or remove tag.
|
|
||||||
let issues_database = entomologist::database::make_issues_database(
|
|
||||||
issues_database_source,
|
|
||||||
entomologist::database::IssuesDatabaseAccess::ReadWrite,
|
|
||||||
)?;
|
|
||||||
let mut issues =
|
|
||||||
entomologist::issues::Issues::new_from_dir(&issues_database.dir)?;
|
|
||||||
let Some(issue) = issues.get_mut_issue(issue_id) else {
|
|
||||||
return Err(anyhow::anyhow!("issue {} not found", issue_id));
|
|
||||||
};
|
|
||||||
let done_time = chrono::DateTime::parse_from_rfc3339(done_time)
|
|
||||||
.unwrap()
|
|
||||||
.with_timezone(&chrono::Local);
|
|
||||||
issue.set_done_time(done_time)?;
|
|
||||||
}
|
|
||||||
None => match &issue.done_time {
|
|
||||||
Some(done_time) => println!("done_time: {}", done_time),
|
|
||||||
None => println!("None"),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
@ -493,9 +440,7 @@ fn main() -> anyhow::Result<()> {
|
||||||
// println!("{:?}", args);
|
// println!("{:?}", args);
|
||||||
|
|
||||||
let issues_database_source = match (&args.issues_dir, &args.issues_branch) {
|
let issues_database_source = match (&args.issues_dir, &args.issues_branch) {
|
||||||
(Some(dir), None) => {
|
(Some(dir), None) => entomologist::database::IssuesDatabaseSource::Dir(std::path::Path::new(dir)),
|
||||||
entomologist::database::IssuesDatabaseSource::Dir(std::path::Path::new(dir))
|
|
||||||
}
|
|
||||||
(None, Some(branch)) => entomologist::database::IssuesDatabaseSource::Branch(branch),
|
(None, Some(branch)) => entomologist::database::IssuesDatabaseSource::Branch(branch),
|
||||||
(None, None) => entomologist::database::IssuesDatabaseSource::Branch("entomologist-data"),
|
(None, None) => entomologist::database::IssuesDatabaseSource::Branch("entomologist-data"),
|
||||||
(Some(_), Some(_)) => {
|
(Some(_), Some(_)) => {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ use std::io::{IsTerminal, Write};
|
||||||
pub struct Comment {
|
pub struct Comment {
|
||||||
pub uuid: String,
|
pub uuid: String,
|
||||||
pub author: String,
|
pub author: String,
|
||||||
pub creation_time: chrono::DateTime<chrono::Local>,
|
pub timestamp: chrono::DateTime<chrono::Local>,
|
||||||
pub description: String,
|
pub description: String,
|
||||||
|
|
||||||
/// This is the directory that the comment lives in. Only used
|
/// This is the directory that the comment lives in. Only used
|
||||||
|
|
@ -53,13 +53,13 @@ impl Comment {
|
||||||
}
|
}
|
||||||
|
|
||||||
let author = crate::git::git_log_oldest_author(comment_dir)?;
|
let author = crate::git::git_log_oldest_author(comment_dir)?;
|
||||||
let creation_time = crate::git::git_log_oldest_timestamp(comment_dir)?;
|
let timestamp = crate::git::git_log_oldest_timestamp(comment_dir)?;
|
||||||
let dir = std::path::PathBuf::from(comment_dir);
|
let dir = std::path::PathBuf::from(comment_dir);
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
uuid: String::from(dir.file_name().unwrap().to_string_lossy()),
|
uuid: String::from(dir.file_name().unwrap().to_string_lossy()),
|
||||||
author,
|
author,
|
||||||
creation_time,
|
timestamp,
|
||||||
description: description.unwrap(),
|
description: description.unwrap(),
|
||||||
dir: std::path::PathBuf::from(comment_dir),
|
dir: std::path::PathBuf::from(comment_dir),
|
||||||
})
|
})
|
||||||
|
|
@ -84,7 +84,7 @@ impl Comment {
|
||||||
let mut comment = crate::comment::Comment {
|
let mut comment = crate::comment::Comment {
|
||||||
uuid,
|
uuid,
|
||||||
author: String::from(""), // this will be updated from git when we re-read this comment
|
author: String::from(""), // this will be updated from git when we re-read this comment
|
||||||
creation_time: chrono::Local::now(),
|
timestamp: chrono::Local::now(),
|
||||||
description: String::from(""), // this will be set immediately below
|
description: String::from(""), // this will be set immediately below
|
||||||
dir: dir.clone(),
|
dir: dir.clone(),
|
||||||
};
|
};
|
||||||
|
|
@ -204,7 +204,7 @@ mod tests {
|
||||||
let expected = Comment {
|
let expected = Comment {
|
||||||
uuid: String::from("9055dac36045fe36545bed7ae7b49347"),
|
uuid: String::from("9055dac36045fe36545bed7ae7b49347"),
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-07T15:26:26-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-07T15:26:26-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe95a31561\n\nIt has multiple lines\n"),
|
description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe95a31561\n\nIt has multiple lines\n"),
|
||||||
|
|
|
||||||
122
src/issue.rs
122
src/issue.rs
|
|
@ -22,8 +22,7 @@ pub type IssueHandle = String;
|
||||||
pub struct Issue {
|
pub struct Issue {
|
||||||
pub id: String,
|
pub id: String,
|
||||||
pub author: String,
|
pub author: String,
|
||||||
pub creation_time: chrono::DateTime<chrono::Local>,
|
pub timestamp: chrono::DateTime<chrono::Local>,
|
||||||
pub done_time: Option<chrono::DateTime<chrono::Local>>,
|
|
||||||
pub tags: Vec<String>,
|
pub tags: Vec<String>,
|
||||||
pub state: State,
|
pub state: State,
|
||||||
pub dependencies: Option<Vec<IssueHandle>>,
|
pub dependencies: Option<Vec<IssueHandle>>,
|
||||||
|
|
@ -44,8 +43,6 @@ pub enum IssueError {
|
||||||
EnvVarError(#[from] std::env::VarError),
|
EnvVarError(#[from] std::env::VarError),
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
CommentError(#[from] crate::comment::CommentError),
|
CommentError(#[from] crate::comment::CommentError),
|
||||||
#[error(transparent)]
|
|
||||||
ChronoParseError(#[from] chrono::format::ParseError),
|
|
||||||
#[error("Failed to parse issue")]
|
#[error("Failed to parse issue")]
|
||||||
IssueParseError,
|
IssueParseError,
|
||||||
#[error("Failed to parse state")]
|
#[error("Failed to parse state")]
|
||||||
|
|
@ -109,7 +106,6 @@ impl Issue {
|
||||||
let mut comments = Vec::<crate::comment::Comment>::new();
|
let mut comments = Vec::<crate::comment::Comment>::new();
|
||||||
let mut assignee: Option<String> = None;
|
let mut assignee: Option<String> = None;
|
||||||
let mut tags = Vec::<String>::new();
|
let mut tags = Vec::<String>::new();
|
||||||
let mut done_time: Option<chrono::DateTime<chrono::Local>> = None;
|
|
||||||
|
|
||||||
for direntry in dir.read_dir()? {
|
for direntry in dir.read_dir()? {
|
||||||
if let Ok(direntry) = direntry {
|
if let Ok(direntry) = direntry {
|
||||||
|
|
@ -123,11 +119,6 @@ impl Issue {
|
||||||
assignee = Some(String::from(
|
assignee = Some(String::from(
|
||||||
std::fs::read_to_string(direntry.path())?.trim(),
|
std::fs::read_to_string(direntry.path())?.trim(),
|
||||||
));
|
));
|
||||||
} else if file_name == "done_time" {
|
|
||||||
let raw_done_time = chrono::DateTime::<_>::parse_from_rfc3339(
|
|
||||||
std::fs::read_to_string(direntry.path())?.trim(),
|
|
||||||
)?;
|
|
||||||
done_time = Some(raw_done_time.into());
|
|
||||||
} else if file_name == "dependencies" {
|
} else if file_name == "dependencies" {
|
||||||
let dep_strings = std::fs::read_to_string(direntry.path())?;
|
let dep_strings = std::fs::read_to_string(direntry.path())?;
|
||||||
let deps: Vec<IssueHandle> = dep_strings
|
let deps: Vec<IssueHandle> = dep_strings
|
||||||
|
|
@ -168,13 +159,12 @@ impl Issue {
|
||||||
};
|
};
|
||||||
|
|
||||||
let author = crate::git::git_log_oldest_author(dir)?;
|
let author = crate::git::git_log_oldest_author(dir)?;
|
||||||
let creation_time = crate::git::git_log_oldest_timestamp(dir)?;
|
let timestamp = crate::git::git_log_oldest_timestamp(dir)?;
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
id,
|
id,
|
||||||
author,
|
author,
|
||||||
creation_time,
|
timestamp,
|
||||||
done_time,
|
|
||||||
tags,
|
tags,
|
||||||
state: state,
|
state: state,
|
||||||
dependencies,
|
dependencies,
|
||||||
|
|
@ -195,7 +185,7 @@ impl Issue {
|
||||||
comments.push(comment);
|
comments.push(comment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
comments.sort_by(|a, b| a.creation_time.cmp(&b.creation_time));
|
comments.sort_by(|a, b| a.timestamp.cmp(&b.timestamp));
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -230,8 +220,7 @@ impl Issue {
|
||||||
let mut issue = Self {
|
let mut issue = Self {
|
||||||
id: String::from(&issue_id),
|
id: String::from(&issue_id),
|
||||||
author: String::from(""),
|
author: String::from(""),
|
||||||
creation_time: chrono::Local::now(),
|
timestamp: chrono::Local::now(),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: State::New,
|
state: State::New,
|
||||||
dependencies: None,
|
dependencies: None,
|
||||||
|
|
@ -254,7 +243,8 @@ impl Issue {
|
||||||
None => issue.edit_description_file()?,
|
None => issue.edit_description_file()?,
|
||||||
};
|
};
|
||||||
|
|
||||||
issue.commit(&format!("create new issue {}", issue_id))?;
|
crate::git::add(&issue_dir)?;
|
||||||
|
crate::git::commit(&issue_dir, &format!("create new issue {}", issue_id))?;
|
||||||
|
|
||||||
Ok(issue)
|
Ok(issue)
|
||||||
}
|
}
|
||||||
|
|
@ -263,15 +253,21 @@ impl Issue {
|
||||||
pub fn edit_description(&mut self) -> Result<(), IssueError> {
|
pub fn edit_description(&mut self) -> Result<(), IssueError> {
|
||||||
self.edit_description_file()?;
|
self.edit_description_file()?;
|
||||||
let description_filename = self.description_filename();
|
let description_filename = self.description_filename();
|
||||||
self.commit(&format!(
|
crate::git::add(&description_filename)?;
|
||||||
"edit description of issue {}",
|
if crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
|
||||||
description_filename
|
crate::git::commit(
|
||||||
.parent()
|
&description_filename.parent().unwrap(),
|
||||||
.unwrap()
|
&format!(
|
||||||
.file_name()
|
"edit description of issue {}",
|
||||||
.unwrap()
|
description_filename
|
||||||
.to_string_lossy(),
|
.parent()
|
||||||
))?;
|
.unwrap()
|
||||||
|
.file_name()
|
||||||
|
.unwrap()
|
||||||
|
.to_string_lossy()
|
||||||
|
),
|
||||||
|
)?;
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -283,22 +279,24 @@ impl Issue {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Change the State of the Issue. If the new state is `Done`,
|
/// Change the State of the Issue.
|
||||||
/// set the Issue `done_time`. Commits.
|
|
||||||
pub fn set_state(&mut self, new_state: State) -> Result<(), IssueError> {
|
pub fn set_state(&mut self, new_state: State) -> Result<(), IssueError> {
|
||||||
let old_state = self.state.clone();
|
let old_state = self.state.clone();
|
||||||
let mut state_filename = std::path::PathBuf::from(&self.dir);
|
let mut state_filename = std::path::PathBuf::from(&self.dir);
|
||||||
state_filename.push("state");
|
state_filename.push("state");
|
||||||
let mut state_file = std::fs::File::create(&state_filename)?;
|
let mut state_file = std::fs::File::create(&state_filename)?;
|
||||||
write!(state_file, "{}", new_state)?;
|
write!(state_file, "{}", new_state)?;
|
||||||
self.commit(&format!(
|
crate::git::add(&state_filename)?;
|
||||||
"change state of issue {}, {} -> {}",
|
if crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
|
||||||
self.dir.file_name().unwrap().to_string_lossy(),
|
crate::git::commit(
|
||||||
old_state,
|
&self.dir,
|
||||||
new_state,
|
&format!(
|
||||||
))?;
|
"change state of issue {}, {} -> {}",
|
||||||
if new_state == State::Done {
|
self.dir.file_name().unwrap().to_string_lossy(),
|
||||||
self.set_done_time(chrono::Local::now())?;
|
old_state,
|
||||||
|
new_state,
|
||||||
|
),
|
||||||
|
)?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
@ -311,24 +309,6 @@ impl Issue {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Set the `done_time` of the Issue. Commits.
|
|
||||||
pub fn set_done_time(
|
|
||||||
&mut self,
|
|
||||||
done_time: chrono::DateTime<chrono::Local>,
|
|
||||||
) -> Result<(), IssueError> {
|
|
||||||
let mut done_time_filename = std::path::PathBuf::from(&self.dir);
|
|
||||||
done_time_filename.push("done_time");
|
|
||||||
let mut done_time_file = std::fs::File::create(&done_time_filename)?;
|
|
||||||
write!(done_time_file, "{}", done_time.to_rfc3339())?;
|
|
||||||
self.done_time = Some(done_time.clone());
|
|
||||||
self.commit(&format!(
|
|
||||||
"set done-time of issue {} to {}",
|
|
||||||
self.dir.file_name().unwrap().to_string_lossy(),
|
|
||||||
done_time,
|
|
||||||
))?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Set the Assignee of an Issue.
|
/// Set the Assignee of an Issue.
|
||||||
pub fn set_assignee(&mut self, new_assignee: &str) -> Result<(), IssueError> {
|
pub fn set_assignee(&mut self, new_assignee: &str) -> Result<(), IssueError> {
|
||||||
let old_assignee = match &self.assignee {
|
let old_assignee = match &self.assignee {
|
||||||
|
|
@ -339,12 +319,18 @@ impl Issue {
|
||||||
assignee_filename.push("assignee");
|
assignee_filename.push("assignee");
|
||||||
let mut assignee_file = std::fs::File::create(&assignee_filename)?;
|
let mut assignee_file = std::fs::File::create(&assignee_filename)?;
|
||||||
write!(assignee_file, "{}", new_assignee)?;
|
write!(assignee_file, "{}", new_assignee)?;
|
||||||
self.commit(&format!(
|
crate::git::add(&assignee_filename)?;
|
||||||
"change assignee of issue {}, {} -> {}",
|
if crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
|
||||||
self.dir.file_name().unwrap().to_string_lossy(),
|
crate::git::commit(
|
||||||
old_assignee,
|
&self.dir,
|
||||||
new_assignee,
|
&format!(
|
||||||
))?;
|
"change assignee of issue {}, {} -> {}",
|
||||||
|
self.dir.file_name().unwrap().to_string_lossy(),
|
||||||
|
old_assignee,
|
||||||
|
new_assignee,
|
||||||
|
),
|
||||||
|
)?;
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -458,15 +444,7 @@ impl Issue {
|
||||||
for tag in &self.tags {
|
for tag in &self.tags {
|
||||||
writeln!(tags_file, "{}", tag)?;
|
writeln!(tags_file, "{}", tag)?;
|
||||||
}
|
}
|
||||||
self.commit(commit_message)?;
|
crate::git::add(&tags_filename)?;
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn commit(&self, commit_message: &str) -> Result<(), IssueError> {
|
|
||||||
crate::git::add(&self.dir)?;
|
|
||||||
if !crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
crate::git::commit(&self.dir, commit_message)?;
|
crate::git::commit(&self.dir, commit_message)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
@ -483,10 +461,9 @@ mod tests {
|
||||||
let expected = Issue {
|
let expected = Issue {
|
||||||
id: String::from("3943fc5c173fdf41c0a22251593cd476d96e6c9f"),
|
id: String::from("3943fc5c173fdf41c0a22251593cd476d96e6c9f"),
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::from([
|
tags: Vec::<String>::from([
|
||||||
String::from("tag1"),
|
String::from("tag1"),
|
||||||
String::from("TAG2"),
|
String::from("TAG2"),
|
||||||
|
|
@ -511,10 +488,9 @@ mod tests {
|
||||||
let expected = Issue {
|
let expected = Issue {
|
||||||
id: String::from("7792b063eef6d33e7da5dc1856750c149ba678c6"),
|
id: String::from("7792b063eef6d33e7da5dc1856750c149ba678c6"),
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: State::InProgress,
|
state: State::InProgress,
|
||||||
dependencies: None,
|
dependencies: None,
|
||||||
|
|
|
||||||
|
|
@ -90,10 +90,9 @@ mod tests {
|
||||||
expected.add_issue(crate::issue::Issue {
|
expected.add_issue(crate::issue::Issue {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: crate::issue::State::InProgress,
|
state: crate::issue::State::InProgress,
|
||||||
dependencies: None,
|
dependencies: None,
|
||||||
|
|
@ -110,10 +109,9 @@ mod tests {
|
||||||
crate::issue::Issue {
|
crate::issue::Issue {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-03T12:14:26-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::from([
|
tags: Vec::<String>::from([
|
||||||
String::from("tag1"),
|
String::from("tag1"),
|
||||||
String::from("TAG2"),
|
String::from("TAG2"),
|
||||||
|
|
@ -143,14 +141,9 @@ mod tests {
|
||||||
expected.add_issue(crate::issue::Issue {
|
expected.add_issue(crate::issue::Issue {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T11:59:44-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-03T11:59:44-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: Some(
|
|
||||||
chrono::DateTime::parse_from_rfc3339("2025-07-15T15:15:15-06:00")
|
|
||||||
.unwrap()
|
|
||||||
.with_timezone(&chrono::Local),
|
|
||||||
),
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: crate::issue::State::Done,
|
state: crate::issue::State::Done,
|
||||||
dependencies: None,
|
dependencies: None,
|
||||||
|
|
@ -172,7 +165,7 @@ mod tests {
|
||||||
crate::comment::Comment {
|
crate::comment::Comment {
|
||||||
uuid: comment_uuid,
|
uuid: comment_uuid,
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-07T15:26:26-06:00").unwrap().with_timezone(&chrono::Local),
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-07T15:26:26-06:00").unwrap().with_timezone(&chrono::Local),
|
||||||
description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe95a31561\n\nIt has multiple lines\n"),
|
description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe95a31561\n\nIt has multiple lines\n"),
|
||||||
dir: std::path::PathBuf::from(comment_dir),
|
dir: std::path::PathBuf::from(comment_dir),
|
||||||
}
|
}
|
||||||
|
|
@ -181,10 +174,9 @@ mod tests {
|
||||||
crate::issue::Issue {
|
crate::issue::Issue {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-03T11:59:44-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-03T11:59:44-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: crate::issue::State::WontDo,
|
state: crate::issue::State::WontDo,
|
||||||
dependencies: None,
|
dependencies: None,
|
||||||
|
|
@ -210,10 +202,9 @@ mod tests {
|
||||||
expected.add_issue(crate::issue::Issue {
|
expected.add_issue(crate::issue::Issue {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
author: String::from("sigil-03 <sigil@glyphs.tech>"),
|
author: String::from("sigil-03 <sigil@glyphs.tech>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: crate::issue::State::Done,
|
state: crate::issue::State::Done,
|
||||||
dependencies: None,
|
dependencies: None,
|
||||||
|
|
@ -230,10 +221,9 @@ mod tests {
|
||||||
crate::issue::Issue {
|
crate::issue::Issue {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
author: String::from("sigil-03 <sigil@glyphs.tech>"),
|
author: String::from("sigil-03 <sigil@glyphs.tech>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: crate::issue::State::WontDo,
|
state: crate::issue::State::WontDo,
|
||||||
dependencies: None,
|
dependencies: None,
|
||||||
|
|
@ -251,10 +241,9 @@ mod tests {
|
||||||
crate::issue::Issue {
|
crate::issue::Issue {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
author: String::from("sigil-03 <sigil@glyphs.tech>"),
|
author: String::from("sigil-03 <sigil@glyphs.tech>"),
|
||||||
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
|
timestamp: chrono::DateTime::parse_from_rfc3339("2025-07-05T13:55:49-06:00")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&chrono::Local),
|
.with_timezone(&chrono::Local),
|
||||||
done_time: None,
|
|
||||||
tags: Vec::<String>::new(),
|
tags: Vec::<String>::new(),
|
||||||
state: crate::issue::State::WontDo,
|
state: crate::issue::State::WontDo,
|
||||||
dependencies: Some(vec![
|
dependencies: Some(vec![
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
2025-07-15T15:15:15-06:00
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue