reya/n34
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: backward compatibility with ngit revision patch hashtag

Browse Source 
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
Awiteb
2025-08-04 09:10:03 +00:00
parent 67339a8a47
commit ad215002e2
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/commands/patch/mod.rs
View File

@@ -72,6 +72,10 @@ static PATCH_VERSION_NUMBER_RE: LazyLock<Regex> = LazyLock::new(|| {
pub const ROOT_HASHTAG_CONTENT: &str = "root"; pub const ROOT_HASHTAG_CONTENT: &str = "root";
/// Content of the hashtag representing the root revision patch. /// Content of the hashtag representing the root revision patch.
pub const REVISION_ROOT_HASHTAG_CONTENT: &str = "root-revision"; pub const REVISION_ROOT_HASHTAG_CONTENT: &str = "root-revision";
/// The content of the hashtag used by `ngit-cli` to represent a root revision
/// patch before the commit 6ae42e67d9da36f6c2e1356acba30a3a62112bc7. This was a
/// typo.
pub const LEGACY_NGIT_REVISION_ROOT_HASHTAG_CONTENT: &str = "revision-root";
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
pub enum PatchSubcommands { pub enum PatchSubcommands {

17
src/nostr_utils/traits.rs
View File

@@ -31,7 +31,11 @@ use nostr::{
use nostr_keyring::KeyringError; use nostr_keyring::KeyringError;
use crate::cli::issue::ISSUE_ALT_PREFIX; use crate::cli::issue::ISSUE_ALT_PREFIX;
use crate::cli::patch::{REVISION_ROOT_HASHTAG_CONTENT, ROOT_HASHTAG_CONTENT}; use crate::cli::patch::{
LEGACY_NGIT_REVISION_ROOT_HASHTAG_CONTENT,
REVISION_ROOT_HASHTAG_CONTENT,
ROOT_HASHTAG_CONTENT,
};
use crate::error::{N34Error, N34Result}; use crate::error::{N34Error, N34Result};
@@ -254,10 +258,13 @@ impl Event {
#[inline] #[inline]
pub fn is_revision_patch(&self) -> bool { pub fn is_revision_patch(&self) -> bool {
self.kind == Kind::GitPatch self.kind == Kind::GitPatch
&& self && self.tags.filter(TagKind::t()).any(|t| {
.tags [
.filter(TagKind::t()) Some(REVISION_ROOT_HASHTAG_CONTENT),
.any(|t| t.content() == Some(REVISION_ROOT_HASHTAG_CONTENT)) Some(LEGACY_NGIT_REVISION_ROOT_HASHTAG_CONTENT),
]
.contains(&t.content())
})
} }
/// Gets the root patch ID from a patch-revision event by finding the `e` /// Gets the root patch ID from a patch-revision event by finding the `e`