workdir.c 51.8 KB
Newer Older
1 2
#include "clar_libgit2.h"
#include "diff_helpers.h"
3
#include "repository.h"
4
#include "git2/sys/diff.h"
5

6 7 8 9
static git_repository *g_repo = NULL;

void test_diff_workdir__cleanup(void)
{
10
	cl_git_sandbox_cleanup();
11 12 13 14
}

void test_diff_workdir__to_index(void)
{
15
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
16
	git_diff *diff = NULL;
17
	diff_expects exp;
Russell Belfer committed
18
	int use_iterator;
19

20 21
	g_repo = cl_git_sandbox_init("status");

22 23 24 25
	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;

26
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
27

Russell Belfer committed
28 29 30 31 32
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
33
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
34 35
		else
			cl_git_pass(git_diff_foreach(
36
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
37 38 39 40 41 42 43 44 45

		/* to generate these values:
		 * - cd to tests/resources/status,
		 * - mv .gitted .git
		 * - git diff --name-status
		 * - git diff
		 * - mv .git .gitted
		 */
		cl_assert_equal_i(13, exp.files);
46 47 48 49 50
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]);
Russell Belfer committed
51 52 53 54 55 56 57

		cl_assert_equal_i(8, exp.hunks);

		cl_assert_equal_i(14, exp.lines);
		cl_assert_equal_i(5, exp.line_ctxt);
		cl_assert_equal_i(4, exp.line_adds);
		cl_assert_equal_i(5, exp.line_dels);
58
	}
59

60 61 62
	{
		git_diff_perfdata perf = GIT_DIFF_PERFDATA_INIT;
		cl_git_pass(git_diff_get_perfdata(&perf, diff));
63
		cl_assert_equal_sz(
64 65
			13 /* in root */ + 3 /* in subdir */, perf.stat_calls);
		cl_assert_equal_sz(5, perf.oid_calculations);
Russell Belfer committed
66
	}
67

68
	git_diff_free(diff);
69 70
}

71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
void test_diff_workdir__to_index_with_assume_unchanged(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	git_diff *diff = NULL;
	git_index *idx = NULL;
	diff_expects exp;
	const git_index_entry *iep;
	git_index_entry ie;

	g_repo = cl_git_sandbox_init("status");

	/* do initial diff */

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
	cl_assert_equal_i(8, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
	git_diff_free(diff);

	/* mark a couple of entries with ASSUME_UNCHANGED */

	cl_git_pass(git_repository_index(&idx, g_repo));

	cl_assert((iep = git_index_get_bypath(idx, "modified_file", 0)) != NULL);
	memcpy(&ie, iep, sizeof(ie));
	ie.flags |= GIT_IDXENTRY_VALID;
	cl_git_pass(git_index_add(idx, &ie));

	cl_assert((iep = git_index_get_bypath(idx, "file_deleted", 0)) != NULL);
	memcpy(&ie, iep, sizeof(ie));
	ie.flags |= GIT_IDXENTRY_VALID;
	cl_git_pass(git_index_add(idx, &ie));

	cl_git_pass(git_index_write(idx));
	git_index_free(idx);

	/* redo diff and see that entries are skipped */

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
	cl_assert_equal_i(6, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(3, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]);
	git_diff_free(diff);

}

125 126 127 128 129
void test_diff_workdir__to_tree(void)
{
	/* grabbed a couple of commit oids from the history of the attr repo */
	const char *a_commit = "26a125ee1bf"; /* the current HEAD */
	const char *b_commit = "0017bd4ab1ec3"; /* the start */
130
	git_tree *a, *b;
131
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
132 133
	git_diff *diff = NULL;
	git_diff *diff2 = NULL;
134
	diff_expects exp;
Russell Belfer committed
135
	int use_iterator;
136

137 138 139 140 141
	g_repo = cl_git_sandbox_init("status");

	a = resolve_commit_oid_to_tree(g_repo, a_commit);
	b = resolve_commit_oid_to_tree(g_repo, b_commit);

142 143 144 145
	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;

146
	/* You can't really generate the equivalent of git_diff_tree_to_workdir()
147 148 149 150 151 152 153 154 155
	 * using C git.  It really wants to interpose the index into the diff.
	 *
	 * To validate the following results with command line git, I ran the
	 * following:
	 * - git ls-tree 26a125
	 * - find . ! -path ./.git/\* -a -type f | git hash-object --stdin-paths
	 * The results are documented at the bottom of this file in the
	 * long comment entitled "PREPARATION OF TEST DATA".
	 */
156
	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));
157

Russell Belfer committed
158 159
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
160

Russell Belfer committed
161 162
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
163
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
164 165
		else
			cl_git_pass(git_diff_foreach(
166
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
167 168

		cl_assert_equal_i(14, exp.files);
169 170 171 172 173
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(5, exp.file_status[GIT_DELTA_UNTRACKED]);
Russell Belfer committed
174
	}
175 176 177 178 179 180

	/* Since there is no git diff equivalent, let's just assume that the
	 * text diffs produced by git_diff_foreach are accurate here.  We will
	 * do more apples-to-apples test comparison below.
	 */

181
	git_diff_free(diff);
182 183 184 185 186 187 188
	diff = NULL;
	memset(&exp, 0, sizeof(exp));

	/* This is a compatible emulation of "git diff <sha>" which looks like
	 * a workdir to tree diff (even though it is not really).  This is what
	 * you would get from "git diff --name-status 26a125ee1bf"
	 */
189 190
	cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts));
	cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts));
191
	cl_git_pass(git_diff_merge(diff, diff2));
192
	git_diff_free(diff2);
193

Russell Belfer committed
194 195 196 197 198
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
199
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
200 201
		else
			cl_git_pass(git_diff_foreach(
202
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
203

Russell Belfer committed
204
		cl_assert_equal_i(15, exp.files);
205 206 207 208 209
		cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(5, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]);
210

Russell Belfer committed
211
		cl_assert_equal_i(11, exp.hunks);
212

Russell Belfer committed
213 214 215 216 217
		cl_assert_equal_i(17, exp.lines);
		cl_assert_equal_i(4, exp.line_ctxt);
		cl_assert_equal_i(8, exp.line_adds);
		cl_assert_equal_i(5, exp.line_dels);
	}
218

219
	git_diff_free(diff);
220 221 222 223 224 225
	diff = NULL;
	memset(&exp, 0, sizeof(exp));

	/* Again, emulating "git diff <sha>" for testing purposes using
	 * "git diff --name-status 0017bd4ab1ec3" instead.
	 */
