Merge branch 'push-tlupsyypvmpk' into 'master'

Add support for jujutsu

See merge request mkjeldsen/commitmsgfmt!80

Author: commonquail

src/parser.rs

@@ -70,6 +70,9 @@ pub fn parse<'a>(input: &'a str, comment_string: &str) -> Vec<Token<'a>> {
             let t = if &line[index..] == " ------------------------ >8 ------------------------" {
                 has_scissors = true;
                 Token::Scissored(line)
+            } else if line[index..].starts_with(" ignore-rest") {
+                has_scissors = true;
+                Token::Scissored(line)
             } else {
                 Token::Comment(line)
             };
@@ -1773,4 +1776,35 @@ do
             ],
         );
     }
+    #[test]
+    fn parses_jj_ignore_content() {
+        assert_eq!(
+            super::parse(
+                "
+subject
+
+# ignore-rest
+above is not a comment;
+do the needful
+
+JJ: ignore-rest, including this because it should be a prefix match
+do
+ not
+  format
+",
+                "JJ:"
+            ),
+            [
+                VerticalSpace,
+                Subject("subject"),
+                VerticalSpace,
+                Paragraph("# ignore-rest above is not a comment; do the needful".into()),
+                VerticalSpace,
+                Scissored("JJ: ignore-rest, including this because it should be a prefix match"),
+                Scissored("do"),
+                Scissored(" not"),
+                Scissored("  format"),
+            ],
+        );
+    }
 }