From 80d9dbc31394d6b179bb0aee58a412709ca48ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Fri, 14 Aug 2020 01:32:54 +0200
Subject: [PATCH] Support sending the root commit instead of 400ing

Also minor cleanup of the affected funxions

Ref: ~sircmpwn/git.sr.ht#255
---
 gitsrht/blueprints/email.py              | 24 +++++++++++++++---------
 gitsrht/templates/send-email-review.html |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gitsrht/blueprints/email.py b/gitsrht/blueprints/email.py
index 8b202e1..d498a19 100644
--- a/gitsrht/blueprints/email.py
+++ b/gitsrht/blueprints/email.py
@@ -26,6 +26,7 @@ smtp_port = cfgi("mail", "smtp-port", default=None)
 smtp_user = cfg("mail", "smtp-user", default=None)
 smtp_password = cfg("mail", "smtp-password", default=None)
 smtp_from = cfg("mail", "smtp-from", default=None)
+outgoing_domain = cfg("git.sr.ht", "outgoing-domain")
 
 @mail.route("/<owner>/<repo>/send-email")
 @loginrequired
@@ -118,20 +119,26 @@ def prepare_patchset(repo, git_repo, cover_letter=None, extra_headers=False,
         if not valid.ok:
             return None
 
-        outgoing_domain = cfg("git.sr.ht", "outgoing-domain")
         args = [
             "git",
             "--git-dir", repo.path,
-            "-c", f"user.name=~{current_user.username}",
+            "-c", f"user.name={current_user.canonical_name}",
             "-c", f"user.email={current_user.username}@{outgoing_domain}",
             "format-patch",
-            f"--from=~{current_user.username} <{current_user.username}@{outgoing_domain}>",
+            f"--from={current_user.canonical_name} <{current_user.username}@{outgoing_domain}>",
             f"--subject-prefix=PATCH {repo.name}",
             "--stdout",
         ]
         if cover_letter:
             args += ["--cover-letter"]
-        args += [f"{start_commit}^..{end_commit}"]
+
+        start_rev = git_repo.get(start_commit)
+        if not start_rev:
+            abort(404)
+        if start_rev.parent_ids:
+            args += [f"{start_commit}^..{end_commit}"]
+        else:
+            args += ["--root", end_commit]
         print(args)
         p = subprocess.run(args, timeout=30,
                 stdout=subprocess.PIPE, stderr=sys.stderr)
@@ -213,10 +220,9 @@ def send_email_review(owner, repo):
             readme = "README"
 
         emails = prepare_patchset(repo, git_repo)
+        start = git_repo.get(start_commit)
+        tip = git_repo.get(end_commit)
         if not emails or not valid.ok:
-            tip = git_repo.get(end_commit)
-            start = git_repo.get(start_commit)
-
             log = get_log(git_repo, tip, until=start)
             diffs = list()
             for commit in log:
@@ -243,8 +249,8 @@ def send_email_review(owner, repo):
         return render_template("send-email-review.html",
                 view="send-email", owner=owner, repo=repo,
                 readme=readme, emails=emails,
-                start=git_repo.get(start_commit),
-                end=git_repo.get(end_commit),
+                start=start,
+                end=tip,
                 cover_letter=bool(cover_letter),
                 cover_letter_subject=cover_letter_subject)
 
diff --git a/gitsrht/templates/send-email-review.html b/gitsrht/templates/send-email-review.html
index 53b8554..54af33c 100644
--- a/gitsrht/templates/send-email-review.html
+++ b/gitsrht/templates/send-email-review.html
@@ -3,7 +3,7 @@
 {% block title %}
 <title>Review patchset for {{repo.owner.canonical_name}}/{{repo.name}} - {{cfg("sr.ht", "site-name")}} git</title>
 {% endblock %}
-{% block body %} 
+{% block body %}
 <div class="header-tabbed">
   <div class="container">
     <ul class="nav nav-tabs">
@@ -95,7 +95,7 @@
     <pre
       style="margin-bottom: 0;"
     >git config format.subjectPrefix "{{repo.name}}" <span class="text-muted"># Only necessary once</span>
-git send-email {% if cover_letter %}--cover-letter {% endif %}{{start.short_id}}^..{{end.short_id}}</pre>
+git send-email {% if cover_letter %}--cover-letter {% endif %}{% if start.parent_ids %}{{start.short_id}}^..{% else %}--root {% endif %}{{end.short_id}}</pre>
   </div>
   <div class="event-list">
     {% for email in emails %}
-- 
2.38.4