thodg/libgit2/tests/diff/patchid.c
Tag
-
Show log
Commit
-
Hash : 89a34828
Author :
Date : 2017-06-16T13:34:43
diff: implement function to calculate patch ID The upstream git project provides the ability to calculate a so-called patch ID. Quoting from git-patch-id(1): A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored." Patch IDs can be used to identify two patches which are probably the same thing, e.g. when a patch has been cherry-picked to another branch. This commit implements a new function `git_diff_patchid`, which gets a patch and derives an OID from the diff. Note the different terminology here: a patch in libgit2 are the differences in a single file and a diff can contain multiple patches for different files. The implementation matches the upstream implementation and should derive the same OID for the same diff. In fact, some code has been directly derived from the upstream implementation. The upstream implementation has two different modes to calculate patch IDs, which is the stable and unstable mode. The old way of calculating the patch IDs was unstable in a sense that a different ordering the diffs was leading to different results. This oversight was fixed in git 1.9, but as git tries hard to never break existing workflows, the old and unstable way is still default. The newer and stable way does not care for ordering of the diff hunks, and in fact it is the mode that should probably be used today. So right now, we only implement the stable way of generating the patch ID.
-
tests/diff/patchid.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
#include "clar_libgit2.h" #include "patch/patch_common.h" static void verify_patch_id(const char *diff_content, const char *expected_id) { git_oid expected_oid, actual_oid; git_diff *diff; cl_git_pass(git_oid_fromstr(&expected_oid, expected_id)); cl_git_pass(git_diff_from_buffer(&diff, diff_content, strlen(diff_content))); cl_git_pass(git_diff_patchid(&actual_oid, diff, NULL)); cl_assert_equal_oid(&expected_oid, &actual_oid); git_diff_free(diff); } void test_diff_patchid__simple_commit(void) { verify_patch_id(PATCH_SIMPLE_COMMIT, "06094b1948b878b7d9ff7560b4eae672a014b0ec"); } void test_diff_patchid__filename_with_spaces(void) { verify_patch_id(PATCH_APPEND_NO_NL, "f0ba05413beaef743b630e796153839462ee477a"); } void test_diff_patchid__multiple_hunks(void) { verify_patch_id(PATCH_MULTIPLE_HUNKS, "81e26c34643d17f521e57c483a6a637e18ba1f57"); } void test_diff_patchid__multiple_files(void) { verify_patch_id(PATCH_MULTIPLE_FILES, "192d1f49d23f2004517963aecd3f8a6c467f50ff"); } void test_diff_patchid__same_diff_with_differing_whitespace_has_same_id(void) { const char *tabs = "diff --git a/file.txt b/file.txt\n" "index 8fecc09..1d43a92 100644\n" "--- a/file.txt\n" "+++ b/file.txt\n" "@@ -1 +1 @@\n" "-old text\n" "+ new text\n"; const char *spaces = "diff --git a/file.txt b/file.txt\n" "index 8fecc09..1d43a92 100644\n" "--- a/file.txt\n" "+++ b/file.txt\n" "@@ -1 +1 @@\n" "-old text\n" "+ new text\n"; const char *id = "11efdd13c30f7a1056eac2ae2fb952da475e2c23"; verify_patch_id(tabs, id); verify_patch_id(spaces, id); }