226 227
	cl_git_pass(git_diff_tree_to_index(&diff, g_repo, b, NULL, &opts));
	cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts));
228
	cl_git_pass(git_diff_merge(diff, diff2));
229
	git_diff_free(diff2);
230

Russell Belfer committed
231 232
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
233

Russell Belfer committed
234 235
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
236
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
237 238
		else
			cl_git_pass(git_diff_foreach(
239
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
240

Russell Belfer committed
241
		cl_assert_equal_i(16, exp.files);
242 243 244 245 246
		cl_assert_equal_i(5, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]);
247

Russell Belfer committed
248 249 250 251 252 253 254
		cl_assert_equal_i(12, exp.hunks);

		cl_assert_equal_i(19, exp.lines);
		cl_assert_equal_i(3, exp.line_ctxt);
		cl_assert_equal_i(12, exp.line_adds);
		cl_assert_equal_i(4, exp.line_dels);
	}
255

256
	git_diff_free(diff);
257

258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289
	/* Let's try that once more with a reversed diff */

	opts.flags |= GIT_DIFF_REVERSE;

	cl_git_pass(git_diff_tree_to_index(&diff, g_repo, b, NULL, &opts));
	cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts));
	cl_git_pass(git_diff_merge(diff, diff2));
	git_diff_free(diff2);

	memset(&exp, 0, sizeof(exp));

	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));

	cl_assert_equal_i(16, exp.files);
	cl_assert_equal_i(5, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]);

	cl_assert_equal_i(12, exp.hunks);

	cl_assert_equal_i(19, exp.lines);
	cl_assert_equal_i(3, exp.line_ctxt);
	cl_assert_equal_i(12, exp.line_dels);
	cl_assert_equal_i(4, exp.line_adds);

	git_diff_free(diff);

	/* all done now */

290 291 292 293
	git_tree_free(a);
	git_tree_free(b);
}

294 295
void test_diff_workdir__to_index_with_pathspec(void)
{
296
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
297
	git_diff *diff = NULL;
298 299
	diff_expects exp;
	char *pathspec = NULL;
Russell Belfer committed
300
	int use_iterator;
301

302 303
	g_repo = cl_git_sandbox_init("status");

304 305 306 307 308 309
	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
	opts.pathspec.strings = &pathspec;
	opts.pathspec.count   = 1;

310
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
311

Russell Belfer committed
312 313 314 315 316
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
317
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
318
		else
319
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
320 321

		cl_assert_equal_i(13, exp.files);
322 323 324 325 326
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]);
Russell Belfer committed
327
	}
328

329
	git_diff_free(diff);
330 331 332

	pathspec = "modified_file";

333
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
334

Russell Belfer committed
335 336 337 338 339
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
340
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
341
		else
342
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
343 344

		cl_assert_equal_i(1, exp.files);
345 346 347 348 349
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]);
Russell Belfer committed
350
	}
351

352
	git_diff_free(diff);
353 354 355

	pathspec = "subdir";

356
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
357

Russell Belfer committed
358 359 360 361 362
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
363
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
364
		else
365
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
366 367

		cl_assert_equal_i(3, exp.files);
368 369 370 371 372
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]);
Russell Belfer committed
373
	}
374

375
	git_diff_free(diff);
376 377 378

	pathspec = "*_deleted";

379
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
380

Russell Belfer committed
381 382 383 384 385
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
386
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
387
		else
388
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
389 390

		cl_assert_equal_i(2, exp.files);
391 392 393 394 395
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]);
Russell Belfer committed
396
	}
397

398
	git_diff_free(diff);
399 400
}

