line-range.c: remove implicit dependency on the_index

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/blame.c b/builtin/blame.c
index c2da673ac802b02609d54de3932fa8a2db221dbd..97632828db99610470c6f6f7d83cd8b073c2f9dc 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1001,7 +1001,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                long bottom, top;
                if (parse_range_arg(range_list.items[range_i].string,
                                    nth_line_cb, &sb, lno, anchor,
                long bottom, top;
                if (parse_range_arg(range_list.items[range_i].string,
                                    nth_line_cb, &sb, lno, anchor,

-                                   &bottom, &top, sb.path))
+                                   &bottom, &top, sb.path, &the_index))

                        usage(blame_usage);
                if ((!lno && (top || bottom)) || lno < bottom)
                        die(Q_("file %s has only %lu line",
                        usage(blame_usage);
                if ((!lno && (top || bottom)) || lno < bottom)
                        die(Q_("file %s has only %lu line",

diff --git a/line-log.c b/line-log.c
index 35adf199a5d8741b4a11bf9d6d20450274aaa04d..d1d429d73818cf4ef47b3e9e64c1e39489200be5 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -574,7 +574,7 @@ parse_lines(struct repository *r, struct commit *commit,
                long begin = 0, end = 0;
                long anchor;
 
                long begin = 0, end = 0;
                long anchor;
 

-               name_part = skip_range_arg(item->string);
+               name_part = skip_range_arg(item->string, r->index);

                if (!name_part || *name_part != ':' || !name_part[1])
                        die("-L argument not 'start,end:file' or ':funcname:file': %s",
                            item->string);
                if (!name_part || *name_part != ':' || !name_part[1])
                        die("-L argument not 'start,end:file' or ':funcname:file': %s",
                            item->string);


@@ -599,7 +599,7 @@ parse_lines(struct repository *r, struct commit *commit,
 
                if (parse_range_arg(range_part, nth_line, &cb_data,
                                    lines, anchor, &begin, &end,
 
                if (parse_range_arg(range_part, nth_line, &cb_data,
                                    lines, anchor, &begin, &end,

-                                   full_name))
+                                   full_name, r->index))

                        die("malformed -L argument '%s'", range_part);
                if ((!lines && (begin || end)) || lines < begin)
                        die("file %s has only %lu lines", name_part, lines);
                        die("malformed -L argument '%s'", range_part);
                if ((!lines && (begin || end)) || lines < begin)
                        die("file %s has only %lu lines", name_part, lines);

diff --git a/line-range.c b/line-range.c
index 7fa0d8bba55ba7e1cc0281aa4c2e0ed57d958eec..9b50583dc05147fb6940c1d551ba274702704f07 100644 (file)
--- a/line-range.c
+++ b/line-range.c
@@ -163,9 +163,10 @@ static const char *find_funcname_matching_regexp(xdemitconf_t *xecfg, const char
        }
 }
 
        }
 }
 

-static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_cb,
-                                       void *cb_data, long lines, long anchor, long *begin, long *end,
-                                       const char *path)
+static const char *parse_range_funcname(
+       const char *arg, nth_line_fn_t nth_line_cb,
+       void *cb_data, long lines, long anchor, long *begin, long *end,
+       const char *path, struct index_state *istate)

 {
        char *pattern;
        const char *term;
 {
        char *pattern;
        const char *term;


@@ -198,7 +199,7 @@ static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_
        anchor--; /* input is in human terms */
        start = nth_line_cb(cb_data, anchor);
 
        anchor--; /* input is in human terms */
        start = nth_line_cb(cb_data, anchor);
 

-       drv = userdiff_find_by_path(&the_index, path);
+       drv = userdiff_find_by_path(istate, path);

        if (drv && drv->funcname.pattern) {
                const struct userdiff_funcname *pe = &drv->funcname;
                xecfg = xcalloc(1, sizeof(*xecfg));
        if (drv && drv->funcname.pattern) {
                const struct userdiff_funcname *pe = &drv->funcname;
                xecfg = xcalloc(1, sizeof(*xecfg));


@@ -244,7 +245,8 @@ static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_
 
 int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
                    void *cb_data, long lines, long anchor,
 
 int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
                    void *cb_data, long lines, long anchor,

-                   long *begin, long *end, const char *path)
+                   long *begin, long *end,
+                   const char *path, struct index_state *istate)

 {
        *begin = *end = 0;
 
 {
        *begin = *end = 0;
 


@@ -254,7 +256,9 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
                anchor = lines + 1;
 
        if (*arg == ':' || (*arg == '^' && *(arg + 1) == ':')) {
                anchor = lines + 1;
 
        if (*arg == ':' || (*arg == '^' && *(arg + 1) == ':')) {

-               arg = parse_range_funcname(arg, nth_line_cb, cb_data, lines, anchor, begin, end, path);
+               arg = parse_range_funcname(arg, nth_line_cb, cb_data,
+                                          lines, anchor, begin, end,
+                                          path, istate);

                if (!arg || *arg)
                        return -1;
                return 0;
                if (!arg || *arg)
                        return -1;
                return 0;


@@ -275,10 +279,12 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
        return 0;
 }
 
        return 0;
 }
 

-const char *skip_range_arg(const char *arg)
+const char *skip_range_arg(const char *arg, struct index_state *istate)

 {
        if (*arg == ':' || (*arg == '^' && *(arg + 1) == ':'))
 {
        if (*arg == ':' || (*arg == '^' && *(arg + 1) == ':'))

-               return parse_range_funcname(arg, NULL, NULL, 0, 0, NULL, NULL, NULL);
+               return parse_range_funcname(arg, NULL, NULL,
+                                           0, 0, NULL, NULL,
+                                           NULL, istate);

 
        arg = parse_loc(arg, NULL, NULL, 0, -1, NULL);
 
 
        arg = parse_loc(arg, NULL, NULL, 0, -1, NULL);
 

diff --git a/line-range.h b/line-range.h
index d3c54e45aa8a8e488778bbc7db1c6a5c0f602ab2..e69bf7c01765bba0b54a7a4174706f1258e0fdb0 100644 (file)
--- a/line-range.h
+++ b/line-range.h
@@ -1,6 +1,8 @@
 #ifndef LINE_RANGE_H
 #define LINE_RANGE_H
 
 #ifndef LINE_RANGE_H
 #define LINE_RANGE_H
 

+struct index_state;
+

 /*
  * Parse one item in an -L begin,end option w.r.t. the notional file
  * object 'cb_data' consisting of 'lines' lines.
 /*
  * Parse one item in an -L begin,end option w.r.t. the notional file
  * object 'cb_data' consisting of 'lines' lines.


@@ -23,7 +25,7 @@ int parse_range_arg(const char *arg,
                    nth_line_fn_t nth_line_cb,
                    void *cb_data, long lines, long anchor,
                    long *begin, long *end,
                    nth_line_fn_t nth_line_cb,
                    void *cb_data, long lines, long anchor,
                    long *begin, long *end,

-                   const char *path);
+                   const char *path, struct index_state *istate);

 
 /*
  * Scan past a range argument that could be parsed by
 
 /*
  * Scan past a range argument that could be parsed by


@@ -34,6 +36,6 @@ int parse_range_arg(const char *arg,
  * NULL in case the argument is obviously malformed.
  */
 
  * NULL in case the argument is obviously malformed.
  */
 

-const char *skip_range_arg(const char *arg);
+const char *skip_range_arg(const char *arg, struct index_state *istate);

 
 #endif /* LINE_RANGE_H */
 
 #endif /* LINE_RANGE_H */