Fossil

Diff
Login

Diff

Differences From Artifact [edd173e24d]:

To Artifact [8127c2c609]:


268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289




290
291
292
293
294
295
296
297
298


299


300
301
302
303
304
305
306
              ";\n"
              "grid-template-areas: \""
              "mrgBaseLn mrgBase mrgBaseSep "
              "mrgLocalLn mrgLocal mrgLocalSep "
              "mrgMILn mrgMI mrgMISep "
              "mrgResLn mrgRes\";\n"
              "}\n", -1);
#define DA(N) blob_append(p,"td." # N " {grid-area: " # N "}\n", -1)
  DA(mrgBaseLn);
  DA(mrgBase);
  DA(mrgBaseSep);
  DA(mrgLocalLn);
  DA(mrgLocal);
  DA(mrgLocalSep);
  DA(mrgMILn);
  DA(mrgMI);
  DA(mrgMISep);
  DA(mrgResLn);
  DA(mrgRes);
#undef DA
  blob_append(p, "</style>\n", -1);
}





/*
** The HTML counterpart of merge_info_tk().
*/
static void merge_info_html(int bBrowser,  /* 0=HTML only, no browser */
                            int bDark,     /* use dark mode */
                            int bAll,      /* All changes, not just merged content */
                            int nContext   /* Diff context lines */){
  Blob out = empty_blob;





  blob_append(&out, diff_webpage_header(bDark), -1);
  merge_info_html_css(&out);

  if( g.argc==2 ){
    /* No files named on the command-line.  Use every file mentioned
    ** in the MERGESTAT table to generate the file list. */
    Stmt q;







|
|
|
|
|
|
|
|
|
|
|
|
|


>
>
>
>









>
>

>
>







268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
              ";\n"
              "grid-template-areas: \""
              "mrgBaseLn mrgBase mrgBaseSep "
              "mrgLocalLn mrgLocal mrgLocalSep "
              "mrgMILn mrgMI mrgMISep "
              "mrgResLn mrgRes\";\n"
              "}\n", -1);
#define GA(N) blob_append(p,"td." # N " {grid-area: " # N "}\n", -1)
  GA(mrgBaseLn);
  GA(mrgBase);
  GA(mrgBaseSep);
  GA(mrgLocalLn);
  GA(mrgLocal);
  GA(mrgLocalSep);
  GA(mrgMILn);
  GA(mrgMI);
  GA(mrgMISep);
  GA(mrgResLn);
  GA(mrgRes);
#undef GA
  blob_append(p, "</style>\n", -1);
}

/*static void merge_info_html_one(MergeBuilderHtml *pB, Blob *pOut,
                                const char *zOp, const char *zFile){
}*/

/*
** The HTML counterpart of merge_info_tk().
*/
static void merge_info_html(int bBrowser,  /* 0=HTML only, no browser */
                            int bDark,     /* use dark mode */
                            int bAll,      /* All changes, not just merged content */
                            int nContext   /* Diff context lines */){
  Blob out = empty_blob;
  MergeBuilderHtml mbh;
  MergeBuilder * mb = &mbh.base;

  mergebuilder_init_html(&mbh);
  mb->nContext = nContext;
  blob_append(&out, diff_webpage_header(bDark), -1);
  merge_info_html_css(&out);

  if( g.argc==2 ){
    /* No files named on the command-line.  Use every file mentioned
    ** in the MERGESTAT table to generate the file list. */
    Stmt q;
350
351
352
353
354
355
356

357
358
359
360
361
362
363
    blob_append(&out, "</ul>\n", 6);
  }

  blob_append(&out, diff_webpage_footer(), -1);
  blob_append_char(&out, '\n');
  blob_write_to_file(&out, "-");
  blob_reset(&out);

}

/*
** COMMAND: merge-info
**
** Usage: %fossil merge-info [OPTIONS]
**







>







358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
    blob_append(&out, "</ul>\n", 6);
  }

  blob_append(&out, diff_webpage_footer(), -1);
  blob_append_char(&out, '\n');
  blob_write_to_file(&out, "-");
  blob_reset(&out);
  mb->xDestroy(mb);
}

/*
** COMMAND: merge-info
**
** Usage: %fossil merge-info [OPTIONS]
**