thodg/libgit2/tests/diff/format_email.c
Tag
-
Show log
Commit
-
Hash : 8d09efa2
Author :
Date : 2014-04-22T12:33:27
Use git_diff_get_stats in example/diff + refactor This takes the `--stat` and related example options in the example diff.c program and converts them to use the `git_diff_get_stats` API which nicely formats stats for you. I went to add bar-graph scaling to the stats formatter and noticed that the `git_diff_stats` structure was holding on to all of the `git_patch` objects. Unfortunately, each of these objects keeps the full text of the diff in memory, so this is very expensive. I ended up modifying `git_diff_stats` to keep just the data that it needs to keep and allowed it to release the patches. Then, I added width scaling to the output on top of that. In making the diff example program match 'git diff' output, I ended up removing an newline from the sumamry output which I then had to compensate for in the email formatting to match the expectations. Lastly, I went through and refactored the tests to use a couple of helper functions and reduce the overall amount of code there.
-
tests/diff/format_email.c
-
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 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 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 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 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467
#include "clar.h" #include "clar_libgit2.h" #include "buffer.h" #include "commit.h" #include "diff.h" static git_repository *repo; void test_diff_format_email__initialize(void) { repo = cl_git_sandbox_init("diff_format_email"); } void test_diff_format_email__cleanup(void) { cl_git_sandbox_cleanup(); } static void assert_email_match( const char *expected, const char *oidstr, git_diff_format_email_options *opts) { git_oid oid; git_commit *commit = NULL; git_diff *diff = NULL; git_buf buf = GIT_BUF_INIT; git_oid_fromstr(&oid, oidstr); cl_git_pass(git_commit_lookup(&commit, repo, &oid)); opts->id = git_commit_id(commit); opts->author = git_commit_author(commit); if (!opts->summary) opts->summary = git_commit_summary(commit); cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); cl_git_pass(git_diff_format_email(&buf, diff, opts)); cl_assert_equal_s(expected, git_buf_cstr(&buf)); git_buf_clear(&buf); cl_git_pass(git_diff_commit_as_email( &buf, repo, commit, 1, 1, opts->flags, NULL)); cl_assert_equal_s(expected, git_buf_cstr(&buf)); git_diff_free(diff); git_commit_free(commit); git_buf_free(&buf); } void test_diff_format_email__simple(void) { git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; const char *email = "From 9264b96c6d104d0e07ae33d3007b6a48246c6f92 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Wed, 9 Apr 2014 20:57:01 +0200\n" \ "Subject: [PATCH] Modify some content\n" \ "\n" \ "---\n" \ " file1.txt | 8 +++++---\n" \ " 1 file changed, 5 insertions(+), 3 deletions(-)\n" \ "\n" \ "diff --git a/file1.txt b/file1.txt\n" \ "index 94aaae8..af8f41d 100644\n" \ "--- a/file1.txt\n" \ "+++ b/file1.txt\n" \ "@@ -1,15 +1,17 @@\n" \ " file1.txt\n" \ " file1.txt\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "+\n" \ "+\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "+_file1.txt_\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; assert_email_match( email, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); } void test_diff_format_email__multiple(void) { git_oid oid; git_commit *commit = NULL; git_diff *diff = NULL; git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; git_buf buf = GIT_BUF_INIT; const char *email = "From 10808fe9c9be5a190c0ba68d1a002233fb363508 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Thu, 10 Apr 2014 19:37:05 +0200\n" \ "Subject: [PATCH 1/2] Added file2.txt file3.txt\n" \ "\n" \ "---\n" \ " file2.txt | 5 +++++\n" \ " file3.txt | 5 +++++\n" \ " 2 files changed, 10 insertions(+), 0 deletions(-)\n" \ " create mode 100644 file2.txt\n" \ " create mode 100644 file3.txt\n" \ "\n" \ "diff --git a/file2.txt b/file2.txt\n" \ "new file mode 100644\n" \ "index 0000000..e909123\n" \ "--- /dev/null\n" \ "+++ b/file2.txt\n" \ "@@ -0,0 +1,5 @@\n" \ "+file2\n" \ "+file2\n" \ "+file2\n" \ "+file2\n" \ "+file2\n" \ "diff --git a/file3.txt b/file3.txt\n" \ "new file mode 100644\n" \ "index 0000000..9435022\n" \ "--- /dev/null\n" \ "+++ b/file3.txt\n" \ "@@ -0,0 +1,5 @@\n" \ "+file3\n" \ "+file3\n" \ "+file3\n" \ "+file3\n" \ "+file3\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n" \ "From 873806f6f27e631eb0b23e4b56bea2bfac14a373 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Thu, 10 Apr 2014 19:37:36 +0200\n" \ "Subject: [PATCH 2/2] Modified file2.txt, file3.txt\n" \ "\n" \ "---\n" \ " file2.txt | 2 +-\n" \ " file3.txt | 2 +-\n" \ " 2 files changed, 2 insertions(+), 2 deletions(-)\n" \ "\n" \ "diff --git a/file2.txt b/file2.txt\n" \ "index e909123..7aff11d 100644\n" \ "--- a/file2.txt\n" \ "+++ b/file2.txt\n" \ "@@ -1,5 +1,5 @@\n" \ " file2\n" \ " file2\n" \ " file2\n" \ "-file2\n" \ "+file2!\n" \ " file2\n" \ "diff --git a/file3.txt b/file3.txt\n" \ "index 9435022..9a2d780 100644\n" \ "--- a/file3.txt\n" \ "+++ b/file3.txt\n" \ "@@ -1,5 +1,5 @@\n" \ " file3\n" \ "-file3\n" \ "+file3!\n" \ " file3\n" \ " file3\n" \ " file3\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; git_oid_fromstr(&oid, "10808fe9c9be5a190c0ba68d1a002233fb363508"); cl_git_pass(git_commit_lookup(&commit, repo, &oid)); opts.id = git_commit_id(commit); opts.author = git_commit_author(commit); opts.summary = git_commit_summary(commit); opts.patch_no = 1; opts.total_patches = 2; cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); cl_git_pass(git_diff_format_email(&buf, diff, &opts)); git_diff_free(diff); git_commit_free(commit); diff = NULL; commit = NULL; git_oid_fromstr(&oid, "873806f6f27e631eb0b23e4b56bea2bfac14a373"); cl_git_pass(git_commit_lookup(&commit, repo, &oid)); opts.id = git_commit_id(commit); opts.author = git_commit_author(commit); opts.summary = git_commit_summary(commit); opts.patch_no = 2; opts.total_patches = 2; cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); cl_git_pass(git_diff_format_email(&buf, diff, &opts)); cl_assert_equal_s(email, git_buf_cstr(&buf)); git_diff_free(diff); git_commit_free(commit); git_buf_free(&buf); } void test_diff_format_email__exclude_marker(void) { git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; const char *email = "From 9264b96c6d104d0e07ae33d3007b6a48246c6f92 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Wed, 9 Apr 2014 20:57:01 +0200\n" \ "Subject: Modify some content\n" \ "\n" \ "---\n" \ " file1.txt | 8 +++++---\n" \ " 1 file changed, 5 insertions(+), 3 deletions(-)\n" \ "\n" \ "diff --git a/file1.txt b/file1.txt\n" \ "index 94aaae8..af8f41d 100644\n" \ "--- a/file1.txt\n" \ "+++ b/file1.txt\n" \ "@@ -1,15 +1,17 @@\n" \ " file1.txt\n" \ " file1.txt\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "+\n" \ "+\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "+_file1.txt_\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; opts.flags |= GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER; assert_email_match( email, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); } void test_diff_format_email__invalid_no(void) { git_oid oid; git_commit *commit = NULL; git_diff *diff = NULL; git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; git_buf buf = GIT_BUF_INIT; git_oid_fromstr(&oid, "9264b96c6d104d0e07ae33d3007b6a48246c6f92"); cl_git_pass(git_commit_lookup(&commit, repo, &oid)); opts.id = git_commit_id(commit); opts.author = git_commit_author(commit); opts.summary = git_commit_summary(commit); opts.patch_no = 2; opts.total_patches = 1; cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); cl_git_fail(git_diff_format_email(&buf, diff, &opts)); cl_git_fail(git_diff_commit_as_email(&buf, repo, commit, 2, 1, 0, NULL)); cl_git_fail(git_diff_commit_as_email(&buf, repo, commit, 0, 0, 0, NULL)); git_diff_free(diff); git_commit_free(commit); git_buf_free(&buf); } void test_diff_format_email__mode_change(void) { git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; const char *email = "From 7ade76dd34bba4733cf9878079f9fd4a456a9189 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Thu, 10 Apr 2014 10:05:03 +0200\n" \ "Subject: [PATCH] Update permissions\n" \ "\n" \ "---\n" \ " file1.txt.renamed | 0\n" \ " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ " mode change 100644 => 100755 file1.txt.renamed\n" \ "\n" \ "diff --git a/file1.txt.renamed b/file1.txt.renamed\n" \ "old mode 100644\n" \ "new mode 100755\n" \ "index a97157a..a97157a\n" \ "--- a/file1.txt.renamed\n" \ "+++ b/file1.txt.renamed\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; assert_email_match( email, "7ade76dd34bba4733cf9878079f9fd4a456a9189", &opts); } void test_diff_format_email__rename_add_remove(void) { git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; const char *email = "From 6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Wed, 9 Apr 2014 21:15:56 +0200\n" \ "Subject: [PATCH] Renamed file1.txt -> file1.txt.renamed\n" \ "\n" \ "---\n" \ " file1.txt | 17 -----------------\n" \ " file1.txt.renamed | 17 +++++++++++++++++\n" \ " 2 files changed, 17 insertions(+), 17 deletions(-)\n" \ " delete mode 100644 file1.txt\n" \ " create mode 100644 file1.txt.renamed\n" \ "\n" \ "diff --git a/file1.txt b/file1.txt\n" \ "deleted file mode 100644\n" \ "index af8f41d..0000000\n" \ "--- a/file1.txt\n" \ "+++ /dev/null\n" \ "@@ -1,17 +0,0 @@\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-_file1.txt_\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-\n" \ "-\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-_file1.txt_\n" \ "-_file1.txt_\n" \ "-file1.txt\n" \ "diff --git a/file1.txt.renamed b/file1.txt.renamed\n" \ "new file mode 100644\n" \ "index 0000000..a97157a\n" \ "--- /dev/null\n" \ "+++ b/file1.txt.renamed\n" \ "@@ -0,0 +1,17 @@\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+_file1.txt_\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+file1.txt_renamed\n" \ "+file1.txt\n" \ "+\n" \ "+\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+file1.txt_renamed\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+_file1.txt_\n" \ "+_file1.txt_\n" \ "+file1.txt\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; assert_email_match( email, "6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d", &opts); } void test_diff_format_email__multiline_summary(void) { git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; const char *email = "From 9264b96c6d104d0e07ae33d3007b6a48246c6f92 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Wed, 9 Apr 2014 20:57:01 +0200\n" \ "Subject: [PATCH] Modify some content\n" \ "\n" \ "---\n" \ " file1.txt | 8 +++++---\n" \ " 1 file changed, 5 insertions(+), 3 deletions(-)\n" \ "\n" \ "diff --git a/file1.txt b/file1.txt\n" \ "index 94aaae8..af8f41d 100644\n" \ "--- a/file1.txt\n" \ "+++ b/file1.txt\n" \ "@@ -1,15 +1,17 @@\n" \ " file1.txt\n" \ " file1.txt\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "+\n" \ "+\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "+_file1.txt_\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; opts.summary = "Modify some content\nSome extra stuff here"; assert_email_match( email, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); } void test_diff_format_email__binary(void) { git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; const char *email = "From 8d7523f6fcb2404257889abe0d96f093d9f524f9 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Sun, 13 Apr 2014 18:10:18 +0200\n" \ "Subject: [PATCH] Modified binary file\n" \ "\n" \ "---\n" \ " binary.bin | Bin 3 -> 0 bytes\n" \ " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ "\n" \ "diff --git a/binary.bin b/binary.bin\n" \ "index bd474b2..9ac35ff 100644\n" \ "Binary files a/binary.bin and b/binary.bin differ\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; /* TODO: Actually 0 bytes here should be 5!. Seems like we don't load the new content for binary files? */ opts.summary = "Modified binary file"; assert_email_match( email, "8d7523f6fcb2404257889abe0d96f093d9f524f9", &opts); }