Compare commits

..

15 commits

Author SHA1 Message Date
bedcc8a352 update-tags-encoding: escape '/' and ',' in tags 2025-07-25 10:22:22 -06:00
87f6b42595 Issue::commit_tags(): write new-style escaped tags 2025-07-25 10:22:11 -06:00
9b941fdbda add some tags with escapes to the tests 2025-07-24 12:14:32 -06:00
bc72061d14 refactor Issue::read_tags() to handle escaping 2025-07-24 12:14:32 -06:00
99d19e0fd9 update test/0000 tags 2025-07-24 12:14:32 -06:00
485f88c686 add a tool to migrate tags from files to dirs 2025-07-24 12:14:32 -06:00
50f2b2a1bf tags is now a directory with a file per tag
This is more conflict resistant than the old encoding where tags was a
file with a line per tag.
2025-07-24 12:14:30 -06:00
fad23ba233 test dir cleanup: rename test/0002/dd79c8cfb8beeacd0460429944b4ecbe
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
2025-07-24 10:20:03 -06:00
b3903a9ed2 test dir cleanup: rename test/0002/a85f81fc5f14cb5d4851dd445dc9744c
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
2025-07-24 10:19:58 -06:00
b3f5aaeb76 test dir cleanup: rename test/0002/3fa5bfd93317ad25772680071d5ac325
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
2025-07-24 10:19:55 -06:00
598f4e5df8 test dir cleanup: rename test/0001/dd79c8cfb8beeacd0460429944b4ecbe comment
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
2025-07-24 10:19:50 -06:00
05c7c6f441 test dir cleanup: rename test/0001/dd79c8cfb8beeacd0460429944b4ecbe
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.

fixup test/0001/dd79c8cfb8beeacd0460429944b4ecbe, no comment yet
2025-07-24 10:19:45 -06:00
694d127638 test dir cleanup: rename test/0001/3fa5bfd93317ad25772680071d5ac325
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
2025-07-24 10:19:40 -06:00
4683760942 test dir cleanup: rename test/0000/7792b063eef6d33e7da5dc1856750c14
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
2025-07-24 10:19:33 -06:00
ef8a648cf8 test dir cleanup: rename test/0000/3943fc5c173fdf41c0a22251593cd476
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
2025-07-24 10:19:22 -06:00
4 changed files with 78 additions and 18 deletions

View file