401 402
void test_diff_workdir__filemode_changes(void)
{
403
	git_diff *diff = NULL;
404
	diff_expects exp;
Russell Belfer committed
405
	int use_iterator;
406 407 408 409 410 411

	if (!cl_is_chmod_supported())
		return;

	g_repo = cl_git_sandbox_init("issue_592");

412
	cl_repo_set_bool(g_repo, "core.filemode", true);
413 414 415

	/* test once with no mods */

416
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
417

Russell Belfer committed
418 419
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
420

Russell Belfer committed
421 422
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
423
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
424 425
		else
			cl_git_pass(git_diff_foreach(
426
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
427 428

		cl_assert_equal_i(0, exp.files);
429
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
430 431
		cl_assert_equal_i(0, exp.hunks);
	}
432

433
	git_diff_free(diff);
434 435 436 437 438

	/* chmod file and test again */

	cl_assert(cl_toggle_filemode("issue_592/a.txt"));

439
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
440

Russell Belfer committed
441 442
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
443

Russell Belfer committed
444 445
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
446
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
447 448
		else
			cl_git_pass(git_diff_foreach(
449
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
450 451

		cl_assert_equal_i(1, exp.files);
452
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
453 454
		cl_assert_equal_i(0, exp.hunks);
	}
455

456
	git_diff_free(diff);
457 458 459 460 461 462

	cl_assert(cl_toggle_filemode("issue_592/a.txt"));
}

void test_diff_workdir__filemode_changes_with_filemode_false(void)
{
463
	git_diff *diff = NULL;
464 465 466 467 468 469 470
	diff_expects exp;

	if (!cl_is_chmod_supported())
		return;

	g_repo = cl_git_sandbox_init("issue_592");

471
	cl_repo_set_bool(g_repo, "core.filemode", false);
472 473 474

	/* test once with no mods */

475
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
476 477 478

	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
479
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
480 481

	cl_assert_equal_i(0, exp.files);
482
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
483 484
	cl_assert_equal_i(0, exp.hunks);

485
	git_diff_free(diff);
486 487 488 489 490

	/* chmod file and test again */

	cl_assert(cl_toggle_filemode("issue_592/a.txt"));

491
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
492 493 494

	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
495
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
496 497

	cl_assert_equal_i(0, exp.files);
498
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
499 500
	cl_assert_equal_i(0, exp.hunks);

501
	git_diff_free(diff);
502 503 504 505

	cl_assert(cl_toggle_filemode("issue_592/a.txt"));
}

506 507
void test_diff_workdir__head_index_and_workdir_all_differ(void)
{
508
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
509
	git_diff *diff_i2t = NULL, *diff_w2i = NULL;
510 511 512
	diff_expects exp;
	char *pathspec = "staged_changes_modified_file";
	git_tree *tree;
Russell Belfer committed
513
	int use_iterator;
514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529

	/* For this file,
	 * - head->index diff has 1 line of context, 1 line of diff
	 * - index->workdir diff has 2 lines of context, 1 line of diff
	 * but
	 * - head->workdir diff has 1 line of context, 2 lines of diff
	 * Let's make sure the right one is returned from each fn.
	 */

	g_repo = cl_git_sandbox_init("status");

	tree = resolve_commit_oid_to_tree(g_repo, "26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f");

	opts.pathspec.strings = &pathspec;
	opts.pathspec.count   = 1;

530 531
	cl_git_pass(git_diff_tree_to_index(&diff_i2t, g_repo, tree, NULL, &opts));
	cl_git_pass(git_diff_index_to_workdir(&diff_w2i, g_repo, NULL, &opts));
532

Russell Belfer committed
533 534 535 536 537
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
538
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
539 540
		else
			cl_git_pass(git_diff_foreach(
541
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
542 543

		cl_assert_equal_i(1, exp.files);
544 545 546
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
547 548 549 550 551 552 553 554 555 556 557 558
		cl_assert_equal_i(1, exp.hunks);
		cl_assert_equal_i(2, exp.lines);
		cl_assert_equal_i(1, exp.line_ctxt);
		cl_assert_equal_i(1, exp.line_adds);
		cl_assert_equal_i(0, exp.line_dels);
	}

	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
559
				diff_w2i, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
560 561
		else
			cl_git_pass(git_diff_foreach(
562
				diff_w2i, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
563 564

		cl_assert_equal_i(1, exp.files);
565 566 567
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
568 569 570 571 572 573
		cl_assert_equal_i(1, exp.hunks);
		cl_assert_equal_i(3, exp.lines);
		cl_assert_equal_i(2, exp.line_ctxt);
		cl_assert_equal_i(1, exp.line_adds);
		cl_assert_equal_i(0, exp.line_dels);
	}
574 575 576

	cl_git_pass(git_diff_merge(diff_i2t, diff_w2i));

Russell Belfer committed
577 578 579 580 581
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
582
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
583 584
		else
			cl_git_pass(git_diff_foreach(
585
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
586 587

		cl_assert_equal_i(1, exp.files);
588 589 590
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
591 592 593 594 595 596
		cl_assert_equal_i(1, exp.hunks);
		cl_assert_equal_i(3, exp.lines);
		cl_assert_equal_i(1, exp.line_ctxt);
		cl_assert_equal_i(2, exp.line_adds);
		cl_assert_equal_i(0, exp.line_dels);
	}
597

598 599
	git_diff_free(diff_i2t);
	git_diff_free(diff_w2i);
Carlos Martín Nieto committed
600 601

	git_tree_free(tree);
602 603 604 605
}

void test_diff_workdir__eof_newline_changes(void)
{
606
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
607
	git_diff *diff = NULL;
608 609
	diff_expects exp;
	char *pathspec = "current_file";
Russell Belfer committed
610
	int use_iterator;
611 612 613 614 615 616

	g_repo = cl_git_sandbox_init("status");

	opts.pathspec.strings = &pathspec;
	opts.pathspec.count   = 1;

617
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
618

Russell Belfer committed
619 620 621 622 623
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
624
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
625 626
		else
			cl_git_pass(git_diff_foreach(
627
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
628 629

		cl_assert_equal_i(0, exp.files);
630 631 632
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
633 634 635 636 637 638
		cl_assert_equal_i(0, exp.hunks);
		cl_assert_equal_i(0, exp.lines);
		cl_assert_equal_i(0, exp.line_ctxt);
		cl_assert_equal_i(0, exp.line_adds);
		cl_assert_equal_i(0, exp.line_dels);
	}
639

640
	git_diff_free(diff);
641 642 643

	cl_git_append2file("status/current_file", "\n");

644
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
645

Russell Belfer committed
646 647 648 649 650
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
651
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
652 653
		else
			cl_git_pass(git_diff_foreach(
654
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
655 656

		cl_assert_equal_i(1, exp.files);
657 658 659
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
660 661 662 663 664 665
		cl_assert_equal_i(1, exp.hunks);
		cl_assert_equal_i(2, exp.lines);
		cl_assert_equal_i(1, exp.line_ctxt);
		cl_assert_equal_i(1, exp.line_adds);
		cl_assert_equal_i(0, exp.line_dels);
	}
666

667
	git_diff_free(diff);
668 669 670

	cl_git_rewritefile("status/current_file", "current_file");

671
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
672

Russell Belfer committed
673 674 675 676 677
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
678
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
679 680
		else
			cl_git_pass(git_diff_foreach(
681
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
682 683

		cl_assert_equal_i(1, exp.files);
684 685 686
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
687 688 689 690 691 692
		cl_assert_equal_i(1, exp.hunks);
		cl_assert_equal_i(3, exp.lines);
		cl_assert_equal_i(0, exp.line_ctxt);
		cl_assert_equal_i(1, exp.line_adds);
		cl_assert_equal_i(2, exp.line_dels);
	}
693

694
	git_diff_free(diff);
695 696
}

697 698
/* PREPARATION OF TEST DATA
 *
699
 * Since there is no command line equivalent of git_diff_tree_to_workdir,
700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758
 * it was a bit of a pain to confirm that I was getting the expected
 * results in the first part of this tests.  Here is what I ended up
 * doing to set my expectation for the file counts and results:
 *
 * Running "git ls-tree 26a125" and "git ls-tree aa27a6" shows:
 *
 *  A a0de7e0ac200c489c41c59dfa910154a70264e6e	current_file
 *  B 5452d32f1dd538eb0405e8a83cc185f79e25e80f	file_deleted
 *  C 452e4244b5d083ddf0460acf1ecc74db9dcfa11a	modified_file
 *  D 32504b727382542f9f089e24fddac5e78533e96c	staged_changes
 *  E 061d42a44cacde5726057b67558821d95db96f19	staged_changes_file_deleted
 *  F 70bd9443ada07063e7fbf0b3ff5c13f7494d89c2	staged_changes_modified_file
 *  G e9b9107f290627c04d097733a10055af941f6bca	staged_delete_file_deleted
 *  H dabc8af9bd6e9f5bbe96a176f1a24baf3d1f8916	staged_delete_modified_file
 *  I 53ace0d1cc1145a5f4fe4f78a186a60263190733	subdir/current_file
 *  J 1888c805345ba265b0ee9449b8877b6064592058	subdir/deleted_file
 *  K a6191982709b746d5650e93c2acf34ef74e11504	subdir/modified_file
 *  L e8ee89e15bbe9b20137715232387b3de5b28972e	subdir.txt
 *
 * --------
 *
 * find . ! -path ./.git/\* -a -type f | git hash-object --stdin-paths
 *
 *  A a0de7e0ac200c489c41c59dfa910154a70264e6e current_file
 *  M 6a79f808a9c6bc9531ac726c184bbcd9351ccf11 ignored_file
 *  C 0a539630525aca2e7bc84975958f92f10a64c9b6 modified_file
 *  N d4fa8600b4f37d7516bef4816ae2c64dbf029e3a new_file
 *  D 55d316c9ba708999f1918e9677d01dfcae69c6b9 staged_changes
 *  F 011c3440d5c596e21d836aa6d7b10eb581f68c49 staged_changes_modified_file
 *  H dabc8af9bd6e9f5bbe96a176f1a24baf3d1f8916 staged_delete_modified_file
 *  O 529a16e8e762d4acb7b9636ff540a00831f9155a staged_new_file
 *  P 8b090c06d14ffa09c4e880088ebad33893f921d1 staged_new_file_modified_file
 *  I 53ace0d1cc1145a5f4fe4f78a186a60263190733 subdir/current_file
 *  K 57274b75eeb5f36fd55527806d567b2240a20c57 subdir/modified_file
 *  Q 80a86a6931b91bc01c2dbf5ca55bdd24ad1ef466 subdir/new_file
 *  L e8ee89e15bbe9b20137715232387b3de5b28972e subdir.txt
 *
 * --------
 *
 *  A - current_file (UNMODIFIED) -> not in results
 *  B D file_deleted
 *  M I ignored_file (IGNORED)
 *  C M modified_file
 *  N U new_file (UNTRACKED)
 *  D M staged_changes
 *  E D staged_changes_file_deleted
 *  F M staged_changes_modified_file
 *  G D staged_delete_file_deleted
 *  H - staged_delete_modified_file (UNMODIFIED) -> not in results
 *  O U staged_new_file
 *  P U staged_new_file_modified_file
 *  I - subdir/current_file (UNMODIFIED) -> not in results
 *  J D subdir/deleted_file
 *  K M subdir/modified_file
 *  Q U subdir/new_file
 *  L - subdir.txt (UNMODIFIED) -> not in results
 *
 * Expect 13 files, 0 ADD, 4 DEL, 4 MOD, 1 IGN, 4 UNTR
 */
759 760 761 762 763 764 765


void test_diff_workdir__larger_hunks(void)
{
	const char *a_commit = "d70d245ed97ed2aa596dd1af6536e4bfdb047b69";
	const char *b_commit = "7a9e0b02e63179929fed24f0a3e0f19168114d10";
	git_tree *a, *b;
766
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
767
	size_t i, d, num_d, h, num_h, l, num_l;
768 769 770 771 772 773 774 775 776 777

	g_repo = cl_git_sandbox_init("diff");

	cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL);
	cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL);

	opts.context_lines = 1;
	opts.interhunk_lines = 0;

	for (i = 0; i <= 2; ++i) {
778 779
		git_diff *diff = NULL;
		git_patch *patch;
780 781
		const git_diff_hunk *hunk;
		const git_diff_line *line;
782 783 784 785

		/* okay, this is a bit silly, but oh well */
		switch (i) {
		case 0:
786
			cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
787 788
			break;
		case 1:
789
			cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));
790 791
			break;
		case 2:
792
			cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, b, &opts));
793 794 795
			break;
		}

796 797
		num_d = git_diff_num_deltas(diff);
		cl_assert_equal_i(2, (int)num_d);
798

799
		for (d = 0; d < num_d; ++d) {
Russell Belfer committed
800
			cl_git_pass(git_patch_from_diff(&patch, diff, d));
801
			cl_assert(patch);
802

803
			num_h = git_patch_num_hunks(patch);
804
			for (h = 0; h < num_h; h++) {
805
				cl_git_pass(git_patch_get_hunk(&hunk, &num_l, patch, h));
806

807
				for (l = 0; l < num_l; ++l) {
808 809
					cl_git_pass(
						git_patch_get_line_in_hunk(&line, patch, h, l));
810
					cl_assert(line);
811 812
				}

813
				/* confirm fail after the last item */
814 815
				cl_git_fail(
					git_patch_get_line_in_hunk(&line, patch, h, num_l));
816 817
			}

818
			/* confirm fail after the last item */
819
			cl_git_fail(git_patch_get_hunk(&hunk, &num_l, patch, num_h));
820

821
			git_patch_free(patch);
822
		}
823

824
		git_diff_free(diff);
825 826 827 828 829
	}

	git_tree_free(a);
	git_tree_free(b);
}
830 831 832

/* Set up a test that exercises this code. The easiest test using existing
 * test data is probably to create a sandbox of submod2 and then run a
833
 * git_diff_tree_to_workdir against tree
834 835 836 837 838 839 840 841 842 843 844 845 846 847
 * 873585b94bdeabccea991ea5e3ec1a277895b698. As for what you should actually
 * test, you can start by just checking that the number of lines of diff
 * content matches the actual output of git diff. That will at least
 * demonstrate that the submodule content is being used to generate somewhat
 * comparable outputs. It is a test that would fail without this code and
 * will succeed with it.
 */

#include "../submodule/submodule_helpers.h"

void test_diff_workdir__submodules(void)
{
	const char *a_commit = "873585b94bdeabccea991ea5e3ec1a277895b698";
	git_tree *a;
848
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
849
	git_diff *diff = NULL;
850 851
	diff_expects exp;

852
	g_repo = setup_fixture_submod2();
853 854 855 856 857

	a = resolve_commit_oid_to_tree(g_repo, a_commit);

	opts.flags =
		GIT_DIFF_INCLUDE_UNTRACKED |
858
		GIT_DIFF_INCLUDE_IGNORED |
859
		GIT_DIFF_RECURSE_UNTRACKED_DIRS |
Russell Belfer committed
860
		GIT_DIFF_SHOW_UNTRACKED_CONTENT;
861

862
	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));
863 864 865 866 867 868

	/* diff_print(stderr, diff); */

	/* essentially doing: git diff 873585b94bdeabccea991ea5e3ec1a277895b698 */

	memset(&exp, 0, sizeof(exp));
869

870
	cl_git_pass(git_diff_foreach(
871
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
872

873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888
	/* so "git diff 873585" returns:
	 *  M   .gitmodules
	 *  A   just_a_dir/contents
	 *  A   just_a_file
	 *  A   sm_added_and_uncommited
	 *  A   sm_changed_file
	 *  A   sm_changed_head
	 *  A   sm_changed_index
	 *  A   sm_changed_untracked_file
	 *  M   sm_missing_commits
	 *  A   sm_unchanged
	 * which is a little deceptive because of the difference between the
	 * "git diff <treeish>" results from "git_diff_tree_to_workdir".  The
	 * only significant difference is that those Added items will show up
	 * as Untracked items in the pure libgit2 diff.
	 *
889
	 * Then add in the two extra untracked items "not" and "not-submodule"
890
	 * to get the 12 files reported here.
891 892
	 */

893
	cl_assert_equal_i(12, exp.files);
894

895 896
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
897
	cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]);
898 899
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(10, exp.file_status[GIT_DELTA_UNTRACKED]);
900 901 902 903 904 905 906 907 908 909

	/* the following numbers match "git diff 873585" exactly */

	cl_assert_equal_i(9, exp.hunks);

	cl_assert_equal_i(33, exp.lines);
	cl_assert_equal_i(2, exp.line_ctxt);
	cl_assert_equal_i(30, exp.line_adds);
	cl_assert_equal_i(1, exp.line_dels);

910
	git_diff_free(diff);
911 912
	git_tree_free(a);
}
913 914 915

