workdir.c 45.5 KB
Newer Older
1 2
#include "clar_libgit2.h"
#include "diff_helpers.h"
3
#include "repository.h"
4 5 6 7 8 9 10 11 12

static git_repository *g_repo = NULL;

void test_diff_workdir__initialize(void)
{
}

void test_diff_workdir__cleanup(void)
{
13
	cl_git_sandbox_cleanup();
14 15 16 17
}

void test_diff_workdir__to_index(void)
{
18
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
19
	git_diff *diff = NULL;
20
	diff_expects exp;
Russell Belfer committed
21
	int use_iterator;
22

23 24
	g_repo = cl_git_sandbox_init("status");

25 26 27 28
	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;

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

Russell Belfer committed
31 32 33 34 35
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

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

		/* 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);
49 50 51 52 53
		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
54 55 56 57 58 59 60 61

		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);
	}
62

63
	git_diff_free(diff);
64 65
}

66 67 68 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
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);

}

120 121 122 123 124
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 */
125
	git_tree *a, *b;
126
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
127 128
	git_diff *diff = NULL;
	git_diff *diff2 = NULL;
129
	diff_expects exp;
Russell Belfer committed
130
	int use_iterator;
131

132 133 134 135 136
	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);

137 138 139 140
	opts.context_lines = 3;
	opts.interhunk_lines = 1;
	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;

141
	/* You can't really generate the equivalent of git_diff_tree_to_workdir()
142 143 144 145 146 147 148 149 150
	 * 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".
	 */
151
	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));
152

Russell Belfer committed
153 154
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
155

Russell Belfer committed
156 157
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
158
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
159 160
		else
			cl_git_pass(git_diff_foreach(
161
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
162 163

		cl_assert_equal_i(14, exp.files);
164 165 166 167 168
		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
169
	}
170 171 172 173 174 175

	/* 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.
	 */

176
	git_diff_free(diff);
177 178 179 180 181 182 183
	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"
	 */
184 185
	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));
186
	cl_git_pass(git_diff_merge(diff, diff2));
187
	git_diff_free(diff2);
188

Russell Belfer committed
189 190 191 192 193
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
194
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
195 196
		else
			cl_git_pass(git_diff_foreach(
197
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
198

Russell Belfer committed
199
		cl_assert_equal_i(15, exp.files);
200 201 202 203 204
		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]);
205

Russell Belfer committed
206
		cl_assert_equal_i(11, exp.hunks);
207

Russell Belfer committed
208 209 210 211 212
		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);
	}
213

214
	git_diff_free(diff);
215 216 217 218 219 220
	diff = NULL;
	memset(&exp, 0, sizeof(exp));

	/* Again, emulating "git diff <sha>" for testing purposes using
	 * "git diff --name-status 0017bd4ab1ec3" instead.
	 */
221 222
	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));
223
	cl_git_pass(git_diff_merge(diff, diff2));
224
	git_diff_free(diff2);
225

Russell Belfer committed
226 227
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
228

Russell Belfer committed
229 230
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
231
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
232 233
		else
			cl_git_pass(git_diff_foreach(
234
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
235

Russell Belfer committed
236
		cl_assert_equal_i(16, exp.files);
237 238 239 240 241
		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]);
242

Russell Belfer committed
243 244 245 246 247 248 249
		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);
	}
250

251
	git_diff_free(diff);
252

253 254 255 256 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
	/* 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 */

285 286 287 288
	git_tree_free(a);
	git_tree_free(b);
}

289 290
void test_diff_workdir__to_index_with_pathspec(void)
{
291
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
292
	git_diff *diff = NULL;
293 294
	diff_expects exp;
	char *pathspec = NULL;
Russell Belfer committed
295
	int use_iterator;
296

297 298
	g_repo = cl_git_sandbox_init("status");

299 300 301 302 303 304
	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;

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

Russell Belfer committed
307 308 309 310 311
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
312
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
313
		else
314
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
315 316

		cl_assert_equal_i(13, exp.files);
317 318 319 320 321
		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
322
	}
323

324
	git_diff_free(diff);
325 326 327

	pathspec = "modified_file";

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

Russell Belfer committed
330 331 332 333 334
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
335
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
336
		else
337
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
338 339

		cl_assert_equal_i(1, exp.files);
340 341 342 343 344
		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
345
	}
346

347
	git_diff_free(diff);