@ -219,7 +219,7 @@ mod tests {
let expected = Comment {
uuid: String::from("9055dac36045fe36545bed7ae7b49347"),
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T10:08:38-06:00")
.unwrap()
.with_timezone(&chrono::Local),
description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe\n\nIt has multiple lines\n"),

View file

@ -577,12 +577,28 @@ impl Issue {
Ok(tag)
}
// Perform escape on a tag to make it into a filename:
// "," => ",0"
// "/" => ",1"
fn tag_to_filename(tag: &str) -> String {
let mut filename = tag.replace(",", ",0");
filename = filename.replace("/", ",1");
return filename;
}
fn commit_tags(&self, commit_message: &str) -> Result<(), IssueError> {
let mut tags_filename = self.dir.clone();
tags_filename.push("tags");
let mut tags_file = std::fs::File::create(&tags_filename)?;
let mut tags_dir_name = self.dir.clone();
tags_dir_name.push("tags");
match std::fs::remove_dir_all(&tags_dir_name) {
Err(e) if e.kind() == std::io::ErrorKind::NotFound => (),
Err(e) => return Err(e.into()),
Ok(_) => (),
}
std::fs::create_dir(&tags_dir_name)?;
for tag in &self.tags {
writeln!(tags_file, "{}", tag)?;
let mut tag_filename = tags_dir_name.clone();
tag_filename.push(Issue::tag_to_filename(tag));
std::fs::File::create(&tag_filename)?;
}
self.commit(commit_message)?;
Ok(())
@ -661,6 +677,42 @@ mod tests {
}
}
#[test]
fn tag_to_filename_0() {
let tag = "hello";
assert_eq!(Issue::tag_to_filename(tag), "hello");
}
#[test]
fn tag_to_filename_1() {
let tag = "hello,";
assert_eq!(Issue::tag_to_filename(tag), "hello,0");
}
#[test]
fn tag_to_filename_2() {
let tag = "/hello";
assert_eq!(Issue::tag_to_filename(tag), ",1hello");
}
#[test]
fn tag_to_filename_3() {
let tag = "hello/bye,boo";
assert_eq!(Issue::tag_to_filename(tag), "hello,1bye,0boo");
}
#[test]
fn tag_to_filename_4() {
let tag = ",,,///,,,";
assert_eq!(Issue::tag_to_filename(tag), ",0,0,0,1,1,1,0,0,0");
}
#[test]
fn tag_to_filename_5() {
let tag = ",0,0,1,1";
assert_eq!(Issue::tag_to_filename(tag), ",00,00,01,01");
}
#[test]
fn read_issue_0() {
let issue_dir = std::path::Path::new("test/0000/3943fc5c173fdf41c0a22251593cd476/");
@ -668,7 +720,7 @@ mod tests {
let expected = Issue {
id: String::from("3943fc5c173fdf41c0a22251593cd476"),
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:36:25-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,
@ -701,7 +753,7 @@ mod tests {
let expected = Issue {
id: String::from("7792b063eef6d33e7da5dc1856750c14"),
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:37:07-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,

View file

@ -102,7 +102,7 @@ mod tests {
expected.add_issue(crate::issue::Issue {
id: uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:37:07-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,
@ -122,7 +122,7 @@ mod tests {
crate::issue::Issue {
id: uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:36:25-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,
@ -160,7 +160,7 @@ mod tests {
expected.add_issue(crate::issue::Issue {
id: uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:37:46-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: Some(
@ -189,7 +189,7 @@ mod tests {
crate::comment::Comment {
uuid: comment_uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00").unwrap().with_timezone(&chrono::Local),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T10:08:38-06:00").unwrap().with_timezone(&chrono::Local),
description: String::from("This is a comment on issue dd79c8cfb8beeacd0460429944b4ecbe\n\nIt has multiple lines\n"),
dir: std::path::PathBuf::from(comment_dir),
}
@ -198,7 +198,7 @@ mod tests {
crate::issue::Issue {
id: uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T10:08:24-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,
@ -226,8 +226,8 @@ mod tests {
dir.push(&uuid);
expected.add_issue(crate::issue::Issue {
id: uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
author: String::from("sigil-03 <sigil@glyphs.tech>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:38:40-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,
@ -246,8 +246,8 @@ mod tests {
expected.add_issue(
crate::issue::Issue {
id: uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
author: String::from("sigil-03 <sigil@glyphs.tech>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:39:20-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,
@ -267,8 +267,8 @@ mod tests {
expected.add_issue(
crate::issue::Issue {
id: uuid,
author: String::from("Sebastian Kuzminsky <seb@highlab.com>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-23T15:06:31-06:00")
author: String::from("sigil-03 <sigil@glyphs.tech>"),
creation_time: chrono::DateTime::parse_from_rfc3339("2025-07-24T08:39:02-06:00")
.unwrap()
.with_timezone(&chrono::Local),
done_time: None,

View file

@ -7,6 +7,13 @@
set -e
#set -x
function escape_tag() {
TAG="$1"
TAG=$(echo "${TAG}" | sed -re 's/,/,0/g')
TAG=$(echo "${TAG}" | sed -re 's/\//,1/g')
echo "${TAG}"
}
BRANCH=""
if [[ -n "$1" ]] && [[ -d "$1" ]]; then
@ -53,6 +60,7 @@ for ISSUE_ID in $(find . -maxdepth 1 -type d -regextype posix-extended -regex '\
mkdir tags
for TAG in ${TAGS}; do
TAG=$(escape_tag "${TAG}")
touch "tags/${TAG}"
done