Add firstPatchLine to IMailMetadata

Track the first patch line from patch email so it can be used on the
commit comment.

Signed-off-by: Chris. Webster <chris@webstech.net>

Author: webstech

lib/github-glue.ts

@@ -190,12 +190,13 @@ export class GitHubGlue {
      * @param {pullRequestKeyInfo} pullRequest - the Pull Request to comment on
      * @param {string} commit the hash of the commit to comment on
      * @param {string} comment the comment
+     * @param {number} line the comment is referencing
      * @returns the comment ID and the URL to the comment
      */
     public async addPRCommitComment(pullRequest: pullRequestKeyInfo,
                                     commit: string,
                                     gitWorkDir: string | undefined,
-                                    comment: string):
+                                    comment: string, line?: number | undefined):
         Promise<{id: number; url: string}> {
         const prKey = getPullRequestKey(pullRequest);
 
@@ -210,7 +211,7 @@ export class GitHubGlue {
             body: comment,
             commit_id: commit,
             path,
-            line: 1,
+            line: line || 1,
             ...prKey
         });
         return {

lib/mail-archive-helper.ts

@@ -145,6 +145,7 @@ export class MailArchiveGitHelper {
                 let pullRequestURL: string | undefined;
                 let originalCommit: string | undefined;
                 let issueCommentId: number | undefined;
+                let firstPatchLine: number | undefined;
                 for (const reference of parsed.references.filter(seen)) {
                     const data = await this.gggNotes.get<IMailMetadata>(reference);
                     if (data && data.pullRequestURL) {
@@ -157,6 +158,7 @@ export class MailArchiveGitHelper {
                             (!issueCommentId && data.issueCommentId)) {
                             pullRequestURL = data.pullRequestURL;
                             issueCommentId = data.issueCommentId;
+                            firstPatchLine = data.firstPatchLine;
                             originalCommit = commit;
                         }
                     }
@@ -182,7 +184,7 @@ export class MailArchiveGitHelper {
                 } else if (originalCommit) {
                     try {
                         const result = await this.githubGlue.addPRCommitComment(pullRequestURL, originalCommit,
-                                                this.gggNotes.workDir, fullComment);
+                                                this.gggNotes.workDir, fullComment, firstPatchLine);
                         issueCommentId = result.id;
                     } catch (error) {
                         const regarding = `${header.slice(0,-3)}, regarding ${originalCommit}:\n\n`;

lib/mail-metadata.ts

@@ -4,4 +4,5 @@ export interface IMailMetadata {
     issueCommentId?: number;
     originalCommit?: string;
     commitInGitGit?: string;
+    firstPatchLine?: number;
 }

lib/patch-series.ts

@@ -823,20 +823,26 @@ export class PatchSeries {
             const messageID = mail.match(/\nMessage-ID: <(.*?)>\n/i);
             if (messageID) {
                 let originalCommit: string | undefined;
+                let firstPatchLine: number | undefined;
                 if (isCoverLetter) {
                     isCoverLetter = false;
                 } else {
                     const commitMatch = mail.match(/^From ([0-9a-f]{40}) /);
                     if (commitMatch) {
                         originalCommit = commitMatch[1];
                     }
+                    const revLine = mail.match(/\n@@ -(\d+),/);
+                    if (revLine) {
+                        firstPatchLine = parseInt(revLine[1], 10);
+                    }
                 }
 
                 const mid = messageID[1];
                 const mailMeta = {
                     messageID: mid,
                     originalCommit,
                     pullRequestURL: this.metadata.pullRequestURL,
+                    firstPatchLine
                 } as IMailMetadata;
                 await this.notes.set(mid, mailMeta, true);
                 if (globalOptions && originalCommit &&