void test_diff_workdir__cannot_diff_against_a_bare_repository(void)
{
916
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
917
	git_diff *diff = NULL;
918 919 920 921
	git_tree *tree;

	g_repo = cl_git_sandbox_init("testrepo.git");

922
	cl_assert_equal_i(
923
		GIT_EBAREREPO, git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
924 925

	cl_git_pass(git_repository_head_tree(&tree, g_repo));
926 927

	cl_assert_equal_i(
928
		GIT_EBAREREPO, git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
929 930 931

	git_tree_free(tree);
}
932 933 934

void test_diff_workdir__to_null_tree(void)
{
935
	git_diff *diff;
936
	diff_expects exp;
937
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
938 939 940 941 942 943

	opts.flags = GIT_DIFF_INCLUDE_UNTRACKED |
		GIT_DIFF_RECURSE_UNTRACKED_DIRS;

	g_repo = cl_git_sandbox_init("status");

944
	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
945 946 947 948 949 950 951 952

	memset(&exp, 0, sizeof(exp));

	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));

	cl_assert_equal_i(exp.files, exp.file_status[GIT_DELTA_UNTRACKED]);

953
	git_diff_free(diff);
954
}
955 956 957

void test_diff_workdir__checks_options_version(void)
{
958
	git_diff *diff;
959 960 961 962 963 964
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	const git_error *err;

	g_repo = cl_git_sandbox_init("status");

	opts.version = 0;
965
	cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
966 967 968 969 970
	err = giterr_last();
	cl_assert_equal_i(GITERR_INVALID, err->klass);

	giterr_clear();
	opts.version = 1024;
971
	cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
972 973 974
	err = giterr_last();
	cl_assert_equal_i(GITERR_INVALID, err->klass);
}
975 976 977