348 349 350

	pathspec = "subdir";

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

Russell Belfer committed
353 354 355 356 357
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
358
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
359
		else
360
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
361 362

		cl_assert_equal_i(3, exp.files);
363 364 365 366 367
		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
368
	}
369

370
	git_diff_free(diff);
371 372 373

	pathspec = "*_deleted";

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

Russell Belfer committed
376 377 378 379 380
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
381
				diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
382
		else
383
			cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp));
Russell Belfer committed
384 385

		cl_assert_equal_i(2, exp.files);
386 387 388 389 390
		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
391
	}
392

393
	git_diff_free(diff);
394 395
}

396 397
void test_diff_workdir__filemode_changes(void)
{
398
	git_diff *diff = NULL;
399
	diff_expects exp;
Russell Belfer committed
400
	int use_iterator;
401 402 403 404 405 406

	if (!cl_is_chmod_supported())
		return;

	g_repo = cl_git_sandbox_init("issue_592");

407
	cl_repo_set_bool(g_repo, "core.filemode", true);
408 409 410

	/* test once with no mods */

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

Russell Belfer committed
413 414
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
415

Russell Belfer committed
416 417
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
418
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
419 420
		else
			cl_git_pass(git_diff_foreach(
421
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
422 423

		cl_assert_equal_i(0, exp.files);
424
		cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
425 426
		cl_assert_equal_i(0, exp.hunks);
	}
427

428
	git_diff_free(diff);
429 430 431 432 433

	/* chmod file and test again */

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

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

Russell Belfer committed
436 437
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));
438

Russell Belfer committed
439 440
		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
441
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
442 443
		else
			cl_git_pass(git_diff_foreach(
444
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
445 446

		cl_assert_equal_i(1, exp.files);
447
		cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
Russell Belfer committed
448 449
		cl_assert_equal_i(0, exp.hunks);
	}
450

451
	git_diff_free(diff);
452 453 454 455 456 457

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

void test_diff_workdir__filemode_changes_with_filemode_false(void)
{
458
	git_diff *diff = NULL;
459 460 461 462 463 464 465
	diff_expects exp;

	if (!cl_is_chmod_supported())
		return;

	g_repo = cl_git_sandbox_init("issue_592");

466
	cl_repo_set_bool(g_repo, "core.filemode", false);
467 468 469

	/* test once with no mods */

470
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
471 472 473

	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
474
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
475 476

	cl_assert_equal_i(0, exp.files);
477
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
478 479
	cl_assert_equal_i(0, exp.hunks);

480
	git_diff_free(diff);
481 482 483 484 485

	/* chmod file and test again */

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

486
	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
487 488 489

	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
490
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
491 492

	cl_assert_equal_i(0, exp.files);
493
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]);
494 495
	cl_assert_equal_i(0, exp.hunks);

496
	git_diff_free(diff);
497 498 499 500

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

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

	/* 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;

525 526
	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));
527

Russell Belfer committed
528 529 530 531 532
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
533
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
534 535
		else
			cl_git_pass(git_diff_foreach(
536
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
537 538

		cl_assert_equal_i(1, exp.files);
539 540 541
		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
542 543 544 545 546 547 548 549 550 551 552 553
		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(
554
				diff_w2i, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
555 556
		else
			cl_git_pass(git_diff_foreach(
557
				diff_w2i, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
558 559

		cl_assert_equal_i(1, exp.files);
560 561 562
		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
563 564 565 566 567 568
		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);
	}
569 570 571

	cl_git_pass(git_diff_merge(diff_i2t, diff_w2i));

Russell Belfer committed
572 573 574 575 576
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
577
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
578 579
		else
			cl_git_pass(git_diff_foreach(
580
				diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
581 582

		cl_assert_equal_i(1, exp.files);
583 584 585
		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
586 587 588 589 590 591
		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);
	}
592

593 594
	git_diff_free(diff_i2t);
	git_diff_free(diff_w2i);
Carlos Martín Nieto committed
595 596

	git_tree_free(tree);
597 598 599 600
}

void test_diff_workdir__eof_newline_changes(void)
{
601
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
602
	git_diff *diff = NULL;
603 604
	diff_expects exp;
	char *pathspec = "current_file";
Russell Belfer committed
605
	int use_iterator;
606 607 608 609 610 611

	g_repo = cl_git_sandbox_init("status");

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

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

Russell Belfer committed
614 615 616 617 618
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
619
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
620 621
		else
			cl_git_pass(git_diff_foreach(
622
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
623 624

		cl_assert_equal_i(0, exp.files);
625 626 627
		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
628 629 630 631 632 633
		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);
	}
634

635
	git_diff_free(diff);
636 637 638

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

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

Russell Belfer committed
641 642 643 644 645
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
646
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
647 648
		else
			cl_git_pass(git_diff_foreach(
649
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
650 651

		cl_assert_equal_i(1, exp.files);
652 653 654
		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
655 656 657 658 659 660
		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);
	}
661

662
	git_diff_free(diff);
663 664 665

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

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

Russell Belfer committed
668 669 670 671 672
	for (use_iterator = 0; use_iterator <= 1; use_iterator++) {
		memset(&exp, 0, sizeof(exp));

		if (use_iterator)
			cl_git_pass(diff_foreach_via_iterator(
673
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
674 675
		else
			cl_git_pass(git_diff_foreach(
676
				diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
Russell Belfer committed
677 678

		cl_assert_equal_i(1, exp.files);
679 680 681
		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
682 683 684 685 686 687
		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);
	}
688

689
	git_diff_free(diff);
690 691
}

692 693
/* PREPARATION OF TEST DATA
 *
694
 * Since there is no command line equivalent of git_diff_tree_to_workdir,
695 696 697 698 699 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
 * 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
 */
