Browser: pass line number to editor when editting the merge.

We calculate which line in the file the cursor is on and
pass that to the editor with "+N".

The calculation doesn't seem quite right sometimes, but
it is close.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/merge2.c b/merge2.c
index bcb8ccb5cac141d404f7f3d43750c0fcc5477b28..2404e7b9c96c0a463b78ffb5a5dc2259dd46c104 100644 (file)
--- a/merge2.c
+++ b/merge2.c
@@ -24,6 +24,7 @@
  */
 
 #include "wiggle.h"
+#include <limits.h>
 
 /*
  * Second attempt at merging....
@@ -611,19 +612,31 @@ struct ci make_merger(struct file af, struct file bf, struct file cf,
        return rv;
 }
 
-static void printrange(FILE *out, struct file *f, int start, int len)
+static int printrange(FILE *out, struct file *f, int start, int len,
+                     int offset)
 {
+       int lines = 0;
        while (len > 0) {
-               printword(out, f->list[start]);
+               struct elmnt e = f->list[start];
+               printword(out, e);
+               if (e.start[e.plen-1] == '\n' &&
+                   offset > 0)
+                       lines++;
+               offset--;
                start++;
                len--;
        }
+       return lines;
 }
 
-void print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
-                     int words, struct merge *merger)
+int print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
+               int words, struct merge *merger,
+               struct merge *mpos, int streampos, int offsetpos)
 {
        struct merge *m;
+       int lineno = 1;
+       int rv = 0;
+       int offset = INT_MAX;
 
        for (m = merger; m->type != End ; m++) {
                struct merge *cm;
@@ -651,9 +664,13 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
                                st = m->hi;
                        st1 = st;
 
+                       if (m == mpos)
+                               offset = offsetpos;
                        if (m->in_conflict == 1 && m->type == Unchanged)
-                               printrange(out, a, m->a+m->lo, m->hi - m->lo);
+                               lineno += printrange(out, a, m->a+m->lo, m->hi - m->lo, offset - m->lo);
 
+                       if (m == mpos)
+                               rv = lineno;
                        if (do_trace)
                                for (cm = m; cm->in_conflict; cm++) {
                                        printf("{%s: %d-%d,%d-%d,%d-%d%s(%d,%d)}\n",
@@ -680,47 +697,73 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
                        }
 
                        fputs(words ? "<<<---" : "<<<<<<< found\n", out);
+                       if (!words)
+                               lineno++;
                        for (cm = m; cm->in_conflict; cm++) {
+                               if (cm == mpos && streampos == 0)
+                                       offset = offsetpos;
                                if (cm->type == Conflict)
                                        found_conflict = 1;
                                if (cm->in_conflict == 1 && cm != m) {
-                                       printrange(out, a, cm->a, cm->lo);
+                                       lineno += printrange(out, a, cm->a, cm->lo, offset);
                                        break;
                                }
-                               printrange(out, a, cm->a+st1, cm->al-st1);
+                               lineno += printrange(out, a, cm->a+st1, cm->al-st1, offset-st1);
                                st1 = 0;
+                               if (cm == mpos && streampos == 0)
+                                       rv = lineno;
                        }
+                       if (cm == mpos && streampos == 0)
+                               rv = lineno;
                        fputs(words ? "|||" : "||||||| expected\n", out);
+                       if (!words)
+                               lineno++;
                        st1 = st;
                        for (cm = m; cm->in_conflict; cm++) {
+                               if (cm == mpos && streampos == 1)
+                                       offset = offsetpos;
                                if (cm->in_conflict == 1 && cm != m) {
-                                       printrange(out, a, cm->a, cm->lo);
+                                       lineno += printrange(out, a, cm->a, cm->lo, offset);
                                        break;
                                }
-                               printrange(out, b, cm->b+st1, cm->bl-st1);
+                               lineno += printrange(out, b, cm->b+st1, cm->bl-st1, offset-st1);
                                st1 = 0;
+                               if (cm == mpos && streampos == 1)
+                                       rv = lineno;
                        }
+                       if (cm == mpos && streampos == 1)
+                               rv = lineno;
                        fputs(words ? "===" : "=======\n", out);
+                       if (!words)
+                               lineno++;
                        st1 = st;
                        for (cm = m; cm->in_conflict; cm++) {
+                               if (cm == mpos && streampos == 2)
+                                       offset = offsetpos;
                                if (cm->in_conflict == 1 && cm != m) {
                                        if (cm->type == Unchanged)
-                                               printrange(out, a, cm->a, cm->lo);
+                                               lineno += printrange(out, a, cm->a, cm->lo, offset);
                                        else
-                                               printrange(out, c, cm->c, cm->cl);
+                                               lineno += printrange(out, c, cm->c, cm->cl, offset);
                                        break;
                                }
                                if (cm->type == Changed)
                                        st1 = 0; /* All of result of change must be printed */