void test_diff_workdir__can_diff_empty_file(void)
{
978
	git_diff *diff;
979 980 981
	git_tree *tree;
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	struct stat st;
982
	git_patch *patch;
983 984 985 986 987 988 989 990 991

	g_repo = cl_git_sandbox_init("attr_index");

	tree = resolve_commit_oid_to_tree(g_repo, "3812cfef3661"); /* HEAD */

	/* baseline - make sure there are no outstanding diffs */

	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
	cl_assert_equal_i(2, (int)git_diff_num_deltas(diff));
992
	git_diff_free(diff);
993 994 995 996 997 998 999 1000 1001 1002

	/* empty contents of file */

	cl_git_rewritefile("attr_index/README.txt", "");
	cl_git_pass(git_path_lstat("attr_index/README.txt", &st));
	cl_assert_equal_i(0, (int)st.st_size);

	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
	cl_assert_equal_i(3, (int)git_diff_num_deltas(diff));
	/* diffs are: .gitattributes, README.txt, sub/sub/.gitattributes */
Russell Belfer committed
1003
	cl_git_pass(git_patch_from_diff(&patch, diff, 1));
1004 1005
	git_patch_free(patch);
	git_diff_free(diff);
1006 1007 1008 1009 1010 1011 1012 1013

	/* remove a file altogether */

	cl_git_pass(p_unlink("attr_index/README.txt"));
	cl_assert(!git_path_exists("attr_index/README.txt"));

	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
	cl_assert_equal_i(3, (int)git_diff_num_deltas(diff));
Russell Belfer committed
1014
	cl_git_pass(git_patch_from_diff(&patch, diff, 1));
1015 1016
	git_patch_free(patch);
	git_diff_free(diff);
Vicent Marti committed
1017 1018

	git_tree_free(tree);
1019
}
1020 1021 1022 1023

void test_diff_workdir__to_index_issue_1397(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1024
	git_diff *diff = NULL;
1025 1026 1027 1028
	diff_expects exp;

	g_repo = cl_git_sandbox_init("issue_1397");

Russell Belfer committed
1029
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
1030 1031 1032 1033 1034 1035

	opts.context_lines = 3;
	opts.interhunk_lines = 1;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

Russell Belfer committed
1036 1037 1038
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1039

Russell Belfer committed
1040 1041 1042
	cl_assert_equal_i(0, exp.files);
	cl_assert_equal_i(0, exp.hunks);
	cl_assert_equal_i(0, exp.lines);
1043

1044
	git_diff_free(diff);
1045 1046
	diff = NULL;

Russell Belfer committed
1047 1048
	cl_git_rewritefile("issue_1397/crlf_file.txt",
		"first line\r\nsecond line modified\r\nboth with crlf");
1049 1050 1051

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

Russell Belfer committed
1052 1053 1054
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1055

Russell Belfer committed
1056 1057
	cl_assert_equal_i(1, exp.files);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
1058

Russell Belfer committed
1059
	cl_assert_equal_i(1, exp.hunks);
1060

Russell Belfer committed
1061 1062 1063 1064
	cl_assert_equal_i(5, exp.lines);
	cl_assert_equal_i(3, exp.line_ctxt);
	cl_assert_equal_i(1, exp.line_adds);
	cl_assert_equal_i(1, exp.line_dels);
1065

1066
	git_diff_free(diff);
1067 1068 1069 1070
}

void test_diff_workdir__to_tree_issue_1397(void)
{
Russell Belfer committed
1071
	const char *a_commit = "7f483a738"; /* the current HEAD */
1072 1073
	git_tree *a;
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1074 1075
	git_diff *diff = NULL;
	git_diff *diff2 = NULL;
1076 1077 1078 1079
	diff_expects exp;

	g_repo = cl_git_sandbox_init("issue_1397");

Russell Belfer committed
1080
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
1081 1082 1083 1084 1085 1086 1087 1088

	a = resolve_commit_oid_to_tree(g_repo, a_commit);

	opts.context_lines = 3;
	opts.interhunk_lines = 1;

	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));