754 755 756 757 758 759 760


void test_diff_workdir__larger_hunks(void)
{
	const char *a_commit = "d70d245ed97ed2aa596dd1af6536e4bfdb047b69";
	const char *b_commit = "7a9e0b02e63179929fed24f0a3e0f19168114d10";
	git_tree *a, *b;
761
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
762
	size_t i, d, num_d, h, num_h, l, num_l;
763 764 765 766 767 768 769 770 771 772

	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) {
773 774
		git_diff *diff = NULL;
		git_patch *patch;
775 776
		const git_diff_hunk *hunk;
		const git_diff_line *line;
777 778 779 780

		/* okay, this is a bit silly, but oh well */
		switch (i) {
		case 0:
781
			cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
782 783
			break;
		case 1:
784
			cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));
785 786
			break;
		case 2:
787
			cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, b, &opts));
788 789 790
			break;
		}

791 792
		num_d = git_diff_num_deltas(diff);
		cl_assert_equal_i(2, (int)num_d);
793

794
		for (d = 0; d < num_d; ++d) {
Russell Belfer committed
795
			cl_git_pass(git_patch_from_diff(&patch, diff, d));
796
			cl_assert(patch);
797

798
			num_h = git_patch_num_hunks(patch);
799
			for (h = 0; h < num_h; h++) {
800
				cl_git_pass(git_patch_get_hunk(&hunk, &num_l, patch, h));
801

802
				for (l = 0; l < num_l; ++l) {
803 804
					cl_git_pass(
						git_patch_get_line_in_hunk(&line, patch, h, l));
805
					cl_assert(line);
806 807
				}

808
				/* confirm fail after the last item */
809 810
				cl_git_fail(
					git_patch_get_line_in_hunk(&line, patch, h, num_l));
811 812
			}

813
			/* confirm fail after the last item */
814
			cl_git_fail(git_patch_get_hunk(&hunk, &num_l, patch, num_h));
815

816
			git_patch_free(patch);
817
		}
818

819
		git_diff_free(diff);
820 821 822 823 824
	}

	git_tree_free(a);
	git_tree_free(b);
}
825 826 827

/* 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
828
 * git_diff_tree_to_workdir against tree
829 830 831 832 833 834 835 836 837 838 839 840 841 842
 * 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;
843
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
844
	git_diff *diff = NULL;
845 846
	diff_expects exp;

847
	g_repo = setup_fixture_submod2();
848 849 850 851 852

	a = resolve_commit_oid_to_tree(g_repo, a_commit);

	opts.flags =
		GIT_DIFF_INCLUDE_UNTRACKED |
853
		GIT_DIFF_INCLUDE_IGNORED |
854
		GIT_DIFF_RECURSE_UNTRACKED_DIRS |
Russell Belfer committed
855
		GIT_DIFF_SHOW_UNTRACKED_CONTENT;
856

857
	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts));
858 859 860 861 862 863

	/* diff_print(stderr, diff); */

	/* essentially doing: git diff 873585b94bdeabccea991ea5e3ec1a277895b698 */

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

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

