change: decode and print {,un}solve order conflicts

laumann

Jun 28, 2023, 6:33 AM

O7XAUFM6CCSFXSBTGOMVHRUQFJEWPO6YLNO52OT3AZ4GYN6JJONAC

Dependencies

• [2] 2YF4J5SJ change: decode and print file undel
• [*] JAGXXSR7 change: initial work on decoding hunks
• [*] 55SITR55 change: decode replacements
• [*] JVU3TTT5 all: switch away from typedefing anonymous structs
• [*] ZKAOPMCH change: Implement decoding of edits, atoms, positions, among others
• [*] Q7TKZCJP Add initial support for reading the offsets from a (fixed) change
• [*] 33ZXTRXR change: decode and print file deletions

Change contents

• edit in hunk.h at line 64
  [5.49]

  [6.899]
  + };

  +

  + struct solveorderconflict {

  + struct atom change;

  + struct local local;

  + };

  +

  + struct unsolveorderconflict {

  + struct atom change;

  + struct local local;
• edit in hunk.h at line 85
  [6.1115]

  [7.417]
  + struct solveorderconflict solveorderconflict;

  + struct unsolveorderconflict unsolveorderconflict;
• edit in change.c at line 366
  [2.407]

  [9.344]
  + );

  + break;

  + case SOLVE_ORDER_CONFLICT:

  + change_decode_atom(

  + binstat, &bhunk->solveorderconflict.change

  + );

  + change_decode_local(

  + binstat, &bhunk->solveorderconflict.local

  + );

  + break;

  + case UNSOLVE_ORDER_CONFLICT:

  + change_decode_atom(

  + binstat, &bhunk->unsolveorderconflict.change

  + );

  + change_decode_local(

  + binstat, &bhunk->unsolveorderconflict.local
• edit in change.c at line 745
  [9.438]

  [9.438]
  + break;

  + }

  + case SOLVE_ORDER_CONFLICT: {

  + struct solveorderconflict *s =

  + &hunk->solveorderconflict;

  + printf(" in %s:%lu\n", s->local.path, s->local.line);

  + break;

  + }

  + case UNSOLVE_ORDER_CONFLICT: {

  + struct unsolveorderconflict *s =

  + &hunk->unsolveorderconflict;

  + printf(" in %s:%lu\n", s->local.path, s->local.line);