Russell Belfer committed
1089 1090 1091
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1092

Russell Belfer committed
1093 1094 1095
	cl_assert_equal_i(0, exp.files);
	cl_assert_equal_i(0, exp.hunks);
	cl_assert_equal_i(0, exp.lines);
1096

1097
	git_diff_free(diff);
1098 1099 1100 1101 1102
	diff = NULL;

	cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts));
	cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts));
	cl_git_pass(git_diff_merge(diff, diff2));
1103
	git_diff_free(diff2);
1104

Russell Belfer committed
1105 1106 1107
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1108

Russell Belfer committed
1109 1110 1111
	cl_assert_equal_i(0, exp.files);
	cl_assert_equal_i(0, exp.hunks);
	cl_assert_equal_i(0, exp.lines);
1112

1113
	git_diff_free(diff);
1114 1115
	git_tree_free(a);
}
1116 1117 1118 1119

void test_diff_workdir__untracked_directory_scenarios(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1120
	git_diff *diff = NULL;
1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169
	diff_expects exp;
	char *pathspec = NULL;
	static const char *files0[] = {
		"subdir/deleted_file",
		"subdir/modified_file",
		"subdir/new_file",
		NULL
	};
	static const char *files1[] = {
		"subdir/deleted_file",
		"subdir/directory/",
		"subdir/modified_file",
		"subdir/new_file",
		NULL
	};
	static const char *files2[] = {
		"subdir/deleted_file",
		"subdir/directory/more/notignored",
		"subdir/modified_file",
		"subdir/new_file",
		NULL
	};

	g_repo = cl_git_sandbox_init("status");
	cl_git_mkfile("status/.gitignore", "ignored\n");

	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
	opts.pathspec.strings = &pathspec;
	opts.pathspec.count   = 1;
	pathspec = "subdir";

	/* baseline for "subdir" pathspec */

	memset(&exp, 0, sizeof(exp));
	exp.names = files0;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(3, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]);

1170
	git_diff_free(diff);
1171 1172 1173 1174 1175 1176 1177 1178

	/* empty directory */

	cl_git_pass(p_mkdir("status/subdir/directory", 0777));

	memset(&exp, 0, sizeof(exp));
	exp.names = files1;

1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(4, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]);

1190
	git_diff_free(diff);
1191 1192 1193 1194 1195 1196 1197 1198

	/* empty directory in empty directory */

	cl_git_pass(p_mkdir("status/subdir/directory/empty", 0777));

	memset(&exp, 0, sizeof(exp));
	exp.names = files1;

1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(4, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]);

1210
	git_diff_free(diff);
1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233

	/* directory with only ignored files */

	cl_git_pass(p_mkdir("status/subdir/directory/deeper", 0777));
	cl_git_mkfile("status/subdir/directory/deeper/ignored", "ignore me\n");

	cl_git_pass(p_mkdir("status/subdir/directory/another", 0777));
	cl_git_mkfile("status/subdir/directory/another/ignored", "ignore me\n");

	memset(&exp, 0, sizeof(exp));
	exp.names = files1;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(4, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]);

1234
	git_diff_free(diff);
1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256

	/* directory with ignored directory (contents irrelevant) */

	cl_git_pass(p_mkdir("status/subdir/directory/more", 0777));
	cl_git_pass(p_mkdir("status/subdir/directory/more/ignored", 0777));
	cl_git_mkfile("status/subdir/directory/more/ignored/notignored",
		"inside ignored dir\n");

	memset(&exp, 0, sizeof(exp));
	exp.names = files1;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(4, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]);

1257
	git_diff_free(diff);
1258 1259 1260

	/* quick version avoids directory scan */

Russell Belfer committed
1261
	opts.flags = opts.flags | GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS;
1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276

	memset(&exp, 0, sizeof(exp));
	exp.names = files1;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(4, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]);

1277
	git_diff_free(diff);
1278 1279 1280

	/* directory with nested non-ignored content */

Russell Belfer committed
1281
	opts.flags = opts.flags & ~GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS;
1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299

	cl_git_mkfile("status/subdir/directory/more/notignored",
		"not ignored deep under untracked\n");

	memset(&exp, 0, sizeof(exp));
	exp.names = files1;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(4, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]);

1300
	git_diff_free(diff);
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320

	/* use RECURSE_UNTRACKED_DIRS to get actual untracked files (no ignores) */

	opts.flags = opts.flags & ~GIT_DIFF_INCLUDE_IGNORED;
	opts.flags = opts.flags | GIT_DIFF_RECURSE_UNTRACKED_DIRS;

	memset(&exp, 0, sizeof(exp));
	exp.names = files2;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));

	cl_assert_equal_i(4, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]);

1321
	git_diff_free(diff);
1322
}
1323 1324 1325 1326 1327


void test_diff_workdir__untracked_directory_comes_last(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1328
	git_diff *diff = NULL;
1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345

	g_repo = cl_git_sandbox_init("renames");

	cl_git_mkfile("renames/.gitignore", "*.ign\n");
	cl_git_pass(p_mkdir("renames/zzz_untracked", 0777));
	cl_git_mkfile("renames/zzz_untracked/an.ign", "ignore me please");
	cl_git_mkfile("renames/zzz_untracked/skip.ign", "ignore me really");
	cl_git_mkfile("renames/zzz_untracked/test.ign", "ignore me now");

	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_assert(diff != NULL);

1346
	git_diff_free(diff);
1347
}
1348 1349 1350 1351

void test_diff_workdir__untracked_with_bom(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1352
	git_diff *diff = NULL;
1353 1354 1355 1356 1357 1358 1359 1360 1361
	const git_diff_delta *delta;

	g_repo = cl_git_sandbox_init("empty_standard_repo");
	cl_repo_set_bool(g_repo, "core.autocrlf", true);

	cl_git_write2file("empty_standard_repo/bom.txt",
		"\xFF\xFE\x31\x00\x32\x00\x33\x00\x34\x00", 10, O_WRONLY|O_CREAT, 0664);

	opts.flags =
Russell Belfer committed
1362
		GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_SHOW_UNTRACKED_CONTENT;
1363 1364 1365 1366

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_assert_equal_i(1, git_diff_num_deltas(diff));
Russell Belfer committed
1367
	cl_assert((delta = git_diff_get_delta(diff, 0)) != NULL);
1368
	cl_assert_equal_i(GIT_DELTA_UNTRACKED, delta->status);
Russell Belfer committed
1369 1370 1371 1372

	/* not known at this point
	 * cl_assert((delta->flags & GIT_DIFF_FLAG_BINARY) != 0);
	 */
1373

1374
	git_diff_free(diff);
1375
}
1376 1377 1378 1379 1380 1381 1382

