Merge pull request #16 from NinjaTrappeur/nin/fix-clone-url-parsing

[bugfix] Support more clone full URLs
picnoir · Nov 15, 2022 · e6d7d6c · e6d7d6c
2 parents 98500dd + df1b7ad
commit e6d7d6c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/my-repo-pins-tests.el b/my-repo-pins-tests.el
@@ -377,6 +377,27 @@ it'll get deleted before the end of the test."
   (should (equal
            (my-repo-pins--parse-repo-identifier "https://github.com/Ninjatrappeur/my-repo-pins.el")
            '((tag . full-url) (full-url . "https://github.com/Ninjatrappeur/my-repo-pins.el"))))
+  (should (equal
+           (my-repo-pins--parse-repo-identifier "[email protected]:NinjaTrappeur/my-repo-pins.git")
+           '((tag . full-url) (full-url . "[email protected]:NinjaTrappeur/my-repo-pins.git"))))
+  (should (equal
+           (my-repo-pins--parse-repo-identifier "git://sourceware.org/git/elfutils.git")
+           '((tag . full-url) (full-url . "git://sourceware.org/git/elfutils.git"))))
+  (should (equal
+           (my-repo-pins--parse-repo-identifier "ssh://sourceware.org/git/elfutils.git")
+           '((tag . full-url) (full-url . "ssh://sourceware.org/git/elfutils.git"))))
+  (should (equal
+           (my-repo-pins--parse-repo-identifier "ftp://sourceware.org/git/elfutils.git")
+           '((tag . full-url) (full-url . "ftp://sourceware.org/git/elfutils.git"))))
+  (should (equal
+           (my-repo-pins--parse-repo-identifier "ftps://sourceware.org/git/elfutils.git")
+           '((tag . full-url) (full-url . "ftps://sourceware.org/git/elfutils.git"))))
+  (should (equal
+           (my-repo-pins--parse-repo-identifier "[email protected]/git/elfutils.git")
+           '((tag . full-url) (full-url . "[email protected]/git/elfutils.git"))))
+  (should (equal
+           (my-repo-pins--parse-repo-identifier "sourceware.org/git/elfutils.git")
+           '((tag . full-url) (full-url . "sourceware.org/git/elfutils.git"))))
   (should (equal
            (my-repo-pins--parse-repo-identifier "github.com/Ninjatrappeur/my-repo-pins.el")
            '((tag . full-url) (full-url . "github.com/Ninjatrappeur/my-repo-pins.el"))))

diff --git a/my-repo-pins.el b/my-repo-pins.el
@@ -399,7 +399,8 @@ or
   (cond
    ;; Full-url case
    ((or (string-match "^https?://.*/.*/.*$" query-str)
-        (string-match "^.*/.*/.*$" query-str))
+        (string-match "^.*/.*/.*$" query-str)
+        (string-match "^.*@.*:?.*$" query-str))
     `((tag . full-url) (full-url . ,query-str)))
    ;; owner/repo case
    ((string-match "^.*/.*$" query-str)