laumann/ani - Change 2LYNPDBTIKRIG2MJSCNGFW3Y2CBWCQMYWGR4PUEVB3G3TCCPMCPQC

change: decode and print solve/unsolve name conflicts

Created by laumann on July 3, 2023

2LYNPDBTIKRIG2MJSCNGFW3Y2CBWCQMYWGR4PUEVB3G3TCCPMCPQC

Dependencies

In channels

main

Change contents

Insertion in hunk.h at line 74 [4.664]

[2.150]

[3.899]

};
struct solvenameconflict {
	struct atom name;
	str path;
};
struct unsolvenameconflict {
	struct atom name;
	str path;

Insertion in hunk.h at line 97 [4.664]

[2.251]

[5.417]

		struct solvenameconflict solvenameconflict;
		struct unsolvenameconflict unsolvenameconflict;

Insertion in change.c at line 382 [7.1047]

[2.640]

[6.344]

			);
			break;
		case SOLVE_NAME_CONFLICT:
			change_decode_atom(
				binstat, &bhunk->solvenameconflict.name
			);
			slen = bincode_getu64(binstat);
			bhunk->solvenameconflict.path =
				bincode_getstr(binstat, slen);
			break;
		case UNSOLVE_NAME_CONFLICT:
			change_decode_atom(
				binstat, &bhunk->unsolvenameconflict.name

Insertion in change.c at line 396 [7.1047]

[6.350]

[8.442]

			slen = bincode_getu64(binstat);
			bhunk->unsolvenameconflict.path =
				bincode_getstr(binstat, slen);

Insertion in change.c at line 773 [7.1047]

[2.981]

[6.438]

			break;
		}
		case SOLVE_NAME_CONFLICT: {
			struct solvenameconflict *s = &hunk->solvenameconflict;
			/* FIXME: get  */
			printf(" in %s\n", s->path);
			break;
		}
		case UNSOLVE_NAME_CONFLICT: {
			struct unsolvenameconflict *s =
				&hunk->unsolvenameconflict;
			printf(" in %s\n", s->path);