void test_diff_workdir__patience_diff(void)
{
	git_index *index;
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	git_diff *diff = NULL;
	git_patch *patch = NULL;
Nicolas Hake committed
1383
	git_buf buf = GIT_BUF_INIT;
1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395
	const char *expected_normal = "diff --git a/test.txt b/test.txt\nindex 34a5acc..d52725f 100644\n--- a/test.txt\n+++ b/test.txt\n@@ -1,10 +1,7 @@\n When I wrote this\n I did not know\n-how to create\n-a patience diff\n I did not know\n how to create\n+a patience diff\n another problem\n-I did not know\n-how to create\n a minimal diff\n";
	const char *expected_patience = "diff --git a/test.txt b/test.txt\nindex 34a5acc..d52725f 100644\n--- a/test.txt\n+++ b/test.txt\n@@ -1,10 +1,7 @@\n When I wrote this\n I did not know\n+I did not know\n how to create\n a patience diff\n-I did not know\n-how to create\n another problem\n-I did not know\n-how to create\n a minimal diff\n";

	g_repo = cl_git_sandbox_init("empty_standard_repo");
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
	cl_git_pass(git_repository_index(&index, g_repo));

	cl_git_mkfile(
		"empty_standard_repo/test.txt",
		"When I wrote this\nI did not know\nhow to create\na patience diff\nI did not know\nhow to create\nanother problem\nI did not know\nhow to create\na minimal diff\n");
	cl_git_pass(git_index_add_bypath(index, "test.txt"));
	cl_repo_commit_from_index(NULL, g_repo, NULL, 1372350000, "Base");
1396
	git_index_free(index);
1397 1398 1399 1400 1401 1402 1403 1404

	cl_git_rewritefile(
		"empty_standard_repo/test.txt",
		"When I wrote this\nI did not know\nI did not know\nhow to create\na patience diff\nanother problem\na minimal diff\n");

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
	cl_assert_equal_i(1, git_diff_num_deltas(diff));
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
Nicolas Hake committed
1405
	cl_git_pass(git_patch_to_buf(&buf, patch));
1406

Nicolas Hake committed
1407 1408
	cl_assert_equal_s(expected_normal, buf.ptr);
	git_buf_clear(&buf);
1409 1410 1411 1412 1413 1414 1415 1416
	git_patch_free(patch);
	git_diff_free(diff);

	opts.flags |= GIT_DIFF_PATIENCE;

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
	cl_assert_equal_i(1, git_diff_num_deltas(diff));
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
Nicolas Hake committed
1417
	cl_git_pass(git_patch_to_buf(&buf, patch));
1418

Nicolas Hake committed
1419 1420 1421 1422
	cl_assert_equal_s(expected_patience, buf.ptr);
	git_buf_clear(&buf);

	git_buf_free(&buf);
1423 1424 1425
	git_patch_free(patch);
	git_diff_free(diff);
}
1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486

void test_diff_workdir__with_stale_index(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	git_diff *diff = NULL;
	git_index *idx = NULL;
	diff_expects exp;

	g_repo = cl_git_sandbox_init("status");
	cl_git_pass(git_repository_index(&idx, g_repo));

	/* make the in-memory index invalid */
	{
		git_repository *r2;
		git_index *idx2;
		cl_git_pass(git_repository_open(&r2, "status"));
		cl_git_pass(git_repository_index(&idx2, r2));
		cl_git_pass(git_index_add_bypath(idx2, "new_file"));
		cl_git_pass(git_index_add_bypath(idx2, "subdir/new_file"));
		cl_git_pass(git_index_remove_bypath(idx2, "staged_new_file"));
		cl_git_pass(git_index_remove_bypath(idx2, "staged_changes_file_deleted"));
		cl_git_pass(git_index_write(idx2));
		git_index_free(idx2);
		git_repository_free(r2);
	}

	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_INCLUDE_UNMODIFIED;

	/* first try with index pointer which should prevent reload */

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, idx, &opts));

	memset(&exp, 0, sizeof(exp));

	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));

	cl_assert_equal_i(17, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]);
	cl_assert_equal_i(5, exp.file_status[GIT_DELTA_UNMODIFIED]);

	git_diff_free(diff);

	/* now let's try without the index pointer which should trigger reload */

	/* two files that were UNTRACKED should have become UNMODIFIED */
	/* one file that was UNMODIFIED should now have become UNTRACKED */
	/* one file that was DELETED should now be gone completely */

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	memset(&exp, 0, sizeof(exp));

	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));

nulltoken committed
1487 1488
	git_diff_free(diff);

1489 1490 1491 1492 1493 1494 1495 1496 1497
	cl_assert_equal_i(16, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(3, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]);
	cl_assert_equal_i(6, exp.file_status[GIT_DELTA_UNMODIFIED]);

	git_index_free(idx);
}
1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539

static int touch_file(void *payload, git_buf *path)
{
	int fd;
	char b;

	GIT_UNUSED(payload);
	if (git_path_isdir(path->ptr))
		return 0;

	cl_assert((fd = p_open(path->ptr, O_RDWR)) >= 0);
	cl_assert_equal_i(1, p_read(fd, &b, 1));
	cl_must_pass(p_lseek(fd, 0, SEEK_SET));
	cl_must_pass(p_write(fd, &b, 1));
	cl_must_pass(p_close(fd));

	return 0;
}

static void basic_diff_status(git_diff **out, const git_diff_options *opts)
{
	diff_expects exp;

	cl_git_pass(git_diff_index_to_workdir(out, g_repo, NULL, opts));

	memset(&exp, 0, sizeof(exp));

	cl_git_pass(git_diff_foreach(
		*out, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));

	cl_assert_equal_i(13, exp.files);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]);
}

