ident: move commit_rewrite_person() to ident.c

commit_rewrite_person() and rewrite_ident_line() are static functions
defined in revision.c.

Their usages are as follows:
- commit_rewrite_person() takes a commit buffer and replaces the author
  and committer idents with their canonical versions using the mailmap
  mechanism
- rewrite_ident_line() takes author/committer header lines from the
  commit buffer and replaces the idents with their canonical versions
  using the mailmap mechanism.

This patch moves commit_rewrite_person() and rewrite_ident_line() to
ident.c which contains many other functions related to idents like
split_ident_line(). By moving commit_rewrite_person() to ident.c, we
also intend to use it in git-cat-file to replace committer and author
idents from the headers to their canonical versions using the mailmap
mechanism. The function is moved as is for now to make it clear that
there are no other changes, but it will be renamed in a following
commit.

Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: John Cai <johncai86@gmail.com>
Signed-off-by: Siddharth Asthana <siddharthasthana31@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index ac5ab4ef9d341088d2b7a0aa5052e982197cf574..16a08aada297516dceb234493c5405d86d0a90d1 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1688,6 +1688,12 @@ struct ident_split {
  */
 int split_ident_line(struct ident_split *, const char *, int);
 
+/*
+ * Given a commit object buffer and the commit headers, replaces the idents
+ * in the headers with their canonical versions using the mailmap mechanism.
+ */
+void commit_rewrite_person(struct strbuf *, const char **, struct string_list *);
+
 /*
  * Compare split idents for equality or strict ordering. Note that we
  * compare only the ident part of the line, ignoring any timestamp.

diff --git a/ident.c b/ident.c
index 89ca5b47008ee50749744914dd80a009d9adcaff..1eee4fd0e36c184992abe027ef20d2c5d6e0ef2c 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -8,6 +8,7 @@
 #include "cache.h"
 #include "config.h"
 #include "date.h"
+#include "mailmap.h"
 
 static struct strbuf git_default_name = STRBUF_INIT;
 static struct strbuf git_default_email = STRBUF_INIT;
@@ -346,6 +347,79 @@ person_only:
        return 0;
 }
 
+/*
+ * Returns the difference between the new and old length of the ident line.
+ */
+static ssize_t rewrite_ident_line(const char *person, size_t len,
+                                  struct strbuf *buf,
+                                  struct string_list *mailmap)
+{
+       size_t namelen, maillen;
+       const char *name;
+       const char *mail;
+       struct ident_split ident;
+
+       if (split_ident_line(&ident, person, len))
+               return 0;
+
+       mail = ident.mail_begin;
+       maillen = ident.mail_end - ident.mail_begin;
+       name = ident.name_begin;
+       namelen = ident.name_end - ident.name_begin;
+
+       if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
+               struct strbuf namemail = STRBUF_INIT;
+               size_t newlen;
+
+               strbuf_addf(&namemail, "%.*s <%.*s>",
+                           (int)namelen, name, (int)maillen, mail);
+
+               strbuf_splice(buf, ident.name_begin - buf->buf,
+                             ident.mail_end - ident.name_begin + 1,
+                             namemail.buf, namemail.len);
+               newlen = namemail.len;
+
+               strbuf_release(&namemail);
+
+               return newlen - (ident.mail_end - ident.name_begin);
+       }
+
+       return 0;
+}
+
+void commit_rewrite_person(struct strbuf *buf, const char **header,
+                           struct string_list *mailmap)
+{
+       size_t buf_offset = 0;
+
+       if (!mailmap)
+               return;
+
+       for (;;) {
+               const char *person, *line;
+               size_t i;
+               int found_header = 0;
+
+               line = buf->buf + buf_offset;
+               if (!*line || *line == '\n')
+                       return; /* End of headers */
+
+               for (i = 0; header[i]; i++)
+                       if (skip_prefix(line, header[i], &person)) {
+                               const char *endp = strchrnul(person, '\n');
+                               found_header = 1;
+                               buf_offset += endp - line;
+                               buf_offset += rewrite_ident_line(person, endp - person, buf, mailmap);
+                               break;
+                       }
+
+               if (!found_header) {
+                       buf_offset = strchrnul(line, '\n') - buf->buf;
+                       if (buf->buf[buf_offset] == '\n')
+                               buf_offset++;
+               }
+       }
+}
 
 static void ident_env_hint(enum want_ident whose_ident)
 {

diff --git a/revision.c b/revision.c
index 3418a1b7f182ec4128c36df5ef571cd4e56cd678..14dca903b6ae95356c5646c63864702dc8bd82dd 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -3755,80 +3755,6 @@ int rewrite_parents(struct rev_info *revs, struct commit *commit,
        return 0;
 }
 
-/*
- * Returns the difference between the new and old length of the ident line.
- */
-static ssize_t rewrite_ident_line(const char *person, size_t len,
-                                  struct strbuf *buf,
-                                  struct string_list *mailmap)
-{
-       size_t namelen, maillen;
-       const char *name;
-       const char *mail;
-       struct ident_split ident;
-
-       if (split_ident_line(&ident, person, len))
-               return 0;
-
-       mail = ident.mail_begin;
-       maillen = ident.mail_end - ident.mail_begin;
-       name = ident.name_begin;
-       namelen = ident.name_end - ident.name_begin;
-
-       if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
-               struct strbuf namemail = STRBUF_INIT;
-               size_t newlen;
-
-               strbuf_addf(&namemail, "%.*s <%.*s>",
-                           (int)namelen, name, (int)maillen, mail);
-
-               strbuf_splice(buf, ident.name_begin - buf->buf,
-                             ident.mail_end - ident.name_begin + 1,
-                             namemail.buf, namemail.len);
-               newlen = namemail.len;
-
-               strbuf_release(&namemail);
-
-               return newlen - (ident.mail_end - ident.name_begin);
-       }
-
-       return 0;
-}
-
-static void commit_rewrite_person(struct strbuf *buf, const char **header,
-                                  struct string_list *mailmap)
-{
-       size_t buf_offset = 0;
-
-       if (!mailmap)
-               return;
-
-       for (;;) {
-               const char *person, *line;
-               size_t i;
-               int found_header = 0;
-
-               line = buf->buf + buf_offset;
-               if (!*line || *line == '\n')
-                       return; /* End of headers */
-
-               for (i = 0; header[i]; i++)
-                       if (skip_prefix(line, header[i], &person)) {
-                               const char *endp = strchrnul(person, '\n');
-                               found_header = 1;
-                               buf_offset += endp - line;
-                               buf_offset += rewrite_ident_line(person, endp - person, buf, mailmap);
-                               break;
-                       }
-
-               if (!found_header) {
-                       buf_offset = strchrnul(line, '\n') - buf->buf;
-                       if (buf->buf[buf_offset] == '\n')
-                               buf_offset++;
-               }
-       }
-}
-
 static int commit_match(struct commit *commit, struct rev_info *opt)
 {
        int retval;