git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH/RFC 08/10] ref-filter: introduce remote_ref_atom_parser()

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Dec 13, 2015, 00:53 UTC
Message-ID
<CAPig+cQrTvDQdCiJGLs8iFj2nS1RvtzbSrDRBpx500JRsAiEtQ@mail.gmail.com>
In-Reply-To
<1447271075-15364-9-git-send-email-Karthik.188@gmail.com>
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak <karthik.188@gmail.com> wrote:
Show 17 quoted lines
> Introduce remote_ref_atom_parser() which will parse the '%(upstream)'
> and '%(push)' atoms and store information into the 'used_atom'
> structure based on the modifiers used along with the corresponding
> atom.
>
> Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
> ---
> diff --git a/ref-filter.c b/ref-filter.c
> @@ -37,6 +37,11 @@ static struct used_atom {
>         union {
>                 const char *color;
>                 struct align align;
> +               struct {
> +                       unsigned int shorten : 1,
> +                               track : 1,
> +                               trackshort : 1;
> +               } remote_ref;

Are 'shorten', 'track', and 'trackshort' mutually exclusive? If so, a simple enum would be clearer than bitfields:

    union {
        const char *color;
        struct align align;
        enum { RR_PLAIN, RR_SHORTEN, RR_TRACK, RR_TRACKSHORT }
            remote_ref;
    };
Or something.
Show 20 quoted lines
>         } u;
>  } *used_atom;
>  static int used_atom_cnt, need_tagged, need_symref;
> @@ -69,6 +74,24 @@ void color_atom_parser(struct used_atom *atom)
> +void remote_ref_atom_parser(struct used_atom *atom)
> +{
> +       const char *buf;
> +
> +       buf = strchr(atom->str, ':');
> +       if (!buf)
> +               return;
> +       buf++;
> +       if (!strcmp(buf, "short"))
> +               atom->u.remote_ref.shorten = 1;
> +       else if (!strcmp(buf, "track"))
> +               atom->u.remote_ref.track = 1;
> +       else if (!strcmp(buf, "trackshort"))
> +               atom->u.remote_ref.trackshort = 1;
> +       else
> +               die(_("improper format entered align:%s"), buf);
"align:"? Also, how about a more grammatically-friendly error message?
Show 22 quoted lines
> +}
> +
> @@ -838,6 +861,42 @@ static inline char *copy_advance(char *dst, const char *src)
> +static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
> +                                   struct branch *branch, const char **s)
> +{
> +       int num_ours, num_theirs;
> +       if (atom->u.remote_ref.shorten)
> +               *s = shorten_unambiguous_ref(refname, warn_ambiguous_refs);
> +       else if (atom->u.remote_ref.track) {
> +               if (stat_tracking_info(branch, &num_ours,
> +                                      &num_theirs, NULL))
> +                       return;
> +               if (!num_ours && !num_theirs)
> +                       *s = "";
> +               else if (!num_ours)
> +                       *s = xstrfmt("[behind %d]", num_theirs);
> +               else if (!num_theirs)
> +                       *s = xstrfmt("[ahead %d]", num_ours);
> +               else
> +                       *s = xstrfmt("[ahead %d, behind %d]",
> +                                    num_ours, num_theirs);
Tangent: These xstrfmt()'d strings are getting leaked, right? Is that
something that we need to worry about (if, for instance, a repository
contains a lot of tracking refs)? Should there be a NEEDSWORK comment
here regarding the issue?
Show 30 quoted lines
> +       } else if (atom->u.remote_ref.trackshort) {
> +               if (stat_tracking_info(branch, &num_ours,
> +                                      &num_theirs, NULL))
> +                       return;
> +
> +               if (!num_ours && !num_theirs)
> +                       *s = "=";
> +               else if (!num_ours)
> +                       *s = "<";
> +               else if (!num_theirs)
> +                       *s = ">";
> +               else
> +                       *s = "<>";
> +       } else
> +               *s = refname;
> +}
> +
>  /*
>   * Parse the object referred by ref, and grab needed value.
>   */
> @@ -948,49 +1011,11 @@ static void populate_value(struct ref_array_item *ref)
>
>                 formatp = strchr(name, ':');
>                 if (formatp) {
> -                       int num_ours, num_theirs;
> -
>                         formatp++;
>                         if (!strcmp(formatp, "short"))
>                                 refname = shorten_unambiguous_ref(refname,
>                                                       warn_ambiguous_refs);
Is this duplicating work already done by fill_remote_ref_details()?
Show 43 quoted lines
> -                       else if (!strcmp(formatp, "track") &&
> -                                (starts_with(name, "upstream") ||
> -                                 starts_with(name, "push"))) {
> -
> -                               if (stat_tracking_info(branch, &num_ours,
> -                                                      &num_theirs, NULL))
> -                                       continue;
> -
> -                               if (!num_ours && !num_theirs)
> -                                       v->s = "";
> -                               else if (!num_ours)
> -                                       v->s = xstrfmt("[behind %d]", num_theirs);
> -                               else if (!num_theirs)
> -                                       v->s = xstrfmt("[ahead %d]", num_ours);
> -                               else
> -                                       v->s = xstrfmt("[ahead %d, behind %d]",
> -                                                      num_ours, num_theirs);
> -                               continue;
> -                       } else if (!strcmp(formatp, "trackshort") &&
> -                                  (starts_with(name, "upstream") ||
> -                                   starts_with(name, "push"))) {
> -                               assert(branch);
> -
> -                               if (stat_tracking_info(branch, &num_ours,
> -                                                       &num_theirs, NULL))
> -                                       continue;
> -
> -                               if (!num_ours && !num_theirs)
> -                                       v->s = "=";
> -                               else if (!num_ours)
> -                                       v->s = "<";
> -                               else if (!num_theirs)
> -                                       v->s = ">";
> -                               else
> -                                       v->s = "<>";
> -                               continue;
> -                       } else
> +                       else
>                                 die("unknown %.*s format %s",
>                                     (int)(formatp - name), name, formatp);
>                 }
> --
> 2.6.2
Previous: Karthik NayakNext: Karthik Nayak
Message 29 of 50 in “ref-filter: use parsing functions”
  1. 00/10 ref-filter: use parsing functionsKarthik Nayak, Nov 11, 2015
  2. 01/10 ref-filter: introduce a parsing function for each atom in valid_atomKarthik Nayak, Nov 11, 2015
  3. Eric SunshineNov 23, 2015
  4. Karthik NayakNov 25, 2015
  5. Eric SunshineNov 25, 2015
  6. Karthik NayakNov 26, 2015
  7. Junio C HamanoDec 11, 2015
  8. Karthik NayakDec 12, 2015
  9. 02/10 ref-filter: introduce struct used_atomKarthik Nayak, Nov 11, 2015
  10. Eric SunshineDec 1, 2015
  11. 03/10 ref-fitler: bump match_atom() name to the topKarthik Nayak, Nov 11, 2015
  12. 04/10 ref-filter: skip deref specifier in match_atom_name()Karthik Nayak, Nov 11, 2015
  13. Eric SunshineDec 1, 2015
  14. Karthik NayakDec 3, 2015
  15. 05/10 ref-filter: introduce color_atom_parser()Karthik Nayak, Nov 11, 2015
  16. Eric SunshineDec 1, 2015
  17. Karthik NayakDec 3, 2015
  18. Eric SunshineDec 13, 2015
  19. Karthik NayakDec 13, 2015
  20. 06/10 strbuf: introduce strbuf_split_str_without_term()Karthik Nayak, Nov 11, 2015
  21. Eric SunshineDec 2, 2015
  22. Karthik NayakDec 3, 2015
  23. Junio C HamanoDec 11, 2015
  24. Karthik NayakDec 12, 2015
  25. 07/10 ref-filter: introduce align_atom_parser()Karthik Nayak, Nov 11, 2015
  26. Eric SunshineDec 2, 2015
  27. Karthik NayakDec 7, 2015
  28. 08/10 ref-filter: introduce remote_ref_atom_parser()Karthik Nayak, Nov 11, 2015
  29. Eric SunshineDec 13, 2015
  30. Karthik NayakDec 13, 2015
  31. Eric SunshineDec 13, 2015
  32. Karthik NayakDec 13, 2015
  33. Eric SunshineDec 13, 2015
  34. Karthik NayakDec 13, 2015
  35. 09/10 ref-filter: introduce contents_atom_parser()Karthik Nayak, Nov 11, 2015
  36. Eric SunshineDec 13, 2015
  37. Eric SunshineDec 13, 2015
  38. Karthik NayakDec 13, 2015
  39. Karthik NayakDec 13, 2015
  40. Jeff KingNov 24, 2015
  41. Karthik NayakNov 25, 2015
  42. 10/10 ref-filter: introduce objectname_atom_parser()Karthik Nayak, Nov 25, 2015
  43. Eric SunshineDec 13, 2015
  44. Karthik NayakDec 13, 2015
  45. Junio C HamanoDec 11, 2015
  46. Eric SunshineDec 13, 2015
  47. Karthik NayakDec 13, 2015
  48. Eric SunshineDec 13, 2015
  49. Karthik NayakDec 16, 2015
  50. Junio C HamanoDec 14, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.