868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883
	/* 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.
	 *
884
	 * Then add in the two extra untracked items "not" and "not-submodule"
885
	 * to get the 12 files reported here.
886 887
	 */

888
	cl_assert_equal_i(12, exp.files);
889

890 891
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]);
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]);
892
	cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]);
893 894
	cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]);
	cl_assert_equal_i(10, exp.file_status[GIT_DELTA_UNTRACKED]);
895 896 897 898 899 900 901 902 903 904

	/* 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);

905
	git_diff_free(diff);
906 907
	git_tree_free(a);
}
908 909 910

void test_diff_workdir__cannot_diff_against_a_bare_repository(void)
{
911
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
912
	git_diff *diff = NULL;
913 914 915 916
	git_tree *tree;

	g_repo = cl_git_sandbox_init("testrepo.git");

917
	cl_assert_equal_i(
918
		GIT_EBAREREPO, git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
919 920

	cl_git_pass(git_repository_head_tree(&tree, g_repo));
921 922

	cl_assert_equal_i(
923
		GIT_EBAREREPO, git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
924 925 926

	git_tree_free(tree);
}
927 928 929

void test_diff_workdir__to_null_tree(void)
{
930
	git_diff *diff;
931
	diff_expects exp;
932
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
933 934 935 936 937 938

	opts.flags = GIT_DIFF_INCLUDE_UNTRACKED |
		GIT_DIFF_RECURSE_UNTRACKED_DIRS;

	g_repo = cl_git_sandbox_init("status");

939
	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
940 941 942 943 944 945 946 947

	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]);

948
	git_diff_free(diff);
949
}
950 951 952

void test_diff_workdir__checks_options_version(void)
{
953
	git_diff *diff;
954 955 956 957 958 959
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	const git_error *err;

	g_repo = cl_git_sandbox_init("status");

	opts.version = 0;
960
	cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
961 962 963 964 965
	err = giterr_last();
	cl_assert_equal_i(GITERR_INVALID, err->klass);

	giterr_clear();
	opts.version = 1024;
966
	cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
967 968 969
	err = giterr_last();
	cl_assert_equal_i(GITERR_INVALID, err->klass);
}
970 971 972

void test_diff_workdir__can_diff_empty_file(void)
{
973
	git_diff *diff;
974 975 976
	git_tree *tree;
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	struct stat st;
977
	git_patch *patch;
978 979 980 981 982 983 984 985 986

	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));
987
	git_diff_free(diff);
988 989 990 991 992 993 994 995 996 997

	/* 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
998
	cl_git_pass(git_patch_from_diff(&patch, diff, 1));
999 1000
	git_patch_free(patch);
	git_diff_free(diff);
1001 1002 1003 1004 1005 1006 1007 1008

	/* 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
1009
	cl_git_pass(git_patch_from_diff(&patch, diff, 1));
1010 1011
	git_patch_free(patch);
	git_diff_free(diff);
Vicent Marti committed
1012 1013

	git_tree_free(tree);
1014
}
1015 1016 1017 1018

void test_diff_workdir__to_index_issue_1397(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1019
	git_diff *diff = NULL;
1020 1021 1022 1023
	diff_expects exp;

	g_repo = cl_git_sandbox_init("issue_1397");

Russell Belfer committed
1024
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
1025 1026 1027 1028 1029 1030

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

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

Russell Belfer committed
1031 1032 1033
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1034

Russell Belfer committed
1035 1036 1037
	cl_assert_equal_i(0, exp.files);
	cl_assert_equal_i(0, exp.hunks);
	cl_assert_equal_i(0, exp.lines);
1038

1039
	git_diff_free(diff);
1040 1041
	diff = NULL;

Russell Belfer committed
1042 1043
	cl_git_rewritefile("issue_1397/crlf_file.txt",
		"first line\r\nsecond line modified\r\nboth with crlf");
1044 1045 1046

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

Russell Belfer committed
1047 1048 1049
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1050

Russell Belfer committed
1051 1052
	cl_assert_equal_i(1, exp.files);
	cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]);
1053

Russell Belfer committed
1054
	cl_assert_equal_i(1, exp.hunks);
1055

Russell Belfer committed
1056 1057 1058 1059
	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);
1060

1061
	git_diff_free(diff);
1062 1063 1064 1065
}

void test_diff_workdir__to_tree_issue_1397(void)
{
Russell Belfer committed
1066
	const char *a_commit = "7f483a738"; /* the current HEAD */