-                               printrange(out, c, cm->c+st1, cm->cl-st1);
+                               lineno += printrange(out, c, cm->c+st1, cm->cl-st1, offset-st1);
                                st1 = 0;
+                               if (cm == mpos && streampos == 2)
+                                       rv = lineno;
                        }
+                       if (cm == mpos && streampos == 2)
+                               rv = lineno;
                        if (!found_conflict) {
                                /* This section was wiggled in successfully,
                                 * but full conflict display was requested.
                                 * So now print out the wiggled result as well.
                                 */
                                fputs(words ? "&&&" : "&&&&&&& resolution\n", out);
+                               if (!words)
+                                       lineno++;
                                st1 = st;
                                for (cm = m; cm->in_conflict; cm++) {
                                        int last = 0;
@@ -730,14 +773,14 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
                                        case Unchanged:
                                        case AlreadyApplied:
                                        case Unmatched:
-                                               printrange(out, a, cm->a+st1,
-                                                          last ? cm->lo : cm->al-st1);
+                                               lineno += printrange(out, a, cm->a+st1,
+                                                                    last ? cm->lo : cm->al-st1, offset-st1);
                                                break;
                                        case Extraneous:
                                                break;
                                        case Changed:
-                                               printrange(out, c, cm->c,
-                                                          last ? cm->lo : cm->cl);
+                                               lineno += printrange(out, c, cm->c,
+                                                                    last ? cm->lo : cm->cl, offset);
                                                break;
                                        case Conflict:
                                        case End:
@@ -749,11 +792,17 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
                                }
                        }
                        fputs(words ? "--->>>" : ">>>>>>> replacement\n", out);
+                       if (!words)
+                               lineno++;
                        m = cm;
                        if (m->in_conflict == 1 && m[1].in_conflict == 0) {
                                /* End of a conflict, no conflict follows */
+                               if (m == mpos)
+                                       offset = offsetpos;
                                if (m->type == Unchanged)
-                                       printrange(out, a, m->a+m->lo, m->hi-m->lo);
+                                       lineno += printrange(out, a, m->a+m->lo, m->hi-m->lo, offset-m->lo);
+                               if (m == mpos)
+                                       rv = lineno;
                                m++;
                        }
                }
@@ -778,23 +827,28 @@ void print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
                               m->in_conflict ? " in_conflict" : "",
                               m->lo, m->hi);
                }
+               if (m == mpos)
+                       offset = offsetpos;
 
                switch (m->type) {
                case Unchanged:
                case AlreadyApplied:
                case Unmatched:
-                       printrange(out, a, m->a, m->al);
+                       lineno += printrange(out, a, m->a, m->al, offset);
                        break;
                case Extraneous:
                        break;
                case Changed:
-                       printrange(out, c, m->c, m->cl);
+                       lineno += printrange(out, c, m->c, m->cl, offset);
                        break;
                case Conflict:
                case End:
                        assert(0);
                }
+               if (m == mpos)
+                       rv = lineno;
        }