void test_diff_workdir__can_update_index(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	git_diff *diff = NULL;
1540
	git_diff_perfdata perf = GIT_DIFF_PERFDATA_INIT;
1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554

	g_repo = cl_git_sandbox_init("status");

	/* touch all the files so stat times are different */
	{
		git_buf path = GIT_BUF_INIT;
		cl_git_pass(git_buf_sets(&path, "status"));
		cl_git_pass(git_path_direach(&path, 0, touch_file, NULL));
		git_buf_free(&path);
	}

	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;

	basic_diff_status(&diff, &opts);
1555 1556 1557 1558

	cl_git_pass(git_diff_get_perfdata(&perf, diff));
	cl_assert_equal_sz(13 + 3, perf.stat_calls);
	cl_assert_equal_sz(5, perf.oid_calculations);
1559 1560 1561 1562 1563 1564 1565

	git_diff_free(diff);

	/* now allow diff to update stat cache */
	opts.flags |= GIT_DIFF_UPDATE_INDEX;

	basic_diff_status(&diff, &opts);
1566 1567 1568 1569

	cl_git_pass(git_diff_get_perfdata(&perf, diff));
	cl_assert_equal_sz(13 + 3, perf.stat_calls);
	cl_assert_equal_sz(5, perf.oid_calculations);
1570 1571 1572 1573 1574 1575

	git_diff_free(diff);

	/* now if we do it again, we should see fewer OID calculations */

	basic_diff_status(&diff, &opts);
1576 1577 1578 1579

	cl_git_pass(git_diff_get_perfdata(&perf, diff));
	cl_assert_equal_sz(13 + 3, perf.stat_calls);
	cl_assert_equal_sz(0, perf.oid_calculations);
1580 1581 1582

	git_diff_free(diff);
}
1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612

#define STR7    "0123456"
#define STR8    "01234567"
#define STR40   STR8   STR8   STR8   STR8   STR8
#define STR200  STR40  STR40  STR40  STR40  STR40
#define STR999Z STR200 STR200 STR200 STR200 STR40 STR40 STR40 STR40 \
	            STR8 STR8 STR8 STR8 STR7 "\0"
#define STR1000 STR200 STR200 STR200 STR200 STR200
#define STR3999Z STR1000 STR1000 STR1000 STR999Z
#define STR4000 STR1000 STR1000 STR1000 STR1000

static void assert_delta_binary(git_diff *diff, size_t idx, int is_binary)
{
	git_patch *patch;
	const git_diff_delta *delta;

	cl_git_pass(git_patch_from_diff(&patch, diff, idx));
	delta = git_patch_get_delta(patch);
	cl_assert_equal_b((delta->flags & GIT_DIFF_FLAG_BINARY), is_binary);
	git_patch_free(patch);
}

void test_diff_workdir__binary_detection(void)
{
	git_index *idx;
	git_diff *diff = NULL;
	git_buf b = GIT_BUF_INIT;
	int i;
	git_buf data[10] = {
		{ "1234567890", 0, 0 },         /* 0 - all ascii text control */
1613 1614
		{ "\xC3\x85\xC3\xBC\xE2\x80\xA0\x48\xC3\xB8\xCF\x80\xCE\xA9", 0, 0 },            /* 1 - UTF-8 multibyte text */
		{ "\xEF\xBB\xBF\xC3\x9C\xE2\xA4\x92\xC6\x92\x38\xC2\xA3\xE2\x82\xAC", 0, 0 }, /* 2 - UTF-8 with BOM */
1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696
		{ STR999Z, 0, 1000 },           /* 3 - ASCII with NUL at 1000 */
		{ STR3999Z, 0, 4000 },          /* 4 - ASCII with NUL at 4000 */
		{ STR4000 STR3999Z "x", 0, 8001 }, /* 5 - ASCII with NUL at 8000 */
		{ STR4000 STR4000 "\0", 0, 8001 }, /* 6 - ASCII with NUL at 8001 */
		{ "\x00\xDC\x00\x6E\x21\x39\xFE\x0E\x00\x63\x00\xF8"
		  "\x00\x64\x00\x65\x20\x48", 0, 18 }, /* 7 - UTF-16 text */
		{ "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d"
		  "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d",
		  0, 26 }, /* 8 - All non-printable characters (no NUL) */
		{ "Hello \x01\x02\x03\x04\x05\x06 World!\x01\x02\x03\x04"
		  "\x05\x06\x07", 0, 26 }, /* 9 - 50-50 non-printable (no NUL) */
	};

	g_repo = cl_git_sandbox_init("empty_standard_repo");
	cl_git_pass(git_repository_index(&idx, g_repo));

	/* We start with ASCII in index and test data in workdir,
	 * then we will try with test data in index and ASCII in workdir.
	 */

	cl_git_pass(git_buf_sets(&b, "empty_standard_repo/0"));
	for (i = 0; i < 10; ++i) {
		b.ptr[b.size - 1] = '0' + i;
		cl_git_mkfile(b.ptr, "baseline");
		cl_git_pass(git_index_add_bypath(idx, &b.ptr[b.size - 1]));

		if (data[i].size == 0)
			data[i].size = strlen(data[i].ptr);
		cl_git_write2file(
			b.ptr, data[i].ptr, data[i].size, O_WRONLY|O_TRUNC, 0664);
	}
	git_index_write(idx);

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));

	cl_assert_equal_i(10, git_diff_num_deltas(diff));

	/* using diff binary detection (i.e. looking for NUL byte) */
	assert_delta_binary(diff, 0, false);
	assert_delta_binary(diff, 1, false);
	assert_delta_binary(diff, 2, false);
	assert_delta_binary(diff, 3, true);
	assert_delta_binary(diff, 4, true);
	assert_delta_binary(diff, 5, true);
	assert_delta_binary(diff, 6, false);
	assert_delta_binary(diff, 7, true);
	assert_delta_binary(diff, 8, false);
	assert_delta_binary(diff, 9, false);
	/* The above have been checked to match command-line Git */

	git_diff_free(diff);

	cl_git_pass(git_buf_sets(&b, "empty_standard_repo/0"));
	for (i = 0; i < 10; ++i) {
		b.ptr[b.size - 1] = '0' + i;
		cl_git_pass(git_index_add_bypath(idx, &b.ptr[b.size - 1]));

		cl_git_write2file(b.ptr, "baseline\n", 9, O_WRONLY|O_TRUNC, 0664);
	}
	git_index_write(idx);

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));

	cl_assert_equal_i(10, git_diff_num_deltas(diff));

	/* using diff binary detection (i.e. looking for NUL byte) */
	assert_delta_binary(diff, 0, false);
	assert_delta_binary(diff, 1, false);
	assert_delta_binary(diff, 2, false);
	assert_delta_binary(diff, 3, true);
	assert_delta_binary(diff, 4, true);
	assert_delta_binary(diff, 5, true);
	assert_delta_binary(diff, 6, false);
	assert_delta_binary(diff, 7, true);
	assert_delta_binary(diff, 8, false);
	assert_delta_binary(diff, 9, false);

	git_diff_free(diff);

	git_index_free(idx);
	git_buf_free(&b);
}