1067 1068
	git_tree *a;
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1069 1070
	git_diff *diff = NULL;
	git_diff *diff2 = NULL;
1071 1072 1073 1074
	diff_expects exp;

	g_repo = cl_git_sandbox_init("issue_1397");

Russell Belfer committed
1075
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
1076 1077 1078 1079 1080 1081 1082 1083

	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
1084 1085 1086
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1087

Russell Belfer committed
1088 1089 1090
	cl_assert_equal_i(0, exp.files);
	cl_assert_equal_i(0, exp.hunks);
	cl_assert_equal_i(0, exp.lines);
1091

1092
	git_diff_free(diff);
1093 1094 1095 1096 1097
	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));
1098
	git_diff_free(diff2);
1099

Russell Belfer committed
1100 1101 1102
	memset(&exp, 0, sizeof(exp));
	cl_git_pass(git_diff_foreach(
		diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
1103

Russell Belfer committed
1104 1105 1106
	cl_assert_equal_i(0, exp.files);
	cl_assert_equal_i(0, exp.hunks);
	cl_assert_equal_i(0, exp.lines);
1107

1108
	git_diff_free(diff);
1109 1110
	git_tree_free(a);
}
1111 1112 1113 1114

void test_diff_workdir__untracked_directory_scenarios(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1115
	git_diff *diff = NULL;
1116 1117 1118 1119 1120 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
	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]);

1165
	git_diff_free(diff);
1166 1167 1168 1169 1170 1171 1172 1173

	/* empty directory */

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

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

1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184
	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]);

1185
	git_diff_free(diff);
1186 1187 1188 1189 1190 1191 1192 1193

	/* empty directory in empty directory */

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

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

1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204
	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]);

1205
	git_diff_free(diff);
1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228

	/* 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]);

1229
	git_diff_free(diff);
1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251

	/* 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]);

1252
	git_diff_free(diff);
1253 1254 1255

	/* quick version avoids directory scan */

Russell Belfer committed
1256
	opts.flags = opts.flags | GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS;
1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271

	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]);

1272
	git_diff_free(diff);
1273 1274 1275

	/* directory with nested non-ignored content */

Russell Belfer committed
1276
	opts.flags = opts.flags & ~GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS;
1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294

	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]);

1295
	git_diff_free(diff);
1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315

	/* 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]);

1316
	git_diff_free(diff);
1317
}
1318 1319 1320 1321 1322


void test_diff_workdir__untracked_directory_comes_last(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1323
	git_diff *diff = NULL;
1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340

	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);

1341
	git_diff_free(diff);
1342
}
1343 1344 1345 1346

void test_diff_workdir__untracked_with_bom(void)
{
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
1347
	git_diff *diff = NULL;
1348 1349 1350 1351 1352 1353 1354 1355 1356
	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
1357
		GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_SHOW_UNTRACKED_CONTENT;
1358 1359 1360 1361

	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
1362
	cl_assert((delta = git_diff_get_delta(diff, 0)) != NULL);
1363
	cl_assert_equal_i(GIT_DELTA_UNTRACKED, delta->status);
Russell Belfer committed
1364 1365 1366 1367

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

1369
	git_diff_free(diff);
1370
}
1371 1372 1373 1374 1375 1376 1377

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
1378
	git_buf buf = GIT_BUF_INIT;
1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390
	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");
1391
	git_index_free(index);
1392 1393 1394 1395 1396 1397 1398 1399

	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
1400
	cl_git_pass(git_patch_to_buf(&buf, patch));
1401

Nicolas Hake committed
1402 1403
	cl_assert_equal_s(expected_normal, buf.ptr);
	git_buf_clear(&buf);
1404 1405 1406 1407 1408 1409 1410 1411
	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
1412
	cl_git_pass(git_patch_to_buf(&buf, patch));
1413

Nicolas Hake committed
1414 1415 1416 1417
	cl_assert_equal_s(expected_patience, buf.ptr);
	git_buf_clear(&buf);

	git_buf_free(&buf);
1418 1419 1420
	git_patch_free(patch);
	git_diff_free(diff);
}
1421 1422 1423 1424 1425 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

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
1482 1483
	git_diff_free(diff);

1484 1485 1486 1487 1488 1489 1490 1491 1492
	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);
}