+       return rv;
 }
 
 int save_merge(struct file a, struct file b, struct file c,
@@ -805,6 +859,7 @@ int save_merge(struct file a, struct file b, struct file c,
        int fd;
        FILE *outfile;
        int err = 0;
+       int lineno = 0;
        strcpy(replacename, file);
        strcat(replacename, "XXXXXX");
        strcpy(orignew, file);
@@ -812,11 +867,12 @@ int save_merge(struct file a, struct file b, struct file c,
 
        fd = mkstemp(replacename);
        if (fd < 0) {
-               err = 1;
+               err = -1;
                goto out;
        }
        outfile = fdopen(fd, "w");
-       print_merge(outfile, &a, &b, &c, 0, merger);
+       lineno = print_merge(outfile, &a, &b, &c, 0, merger,
+                            NULL, 0, 0);
        fclose(outfile);
        if (backup && rename(file, orignew) != 0)
                err = -2;
@@ -826,15 +882,17 @@ int save_merge(struct file a, struct file b, struct file c,
 out:
        free(replacename);
        free(orignew);
-       return err;
+       return err < 0 ? err : lineno;
 }
 
 int save_tmp_merge(struct file a, struct file b, struct file c,
-                  struct merge *merger, char **filep)
+                  struct merge *merger, char **filep,
+                  struct merge *mpos, int streampos, int offsetpos)
 {
        int fd;
        FILE *outfile;
        char *dir, *fname;
+       int lineno;
 
        dir = getenv("TMPDIR");
        if (!dir)
@@ -848,8 +906,9 @@ int save_tmp_merge(struct file a, struct file b, struct file c,
                return -1;
        }
        outfile = fdopen(fd, "w");
-       print_merge(outfile, &a, &b, &c, 0, merger);
+       lineno = print_merge(outfile, &a, &b, &c, 0, merger,
+                            mpos, streampos, offsetpos);
        fclose(outfile);
        *filep = fname;
-       return 0;
+       return lineno;
 }

diff --git a/vpatch.c b/vpatch.c
index 310d3998080d72a35c564ccfc02542581b880f2c..3d528038c270f59e3e43831c3f78b333302d8fba 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -1256,16 +1256,18 @@ static char *toggle_ignore[] = {
        NULL
 };
 
-static void do_edit(char *file)
+static void do_edit(char *file, int line)
 {
        char *ed = getenv("VISUAL");
+       char linebuf[20];
        if (!ed)
                ed = getenv("EDITOR");
        if (!ed)
                ed = "/usr/bin/edit";
+       snprintf(linebuf, sizeof(linebuf), "+%d", line);
        switch(fork()) {
        case 0:
-               execlp(ed, ed, file, NULL);
+               execlp(ed, ed, linebuf, file, NULL);
                exit(2);
        case -1:
                break;
@@ -1325,6 +1327,7 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace,
                tmeta;
        int num = -1,     /* numeric arg being typed. */
                tnum;
+       int lineno;
        int changes = 0; /* If any edits have been made to the merge */
        int answer;     /* answer to 'save changes?' question */
        int do_mark;
@@ -1835,11 +1838,14 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace,
                                mesg = "Cannot run editor when diffing";
                                break;
                        }
-                       save_tmp_merge(fm, fb, fa, ci.merger,
-                                      &tempname);
+                       lineno = save_tmp_merge(fm, fb, fa, ci.merger,
+                                               &tempname,
+                                               ci.merger + pos.p.m,
+                                               pos.p.s,
+                                               pos.p.o);
                        endwin();
                        free_stuff();
-                       do_edit(tempname);
+                       do_edit(tempname, lineno);
                        sp = load_file(tempname);
                        split_merge(sp, &sm, &sb, &sa);
                        free(sp.body);

diff --git a/wiggle.c b/wiggle.c
index 44263034c6eca66fc98328356a79af32eb17b649..fe71d495865b8bec8a1f7abb0c7f69a7f9abb13d 100644 (file)
--- a/wiggle.c
+++ b/wiggle.c
@@ -567,7 +567,7 @@ static int do_merge(int argc, char *argv[], int obj, int blanks,
        ci = make_merger(fl[0], fl[1], fl[2], csl1, csl2,
                         obj == 'w', ignore, show_wiggles > 1);
        print_merge(outfile, &fl[0], &fl[1], &fl[2],
-                   obj == 'w', ci.merger);
+                   obj == 'w', ci.merger, NULL, 0, 0);
        if (!quiet && ci.conflicts)
                fprintf(stderr,
                        "%d unresolved conflict%s found\n",

diff --git a/wiggle.h b/wiggle.h
index 71c601c533eaf9880ecde1ced0b2fb66e731b8de..1795c5a56ac5cdf07eab63e4dec102159e497e01 100644 (file)
--- a/wiggle.h
+++ b/wiggle.h
@@ -166,14 +166,16 @@ struct ci {
        int conflicts, wiggles, ignored;
        struct merge *merger;
 };
-extern void print_merge(FILE *out,
-                       struct file *a, struct file *b, struct file *c,
-                       int words, struct merge *merger);
+extern int print_merge(FILE *out,
+                      struct file *a, struct file *b, struct file *c,
+                      int words, struct merge *merger,
+                      struct merge *mpos, int streampos, int offsetpos);
 extern void printword(FILE *f, struct elmnt e);
 extern int save_merge(struct file a, struct file b, struct file c,
                      struct merge *merger, char *file, int backup);
 extern int save_tmp_merge(struct file a, struct file b, struct file c,
-                         struct merge *merger, char **filep);
+                         struct merge *merger, char **filep,
+                         struct merge *mpos, int streampos, int offsetpos);
 
 extern int isolate_conflicts(struct file af, struct file bf, struct file cf,
                             struct csl *csl1, struct csl *csl2, int words,