laumann/ani - Change EHVLRMEF6YK5FRIV5V7V6P5RHJPCYKMSW5OVKDXLUEWHEM624FBAC

change: add vertexeq, fix deleted lines duplication

When looking through all the edges for contents that has been deleted, we may encounter the same vertex referenced by edge->to. This can result in some deleted text being printed multiple times, if we don't take care to deduplicate it.

This change introduces vertexeq() that compares vertices by hash, start and end positions. This is used to keep track of the last vertex we encountered and compare it to the current one we're inspecting.

The new "check2" target in Makefile prints a change that has multiple edits and replacements, and one file addition.

Created by laumann on July 13, 2023

EHVLRMEF6YK5FRIV5V7V6P5RHJPCYKMSW5OVKDXLUEWHEM624FBAC

Dependencies

In channels

main

Change contents

Insertion in vertex.h at line 40 [5.33]

[4.246]

[5.624]


int vertexeq(struct vertex *v1, struct vertex *v2);

File addition: vertex.c (----------)

[6.1]

#include <stdint.h>
#include <stddef.h>
#include "common.h"
#include "hash.h"
#include "vertex.h"
int
vertexeq(struct vertex *v1, struct vertex *v2)
{
	return hasheq(&v1->change, &v2->change) && v1->start == v2->start &&
	       v1->end == v2->end;
}

Insertion in meson.build at line 30 [7.36]
[7.346]
[8.1399]
```
  'vertex.c',
```
Insertion in hash.c at line 38 [9.360]
[3.739]
[3.739]
```
/* Return 1 if hashes are equal, 0 otherwise */
```
Insertion in change.c at line 568 [10.1047]
[3.2157]
[3.2157]
```
	struct vertex *vto = NULL;
```

Replacement in change.c at line 590 [10.1047]

B:BD[3.2651] → [3.2651:2953]

			// FIXME: need to keep track of current! see
			// /home/t/sources/pijul/pijul/libpijul/src/changestore/filesystem.rs (get_contents_ext)
			size_t z = edge->to.end - edge->to.start;
			/* TODO loop over the edges, extract relevant contents from the changestore */
			// keep track of current vertex

[3.2651]

[3.2953]

			if (vto && vertexeq(&edge->to, vto))
				continue;
			vto = &edge->to;
			size_t z = vto->end - vto->start;

Replacement in change.c at line 595 [10.1047]

B:BD[3.2954] → [3.2954:3153]

			ch = changestoreget(changes, &edge->to.change);
			/* printf("changestoreget("); */
			/* hashprint(&edge->to.change); */
			/* printf(")"); */
			/* printf(" - %s\n", ch ? "ok" : "fail :-("); */

[3.2954]

[3.3153]

			ch = changestoreget(changes, &vto->change);

Replacement in change.c at line 602 [10.1047]
B:BD[3.3345] → [3.3345:3360]
```
				if (buf) {
```
[3.3345]
[3.3360]
```
				if (buf)
```
Replacement in change.c at line 606 [10.1047]
B:BD[3.3425] → [3.3425:3438]
```
				} else {
```
[3.3425]
[3.3438]
```
				else
```

Replacement in change.c at line 608 [10.1047]

B:BD[3.3479] → [3.3479:3552]

				}
				memcpy(&buf[sz], &ch->contents[edge->to.start],
				       z);

[3.3479]

[3.3552]

				memcpy(&buf[sz], &ch->contents[vto->start], z);

Replacement in change.c at line 714 [10.1047]
B:BD[3.5033] → [3.5033:5044]
```
		if (res)
```
[3.5033]
[3.5044]
```
		if (res) {
```
Insertion in change.c at line 716 [10.1047]
[3.5075]
[11.962]
```
			free(res);
		}
```

Insertion in Makefile at line 53 [13.458]

[12.82]

[2.13]

check2: build
	build/ani change YM2LC6QP2D7TK3JUKOXWUWTQEGMCEGQDGPTOZPWC3BRDFNRKSZWQC # this one has file additions

change: add vertexeq, fix deleted lines duplication

Dependencies

In channels

Change contents

Insertion in vertex.h at line 40 [5.33]

File addition: vertex.c (----------)

Insertion in meson.build at line 30 [7.36]

Insertion in hash.c at line 38 [9.360]

Insertion in change.c at line 568 [10.1047]

Replacement in change.c at line 590 [10.1047]

Replacement in change.c at line 595 [10.1047]

Replacement in change.c at line 602 [10.1047]

Replacement in change.c at line 606 [10.1047]

Replacement in change.c at line 608 [10.1047]

Replacement in change.c at line 714 [10.1047]

Insertion in change.c at line 716 [10.1047]

Insertion in Makefile at line 53 [13.458]