# # # delete "tests/(minor)_context_diff" # # delete "tests/(minor)_context_diff/__driver__.lua" # # add_file "tests/diff_output_formats/A.cd" # content [46aef0f6bf02b1df8c38439637334c6808c1a736] # # add_file "tests/diff_output_formats/A.cdp" # content [87eaed30b1ef1fb338c9acafd3a12fc894531028] # # add_file "tests/diff_output_formats/A.dst" # content [9a077b2b5aee84d84ae0f939c8059516485e6514] # # add_file "tests/diff_output_formats/A.src" # content [3461fa0f7108da24afeabbccf92a17c94bb7ef71] # # add_file "tests/diff_output_formats/A.ud" # content [8cb177661c243e9e45ef65bc892d5a7a4598c593] # # add_file "tests/diff_output_formats/A.udp" # content [b9dccc3bbc436f14d253b5cae5b885031aa53489] # # add_file "tests/diff_output_formats/B.cd" # content [13ec056b2d92dda60fdfed7e9f060190c68e1484] # # add_file "tests/diff_output_formats/B.cdp" # content [df96a8b5ff9c7ed2eb1065cee7291cd93a88397d] # # add_file "tests/diff_output_formats/B.dst" # content [8e23aad88bf337b76da6891368557a206f7b7f51] # # add_file "tests/diff_output_formats/B.src" # content [1219e5ab2b8d60bde359d2b8c569220400fae94e] # # add_file "tests/diff_output_formats/B.ud" # content [ad150a6c9927a70d921a361b3a9b8f89c0fbb349] # # add_file "tests/diff_output_formats/B.udp" # content [ad8e3cbae8ee44a9b9167f3fce8155a55840e299] # # add_file "tests/diff_output_formats/C.cd" # content [dfc8e8b1b564f42e96c52af0e5e73d09a9c31b6b] # # add_file "tests/diff_output_formats/C.cdp" # content [62f1650941bca9406553a24a59fa64a809d2d9ee] # # add_file "tests/diff_output_formats/C.dst" # content [d127b34595fcbd709ce2dedb033065e4e3b5d351] # # add_file "tests/diff_output_formats/C.src" # content [a855dab66165b2d529ede16de9e7334aaf58778f] # # add_file "tests/diff_output_formats/C.ud" # content [dd1ad0447e03f2d2217307f15b9161070291613a] # # add_file "tests/diff_output_formats/C.udp" # content [712a589fe9c3611cbd53d55a7722046ac9bf5596] # # add_file "tests/diff_output_formats/D.cd" # content [8efcc27199f95d4c4d47bda3aea64f7338a2d7d4] # # add_file "tests/diff_output_formats/D.cdp" # content [cd64dc67a74fd709ace880f5bb16ccb78805a35a] # # add_file "tests/diff_output_formats/D.dst" # content [500eab064ed1e352dd30a7f45535862b1d113826] # # add_file "tests/diff_output_formats/D.src" # content [f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a] # # add_file "tests/diff_output_formats/D.ud" # content [5ea1449b845ca21262d6b8f2bc8f47f23bf791dd] # # add_file "tests/diff_output_formats/D.udp" # content [ee6c2d228454f44dbded53ec84eed8f244d66394] # # add_file "tests/diff_output_formats/E.cd" # content [f5d8b8de0d8d73eeb4f69dbb49609449b9957235] # # add_file "tests/diff_output_formats/E.cdp" # content [5359754f3f5ee3c31222c266d93da93754deb27c] # # add_file "tests/diff_output_formats/E.dst" # content [0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69] # # add_file "tests/diff_output_formats/E.src" # content [b984e2f8d936bf914f04e727e43b10760b71dc4f] # # add_file "tests/diff_output_formats/E.ud" # content [ad0604646c055468ff6fa301ea11a7397dadb19e] # # add_file "tests/diff_output_formats/E.udp" # content [291adbd2143f1ded0671e332c5da03acba4731d5] # # add_file "tests/diff_output_formats/F.cd" # content [32fc67fdd05aeb4ab96674896723ac424141158b] # # add_file "tests/diff_output_formats/F.cdp" # content [da09b452df8eca6e4b409b2c60ed51ce4ed34abc] # # add_file "tests/diff_output_formats/F.dst" # content [e6a9ea1b3439de3a9add6bb24d5d08862076dc67] # # add_file "tests/diff_output_formats/F.src" # content [4665d5dc5d5be1f5496840ca248f5d459be1fe0e] # # add_file "tests/diff_output_formats/F.ud" # content [2d1b447b46e7931557e1597c0f42cbdfce8fa388] # # add_file "tests/diff_output_formats/F.udp" # content [45f8cd335cdb9748e59b6f56b33d71e265163a8b] # # add_file "tests/diff_output_formats/G.cd" # content [eea66c30a23938cc3332ad9c9d8b53149ae599eb] # # add_file "tests/diff_output_formats/G.cdp" # content [8472049d7b6e94f37226d3a1e5d11b8ce87c6f4f] # # add_file "tests/diff_output_formats/G.dst" # content [609b4ae23447168db4bf7395433c41bdfcc249d0] # # add_file "tests/diff_output_formats/G.src" # content [b4acbe7b532ecffc6f1c7893d2531838807ffccd] # # add_file "tests/diff_output_formats/G.ud" # content [fd5b9eefe4e8e6fe5efe8945d383f7d1287c55e7] # # add_file "tests/diff_output_formats/G.udp" # content [3fb6ca62deb44f8f6ed938498d5da2e2ac5a8634] # # add_file "tests/diff_output_formats/H.cd" # content [e9e0b4f7c683e5620fd46d3d8fa9b68e77d4cd64] # # add_file "tests/diff_output_formats/H.cdp" # content [9cafc25f889fef524ee2391fbfa271c5876cf35e] # # add_file "tests/diff_output_formats/H.dst" # content [2f076c5d449b7841f873a173f4c8ac162d778304] # # add_file "tests/diff_output_formats/H.src" # content [b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379] # # add_file "tests/diff_output_formats/H.ud" # content [5ef077f1da11fb8638d73e8a6571ff93a0fe1874] # # add_file "tests/diff_output_formats/H.udp" # content [89c15555eb4658c6fdc8d38bf1e85060b79fdd05] # # add_file "tests/diff_output_formats/I.cd" # content [45f80fe25d8530e0cba92232b431476e5b086b03] # # add_file "tests/diff_output_formats/I.cdp" # content [06fdd7b950ce01d587d13ab1aec3203dfb0aa918] # # add_file "tests/diff_output_formats/I.dst" # content [ccdcc1ef902cf1c0082b992e731b057d30b40814] # # add_file "tests/diff_output_formats/I.src" # content [4d32e91882cbb8a15c643265088861861bef0c16] # # add_file "tests/diff_output_formats/I.ud" # content [39db6ed118af85891b95113e216a622a7d60eb63] # # add_file "tests/diff_output_formats/I.udp" # content [8e40b30a4ce01d94d30ecb336f5918fabf13555d] # # add_file "tests/diff_output_formats/J.cd" # content [d81a80980c6eba5027990324da04f846fc3f9f3c] # # add_file "tests/diff_output_formats/J.cdp" # content [bb1b2a8556d1750b60933ffb60ef2cbe01621a79] # # add_file "tests/diff_output_formats/J.dst" # content [93462d067100103422a0e59722155b3a916770a2] # # add_file "tests/diff_output_formats/J.src" # content [cc172a94441af071b19c3eddddc21053634e94bb] # # add_file "tests/diff_output_formats/J.ud" # content [dabba4fee19e7f11048c289796e4f836000c517b] # # add_file "tests/diff_output_formats/J.udp" # content [29fffc4740f7617713a79f51bf34ca6d9f99af15] # # patch "cmd_diff_log.cc" # from [caa41fb44a1e29cf9e989c82afbdf29126d9c951] # to [4c1d8af34b23d751670954077068a74365f7b707] # # patch "cmd_files.cc" # from [442a350ece280378c85d8c4d7ce01ad9af98ae47] # to [e1acc00226339ea615f5e87ec82c741a21c4adb0] # # patch "diff_patch.cc" # from [46b072dce126c4f2447fcfb46f7162aae34fe05a] # to [58992acda1d83a73cf86e3051fb9ef6affccf72d] # # patch "diff_patch.hh" # from [a963d4afdaa1db93a25924ec994f114e413f69c2] # to [e091a6f243dc69e47ea0fa313f5e5bcceb1b049b] # # patch "lua_hooks.cc" # from [5cd3dc9801c357f9127c51fd454332d3d13196bf] # to [0650e44236b780eca2e9bd964b303d08291a5a68] # # patch "lua_hooks.hh" # from [6a5820f9ff8d94090bf2d12f5e406b2e32747699] # to [f7acc9339fb54e2093797b8c7192b6846d7b6fe5] # # patch "std_hooks.lua" # from [8a7070484c06a9fcc5db1d2288862e99c956f3ae] # to [732d295dccfc914b8d6c38deba379f2b148367fb] # # patch "tests/diff_output_formats/__driver__.lua" # from [4df984a3a42eaa2b130b96b14d555db1d6082e17] # to [9cdd663727e0619a1801529674f96b3648860799] # # patch "tests/test_hooks.lua" # from [bd224e643fb22b048f55924561045f6d9bab70c4] # to [858d6bfc517923a0a8d006180ac95080599ac1f6] # # patch "testsuite.lua" # from [5eef9df65c55d57447fb154990c6a165339d8d3b] # to [56424ca5f48d03687ec4098e6e589eb9fbd69303] # ============================================================ --- tests/diff_output_formats/A.cd 46aef0f6bf02b1df8c38439637334c6808c1a736 +++ tests/diff_output_formats/A.cd 46aef0f6bf02b1df8c38439637334c6808c1a736 @@ -0,0 +1,74 @@ +*** A 3461fa0f7108da24afeabbccf92a17c94bb7ef71 +--- A 9a077b2b5aee84d84ae0f939c8059516485e6514 +*************** +*** 1,19 **** +- hunk 0 -- initial 0 + hunk 0 -- initial 1 +- hunk 0 -- initial 2 +- hunk 0 -- initial 3 +- hunk 0 -- initial 4 +- hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 + hunk 1 -- initial 1 +- hunk 1 -- initial 2 +- hunk 1 -- initial 3 +- hunk 1 -- initial 4 +- hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 +--- 1,9 ---- +*************** +*** 78,85 **** +--- 68,80 ---- + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++ hunk 8 -- insert 3 ++ hunk 8 -- insert 1 + hunk 8 -- initial 0 + hunk 8 -- initial 1 ++ hunk 8 -- insert 4 ++ hunk 8 -- insert 2 ++ hunk 8 -- insert 0 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +*************** +*** 88,100 **** + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 +- hunk 9 -- initial 0 + hunk 9 -- initial 1 +- hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 +- hunk 9 -- initial 6 +- hunk 9 -- initial 7 +- hunk 9 -- initial 8 + hunk 9 -- initial 9 +--- 83,100 ---- + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 1 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/A.cdp 87eaed30b1ef1fb338c9acafd3a12fc894531028 +++ tests/diff_output_formats/A.cdp 87eaed30b1ef1fb338c9acafd3a12fc894531028 @@ -0,0 +1,74 @@ +*** A 3461fa0f7108da24afeabbccf92a17c94bb7ef71 +--- A 9a077b2b5aee84d84ae0f939c8059516485e6514 +*************** +*** 1,19 **** +- hunk 0 -- initial 0 + hunk 0 -- initial 1 +- hunk 0 -- initial 2 +- hunk 0 -- initial 3 +- hunk 0 -- initial 4 +- hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 + hunk 1 -- initial 1 +- hunk 1 -- initial 2 +- hunk 1 -- initial 3 +- hunk 1 -- initial 4 +- hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 +--- 1,9 ---- +*************** hunk 7 -- initial 6 +*** 78,85 **** +--- 68,80 ---- + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++ hunk 8 -- insert 3 ++ hunk 8 -- insert 1 + hunk 8 -- initial 0 + hunk 8 -- initial 1 ++ hunk 8 -- insert 4 ++ hunk 8 -- insert 2 ++ hunk 8 -- insert 0 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +*************** hunk 8 -- initial 6 +*** 88,100 **** + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 +- hunk 9 -- initial 0 + hunk 9 -- initial 1 +- hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 +- hunk 9 -- initial 6 +- hunk 9 -- initial 7 +- hunk 9 -- initial 8 + hunk 9 -- initial 9 +--- 83,100 ---- + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 1 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/A.dst 9a077b2b5aee84d84ae0f939c8059516485e6514 +++ tests/diff_output_formats/A.dst 9a077b2b5aee84d84ae0f939c8059516485e6514 @@ -0,0 +1,100 @@ +hunk 0 -- initial 1 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 1 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- insert 3 +hunk 8 -- insert 1 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- insert 4 +hunk 8 -- insert 2 +hunk 8 -- insert 0 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 1 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 9 +append 0 +append 1 +append 2 +append 3 +append 4 +append 5 +append 6 +append 7 +append 8 +append 9 ============================================================ --- tests/diff_output_formats/A.src 3461fa0f7108da24afeabbccf92a17c94bb7ef71 +++ tests/diff_output_formats/A.src 3461fa0f7108da24afeabbccf92a17c94bb7ef71 @@ -0,0 +1,100 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 ============================================================ --- tests/diff_output_formats/A.ud 8cb177661c243e9e45ef65bc892d5a7a4598c593 +++ tests/diff_output_formats/A.ud 8cb177661c243e9e45ef65bc892d5a7a4598c593 @@ -0,0 +1,60 @@ +--- A 3461fa0f7108da24afeabbccf92a17c94bb7ef71 ++++ A 9a077b2b5aee84d84ae0f939c8059516485e6514 +@@ -1,19 +1,9 @@ +-hunk 0 -- initial 0 + hunk 0 -- initial 1 +-hunk 0 -- initial 2 +-hunk 0 -- initial 3 +-hunk 0 -- initial 4 +-hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 + hunk 1 -- initial 1 +-hunk 1 -- initial 2 +-hunk 1 -- initial 3 +-hunk 1 -- initial 4 +-hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 +@@ -78,8 +68,13 @@ + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++hunk 8 -- insert 3 ++hunk 8 -- insert 1 + hunk 8 -- initial 0 + hunk 8 -- initial 1 ++hunk 8 -- insert 4 ++hunk 8 -- insert 2 ++hunk 8 -- insert 0 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +@@ -88,13 +83,18 @@ + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 +-hunk 9 -- initial 0 + hunk 9 -- initial 1 +-hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 +-hunk 9 -- initial 6 +-hunk 9 -- initial 7 +-hunk 9 -- initial 8 + hunk 9 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/A.udp b9dccc3bbc436f14d253b5cae5b885031aa53489 +++ tests/diff_output_formats/A.udp b9dccc3bbc436f14d253b5cae5b885031aa53489 @@ -0,0 +1,60 @@ +--- A 3461fa0f7108da24afeabbccf92a17c94bb7ef71 ++++ A 9a077b2b5aee84d84ae0f939c8059516485e6514 +@@ -1,19 +1,9 @@ +-hunk 0 -- initial 0 + hunk 0 -- initial 1 +-hunk 0 -- initial 2 +-hunk 0 -- initial 3 +-hunk 0 -- initial 4 +-hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 + hunk 1 -- initial 1 +-hunk 1 -- initial 2 +-hunk 1 -- initial 3 +-hunk 1 -- initial 4 +-hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 +@@ -78,8 +68,13 @@ hunk 7 -- initial 6 + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++hunk 8 -- insert 3 ++hunk 8 -- insert 1 + hunk 8 -- initial 0 + hunk 8 -- initial 1 ++hunk 8 -- insert 4 ++hunk 8 -- insert 2 ++hunk 8 -- insert 0 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +@@ -88,13 +83,18 @@ hunk 8 -- initial 6 + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 +-hunk 9 -- initial 0 + hunk 9 -- initial 1 +-hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 +-hunk 9 -- initial 6 +-hunk 9 -- initial 7 +-hunk 9 -- initial 8 + hunk 9 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/B.cd 13ec056b2d92dda60fdfed7e9f060190c68e1484 +++ tests/diff_output_formats/B.cd 13ec056b2d92dda60fdfed7e9f060190c68e1484 @@ -0,0 +1,168 @@ +*** B 1219e5ab2b8d60bde359d2b8c569220400fae94e +--- B 8e23aad88bf337b76da6891368557a206f7b7f51 +*************** +*** 1,50 **** + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 +- hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 +- hunk 1 -- initial 5 +- hunk 1 -- initial 6 + hunk 1 -- initial 7 +- hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 +- hunk 3 -- initial 0 +- hunk 3 -- initial 1 + hunk 3 -- initial 2 +- hunk 3 -- initial 3 +- hunk 3 -- initial 4 + hunk 3 -- initial 5 +- hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +--- 1,65 ---- ++ prepend 0 ++ prepend 1 ++ prepend 2 ++ prepend 3 ++ prepend 4 ++ prepend 5 ++ prepend 6 ++ prepend 7 ++ prepend 8 ++ prepend 9 + hunk 0 -- initial 0 ++ hunk 0 -- insert 1 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 ++ hunk 0 -- insert 4 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 ++ hunk 0 -- insert 0 ++ hunk 0 -- insert 2 ++ hunk 0 -- insert 3 + hunk 0 -- initial 9 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 7 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 ++ hunk 2 -- insert 3 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 ++ hunk 2 -- insert 2 ++ hunk 2 -- insert 0 + hunk 2 -- initial 8 ++ hunk 2 -- insert 4 ++ hunk 2 -- insert 1 + hunk 2 -- initial 9 + hunk 3 -- initial 2 + hunk 3 -- initial 5 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 ++ hunk 4 -- insert 1 + hunk 4 -- initial 1 ++ hunk 4 -- insert 3 + hunk 4 -- initial 2 ++ hunk 4 -- insert 0 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 ++ hunk 4 -- insert 2 ++ hunk 4 -- insert 4 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +*************** +*** 78,92 **** + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +- hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 2 +- hunk 8 -- initial 3 + hunk 8 -- initial 4 +- hunk 8 -- initial 5 +- hunk 8 -- initial 6 + hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +--- 93,102 ---- +*************** +*** 101,107 **** +--- 111,122 ---- + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 ++ hunk 10 -- insert 0 ++ hunk 10 -- insert 1 ++ hunk 10 -- insert 3 + hunk 10 -- initial 3 ++ hunk 10 -- insert 2 ++ hunk 10 -- insert 4 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 +*************** +*** 109,120 **** + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +- hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 +- hunk 11 -- initial 4 +- hunk 11 -- initial 5 +- hunk 11 -- initial 6 + hunk 11 -- initial 7 +- hunk 11 -- initial 8 + hunk 11 -- initial 9 +--- 124,130 ---- ============================================================ --- tests/diff_output_formats/B.cdp df96a8b5ff9c7ed2eb1065cee7291cd93a88397d +++ tests/diff_output_formats/B.cdp df96a8b5ff9c7ed2eb1065cee7291cd93a88397d @@ -0,0 +1,168 @@ +*** B 1219e5ab2b8d60bde359d2b8c569220400fae94e +--- B 8e23aad88bf337b76da6891368557a206f7b7f51 +*************** +*** 1,50 **** + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 +- hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 +- hunk 1 -- initial 5 +- hunk 1 -- initial 6 + hunk 1 -- initial 7 +- hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 +- hunk 3 -- initial 0 +- hunk 3 -- initial 1 + hunk 3 -- initial 2 +- hunk 3 -- initial 3 +- hunk 3 -- initial 4 + hunk 3 -- initial 5 +- hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +--- 1,65 ---- ++ prepend 0 ++ prepend 1 ++ prepend 2 ++ prepend 3 ++ prepend 4 ++ prepend 5 ++ prepend 6 ++ prepend 7 ++ prepend 8 ++ prepend 9 + hunk 0 -- initial 0 ++ hunk 0 -- insert 1 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 ++ hunk 0 -- insert 4 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 ++ hunk 0 -- insert 0 ++ hunk 0 -- insert 2 ++ hunk 0 -- insert 3 + hunk 0 -- initial 9 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 7 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 ++ hunk 2 -- insert 3 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 ++ hunk 2 -- insert 2 ++ hunk 2 -- insert 0 + hunk 2 -- initial 8 ++ hunk 2 -- insert 4 ++ hunk 2 -- insert 1 + hunk 2 -- initial 9 + hunk 3 -- initial 2 + hunk 3 -- initial 5 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 ++ hunk 4 -- insert 1 + hunk 4 -- initial 1 ++ hunk 4 -- insert 3 + hunk 4 -- initial 2 ++ hunk 4 -- insert 0 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 ++ hunk 4 -- insert 2 ++ hunk 4 -- insert 4 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +*************** hunk 7 -- initial 6 +*** 78,92 **** + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +- hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 2 +- hunk 8 -- initial 3 + hunk 8 -- initial 4 +- hunk 8 -- initial 5 +- hunk 8 -- initial 6 + hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +--- 93,102 ---- +*************** hunk 9 -- initial 9 +*** 101,107 **** +--- 111,122 ---- + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 ++ hunk 10 -- insert 0 ++ hunk 10 -- insert 1 ++ hunk 10 -- insert 3 + hunk 10 -- initial 3 ++ hunk 10 -- insert 2 ++ hunk 10 -- insert 4 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 +*************** hunk 10 -- initial 7 +*** 109,120 **** + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +- hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 +- hunk 11 -- initial 4 +- hunk 11 -- initial 5 +- hunk 11 -- initial 6 + hunk 11 -- initial 7 +- hunk 11 -- initial 8 + hunk 11 -- initial 9 +--- 124,130 ---- ============================================================ --- tests/diff_output_formats/B.dst 8e23aad88bf337b76da6891368557a206f7b7f51 +++ tests/diff_output_formats/B.dst 8e23aad88bf337b76da6891368557a206f7b7f51 @@ -0,0 +1,130 @@ +prepend 0 +prepend 1 +prepend 2 +prepend 3 +prepend 4 +prepend 5 +prepend 6 +prepend 7 +prepend 8 +prepend 9 +hunk 0 -- initial 0 +hunk 0 -- insert 1 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- insert 4 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- insert 0 +hunk 0 -- insert 2 +hunk 0 -- insert 3 +hunk 0 -- initial 9 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 7 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- insert 3 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- insert 2 +hunk 2 -- insert 0 +hunk 2 -- initial 8 +hunk 2 -- insert 4 +hunk 2 -- insert 1 +hunk 2 -- initial 9 +hunk 3 -- initial 2 +hunk 3 -- initial 5 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- insert 1 +hunk 4 -- initial 1 +hunk 4 -- insert 3 +hunk 4 -- initial 2 +hunk 4 -- insert 0 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- insert 2 +hunk 4 -- insert 4 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 4 +hunk 8 -- initial 7 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- insert 0 +hunk 10 -- insert 1 +hunk 10 -- insert 3 +hunk 10 -- initial 3 +hunk 10 -- insert 2 +hunk 10 -- insert 4 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 7 +hunk 11 -- initial 9 ============================================================ --- tests/diff_output_formats/B.src 1219e5ab2b8d60bde359d2b8c569220400fae94e +++ tests/diff_output_formats/B.src 1219e5ab2b8d60bde359d2b8c569220400fae94e @@ -0,0 +1,120 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 ============================================================ --- tests/diff_output_formats/B.ud ad150a6c9927a70d921a361b3a9b8f89c0fbb349 +++ tests/diff_output_formats/B.ud ad150a6c9927a70d921a361b3a9b8f89c0fbb349 @@ -0,0 +1,120 @@ +--- B 1219e5ab2b8d60bde359d2b8c569220400fae94e ++++ B 8e23aad88bf337b76da6891368557a206f7b7f51 +@@ -1,50 +1,65 @@ ++prepend 0 ++prepend 1 ++prepend 2 ++prepend 3 ++prepend 4 ++prepend 5 ++prepend 6 ++prepend 7 ++prepend 8 ++prepend 9 + hunk 0 -- initial 0 ++hunk 0 -- insert 1 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 ++hunk 0 -- insert 4 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 ++hunk 0 -- insert 0 ++hunk 0 -- insert 2 ++hunk 0 -- insert 3 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 +-hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 +-hunk 1 -- initial 5 +-hunk 1 -- initial 6 + hunk 1 -- initial 7 +-hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 ++hunk 2 -- insert 3 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 ++hunk 2 -- insert 2 ++hunk 2 -- insert 0 + hunk 2 -- initial 8 ++hunk 2 -- insert 4 ++hunk 2 -- insert 1 + hunk 2 -- initial 9 +-hunk 3 -- initial 0 +-hunk 3 -- initial 1 + hunk 3 -- initial 2 +-hunk 3 -- initial 3 +-hunk 3 -- initial 4 + hunk 3 -- initial 5 +-hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 ++hunk 4 -- insert 1 + hunk 4 -- initial 1 ++hunk 4 -- insert 3 + hunk 4 -- initial 2 ++hunk 4 -- insert 0 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 ++hunk 4 -- insert 2 ++hunk 4 -- insert 4 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +@@ -78,15 +93,10 @@ + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +-hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 2 +-hunk 8 -- initial 3 + hunk 8 -- initial 4 +-hunk 8 -- initial 5 +-hunk 8 -- initial 6 + hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +@@ -101,7 +111,12 @@ + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 ++hunk 10 -- insert 0 ++hunk 10 -- insert 1 ++hunk 10 -- insert 3 + hunk 10 -- initial 3 ++hunk 10 -- insert 2 ++hunk 10 -- insert 4 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 +@@ -109,12 +124,7 @@ + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +-hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 +-hunk 11 -- initial 4 +-hunk 11 -- initial 5 +-hunk 11 -- initial 6 + hunk 11 -- initial 7 +-hunk 11 -- initial 8 + hunk 11 -- initial 9 ============================================================ --- tests/diff_output_formats/B.udp ad8e3cbae8ee44a9b9167f3fce8155a55840e299 +++ tests/diff_output_formats/B.udp ad8e3cbae8ee44a9b9167f3fce8155a55840e299 @@ -0,0 +1,120 @@ +--- B 1219e5ab2b8d60bde359d2b8c569220400fae94e ++++ B 8e23aad88bf337b76da6891368557a206f7b7f51 +@@ -1,50 +1,65 @@ ++prepend 0 ++prepend 1 ++prepend 2 ++prepend 3 ++prepend 4 ++prepend 5 ++prepend 6 ++prepend 7 ++prepend 8 ++prepend 9 + hunk 0 -- initial 0 ++hunk 0 -- insert 1 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 ++hunk 0 -- insert 4 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 ++hunk 0 -- insert 0 ++hunk 0 -- insert 2 ++hunk 0 -- insert 3 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 +-hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 +-hunk 1 -- initial 5 +-hunk 1 -- initial 6 + hunk 1 -- initial 7 +-hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 ++hunk 2 -- insert 3 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 ++hunk 2 -- insert 2 ++hunk 2 -- insert 0 + hunk 2 -- initial 8 ++hunk 2 -- insert 4 ++hunk 2 -- insert 1 + hunk 2 -- initial 9 +-hunk 3 -- initial 0 +-hunk 3 -- initial 1 + hunk 3 -- initial 2 +-hunk 3 -- initial 3 +-hunk 3 -- initial 4 + hunk 3 -- initial 5 +-hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 ++hunk 4 -- insert 1 + hunk 4 -- initial 1 ++hunk 4 -- insert 3 + hunk 4 -- initial 2 ++hunk 4 -- insert 0 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 ++hunk 4 -- insert 2 ++hunk 4 -- insert 4 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +@@ -78,15 +93,10 @@ hunk 7 -- initial 6 + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +-hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 2 +-hunk 8 -- initial 3 + hunk 8 -- initial 4 +-hunk 8 -- initial 5 +-hunk 8 -- initial 6 + hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +@@ -101,7 +111,12 @@ hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 ++hunk 10 -- insert 0 ++hunk 10 -- insert 1 ++hunk 10 -- insert 3 + hunk 10 -- initial 3 ++hunk 10 -- insert 2 ++hunk 10 -- insert 4 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 +@@ -109,12 +124,7 @@ hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +-hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 +-hunk 11 -- initial 4 +-hunk 11 -- initial 5 +-hunk 11 -- initial 6 + hunk 11 -- initial 7 +-hunk 11 -- initial 8 + hunk 11 -- initial 9 ============================================================ --- tests/diff_output_formats/C.cd dfc8e8b1b564f42e96c52af0e5e73d09a9c31b6b +++ tests/diff_output_formats/C.cd dfc8e8b1b564f42e96c52af0e5e73d09a9c31b6b @@ -0,0 +1,143 @@ +*** C a855dab66165b2d529ede16de9e7334aaf58778f +--- C d127b34595fcbd709ce2dedb033065e4e3b5d351 +*************** +*** 14,22 **** +--- 14,27 ---- + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 ++ hunk 1 -- insert 0 + hunk 1 -- initial 6 + hunk 1 -- initial 7 ++ hunk 1 -- insert 2 + hunk 1 -- initial 8 ++ hunk 1 -- insert 3 ++ hunk 1 -- insert 1 ++ hunk 1 -- insert 4 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 +*************** +*** 28,52 **** + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +- hunk 4 -- initial 0 +- hunk 4 -- initial 1 +- hunk 4 -- initial 2 + hunk 4 -- initial 3 +- hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 +- hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +--- 33,57 ---- + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 ++ hunk 3 -- insert 0 + hunk 3 -- initial 0 + hunk 3 -- initial 1 ++ hunk 3 -- insert 3 + hunk 3 -- initial 2 ++ hunk 3 -- insert 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 ++ hunk 3 -- insert 1 ++ hunk 3 -- insert 4 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 3 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +*************** +*** 78,91 **** +--- 83,101 ---- + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++ hunk 8 -- insert 1 + hunk 8 -- initial 0 ++ hunk 8 -- insert 2 + hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++ hunk 8 -- insert 0 + hunk 8 -- initial 5 ++ hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++ hunk 8 -- insert 4 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 +*************** +*** 118,140 **** + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 +- hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +- hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +--- 128,150 ---- + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 5 + hunk 12 -- initial 9 ++ hunk 13 -- insert 2 + hunk 13 -- initial 0 ++ hunk 13 -- insert 1 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 ++ hunk 13 -- insert 0 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 ++ hunk 13 -- insert 3 ++ hunk 13 -- insert 4 + hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.cdp 62f1650941bca9406553a24a59fa64a809d2d9ee +++ tests/diff_output_formats/C.cdp 62f1650941bca9406553a24a59fa64a809d2d9ee @@ -0,0 +1,143 @@ +*** C a855dab66165b2d529ede16de9e7334aaf58778f +--- C d127b34595fcbd709ce2dedb033065e4e3b5d351 +*************** hunk 1 -- initial 2 +*** 14,22 **** +--- 14,27 ---- + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 ++ hunk 1 -- insert 0 + hunk 1 -- initial 6 + hunk 1 -- initial 7 ++ hunk 1 -- insert 2 + hunk 1 -- initial 8 ++ hunk 1 -- insert 3 ++ hunk 1 -- insert 1 ++ hunk 1 -- insert 4 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 +*************** hunk 2 -- initial 6 +*** 28,52 **** + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +- hunk 4 -- initial 0 +- hunk 4 -- initial 1 +- hunk 4 -- initial 2 + hunk 4 -- initial 3 +- hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 +- hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +--- 33,57 ---- + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 ++ hunk 3 -- insert 0 + hunk 3 -- initial 0 + hunk 3 -- initial 1 ++ hunk 3 -- insert 3 + hunk 3 -- initial 2 ++ hunk 3 -- insert 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 ++ hunk 3 -- insert 1 ++ hunk 3 -- insert 4 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 3 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +*************** hunk 7 -- initial 6 +*** 78,91 **** +--- 83,101 ---- + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++ hunk 8 -- insert 1 + hunk 8 -- initial 0 ++ hunk 8 -- insert 2 + hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++ hunk 8 -- insert 0 + hunk 8 -- initial 5 ++ hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++ hunk 8 -- insert 4 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 +*************** hunk 11 -- initial 6 +*** 118,140 **** + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 +- hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +- hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +--- 128,150 ---- + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 5 + hunk 12 -- initial 9 ++ hunk 13 -- insert 2 + hunk 13 -- initial 0 ++ hunk 13 -- insert 1 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 ++ hunk 13 -- insert 0 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 ++ hunk 13 -- insert 3 ++ hunk 13 -- insert 4 + hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.dst d127b34595fcbd709ce2dedb033065e4e3b5d351 +++ tests/diff_output_formats/C.dst d127b34595fcbd709ce2dedb033065e4e3b5d351 @@ -0,0 +1,150 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- insert 0 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- insert 2 +hunk 1 -- initial 8 +hunk 1 -- insert 3 +hunk 1 -- insert 1 +hunk 1 -- insert 4 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- insert 0 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- insert 3 +hunk 3 -- initial 2 +hunk 3 -- insert 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- insert 1 +hunk 3 -- insert 4 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 3 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- insert 1 +hunk 8 -- initial 0 +hunk 8 -- insert 2 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- insert 0 +hunk 8 -- initial 5 +hunk 8 -- insert 3 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- insert 4 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 5 +hunk 12 -- initial 9 +hunk 13 -- insert 2 +hunk 13 -- initial 0 +hunk 13 -- insert 1 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- insert 0 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- insert 3 +hunk 13 -- insert 4 +hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.src a855dab66165b2d529ede16de9e7334aaf58778f +++ tests/diff_output_formats/C.src a855dab66165b2d529ede16de9e7334aaf58778f @@ -0,0 +1,140 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.ud dd1ad0447e03f2d2217307f15b9161070291613a +++ tests/diff_output_formats/C.ud dd1ad0447e03f2d2217307f15b9161070291613a @@ -0,0 +1,97 @@ +--- C a855dab66165b2d529ede16de9e7334aaf58778f ++++ C d127b34595fcbd709ce2dedb033065e4e3b5d351 +@@ -14,9 +14,14 @@ + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 ++hunk 1 -- insert 0 + hunk 1 -- initial 6 + hunk 1 -- initial 7 ++hunk 1 -- insert 2 + hunk 1 -- initial 8 ++hunk 1 -- insert 3 ++hunk 1 -- insert 1 ++hunk 1 -- insert 4 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 +@@ -28,25 +33,25 @@ + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 ++hunk 3 -- insert 0 + hunk 3 -- initial 0 + hunk 3 -- initial 1 ++hunk 3 -- insert 3 + hunk 3 -- initial 2 ++hunk 3 -- insert 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 ++hunk 3 -- insert 1 ++hunk 3 -- insert 4 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +-hunk 4 -- initial 0 +-hunk 4 -- initial 1 +-hunk 4 -- initial 2 + hunk 4 -- initial 3 +-hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 +-hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +@@ -78,14 +83,19 @@ + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++hunk 8 -- insert 1 + hunk 8 -- initial 0 ++hunk 8 -- insert 2 + hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++hunk 8 -- insert 0 + hunk 8 -- initial 5 ++hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++hunk 8 -- insert 4 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 +@@ -118,23 +128,23 @@ + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 +-hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +-hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 ++hunk 13 -- insert 2 + hunk 13 -- initial 0 ++hunk 13 -- insert 1 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 ++hunk 13 -- insert 0 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 ++hunk 13 -- insert 3 ++hunk 13 -- insert 4 + hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.udp 712a589fe9c3611cbd53d55a7722046ac9bf5596 +++ tests/diff_output_formats/C.udp 712a589fe9c3611cbd53d55a7722046ac9bf5596 @@ -0,0 +1,97 @@ +--- C a855dab66165b2d529ede16de9e7334aaf58778f ++++ C d127b34595fcbd709ce2dedb033065e4e3b5d351 +@@ -14,9 +14,14 @@ hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 ++hunk 1 -- insert 0 + hunk 1 -- initial 6 + hunk 1 -- initial 7 ++hunk 1 -- insert 2 + hunk 1 -- initial 8 ++hunk 1 -- insert 3 ++hunk 1 -- insert 1 ++hunk 1 -- insert 4 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 +@@ -28,25 +33,25 @@ hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 ++hunk 3 -- insert 0 + hunk 3 -- initial 0 + hunk 3 -- initial 1 ++hunk 3 -- insert 3 + hunk 3 -- initial 2 ++hunk 3 -- insert 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 ++hunk 3 -- insert 1 ++hunk 3 -- insert 4 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +-hunk 4 -- initial 0 +-hunk 4 -- initial 1 +-hunk 4 -- initial 2 + hunk 4 -- initial 3 +-hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 +-hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +@@ -78,14 +83,19 @@ hunk 7 -- initial 6 + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++hunk 8 -- insert 1 + hunk 8 -- initial 0 ++hunk 8 -- insert 2 + hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++hunk 8 -- insert 0 + hunk 8 -- initial 5 ++hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++hunk 8 -- insert 4 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 +@@ -118,23 +128,23 @@ hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 +-hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +-hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 ++hunk 13 -- insert 2 + hunk 13 -- initial 0 ++hunk 13 -- insert 1 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 ++hunk 13 -- insert 0 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 ++hunk 13 -- insert 3 ++hunk 13 -- insert 4 + hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/D.cd 8efcc27199f95d4c4d47bda3aea64f7338a2d7d4 +++ tests/diff_output_formats/D.cd 8efcc27199f95d4c4d47bda3aea64f7338a2d7d4 @@ -0,0 +1,142 @@ +*** D f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a +--- D 500eab064ed1e352dd30a7f45535862b1d113826 +*************** +*** 1,12 **** +- hunk 0 -- initial 0 + hunk 0 -- initial 1 +- hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 +- hunk 0 -- initial 5 + hunk 0 -- initial 6 +- hunk 0 -- initial 7 +- hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 + hunk 1 -- initial 1 +--- 1,7 ---- +*************** +*** 38,51 **** + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +- hunk 4 -- initial 0 +- hunk 4 -- initial 1 + hunk 4 -- initial 2 +- hunk 4 -- initial 3 + hunk 4 -- initial 4 +- hunk 4 -- initial 5 + hunk 4 -- initial 6 +- hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +--- 33,41 ---- +*************** +*** 68,82 **** + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +- hunk 7 -- initial 0 +- hunk 7 -- initial 1 +- hunk 7 -- initial 2 +- hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 6 + hunk 7 -- initial 7 +- hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +--- 58,67 ---- +*************** +*** 99,131 **** + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 +- hunk 10 -- initial 1 + hunk 10 -- initial 2 +- hunk 10 -- initial 3 +- hunk 10 -- initial 4 +- hunk 10 -- initial 5 + hunk 10 -- initial 6 +- hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +--- 84,121 ---- + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 2 + hunk 10 -- initial 6 + hunk 10 -- initial 8 + hunk 10 -- initial 9 ++ hunk 11 -- insert 0 + hunk 11 -- initial 0 + hunk 11 -- initial 1 ++ hunk 11 -- insert 2 + hunk 11 -- initial 2 ++ hunk 11 -- insert 4 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++ hunk 11 -- insert 1 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++ hunk 11 -- insert 3 + hunk 11 -- initial 9 ++ hunk 12 -- insert 3 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 ++ hunk 12 -- insert 1 ++ hunk 12 -- insert 0 ++ hunk 12 -- insert 2 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 ++ hunk 12 -- insert 4 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +*************** +*** 148,160 **** + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 +- hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 +- hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 +- hunk 15 -- initial 6 +- hunk 15 -- initial 7 +- hunk 15 -- initial 8 + hunk 15 -- initial 9 +--- 138,145 ---- ============================================================ --- tests/diff_output_formats/D.cdp cd64dc67a74fd709ace880f5bb16ccb78805a35a +++ tests/diff_output_formats/D.cdp cd64dc67a74fd709ace880f5bb16ccb78805a35a @@ -0,0 +1,142 @@ +*** D f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a +--- D 500eab064ed1e352dd30a7f45535862b1d113826 +*************** +*** 1,12 **** +- hunk 0 -- initial 0 + hunk 0 -- initial 1 +- hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 +- hunk 0 -- initial 5 + hunk 0 -- initial 6 +- hunk 0 -- initial 7 +- hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 + hunk 1 -- initial 1 +--- 1,7 ---- +*************** hunk 3 -- initial 6 +*** 38,51 **** + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +- hunk 4 -- initial 0 +- hunk 4 -- initial 1 + hunk 4 -- initial 2 +- hunk 4 -- initial 3 + hunk 4 -- initial 4 +- hunk 4 -- initial 5 + hunk 4 -- initial 6 +- hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +--- 33,41 ---- +*************** hunk 6 -- initial 6 +*** 68,82 **** + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +- hunk 7 -- initial 0 +- hunk 7 -- initial 1 +- hunk 7 -- initial 2 +- hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 6 + hunk 7 -- initial 7 +- hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +--- 58,67 ---- +*************** hunk 9 -- initial 7 +*** 99,131 **** + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 +- hunk 10 -- initial 1 + hunk 10 -- initial 2 +- hunk 10 -- initial 3 +- hunk 10 -- initial 4 +- hunk 10 -- initial 5 + hunk 10 -- initial 6 +- hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +--- 84,121 ---- + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 2 + hunk 10 -- initial 6 + hunk 10 -- initial 8 + hunk 10 -- initial 9 ++ hunk 11 -- insert 0 + hunk 11 -- initial 0 + hunk 11 -- initial 1 ++ hunk 11 -- insert 2 + hunk 11 -- initial 2 ++ hunk 11 -- insert 4 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++ hunk 11 -- insert 1 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++ hunk 11 -- insert 3 + hunk 11 -- initial 9 ++ hunk 12 -- insert 3 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 ++ hunk 12 -- insert 1 ++ hunk 12 -- insert 0 ++ hunk 12 -- insert 2 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 ++ hunk 12 -- insert 4 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +*************** hunk 14 -- initial 6 +*** 148,160 **** + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 +- hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 +- hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 +- hunk 15 -- initial 6 +- hunk 15 -- initial 7 +- hunk 15 -- initial 8 + hunk 15 -- initial 9 +--- 138,145 ---- ============================================================ --- tests/diff_output_formats/D.dst 500eab064ed1e352dd30a7f45535862b1d113826 +++ tests/diff_output_formats/D.dst 500eab064ed1e352dd30a7f45535862b1d113826 @@ -0,0 +1,145 @@ +hunk 0 -- initial 1 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 6 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 2 +hunk 4 -- initial 4 +hunk 4 -- initial 6 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 2 +hunk 10 -- initial 6 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- insert 0 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- insert 2 +hunk 11 -- initial 2 +hunk 11 -- insert 4 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- insert 1 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- insert 3 +hunk 11 -- initial 9 +hunk 12 -- insert 3 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- insert 1 +hunk 12 -- insert 0 +hunk 12 -- insert 2 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- insert 4 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 9 ============================================================ --- tests/diff_output_formats/D.src f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a +++ tests/diff_output_formats/D.src f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a @@ -0,0 +1,160 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 ============================================================ --- tests/diff_output_formats/D.ud 5ea1449b845ca21262d6b8f2bc8f47f23bf791dd +++ tests/diff_output_formats/D.ud 5ea1449b845ca21262d6b8f2bc8f47f23bf791dd @@ -0,0 +1,104 @@ +--- D f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a ++++ D 500eab064ed1e352dd30a7f45535862b1d113826 +@@ -1,12 +1,7 @@ +-hunk 0 -- initial 0 + hunk 0 -- initial 1 +-hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 +-hunk 0 -- initial 5 + hunk 0 -- initial 6 +-hunk 0 -- initial 7 +-hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 + hunk 1 -- initial 1 +@@ -38,14 +33,9 @@ + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +-hunk 4 -- initial 0 +-hunk 4 -- initial 1 + hunk 4 -- initial 2 +-hunk 4 -- initial 3 + hunk 4 -- initial 4 +-hunk 4 -- initial 5 + hunk 4 -- initial 6 +-hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +@@ -68,15 +58,10 @@ + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +-hunk 7 -- initial 0 +-hunk 7 -- initial 1 +-hunk 7 -- initial 2 +-hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 6 + hunk 7 -- initial 7 +-hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +@@ -99,33 +84,38 @@ + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 +-hunk 10 -- initial 1 + hunk 10 -- initial 2 +-hunk 10 -- initial 3 +-hunk 10 -- initial 4 +-hunk 10 -- initial 5 + hunk 10 -- initial 6 +-hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 ++hunk 11 -- insert 0 + hunk 11 -- initial 0 + hunk 11 -- initial 1 ++hunk 11 -- insert 2 + hunk 11 -- initial 2 ++hunk 11 -- insert 4 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++hunk 11 -- insert 1 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++hunk 11 -- insert 3 + hunk 11 -- initial 9 ++hunk 12 -- insert 3 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 ++hunk 12 -- insert 1 ++hunk 12 -- insert 0 ++hunk 12 -- insert 2 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 ++hunk 12 -- insert 4 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +@@ -148,13 +138,8 @@ + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 +-hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 +-hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 +-hunk 15 -- initial 6 +-hunk 15 -- initial 7 +-hunk 15 -- initial 8 + hunk 15 -- initial 9 ============================================================ --- tests/diff_output_formats/D.udp ee6c2d228454f44dbded53ec84eed8f244d66394 +++ tests/diff_output_formats/D.udp ee6c2d228454f44dbded53ec84eed8f244d66394 @@ -0,0 +1,104 @@ +--- D f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a ++++ D 500eab064ed1e352dd30a7f45535862b1d113826 +@@ -1,12 +1,7 @@ +-hunk 0 -- initial 0 + hunk 0 -- initial 1 +-hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 +-hunk 0 -- initial 5 + hunk 0 -- initial 6 +-hunk 0 -- initial 7 +-hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 + hunk 1 -- initial 1 +@@ -38,14 +33,9 @@ hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +-hunk 4 -- initial 0 +-hunk 4 -- initial 1 + hunk 4 -- initial 2 +-hunk 4 -- initial 3 + hunk 4 -- initial 4 +-hunk 4 -- initial 5 + hunk 4 -- initial 6 +-hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +@@ -68,15 +58,10 @@ hunk 6 -- initial 6 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +-hunk 7 -- initial 0 +-hunk 7 -- initial 1 +-hunk 7 -- initial 2 +-hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 6 + hunk 7 -- initial 7 +-hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +@@ -99,33 +84,38 @@ hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 +-hunk 10 -- initial 1 + hunk 10 -- initial 2 +-hunk 10 -- initial 3 +-hunk 10 -- initial 4 +-hunk 10 -- initial 5 + hunk 10 -- initial 6 +-hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 ++hunk 11 -- insert 0 + hunk 11 -- initial 0 + hunk 11 -- initial 1 ++hunk 11 -- insert 2 + hunk 11 -- initial 2 ++hunk 11 -- insert 4 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++hunk 11 -- insert 1 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++hunk 11 -- insert 3 + hunk 11 -- initial 9 ++hunk 12 -- insert 3 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 ++hunk 12 -- insert 1 ++hunk 12 -- insert 0 ++hunk 12 -- insert 2 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 ++hunk 12 -- insert 4 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +@@ -148,13 +138,8 @@ hunk 14 -- initial 6 + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 +-hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 +-hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 +-hunk 15 -- initial 6 +-hunk 15 -- initial 7 +-hunk 15 -- initial 8 + hunk 15 -- initial 9 ============================================================ --- tests/diff_output_formats/E.cd f5d8b8de0d8d73eeb4f69dbb49609449b9957235 +++ tests/diff_output_formats/E.cd f5d8b8de0d8d73eeb4f69dbb49609449b9957235 @@ -0,0 +1,128 @@ +*** E b984e2f8d936bf914f04e727e43b10760b71dc4f +--- E 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +*************** +*** 8,18 **** +--- 8,23 ---- + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 ++ hunk 1 -- insert 0 ++ hunk 1 -- insert 1 + hunk 1 -- initial 0 ++ hunk 1 -- insert 3 ++ hunk 1 -- insert 4 + hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 ++ hunk 1 -- insert 2 + hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 +*************** +*** 38,49 **** +--- 43,59 ---- + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 ++ hunk 4 -- insert 3 + hunk 4 -- initial 0 ++ hunk 4 -- insert 2 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++ hunk 4 -- insert 1 + hunk 4 -- initial 4 ++ hunk 4 -- insert 0 + hunk 4 -- initial 5 ++ hunk 4 -- insert 4 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 +*************** +*** 88,98 **** +--- 98,113 ---- + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 ++ hunk 9 -- insert 2 + hunk 9 -- initial 0 ++ hunk 9 -- insert 4 + hunk 9 -- initial 1 ++ hunk 9 -- insert 3 ++ hunk 9 -- insert 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++ hunk 9 -- insert 0 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 +*************** +*** 104,112 **** +--- 119,132 ---- + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 ++ hunk 10 -- insert 3 ++ hunk 10 -- insert 4 ++ hunk 10 -- insert 2 ++ hunk 10 -- insert 0 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 ++ hunk 10 -- insert 1 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 +*************** +*** 119,132 **** + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 +- hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +- hunk 12 -- initial 4 +- hunk 12 -- initial 5 + hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 +--- 139,147 ---- +*************** +*** 138,152 **** + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +- hunk 14 -- initial 0 + hunk 14 -- initial 1 +- hunk 14 -- initial 2 +- hunk 14 -- initial 3 +- hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 +- hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 +--- 153,162 ---- +*************** +*** 178,180 **** +--- 188,200 ---- + hunk 17 -- initial 7 + hunk 17 -- initial 8 + hunk 17 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/E.cdp 5359754f3f5ee3c31222c266d93da93754deb27c +++ tests/diff_output_formats/E.cdp 5359754f3f5ee3c31222c266d93da93754deb27c @@ -0,0 +1,128 @@ +*** E b984e2f8d936bf914f04e727e43b10760b71dc4f +--- E 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +*************** hunk 0 -- initial 6 +*** 8,18 **** +--- 8,23 ---- + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 ++ hunk 1 -- insert 0 ++ hunk 1 -- insert 1 + hunk 1 -- initial 0 ++ hunk 1 -- insert 3 ++ hunk 1 -- insert 4 + hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 ++ hunk 1 -- insert 2 + hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 +*************** hunk 3 -- initial 6 +*** 38,49 **** +--- 43,59 ---- + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 ++ hunk 4 -- insert 3 + hunk 4 -- initial 0 ++ hunk 4 -- insert 2 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++ hunk 4 -- insert 1 + hunk 4 -- initial 4 ++ hunk 4 -- insert 0 + hunk 4 -- initial 5 ++ hunk 4 -- insert 4 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 +*************** hunk 8 -- initial 6 +*** 88,98 **** +--- 98,113 ---- + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 ++ hunk 9 -- insert 2 + hunk 9 -- initial 0 ++ hunk 9 -- insert 4 + hunk 9 -- initial 1 ++ hunk 9 -- insert 3 ++ hunk 9 -- insert 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++ hunk 9 -- insert 0 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 +*************** hunk 10 -- initial 2 +*** 104,112 **** +--- 119,132 ---- + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 ++ hunk 10 -- insert 3 ++ hunk 10 -- insert 4 ++ hunk 10 -- insert 2 ++ hunk 10 -- insert 0 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 ++ hunk 10 -- insert 1 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 +*************** hunk 11 -- initial 7 +*** 119,132 **** + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 +- hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +- hunk 12 -- initial 4 +- hunk 12 -- initial 5 + hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 +--- 139,147 ---- +*************** hunk 13 -- initial 6 +*** 138,152 **** + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +- hunk 14 -- initial 0 + hunk 14 -- initial 1 +- hunk 14 -- initial 2 +- hunk 14 -- initial 3 +- hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 +- hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 +--- 153,162 ---- +*************** hunk 17 -- initial 6 +*** 178,180 **** +--- 188,200 ---- + hunk 17 -- initial 7 + hunk 17 -- initial 8 + hunk 17 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/E.dst 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +++ tests/diff_output_formats/E.dst 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 @@ -0,0 +1,200 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- insert 0 +hunk 1 -- insert 1 +hunk 1 -- initial 0 +hunk 1 -- insert 3 +hunk 1 -- insert 4 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- insert 2 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- insert 3 +hunk 4 -- initial 0 +hunk 4 -- insert 2 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- insert 1 +hunk 4 -- initial 4 +hunk 4 -- insert 0 +hunk 4 -- initial 5 +hunk 4 -- insert 4 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- insert 2 +hunk 9 -- initial 0 +hunk 9 -- insert 4 +hunk 9 -- initial 1 +hunk 9 -- insert 3 +hunk 9 -- insert 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- insert 0 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- insert 3 +hunk 10 -- insert 4 +hunk 10 -- insert 2 +hunk 10 -- insert 0 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- insert 1 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 6 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 1 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +append 0 +append 1 +append 2 +append 3 +append 4 +append 5 +append 6 +append 7 +append 8 +append 9 ============================================================ --- tests/diff_output_formats/E.src b984e2f8d936bf914f04e727e43b10760b71dc4f +++ tests/diff_output_formats/E.src b984e2f8d936bf914f04e727e43b10760b71dc4f @@ -0,0 +1,180 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 ============================================================ --- tests/diff_output_formats/E.ud ad0604646c055468ff6fa301ea11a7397dadb19e +++ tests/diff_output_formats/E.ud ad0604646c055468ff6fa301ea11a7397dadb19e @@ -0,0 +1,114 @@ +--- E b984e2f8d936bf914f04e727e43b10760b71dc4f ++++ E 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +@@ -8,11 +8,16 @@ + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 ++hunk 1 -- insert 0 ++hunk 1 -- insert 1 + hunk 1 -- initial 0 ++hunk 1 -- insert 3 ++hunk 1 -- insert 4 + hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 ++hunk 1 -- insert 2 + hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 +@@ -38,12 +43,17 @@ + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 ++hunk 4 -- insert 3 + hunk 4 -- initial 0 ++hunk 4 -- insert 2 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++hunk 4 -- insert 1 + hunk 4 -- initial 4 ++hunk 4 -- insert 0 + hunk 4 -- initial 5 ++hunk 4 -- insert 4 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 +@@ -88,11 +98,16 @@ + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 ++hunk 9 -- insert 2 + hunk 9 -- initial 0 ++hunk 9 -- insert 4 + hunk 9 -- initial 1 ++hunk 9 -- insert 3 ++hunk 9 -- insert 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++hunk 9 -- insert 0 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 +@@ -104,9 +119,14 @@ + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 ++hunk 10 -- insert 3 ++hunk 10 -- insert 4 ++hunk 10 -- insert 2 ++hunk 10 -- insert 0 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 ++hunk 10 -- insert 1 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 +@@ -119,14 +139,9 @@ + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 +-hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +-hunk 12 -- initial 4 +-hunk 12 -- initial 5 + hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 +@@ -138,15 +153,10 @@ + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +-hunk 14 -- initial 0 + hunk 14 -- initial 1 +-hunk 14 -- initial 2 +-hunk 14 -- initial 3 +-hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 +-hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 +@@ -178,3 +188,13 @@ + hunk 17 -- initial 7 + hunk 17 -- initial 8 + hunk 17 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/E.udp 291adbd2143f1ded0671e332c5da03acba4731d5 +++ tests/diff_output_formats/E.udp 291adbd2143f1ded0671e332c5da03acba4731d5 @@ -0,0 +1,114 @@ +--- E b984e2f8d936bf914f04e727e43b10760b71dc4f ++++ E 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +@@ -8,11 +8,16 @@ hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 ++hunk 1 -- insert 0 ++hunk 1 -- insert 1 + hunk 1 -- initial 0 ++hunk 1 -- insert 3 ++hunk 1 -- insert 4 + hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 ++hunk 1 -- insert 2 + hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 +@@ -38,12 +43,17 @@ hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 ++hunk 4 -- insert 3 + hunk 4 -- initial 0 ++hunk 4 -- insert 2 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++hunk 4 -- insert 1 + hunk 4 -- initial 4 ++hunk 4 -- insert 0 + hunk 4 -- initial 5 ++hunk 4 -- insert 4 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 +@@ -88,11 +98,16 @@ hunk 8 -- initial 6 + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 ++hunk 9 -- insert 2 + hunk 9 -- initial 0 ++hunk 9 -- insert 4 + hunk 9 -- initial 1 ++hunk 9 -- insert 3 ++hunk 9 -- insert 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++hunk 9 -- insert 0 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 +@@ -104,9 +119,14 @@ hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 ++hunk 10 -- insert 3 ++hunk 10 -- insert 4 ++hunk 10 -- insert 2 ++hunk 10 -- insert 0 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 ++hunk 10 -- insert 1 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 +@@ -119,14 +139,9 @@ hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 +-hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +-hunk 12 -- initial 4 +-hunk 12 -- initial 5 + hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 +@@ -138,15 +153,10 @@ hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +-hunk 14 -- initial 0 + hunk 14 -- initial 1 +-hunk 14 -- initial 2 +-hunk 14 -- initial 3 +-hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 +-hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 +@@ -178,3 +188,13 @@ hunk 17 -- initial 6 + hunk 17 -- initial 7 + hunk 17 -- initial 8 + hunk 17 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/F.cd 32fc67fdd05aeb4ab96674896723ac424141158b +++ tests/diff_output_formats/F.cd 32fc67fdd05aeb4ab96674896723ac424141158b @@ -0,0 +1,182 @@ +*** F 4665d5dc5d5be1f5496840ca248f5d459be1fe0e +--- F e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +*************** +*** 1,11 **** +--- 1,26 ---- ++ prepend 0 ++ prepend 1 ++ prepend 2 ++ prepend 3 ++ prepend 4 ++ prepend 5 ++ prepend 6 ++ prepend 7 ++ prepend 8 ++ prepend 9 ++ hunk 0 -- insert 2 + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 ++ hunk 0 -- insert 1 ++ hunk 0 -- insert 0 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 ++ hunk 0 -- insert 4 + hunk 0 -- initial 7 ++ hunk 0 -- insert 3 + hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 +*************** +*** 22,42 **** + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 +- hunk 3 -- initial 3 +- hunk 3 -- initial 4 +- hunk 3 -- initial 5 + hunk 3 -- initial 6 +- hunk 3 -- initial 7 +- hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +--- 37,57 ---- + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 ++ hunk 2 -- insert 2 ++ hunk 2 -- insert 4 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 ++ hunk 2 -- insert 1 ++ hunk 2 -- insert 0 ++ hunk 2 -- insert 3 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 + hunk 3 -- initial 6 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +*************** +*** 60,70 **** +--- 75,90 ---- + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 ++ hunk 6 -- insert 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 ++ hunk 6 -- insert 0 ++ hunk 6 -- insert 2 ++ hunk 6 -- insert 3 ++ hunk 6 -- insert 4 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +*************** +*** 98,111 **** + hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 +- hunk 10 -- initial 0 +- hunk 10 -- initial 1 +- hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 +- hunk 10 -- initial 6 +- hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +--- 118,126 ---- +*************** +*** 115,142 **** + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 +- hunk 12 -- initial 3 +- hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 +- hunk 13 -- initial 0 +- hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 +- hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +--- 130,152 ---- + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 ++ hunk 11 -- insert 2 ++ hunk 11 -- insert 4 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++ hunk 11 -- insert 0 ++ hunk 11 -- insert 3 ++ hunk 11 -- insert 1 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 5 + hunk 12 -- initial 9 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +*************** +*** 198,200 **** +--- 208,220 ---- + hunk 19 -- initial 7 + hunk 19 -- initial 8 + hunk 19 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/F.cdp da09b452df8eca6e4b409b2c60ed51ce4ed34abc +++ tests/diff_output_formats/F.cdp da09b452df8eca6e4b409b2c60ed51ce4ed34abc @@ -0,0 +1,182 @@ +*** F 4665d5dc5d5be1f5496840ca248f5d459be1fe0e +--- F e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +*************** +*** 1,11 **** +--- 1,26 ---- ++ prepend 0 ++ prepend 1 ++ prepend 2 ++ prepend 3 ++ prepend 4 ++ prepend 5 ++ prepend 6 ++ prepend 7 ++ prepend 8 ++ prepend 9 ++ hunk 0 -- insert 2 + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 ++ hunk 0 -- insert 1 ++ hunk 0 -- insert 0 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 ++ hunk 0 -- insert 4 + hunk 0 -- initial 7 ++ hunk 0 -- insert 3 + hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 +*************** hunk 2 -- initial 0 +*** 22,42 **** + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 +- hunk 3 -- initial 3 +- hunk 3 -- initial 4 +- hunk 3 -- initial 5 + hunk 3 -- initial 6 +- hunk 3 -- initial 7 +- hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +--- 37,57 ---- + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 ++ hunk 2 -- insert 2 ++ hunk 2 -- insert 4 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 ++ hunk 2 -- insert 1 ++ hunk 2 -- insert 0 ++ hunk 2 -- insert 3 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 + hunk 3 -- initial 6 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +*************** hunk 5 -- initial 8 +*** 60,70 **** +--- 75,90 ---- + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 ++ hunk 6 -- insert 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 ++ hunk 6 -- insert 0 ++ hunk 6 -- insert 2 ++ hunk 6 -- insert 3 ++ hunk 6 -- insert 4 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +*************** hunk 9 -- initial 6 +*** 98,111 **** + hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 +- hunk 10 -- initial 0 +- hunk 10 -- initial 1 +- hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 +- hunk 10 -- initial 6 +- hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +--- 118,126 ---- +*************** hunk 11 -- initial 3 +*** 115,142 **** + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 +- hunk 12 -- initial 3 +- hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 +- hunk 13 -- initial 0 +- hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 +- hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +--- 130,152 ---- + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 ++ hunk 11 -- insert 2 ++ hunk 11 -- insert 4 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++ hunk 11 -- insert 0 ++ hunk 11 -- insert 3 ++ hunk 11 -- insert 1 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 5 + hunk 12 -- initial 9 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +*************** hunk 19 -- initial 6 +*** 198,200 **** +--- 208,220 ---- + hunk 19 -- initial 7 + hunk 19 -- initial 8 + hunk 19 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/F.dst e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +++ tests/diff_output_formats/F.dst e6a9ea1b3439de3a9add6bb24d5d08862076dc67 @@ -0,0 +1,220 @@ +prepend 0 +prepend 1 +prepend 2 +prepend 3 +prepend 4 +prepend 5 +prepend 6 +prepend 7 +prepend 8 +prepend 9 +hunk 0 -- insert 2 +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- insert 1 +hunk 0 -- insert 0 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- insert 4 +hunk 0 -- initial 7 +hunk 0 -- insert 3 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- insert 2 +hunk 2 -- insert 4 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- insert 1 +hunk 2 -- insert 0 +hunk 2 -- insert 3 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 6 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- insert 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- insert 0 +hunk 6 -- insert 2 +hunk 6 -- insert 3 +hunk 6 -- insert 4 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- insert 2 +hunk 11 -- insert 4 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- insert 0 +hunk 11 -- insert 3 +hunk 11 -- insert 1 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 5 +hunk 12 -- initial 9 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +append 0 +append 1 +append 2 +append 3 +append 4 +append 5 +append 6 +append 7 +append 8 +append 9 ============================================================ --- tests/diff_output_formats/F.src 4665d5dc5d5be1f5496840ca248f5d459be1fe0e +++ tests/diff_output_formats/F.src 4665d5dc5d5be1f5496840ca248f5d459be1fe0e @@ -0,0 +1,200 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 ============================================================ --- tests/diff_output_formats/F.ud 2d1b447b46e7931557e1597c0f42cbdfce8fa388 +++ tests/diff_output_formats/F.ud 2d1b447b46e7931557e1597c0f42cbdfce8fa388 @@ -0,0 +1,136 @@ +--- F 4665d5dc5d5be1f5496840ca248f5d459be1fe0e ++++ F e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +@@ -1,11 +1,26 @@ ++prepend 0 ++prepend 1 ++prepend 2 ++prepend 3 ++prepend 4 ++prepend 5 ++prepend 6 ++prepend 7 ++prepend 8 ++prepend 9 ++hunk 0 -- insert 2 + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 ++hunk 0 -- insert 1 ++hunk 0 -- insert 0 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 ++hunk 0 -- insert 4 + hunk 0 -- initial 7 ++hunk 0 -- insert 3 + hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 +@@ -22,21 +37,21 @@ + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 ++hunk 2 -- insert 2 ++hunk 2 -- insert 4 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 ++hunk 2 -- insert 1 ++hunk 2 -- insert 0 ++hunk 2 -- insert 3 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 +-hunk 3 -- initial 3 +-hunk 3 -- initial 4 +-hunk 3 -- initial 5 + hunk 3 -- initial 6 +-hunk 3 -- initial 7 +-hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +@@ -60,11 +75,16 @@ + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 ++hunk 6 -- insert 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 ++hunk 6 -- insert 0 ++hunk 6 -- insert 2 ++hunk 6 -- insert 3 ++hunk 6 -- insert 4 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +@@ -98,14 +118,9 @@ + hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 +-hunk 10 -- initial 0 +-hunk 10 -- initial 1 +-hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 +-hunk 10 -- initial 6 +-hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +@@ -115,28 +130,23 @@ + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 ++hunk 11 -- insert 2 ++hunk 11 -- insert 4 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++hunk 11 -- insert 0 ++hunk 11 -- insert 3 ++hunk 11 -- insert 1 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 +-hunk 12 -- initial 3 +-hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 +-hunk 13 -- initial 0 +-hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 +-hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +@@ -198,3 +208,13 @@ + hunk 19 -- initial 7 + hunk 19 -- initial 8 + hunk 19 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/F.udp 45f8cd335cdb9748e59b6f56b33d71e265163a8b +++ tests/diff_output_formats/F.udp 45f8cd335cdb9748e59b6f56b33d71e265163a8b @@ -0,0 +1,136 @@ +--- F 4665d5dc5d5be1f5496840ca248f5d459be1fe0e ++++ F e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +@@ -1,11 +1,26 @@ ++prepend 0 ++prepend 1 ++prepend 2 ++prepend 3 ++prepend 4 ++prepend 5 ++prepend 6 ++prepend 7 ++prepend 8 ++prepend 9 ++hunk 0 -- insert 2 + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 ++hunk 0 -- insert 1 ++hunk 0 -- insert 0 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 ++hunk 0 -- insert 4 + hunk 0 -- initial 7 ++hunk 0 -- insert 3 + hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 +@@ -22,21 +37,21 @@ hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 ++hunk 2 -- insert 2 ++hunk 2 -- insert 4 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 ++hunk 2 -- insert 1 ++hunk 2 -- insert 0 ++hunk 2 -- insert 3 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 +-hunk 3 -- initial 3 +-hunk 3 -- initial 4 +-hunk 3 -- initial 5 + hunk 3 -- initial 6 +-hunk 3 -- initial 7 +-hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +@@ -60,11 +75,16 @@ hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 ++hunk 6 -- insert 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 ++hunk 6 -- insert 0 ++hunk 6 -- insert 2 ++hunk 6 -- insert 3 ++hunk 6 -- insert 4 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +@@ -98,14 +118,9 @@ hunk 9 -- initial 6 + hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 +-hunk 10 -- initial 0 +-hunk 10 -- initial 1 +-hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 +-hunk 10 -- initial 6 +-hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +@@ -115,28 +130,23 @@ hunk 11 -- initial 3 + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 ++hunk 11 -- insert 2 ++hunk 11 -- insert 4 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++hunk 11 -- insert 0 ++hunk 11 -- insert 3 ++hunk 11 -- insert 1 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 +-hunk 12 -- initial 3 +-hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 +-hunk 13 -- initial 0 +-hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 +-hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +@@ -198,3 +208,13 @@ hunk 19 -- initial 6 + hunk 19 -- initial 7 + hunk 19 -- initial 8 + hunk 19 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/G.cd eea66c30a23938cc3332ad9c9d8b53149ae599eb +++ tests/diff_output_formats/G.cd eea66c30a23938cc3332ad9c9d8b53149ae599eb @@ -0,0 +1,186 @@ +*** G b4acbe7b532ecffc6f1c7893d2531838807ffccd +--- G 609b4ae23447168db4bf7395433c41bdfcc249d0 +*************** +*** 8,20 **** + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 +- hunk 1 -- initial 1 +- hunk 1 -- initial 2 +- hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 +- hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 +--- 8,15 ---- +*************** +*** 29,40 **** +--- 24,40 ---- + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 ++ hunk 3 -- insert 0 ++ hunk 3 -- insert 3 + hunk 3 -- initial 1 ++ hunk 3 -- insert 4 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 ++ hunk 3 -- insert 2 + hunk 3 -- initial 5 + hunk 3 -- initial 6 ++ hunk 3 -- insert 1 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +*************** +*** 50,59 **** +--- 50,64 ---- + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 ++ hunk 5 -- insert 1 ++ hunk 5 -- insert 0 + hunk 5 -- initial 2 + hunk 5 -- initial 3 ++ hunk 5 -- insert 4 + hunk 5 -- initial 4 + hunk 5 -- initial 5 ++ hunk 5 -- insert 2 ++ hunk 5 -- insert 3 + hunk 5 -- initial 6 + hunk 5 -- initial 7 + hunk 5 -- initial 8 +*************** +*** 109,118 **** +--- 114,128 ---- + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 ++ hunk 11 -- insert 4 + hunk 11 -- initial 1 ++ hunk 11 -- insert 3 ++ hunk 11 -- insert 2 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++ hunk 11 -- insert 1 ++ hunk 11 -- insert 0 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 +*************** +*** 122,142 **** + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +- hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 +- hunk 13 -- initial 6 + hunk 13 -- initial 7 +- hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +--- 132,152 ---- + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++ hunk 12 -- insert 2 ++ hunk 12 -- insert 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++ hunk 12 -- insert 4 ++ hunk 12 -- insert 0 ++ hunk 12 -- insert 1 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 7 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +*************** +*** 149,171 **** + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 +- hunk 16 -- initial 0 + hunk 16 -- initial 1 +- hunk 16 -- initial 2 + hunk 16 -- initial 3 + hunk 16 -- initial 4 +- hunk 16 -- initial 5 +- hunk 16 -- initial 6 +- hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +--- 159,181 ---- + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 ++ hunk 15 -- insert 2 ++ hunk 15 -- insert 1 + hunk 15 -- initial 1 ++ hunk 15 -- insert 3 + hunk 15 -- initial 2 ++ hunk 15 -- insert 0 + hunk 15 -- initial 3 + hunk 15 -- initial 4 ++ hunk 15 -- insert 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 1 + hunk 16 -- initial 3 + hunk 16 -- initial 4 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +*************** +*** 211,220 **** +--- 221,235 ---- + hunk 21 -- initial 0 + hunk 21 -- initial 1 + hunk 21 -- initial 2 ++ hunk 21 -- insert 1 + hunk 21 -- initial 3 + hunk 21 -- initial 4 + hunk 21 -- initial 5 + hunk 21 -- initial 6 ++ hunk 21 -- insert 4 + hunk 21 -- initial 7 ++ hunk 21 -- insert 3 + hunk 21 -- initial 8 ++ hunk 21 -- insert 0 ++ hunk 21 -- insert 2 + hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.cdp 8472049d7b6e94f37226d3a1e5d11b8ce87c6f4f +++ tests/diff_output_formats/G.cdp 8472049d7b6e94f37226d3a1e5d11b8ce87c6f4f @@ -0,0 +1,186 @@ +*** G b4acbe7b532ecffc6f1c7893d2531838807ffccd +--- G 609b4ae23447168db4bf7395433c41bdfcc249d0 +*************** hunk 0 -- initial 6 +*** 8,20 **** + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 +- hunk 1 -- initial 1 +- hunk 1 -- initial 2 +- hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 +- hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 +--- 8,15 ---- +*************** hunk 2 -- initial 7 +*** 29,40 **** +--- 24,40 ---- + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 ++ hunk 3 -- insert 0 ++ hunk 3 -- insert 3 + hunk 3 -- initial 1 ++ hunk 3 -- insert 4 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 ++ hunk 3 -- insert 2 + hunk 3 -- initial 5 + hunk 3 -- initial 6 ++ hunk 3 -- insert 1 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +*************** hunk 4 -- initial 8 +*** 50,59 **** +--- 50,64 ---- + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 ++ hunk 5 -- insert 1 ++ hunk 5 -- insert 0 + hunk 5 -- initial 2 + hunk 5 -- initial 3 ++ hunk 5 -- insert 4 + hunk 5 -- initial 4 + hunk 5 -- initial 5 ++ hunk 5 -- insert 2 ++ hunk 5 -- insert 3 + hunk 5 -- initial 6 + hunk 5 -- initial 7 + hunk 5 -- initial 8 +*************** hunk 10 -- initial 7 +*** 109,118 **** +--- 114,128 ---- + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 ++ hunk 11 -- insert 4 + hunk 11 -- initial 1 ++ hunk 11 -- insert 3 ++ hunk 11 -- insert 2 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++ hunk 11 -- insert 1 ++ hunk 11 -- insert 0 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 +*************** hunk 12 -- initial 0 +*** 122,142 **** + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +- hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 +- hunk 13 -- initial 6 + hunk 13 -- initial 7 +- hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +--- 132,152 ---- + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++ hunk 12 -- insert 2 ++ hunk 12 -- insert 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++ hunk 12 -- insert 4 ++ hunk 12 -- insert 0 ++ hunk 12 -- insert 1 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 7 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +*************** hunk 14 -- initial 7 +*** 149,171 **** + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 +- hunk 16 -- initial 0 + hunk 16 -- initial 1 +- hunk 16 -- initial 2 + hunk 16 -- initial 3 + hunk 16 -- initial 4 +- hunk 16 -- initial 5 +- hunk 16 -- initial 6 +- hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +--- 159,181 ---- + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 ++ hunk 15 -- insert 2 ++ hunk 15 -- insert 1 + hunk 15 -- initial 1 ++ hunk 15 -- insert 3 + hunk 15 -- initial 2 ++ hunk 15 -- insert 0 + hunk 15 -- initial 3 + hunk 15 -- initial 4 ++ hunk 15 -- insert 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 1 + hunk 16 -- initial 3 + hunk 16 -- initial 4 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +*************** hunk 20 -- initial 9 +*** 211,220 **** +--- 221,235 ---- + hunk 21 -- initial 0 + hunk 21 -- initial 1 + hunk 21 -- initial 2 ++ hunk 21 -- insert 1 + hunk 21 -- initial 3 + hunk 21 -- initial 4 + hunk 21 -- initial 5 + hunk 21 -- initial 6 ++ hunk 21 -- insert 4 + hunk 21 -- initial 7 ++ hunk 21 -- insert 3 + hunk 21 -- initial 8 ++ hunk 21 -- insert 0 ++ hunk 21 -- insert 2 + hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.dst 609b4ae23447168db4bf7395433c41bdfcc249d0 +++ tests/diff_output_formats/G.dst 609b4ae23447168db4bf7395433c41bdfcc249d0 @@ -0,0 +1,235 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- insert 0 +hunk 3 -- insert 3 +hunk 3 -- initial 1 +hunk 3 -- insert 4 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- insert 2 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- insert 1 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- insert 1 +hunk 5 -- insert 0 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- insert 4 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- insert 2 +hunk 5 -- insert 3 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- insert 4 +hunk 11 -- initial 1 +hunk 11 -- insert 3 +hunk 11 -- insert 2 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- insert 1 +hunk 11 -- insert 0 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- insert 2 +hunk 12 -- insert 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- insert 4 +hunk 12 -- insert 0 +hunk 12 -- insert 1 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 7 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- insert 2 +hunk 15 -- insert 1 +hunk 15 -- initial 1 +hunk 15 -- insert 3 +hunk 15 -- initial 2 +hunk 15 -- insert 0 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- insert 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 1 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- insert 1 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- insert 4 +hunk 21 -- initial 7 +hunk 21 -- insert 3 +hunk 21 -- initial 8 +hunk 21 -- insert 0 +hunk 21 -- insert 2 +hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.src b4acbe7b532ecffc6f1c7893d2531838807ffccd +++ tests/diff_output_formats/G.src b4acbe7b532ecffc6f1c7893d2531838807ffccd @@ -0,0 +1,220 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.ud fd5b9eefe4e8e6fe5efe8945d383f7d1287c55e7 +++ tests/diff_output_formats/G.ud fd5b9eefe4e8e6fe5efe8945d383f7d1287c55e7 @@ -0,0 +1,138 @@ +--- G b4acbe7b532ecffc6f1c7893d2531838807ffccd ++++ G 609b4ae23447168db4bf7395433c41bdfcc249d0 +@@ -8,13 +8,8 @@ + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 +-hunk 1 -- initial 1 +-hunk 1 -- initial 2 +-hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 +-hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 +@@ -29,12 +24,17 @@ + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 ++hunk 3 -- insert 0 ++hunk 3 -- insert 3 + hunk 3 -- initial 1 ++hunk 3 -- insert 4 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 ++hunk 3 -- insert 2 + hunk 3 -- initial 5 + hunk 3 -- initial 6 ++hunk 3 -- insert 1 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +@@ -50,10 +50,15 @@ + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 ++hunk 5 -- insert 1 ++hunk 5 -- insert 0 + hunk 5 -- initial 2 + hunk 5 -- initial 3 ++hunk 5 -- insert 4 + hunk 5 -- initial 4 + hunk 5 -- initial 5 ++hunk 5 -- insert 2 ++hunk 5 -- insert 3 + hunk 5 -- initial 6 + hunk 5 -- initial 7 + hunk 5 -- initial 8 +@@ -109,10 +114,15 @@ + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 ++hunk 11 -- insert 4 + hunk 11 -- initial 1 ++hunk 11 -- insert 3 ++hunk 11 -- insert 2 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++hunk 11 -- insert 1 ++hunk 11 -- insert 0 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 +@@ -122,21 +132,21 @@ + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++hunk 12 -- insert 2 ++hunk 12 -- insert 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++hunk 12 -- insert 4 ++hunk 12 -- insert 0 ++hunk 12 -- insert 1 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +-hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 +-hunk 13 -- initial 6 + hunk 13 -- initial 7 +-hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +@@ -149,23 +159,23 @@ + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 ++hunk 15 -- insert 2 ++hunk 15 -- insert 1 + hunk 15 -- initial 1 ++hunk 15 -- insert 3 + hunk 15 -- initial 2 ++hunk 15 -- insert 0 + hunk 15 -- initial 3 + hunk 15 -- initial 4 ++hunk 15 -- insert 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 +-hunk 16 -- initial 0 + hunk 16 -- initial 1 +-hunk 16 -- initial 2 + hunk 16 -- initial 3 + hunk 16 -- initial 4 +-hunk 16 -- initial 5 +-hunk 16 -- initial 6 +-hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +@@ -211,10 +221,15 @@ + hunk 21 -- initial 0 + hunk 21 -- initial 1 + hunk 21 -- initial 2 ++hunk 21 -- insert 1 + hunk 21 -- initial 3 + hunk 21 -- initial 4 + hunk 21 -- initial 5 + hunk 21 -- initial 6 ++hunk 21 -- insert 4 + hunk 21 -- initial 7 ++hunk 21 -- insert 3 + hunk 21 -- initial 8 ++hunk 21 -- insert 0 ++hunk 21 -- insert 2 + hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.udp 3fb6ca62deb44f8f6ed938498d5da2e2ac5a8634 +++ tests/diff_output_formats/G.udp 3fb6ca62deb44f8f6ed938498d5da2e2ac5a8634 @@ -0,0 +1,138 @@ +--- G b4acbe7b532ecffc6f1c7893d2531838807ffccd ++++ G 609b4ae23447168db4bf7395433c41bdfcc249d0 +@@ -8,13 +8,8 @@ hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 +-hunk 1 -- initial 1 +-hunk 1 -- initial 2 +-hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 +-hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 +@@ -29,12 +24,17 @@ hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 ++hunk 3 -- insert 0 ++hunk 3 -- insert 3 + hunk 3 -- initial 1 ++hunk 3 -- insert 4 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 ++hunk 3 -- insert 2 + hunk 3 -- initial 5 + hunk 3 -- initial 6 ++hunk 3 -- insert 1 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +@@ -50,10 +50,15 @@ hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 ++hunk 5 -- insert 1 ++hunk 5 -- insert 0 + hunk 5 -- initial 2 + hunk 5 -- initial 3 ++hunk 5 -- insert 4 + hunk 5 -- initial 4 + hunk 5 -- initial 5 ++hunk 5 -- insert 2 ++hunk 5 -- insert 3 + hunk 5 -- initial 6 + hunk 5 -- initial 7 + hunk 5 -- initial 8 +@@ -109,10 +114,15 @@ hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 ++hunk 11 -- insert 4 + hunk 11 -- initial 1 ++hunk 11 -- insert 3 ++hunk 11 -- insert 2 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++hunk 11 -- insert 1 ++hunk 11 -- insert 0 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 +@@ -122,21 +132,21 @@ hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++hunk 12 -- insert 2 ++hunk 12 -- insert 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++hunk 12 -- insert 4 ++hunk 12 -- insert 0 ++hunk 12 -- insert 1 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +-hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 +-hunk 13 -- initial 6 + hunk 13 -- initial 7 +-hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +@@ -149,23 +159,23 @@ hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 ++hunk 15 -- insert 2 ++hunk 15 -- insert 1 + hunk 15 -- initial 1 ++hunk 15 -- insert 3 + hunk 15 -- initial 2 ++hunk 15 -- insert 0 + hunk 15 -- initial 3 + hunk 15 -- initial 4 ++hunk 15 -- insert 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 +-hunk 16 -- initial 0 + hunk 16 -- initial 1 +-hunk 16 -- initial 2 + hunk 16 -- initial 3 + hunk 16 -- initial 4 +-hunk 16 -- initial 5 +-hunk 16 -- initial 6 +-hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +@@ -211,10 +221,15 @@ hunk 20 -- initial 9 + hunk 21 -- initial 0 + hunk 21 -- initial 1 + hunk 21 -- initial 2 ++hunk 21 -- insert 1 + hunk 21 -- initial 3 + hunk 21 -- initial 4 + hunk 21 -- initial 5 + hunk 21 -- initial 6 ++hunk 21 -- insert 4 + hunk 21 -- initial 7 ++hunk 21 -- insert 3 + hunk 21 -- initial 8 ++hunk 21 -- insert 0 ++hunk 21 -- insert 2 + hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/H.cd e9e0b4f7c683e5620fd46d3d8fa9b68e77d4cd64 +++ tests/diff_output_formats/H.cd e9e0b4f7c683e5620fd46d3d8fa9b68e77d4cd64 @@ -0,0 +1,222 @@ +*** H b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 +--- H 2f076c5d449b7841f873a173f4c8ac162d778304 +*************** +*** 42,51 **** +--- 42,56 ---- + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++ hunk 4 -- insert 4 ++ hunk 4 -- insert 0 + hunk 4 -- initial 4 + hunk 4 -- initial 5 ++ hunk 4 -- insert 3 ++ hunk 4 -- insert 2 + hunk 4 -- initial 6 + hunk 4 -- initial 7 ++ hunk 4 -- insert 1 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +*************** +*** 59,92 **** + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 +- hunk 7 -- initial 4 +- hunk 7 -- initial 5 +- hunk 7 -- initial 6 +- hunk 7 -- initial 7 +- hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +- hunk 8 -- initial 2 +- hunk 8 -- initial 3 +- hunk 8 -- initial 4 + hunk 8 -- initial 5 + hunk 8 -- initial 6 +- hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +--- 64,92 ---- + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 ++ hunk 6 -- insert 1 ++ hunk 6 -- insert 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 ++ hunk 6 -- insert 4 + hunk 6 -- initial 3 ++ hunk 6 -- insert 2 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 ++ hunk 6 -- insert 3 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 5 + hunk 8 -- initial 6 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +*************** +*** 95,102 **** +--- 95,107 ---- + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 ++ hunk 9 -- insert 0 + hunk 9 -- initial 7 ++ hunk 9 -- insert 1 + hunk 9 -- initial 8 ++ hunk 9 -- insert 3 ++ hunk 9 -- insert 4 ++ hunk 9 -- insert 2 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +*************** +*** 118,161 **** + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 +- hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 +- hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 + hunk 13 -- initial 6 +- hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +--- 123,176 ---- + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 ++ hunk 12 -- insert 4 + hunk 12 -- initial 0 + hunk 12 -- initial 1 ++ hunk 12 -- insert 3 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++ hunk 12 -- insert 2 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++ hunk 12 -- insert 1 ++ hunk 12 -- insert 0 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 6 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++ hunk 14 -- insert 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 ++ hunk 14 -- insert 3 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 ++ hunk 14 -- insert 0 + hunk 14 -- initial 8 ++ hunk 14 -- insert 4 ++ hunk 14 -- insert 2 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 ++ hunk 15 -- insert 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 ++ hunk 15 -- insert 2 ++ hunk 15 -- insert 0 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 ++ hunk 15 -- insert 3 + hunk 15 -- initial 7 ++ hunk 15 -- insert 4 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +*************** +*** 192,202 **** +--- 207,222 ---- + hunk 19 -- initial 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 ++ hunk 19 -- insert 3 ++ hunk 19 -- insert 0 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 + hunk 19 -- initial 7 + hunk 19 -- initial 8 ++ hunk 19 -- insert 1 ++ hunk 19 -- insert 2 ++ hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ============================================================ --- tests/diff_output_formats/H.cdp 9cafc25f889fef524ee2391fbfa271c5876cf35e +++ tests/diff_output_formats/H.cdp 9cafc25f889fef524ee2391fbfa271c5876cf35e @@ -0,0 +1,222 @@ +*** H b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 +--- H 2f076c5d449b7841f873a173f4c8ac162d778304 +*************** hunk 4 -- initial 0 +*** 42,51 **** +--- 42,56 ---- + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++ hunk 4 -- insert 4 ++ hunk 4 -- insert 0 + hunk 4 -- initial 4 + hunk 4 -- initial 5 ++ hunk 4 -- insert 3 ++ hunk 4 -- insert 2 + hunk 4 -- initial 6 + hunk 4 -- initial 7 ++ hunk 4 -- insert 1 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +*************** hunk 5 -- initial 7 +*** 59,92 **** + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 +- hunk 7 -- initial 4 +- hunk 7 -- initial 5 +- hunk 7 -- initial 6 +- hunk 7 -- initial 7 +- hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +- hunk 8 -- initial 2 +- hunk 8 -- initial 3 +- hunk 8 -- initial 4 + hunk 8 -- initial 5 + hunk 8 -- initial 6 +- hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +--- 64,92 ---- + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 ++ hunk 6 -- insert 1 ++ hunk 6 -- insert 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 ++ hunk 6 -- insert 4 + hunk 6 -- initial 3 ++ hunk 6 -- insert 2 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 ++ hunk 6 -- insert 3 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 5 + hunk 8 -- initial 6 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +*************** hunk 9 -- initial 3 +*** 95,102 **** +--- 95,107 ---- + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 ++ hunk 9 -- insert 0 + hunk 9 -- initial 7 ++ hunk 9 -- insert 1 + hunk 9 -- initial 8 ++ hunk 9 -- insert 3 ++ hunk 9 -- insert 4 ++ hunk 9 -- insert 2 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +*************** hunk 11 -- initial 6 +*** 118,161 **** + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 +- hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 +- hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 + hunk 13 -- initial 6 +- hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +--- 123,176 ---- + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 ++ hunk 12 -- insert 4 + hunk 12 -- initial 0 + hunk 12 -- initial 1 ++ hunk 12 -- insert 3 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++ hunk 12 -- insert 2 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++ hunk 12 -- insert 1 ++ hunk 12 -- insert 0 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 6 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++ hunk 14 -- insert 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 ++ hunk 14 -- insert 3 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 ++ hunk 14 -- insert 0 + hunk 14 -- initial 8 ++ hunk 14 -- insert 4 ++ hunk 14 -- insert 2 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 ++ hunk 15 -- insert 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 ++ hunk 15 -- insert 2 ++ hunk 15 -- insert 0 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 ++ hunk 15 -- insert 3 + hunk 15 -- initial 7 ++ hunk 15 -- insert 4 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +*************** hunk 19 -- initial 0 +*** 192,202 **** +--- 207,222 ---- + hunk 19 -- initial 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 ++ hunk 19 -- insert 3 ++ hunk 19 -- insert 0 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 + hunk 19 -- initial 7 + hunk 19 -- initial 8 ++ hunk 19 -- insert 1 ++ hunk 19 -- insert 2 ++ hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ============================================================ --- tests/diff_output_formats/H.dst 2f076c5d449b7841f873a173f4c8ac162d778304 +++ tests/diff_output_formats/H.dst 2f076c5d449b7841f873a173f4c8ac162d778304 @@ -0,0 +1,260 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- insert 4 +hunk 4 -- insert 0 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- insert 3 +hunk 4 -- insert 2 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- insert 1 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- insert 1 +hunk 6 -- insert 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- insert 4 +hunk 6 -- initial 3 +hunk 6 -- insert 2 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- insert 3 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- insert 0 +hunk 9 -- initial 7 +hunk 9 -- insert 1 +hunk 9 -- initial 8 +hunk 9 -- insert 3 +hunk 9 -- insert 4 +hunk 9 -- insert 2 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- insert 4 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- insert 3 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- insert 2 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- insert 1 +hunk 12 -- insert 0 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 6 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- insert 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- insert 3 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- insert 0 +hunk 14 -- initial 8 +hunk 14 -- insert 4 +hunk 14 -- insert 2 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- insert 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- insert 2 +hunk 15 -- insert 0 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- insert 3 +hunk 15 -- initial 7 +hunk 15 -- insert 4 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- insert 3 +hunk 19 -- insert 0 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- insert 1 +hunk 19 -- insert 2 +hunk 19 -- insert 4 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 ============================================================ --- tests/diff_output_formats/H.src b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 +++ tests/diff_output_formats/H.src b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 @@ -0,0 +1,240 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 ============================================================ --- tests/diff_output_formats/H.ud 5ef077f1da11fb8638d73e8a6571ff93a0fe1874 +++ tests/diff_output_formats/H.ud 5ef077f1da11fb8638d73e8a6571ff93a0fe1874 @@ -0,0 +1,149 @@ +--- H b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 ++++ H 2f076c5d449b7841f873a173f4c8ac162d778304 +@@ -42,10 +42,15 @@ + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++hunk 4 -- insert 4 ++hunk 4 -- insert 0 + hunk 4 -- initial 4 + hunk 4 -- initial 5 ++hunk 4 -- insert 3 ++hunk 4 -- insert 2 + hunk 4 -- initial 6 + hunk 4 -- initial 7 ++hunk 4 -- insert 1 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +@@ -59,34 +64,29 @@ + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 ++hunk 6 -- insert 1 ++hunk 6 -- insert 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 ++hunk 6 -- insert 4 + hunk 6 -- initial 3 ++hunk 6 -- insert 2 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 ++hunk 6 -- insert 3 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 +-hunk 7 -- initial 4 +-hunk 7 -- initial 5 +-hunk 7 -- initial 6 +-hunk 7 -- initial 7 +-hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +-hunk 8 -- initial 2 +-hunk 8 -- initial 3 +-hunk 8 -- initial 4 + hunk 8 -- initial 5 + hunk 8 -- initial 6 +-hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +@@ -95,8 +95,13 @@ + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 ++hunk 9 -- insert 0 + hunk 9 -- initial 7 ++hunk 9 -- insert 1 + hunk 9 -- initial 8 ++hunk 9 -- insert 3 ++hunk 9 -- insert 4 ++hunk 9 -- insert 2 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +@@ -118,44 +123,54 @@ + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 ++hunk 12 -- insert 4 + hunk 12 -- initial 0 + hunk 12 -- initial 1 ++hunk 12 -- insert 3 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++hunk 12 -- insert 2 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++hunk 12 -- insert 1 ++hunk 12 -- insert 0 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 +-hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 +-hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 + hunk 13 -- initial 6 +-hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++hunk 14 -- insert 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 ++hunk 14 -- insert 3 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 ++hunk 14 -- insert 0 + hunk 14 -- initial 8 ++hunk 14 -- insert 4 ++hunk 14 -- insert 2 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 ++hunk 15 -- insert 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 ++hunk 15 -- insert 2 ++hunk 15 -- insert 0 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 ++hunk 15 -- insert 3 + hunk 15 -- initial 7 ++hunk 15 -- insert 4 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +@@ -192,11 +207,16 @@ + hunk 19 -- initial 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 ++hunk 19 -- insert 3 ++hunk 19 -- insert 0 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 + hunk 19 -- initial 7 + hunk 19 -- initial 8 ++hunk 19 -- insert 1 ++hunk 19 -- insert 2 ++hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ============================================================ --- tests/diff_output_formats/H.udp 89c15555eb4658c6fdc8d38bf1e85060b79fdd05 +++ tests/diff_output_formats/H.udp 89c15555eb4658c6fdc8d38bf1e85060b79fdd05 @@ -0,0 +1,149 @@ +--- H b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 ++++ H 2f076c5d449b7841f873a173f4c8ac162d778304 +@@ -42,10 +42,15 @@ hunk 4 -- initial 0 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++hunk 4 -- insert 4 ++hunk 4 -- insert 0 + hunk 4 -- initial 4 + hunk 4 -- initial 5 ++hunk 4 -- insert 3 ++hunk 4 -- insert 2 + hunk 4 -- initial 6 + hunk 4 -- initial 7 ++hunk 4 -- insert 1 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +@@ -59,34 +64,29 @@ hunk 5 -- initial 7 + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 ++hunk 6 -- insert 1 ++hunk 6 -- insert 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 ++hunk 6 -- insert 4 + hunk 6 -- initial 3 ++hunk 6 -- insert 2 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 ++hunk 6 -- insert 3 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 +-hunk 7 -- initial 4 +-hunk 7 -- initial 5 +-hunk 7 -- initial 6 +-hunk 7 -- initial 7 +-hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +-hunk 8 -- initial 2 +-hunk 8 -- initial 3 +-hunk 8 -- initial 4 + hunk 8 -- initial 5 + hunk 8 -- initial 6 +-hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +@@ -95,8 +95,13 @@ hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 ++hunk 9 -- insert 0 + hunk 9 -- initial 7 ++hunk 9 -- insert 1 + hunk 9 -- initial 8 ++hunk 9 -- insert 3 ++hunk 9 -- insert 4 ++hunk 9 -- insert 2 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +@@ -118,44 +123,54 @@ hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 ++hunk 12 -- insert 4 + hunk 12 -- initial 0 + hunk 12 -- initial 1 ++hunk 12 -- insert 3 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++hunk 12 -- insert 2 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++hunk 12 -- insert 1 ++hunk 12 -- insert 0 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 +-hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 +-hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 + hunk 13 -- initial 6 +-hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++hunk 14 -- insert 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 ++hunk 14 -- insert 3 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 ++hunk 14 -- insert 0 + hunk 14 -- initial 8 ++hunk 14 -- insert 4 ++hunk 14 -- insert 2 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 ++hunk 15 -- insert 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 ++hunk 15 -- insert 2 ++hunk 15 -- insert 0 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 ++hunk 15 -- insert 3 + hunk 15 -- initial 7 ++hunk 15 -- insert 4 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +@@ -192,11 +207,16 @@ hunk 19 -- initial 0 + hunk 19 -- initial 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 ++hunk 19 -- insert 3 ++hunk 19 -- insert 0 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 + hunk 19 -- initial 7 + hunk 19 -- initial 8 ++hunk 19 -- insert 1 ++hunk 19 -- insert 2 ++hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ============================================================ --- tests/diff_output_formats/I.cd 45f80fe25d8530e0cba92232b431476e5b086b03 +++ tests/diff_output_formats/I.cd 45f80fe25d8530e0cba92232b431476e5b086b03 @@ -0,0 +1,232 @@ +*** I 4d32e91882cbb8a15c643265088861861bef0c16 +--- I ccdcc1ef902cf1c0082b992e731b057d30b40814 +*************** +*** 1,10 **** + hunk 0 -- initial 0 +- hunk 0 -- initial 1 +- hunk 0 -- initial 2 + hunk 0 -- initial 3 +- hunk 0 -- initial 4 +- hunk 0 -- initial 5 +- hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +--- 1,5 ---- +*************** +*** 19,31 **** + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 +- hunk 2 -- initial 1 +- hunk 2 -- initial 2 + hunk 2 -- initial 3 +- hunk 2 -- initial 4 +- hunk 2 -- initial 5 + hunk 2 -- initial 6 +- hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 +--- 14,21 ---- +*************** +*** 48,62 **** + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +- hunk 5 -- initial 0 + hunk 5 -- initial 1 +- hunk 5 -- initial 2 + hunk 5 -- initial 3 +- hunk 5 -- initial 4 + hunk 5 -- initial 5 +- hunk 5 -- initial 6 + hunk 5 -- initial 7 +- hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 +--- 38,47 ---- +*************** +*** 69,109 **** + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 +- hunk 7 -- initial 1 +- hunk 7 -- initial 2 +- hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 +- hunk 7 -- initial 6 +- hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +- hunk 8 -- initial 0 +- hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +- hunk 8 -- initial 5 + hunk 8 -- initial 6 +- hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 +- hunk 9 -- initial 0 + hunk 9 -- initial 1 +- hunk 9 -- initial 2 + hunk 9 -- initial 3 +- hunk 9 -- initial 4 +- hunk 9 -- initial 5 + hunk 9 -- initial 6 +- hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +--- 54,84 ---- + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 + hunk 8 -- initial 6 + hunk 8 -- initial 9 + hunk 9 -- initial 1 + hunk 9 -- initial 3 + hunk 9 -- initial 6 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 ++ hunk 10 -- insert 3 + hunk 10 -- initial 2 + hunk 10 -- initial 3 ++ hunk 10 -- insert 2 + hunk 10 -- initial 4 ++ hunk 10 -- insert 0 + hunk 10 -- initial 5 ++ hunk 10 -- insert 4 ++ hunk 10 -- insert 1 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +*************** +*** 138,146 **** +--- 113,126 ---- + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 ++ hunk 14 -- insert 3 ++ hunk 14 -- insert 2 ++ hunk 14 -- insert 4 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++ hunk 14 -- insert 0 + hunk 14 -- initial 2 ++ hunk 14 -- insert 1 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 +*************** +*** 168,182 **** + hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 +- hunk 17 -- initial 0 + hunk 17 -- initial 1 + hunk 17 -- initial 2 + hunk 17 -- initial 3 +- hunk 17 -- initial 4 + hunk 17 -- initial 5 +- hunk 17 -- initial 6 +- hunk 17 -- initial 7 +- hunk 17 -- initial 8 + hunk 17 -- initial 9 + hunk 18 -- initial 0 + hunk 18 -- initial 1 +--- 148,157 ---- +*************** +*** 190,210 **** +--- 165,195 ---- + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 ++ hunk 19 -- insert 0 ++ hunk 19 -- insert 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 ++ hunk 19 -- insert 3 + hunk 19 -- initial 7 ++ hunk 19 -- insert 2 + hunk 19 -- initial 8 ++ hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ++ hunk 20 -- insert 0 + hunk 20 -- initial 2 + hunk 20 -- initial 3 ++ hunk 20 -- insert 3 + hunk 20 -- initial 4 + hunk 20 -- initial 5 + hunk 20 -- initial 6 ++ hunk 20 -- insert 1 ++ hunk 20 -- insert 4 ++ hunk 20 -- insert 2 + hunk 20 -- initial 7 + hunk 20 -- initial 8 + hunk 20 -- initial 9 +*************** +*** 219,234 **** +--- 204,227 ---- + hunk 21 -- initial 8 + hunk 21 -- initial 9 + hunk 22 -- initial 0 ++ hunk 22 -- insert 0 + hunk 22 -- initial 1 ++ hunk 22 -- insert 3 + hunk 22 -- initial 2 + hunk 22 -- initial 3 + hunk 22 -- initial 4 + hunk 22 -- initial 5 ++ hunk 22 -- insert 2 ++ hunk 22 -- insert 1 ++ hunk 22 -- insert 4 + hunk 22 -- initial 6 + hunk 22 -- initial 7 + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++ hunk 23 -- insert 2 ++ hunk 23 -- insert 4 ++ hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 + hunk 23 -- initial 3 +*************** +*** 236,242 **** +--- 229,237 ---- + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++ hunk 23 -- insert 1 + hunk 23 -- initial 8 ++ hunk 23 -- insert 0 + hunk 23 -- initial 9 + hunk 24 -- initial 0 + hunk 24 -- initial 1 ============================================================ --- tests/diff_output_formats/I.cdp 06fdd7b950ce01d587d13ab1aec3203dfb0aa918 +++ tests/diff_output_formats/I.cdp 06fdd7b950ce01d587d13ab1aec3203dfb0aa918 @@ -0,0 +1,232 @@ +*** I 4d32e91882cbb8a15c643265088861861bef0c16 +--- I ccdcc1ef902cf1c0082b992e731b057d30b40814 +*************** +*** 1,10 **** + hunk 0 -- initial 0 +- hunk 0 -- initial 1 +- hunk 0 -- initial 2 + hunk 0 -- initial 3 +- hunk 0 -- initial 4 +- hunk 0 -- initial 5 +- hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +--- 1,5 ---- +*************** hunk 1 -- initial 7 +*** 19,31 **** + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 +- hunk 2 -- initial 1 +- hunk 2 -- initial 2 + hunk 2 -- initial 3 +- hunk 2 -- initial 4 +- hunk 2 -- initial 5 + hunk 2 -- initial 6 +- hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 +--- 14,21 ---- +*************** hunk 4 -- initial 6 +*** 48,62 **** + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +- hunk 5 -- initial 0 + hunk 5 -- initial 1 +- hunk 5 -- initial 2 + hunk 5 -- initial 3 +- hunk 5 -- initial 4 + hunk 5 -- initial 5 +- hunk 5 -- initial 6 + hunk 5 -- initial 7 +- hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 +--- 38,47 ---- +*************** hunk 6 -- initial 7 +*** 69,109 **** + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 +- hunk 7 -- initial 1 +- hunk 7 -- initial 2 +- hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 +- hunk 7 -- initial 6 +- hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +- hunk 8 -- initial 0 +- hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +- hunk 8 -- initial 5 + hunk 8 -- initial 6 +- hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 +- hunk 9 -- initial 0 + hunk 9 -- initial 1 +- hunk 9 -- initial 2 + hunk 9 -- initial 3 +- hunk 9 -- initial 4 +- hunk 9 -- initial 5 + hunk 9 -- initial 6 +- hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +--- 54,84 ---- + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 + hunk 8 -- initial 6 + hunk 8 -- initial 9 + hunk 9 -- initial 1 + hunk 9 -- initial 3 + hunk 9 -- initial 6 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 ++ hunk 10 -- insert 3 + hunk 10 -- initial 2 + hunk 10 -- initial 3 ++ hunk 10 -- insert 2 + hunk 10 -- initial 4 ++ hunk 10 -- insert 0 + hunk 10 -- initial 5 ++ hunk 10 -- insert 4 ++ hunk 10 -- insert 1 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +*************** hunk 13 -- initial 6 +*** 138,146 **** +--- 113,126 ---- + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 ++ hunk 14 -- insert 3 ++ hunk 14 -- insert 2 ++ hunk 14 -- insert 4 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++ hunk 14 -- insert 0 + hunk 14 -- initial 2 ++ hunk 14 -- insert 1 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 +*************** hunk 16 -- initial 6 +*** 168,182 **** + hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 +- hunk 17 -- initial 0 + hunk 17 -- initial 1 + hunk 17 -- initial 2 + hunk 17 -- initial 3 +- hunk 17 -- initial 4 + hunk 17 -- initial 5 +- hunk 17 -- initial 6 +- hunk 17 -- initial 7 +- hunk 17 -- initial 8 + hunk 17 -- initial 9 + hunk 18 -- initial 0 + hunk 18 -- initial 1 +--- 148,157 ---- +*************** hunk 18 -- initial 8 +*** 190,210 **** +--- 165,195 ---- + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 ++ hunk 19 -- insert 0 ++ hunk 19 -- insert 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 ++ hunk 19 -- insert 3 + hunk 19 -- initial 7 ++ hunk 19 -- insert 2 + hunk 19 -- initial 8 ++ hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ++ hunk 20 -- insert 0 + hunk 20 -- initial 2 + hunk 20 -- initial 3 ++ hunk 20 -- insert 3 + hunk 20 -- initial 4 + hunk 20 -- initial 5 + hunk 20 -- initial 6 ++ hunk 20 -- insert 1 ++ hunk 20 -- insert 4 ++ hunk 20 -- insert 2 + hunk 20 -- initial 7 + hunk 20 -- initial 8 + hunk 20 -- initial 9 +*************** hunk 21 -- initial 7 +*** 219,234 **** +--- 204,227 ---- + hunk 21 -- initial 8 + hunk 21 -- initial 9 + hunk 22 -- initial 0 ++ hunk 22 -- insert 0 + hunk 22 -- initial 1 ++ hunk 22 -- insert 3 + hunk 22 -- initial 2 + hunk 22 -- initial 3 + hunk 22 -- initial 4 + hunk 22 -- initial 5 ++ hunk 22 -- insert 2 ++ hunk 22 -- insert 1 ++ hunk 22 -- insert 4 + hunk 22 -- initial 6 + hunk 22 -- initial 7 + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++ hunk 23 -- insert 2 ++ hunk 23 -- insert 4 ++ hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 + hunk 23 -- initial 3 +*************** hunk 23 -- initial 4 +*** 236,242 **** +--- 229,237 ---- + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++ hunk 23 -- insert 1 + hunk 23 -- initial 8 ++ hunk 23 -- insert 0 + hunk 23 -- initial 9 + hunk 24 -- initial 0 + hunk 24 -- initial 1 ============================================================ --- tests/diff_output_formats/I.dst ccdcc1ef902cf1c0082b992e731b057d30b40814 +++ tests/diff_output_formats/I.dst ccdcc1ef902cf1c0082b992e731b057d30b40814 @@ -0,0 +1,255 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 3 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 3 +hunk 2 -- initial 6 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 1 +hunk 5 -- initial 3 +hunk 5 -- initial 5 +hunk 5 -- initial 7 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 6 +hunk 8 -- initial 9 +hunk 9 -- initial 1 +hunk 9 -- initial 3 +hunk 9 -- initial 6 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- insert 3 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- insert 2 +hunk 10 -- initial 4 +hunk 10 -- insert 0 +hunk 10 -- initial 5 +hunk 10 -- insert 4 +hunk 10 -- insert 1 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- insert 3 +hunk 14 -- insert 2 +hunk 14 -- insert 4 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- insert 0 +hunk 14 -- initial 2 +hunk 14 -- insert 1 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 5 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- insert 0 +hunk 19 -- insert 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- insert 3 +hunk 19 -- initial 7 +hunk 19 -- insert 2 +hunk 19 -- initial 8 +hunk 19 -- insert 4 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- insert 0 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- insert 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- insert 1 +hunk 20 -- insert 4 +hunk 20 -- insert 2 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- insert 0 +hunk 22 -- initial 1 +hunk 22 -- insert 3 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- insert 2 +hunk 22 -- insert 1 +hunk 22 -- insert 4 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- insert 2 +hunk 23 -- insert 4 +hunk 23 -- insert 3 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- insert 1 +hunk 23 -- initial 8 +hunk 23 -- insert 0 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 2 +hunk 25 -- initial 3 +hunk 25 -- initial 4 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 7 +hunk 25 -- initial 8 +hunk 25 -- initial 9 ============================================================ --- tests/diff_output_formats/I.src 4d32e91882cbb8a15c643265088861861bef0c16 +++ tests/diff_output_formats/I.src 4d32e91882cbb8a15c643265088861861bef0c16 @@ -0,0 +1,260 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 2 +hunk 25 -- initial 3 +hunk 25 -- initial 4 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 7 +hunk 25 -- initial 8 +hunk 25 -- initial 9 ============================================================ --- tests/diff_output_formats/I.ud 39db6ed118af85891b95113e216a622a7d60eb63 +++ tests/diff_output_formats/I.ud 39db6ed118af85891b95113e216a622a7d60eb63 @@ -0,0 +1,188 @@ +--- I 4d32e91882cbb8a15c643265088861861bef0c16 ++++ I ccdcc1ef902cf1c0082b992e731b057d30b40814 +@@ -1,10 +1,5 @@ + hunk 0 -- initial 0 +-hunk 0 -- initial 1 +-hunk 0 -- initial 2 + hunk 0 -- initial 3 +-hunk 0 -- initial 4 +-hunk 0 -- initial 5 +-hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +@@ -19,13 +14,8 @@ + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 +-hunk 2 -- initial 1 +-hunk 2 -- initial 2 + hunk 2 -- initial 3 +-hunk 2 -- initial 4 +-hunk 2 -- initial 5 + hunk 2 -- initial 6 +-hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 +@@ -48,15 +38,10 @@ + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +-hunk 5 -- initial 0 + hunk 5 -- initial 1 +-hunk 5 -- initial 2 + hunk 5 -- initial 3 +-hunk 5 -- initial 4 + hunk 5 -- initial 5 +-hunk 5 -- initial 6 + hunk 5 -- initial 7 +-hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 +@@ -69,41 +54,31 @@ + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 +-hunk 7 -- initial 1 +-hunk 7 -- initial 2 +-hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 +-hunk 7 -- initial 6 +-hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +-hunk 8 -- initial 0 +-hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +-hunk 8 -- initial 5 + hunk 8 -- initial 6 +-hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 +-hunk 9 -- initial 0 + hunk 9 -- initial 1 +-hunk 9 -- initial 2 + hunk 9 -- initial 3 +-hunk 9 -- initial 4 +-hunk 9 -- initial 5 + hunk 9 -- initial 6 +-hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 ++hunk 10 -- insert 3 + hunk 10 -- initial 2 + hunk 10 -- initial 3 ++hunk 10 -- insert 2 + hunk 10 -- initial 4 ++hunk 10 -- insert 0 + hunk 10 -- initial 5 ++hunk 10 -- insert 4 ++hunk 10 -- insert 1 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +@@ -138,9 +113,14 @@ + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 ++hunk 14 -- insert 3 ++hunk 14 -- insert 2 ++hunk 14 -- insert 4 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++hunk 14 -- insert 0 + hunk 14 -- initial 2 ++hunk 14 -- insert 1 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 +@@ -168,15 +148,10 @@ + hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 +-hunk 17 -- initial 0 + hunk 17 -- initial 1 + hunk 17 -- initial 2 + hunk 17 -- initial 3 +-hunk 17 -- initial 4 + hunk 17 -- initial 5 +-hunk 17 -- initial 6 +-hunk 17 -- initial 7 +-hunk 17 -- initial 8 + hunk 17 -- initial 9 + hunk 18 -- initial 0 + hunk 18 -- initial 1 +@@ -190,21 +165,31 @@ + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 ++hunk 19 -- insert 0 ++hunk 19 -- insert 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 ++hunk 19 -- insert 3 + hunk 19 -- initial 7 ++hunk 19 -- insert 2 + hunk 19 -- initial 8 ++hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ++hunk 20 -- insert 0 + hunk 20 -- initial 2 + hunk 20 -- initial 3 ++hunk 20 -- insert 3 + hunk 20 -- initial 4 + hunk 20 -- initial 5 + hunk 20 -- initial 6 ++hunk 20 -- insert 1 ++hunk 20 -- insert 4 ++hunk 20 -- insert 2 + hunk 20 -- initial 7 + hunk 20 -- initial 8 + hunk 20 -- initial 9 +@@ -219,16 +204,24 @@ + hunk 21 -- initial 8 + hunk 21 -- initial 9 + hunk 22 -- initial 0 ++hunk 22 -- insert 0 + hunk 22 -- initial 1 ++hunk 22 -- insert 3 + hunk 22 -- initial 2 + hunk 22 -- initial 3 + hunk 22 -- initial 4 + hunk 22 -- initial 5 ++hunk 22 -- insert 2 ++hunk 22 -- insert 1 ++hunk 22 -- insert 4 + hunk 22 -- initial 6 + hunk 22 -- initial 7 + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++hunk 23 -- insert 2 ++hunk 23 -- insert 4 ++hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 + hunk 23 -- initial 3 +@@ -236,7 +229,9 @@ + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++hunk 23 -- insert 1 + hunk 23 -- initial 8 ++hunk 23 -- insert 0 + hunk 23 -- initial 9 + hunk 24 -- initial 0 + hunk 24 -- initial 1 ============================================================ --- tests/diff_output_formats/I.udp 8e40b30a4ce01d94d30ecb336f5918fabf13555d +++ tests/diff_output_formats/I.udp 8e40b30a4ce01d94d30ecb336f5918fabf13555d @@ -0,0 +1,188 @@ +--- I 4d32e91882cbb8a15c643265088861861bef0c16 ++++ I ccdcc1ef902cf1c0082b992e731b057d30b40814 +@@ -1,10 +1,5 @@ + hunk 0 -- initial 0 +-hunk 0 -- initial 1 +-hunk 0 -- initial 2 + hunk 0 -- initial 3 +-hunk 0 -- initial 4 +-hunk 0 -- initial 5 +-hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +@@ -19,13 +14,8 @@ hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 +-hunk 2 -- initial 1 +-hunk 2 -- initial 2 + hunk 2 -- initial 3 +-hunk 2 -- initial 4 +-hunk 2 -- initial 5 + hunk 2 -- initial 6 +-hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 +@@ -48,15 +38,10 @@ hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +-hunk 5 -- initial 0 + hunk 5 -- initial 1 +-hunk 5 -- initial 2 + hunk 5 -- initial 3 +-hunk 5 -- initial 4 + hunk 5 -- initial 5 +-hunk 5 -- initial 6 + hunk 5 -- initial 7 +-hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 +@@ -69,41 +54,31 @@ hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 +-hunk 7 -- initial 1 +-hunk 7 -- initial 2 +-hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 +-hunk 7 -- initial 6 +-hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +-hunk 8 -- initial 0 +-hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +-hunk 8 -- initial 5 + hunk 8 -- initial 6 +-hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 +-hunk 9 -- initial 0 + hunk 9 -- initial 1 +-hunk 9 -- initial 2 + hunk 9 -- initial 3 +-hunk 9 -- initial 4 +-hunk 9 -- initial 5 + hunk 9 -- initial 6 +-hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 ++hunk 10 -- insert 3 + hunk 10 -- initial 2 + hunk 10 -- initial 3 ++hunk 10 -- insert 2 + hunk 10 -- initial 4 ++hunk 10 -- insert 0 + hunk 10 -- initial 5 ++hunk 10 -- insert 4 ++hunk 10 -- insert 1 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +@@ -138,9 +113,14 @@ hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 ++hunk 14 -- insert 3 ++hunk 14 -- insert 2 ++hunk 14 -- insert 4 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++hunk 14 -- insert 0 + hunk 14 -- initial 2 ++hunk 14 -- insert 1 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 +@@ -168,15 +148,10 @@ hunk 16 -- initial 6 + hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 +-hunk 17 -- initial 0 + hunk 17 -- initial 1 + hunk 17 -- initial 2 + hunk 17 -- initial 3 +-hunk 17 -- initial 4 + hunk 17 -- initial 5 +-hunk 17 -- initial 6 +-hunk 17 -- initial 7 +-hunk 17 -- initial 8 + hunk 17 -- initial 9 + hunk 18 -- initial 0 + hunk 18 -- initial 1 +@@ -190,21 +165,31 @@ hunk 18 -- initial 8 + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 ++hunk 19 -- insert 0 ++hunk 19 -- insert 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 ++hunk 19 -- insert 3 + hunk 19 -- initial 7 ++hunk 19 -- insert 2 + hunk 19 -- initial 8 ++hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ++hunk 20 -- insert 0 + hunk 20 -- initial 2 + hunk 20 -- initial 3 ++hunk 20 -- insert 3 + hunk 20 -- initial 4 + hunk 20 -- initial 5 + hunk 20 -- initial 6 ++hunk 20 -- insert 1 ++hunk 20 -- insert 4 ++hunk 20 -- insert 2 + hunk 20 -- initial 7 + hunk 20 -- initial 8 + hunk 20 -- initial 9 +@@ -219,16 +204,24 @@ hunk 21 -- initial 7 + hunk 21 -- initial 8 + hunk 21 -- initial 9 + hunk 22 -- initial 0 ++hunk 22 -- insert 0 + hunk 22 -- initial 1 ++hunk 22 -- insert 3 + hunk 22 -- initial 2 + hunk 22 -- initial 3 + hunk 22 -- initial 4 + hunk 22 -- initial 5 ++hunk 22 -- insert 2 ++hunk 22 -- insert 1 ++hunk 22 -- insert 4 + hunk 22 -- initial 6 + hunk 22 -- initial 7 + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++hunk 23 -- insert 2 ++hunk 23 -- insert 4 ++hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 + hunk 23 -- initial 3 +@@ -236,7 +229,9 @@ hunk 23 -- initial 4 + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++hunk 23 -- insert 1 + hunk 23 -- initial 8 ++hunk 23 -- insert 0 + hunk 23 -- initial 9 + hunk 24 -- initial 0 + hunk 24 -- initial 1 ============================================================ --- tests/diff_output_formats/J.cd d81a80980c6eba5027990324da04f846fc3f9f3c +++ tests/diff_output_formats/J.cd d81a80980c6eba5027990324da04f846fc3f9f3c @@ -0,0 +1,211 @@ +*** J cc172a94441af071b19c3eddddc21053634e94bb +--- J 93462d067100103422a0e59722155b3a916770a2 +*************** +*** 19,41 **** + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 +- hunk 3 -- initial 0 + hunk 3 -- initial 1 +- hunk 3 -- initial 2 + hunk 3 -- initial 3 +- hunk 3 -- initial 4 +- hunk 3 -- initial 5 + hunk 3 -- initial 6 +- hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +--- 19,41 ---- + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 ++ hunk 2 -- insert 4 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 ++ hunk 2 -- insert 2 + hunk 2 -- initial 5 ++ hunk 2 -- insert 0 ++ hunk 2 -- insert 1 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 ++ hunk 2 -- insert 3 + hunk 2 -- initial 9 + hunk 3 -- initial 1 + hunk 3 -- initial 3 + hunk 3 -- initial 6 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +*************** +*** 58,72 **** + hunk 5 -- initial 7 + hunk 5 -- initial 8 + hunk 5 -- initial 9 +- hunk 6 -- initial 0 +- hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 +- hunk 6 -- initial 6 +- hunk 6 -- initial 7 +- hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 +--- 58,67 ---- +*************** +*** 83,102 **** +--- 78,107 ---- + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++ hunk 8 -- insert 0 + hunk 8 -- initial 5 ++ hunk 8 -- insert 1 ++ hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++ hunk 8 -- insert 4 + hunk 8 -- initial 8 ++ hunk 8 -- insert 2 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++ hunk 9 -- insert 0 ++ hunk 9 -- insert 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 ++ hunk 9 -- insert 1 + hunk 9 -- initial 8 ++ hunk 9 -- insert 2 ++ hunk 9 -- insert 3 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +*************** +*** 108,131 **** + hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 +- hunk 11 -- initial 0 + hunk 11 -- initial 1 +- hunk 11 -- initial 2 + hunk 11 -- initial 3 +- hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 +- hunk 11 -- initial 7 +- hunk 11 -- initial 8 + hunk 11 -- initial 9 +- hunk 12 -- initial 0 +- hunk 12 -- initial 1 +- hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +--- 113,126 ---- +*************** +*** 139,151 **** + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 +- hunk 14 -- initial 1 +- hunk 14 -- initial 2 +- hunk 14 -- initial 3 + hunk 14 -- initial 4 +- hunk 14 -- initial 5 + hunk 14 -- initial 6 +- hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 +--- 134,141 ---- +*************** +*** 182,192 **** +--- 172,187 ---- + hunk 18 -- initial 1 + hunk 18 -- initial 2 + hunk 18 -- initial 3 ++ hunk 18 -- insert 0 ++ hunk 18 -- insert 3 + hunk 18 -- initial 4 + hunk 18 -- initial 5 ++ hunk 18 -- insert 1 + hunk 18 -- initial 6 + hunk 18 -- initial 7 ++ hunk 18 -- insert 2 + hunk 18 -- initial 8 ++ hunk 18 -- insert 4 + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 +*************** +*** 229,241 **** +--- 224,241 ---- + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++ hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 ++ hunk 23 -- insert 2 + hunk 23 -- initial 3 ++ hunk 23 -- insert 1 + hunk 23 -- initial 4 + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++ hunk 23 -- insert 0 ++ hunk 23 -- insert 4 + hunk 23 -- initial 8 + hunk 23 -- initial 9 + hunk 24 -- initial 0 +*************** +*** 250,272 **** + hunk 24 -- initial 9 + hunk 25 -- initial 0 + hunk 25 -- initial 1 +- hunk 25 -- initial 2 +- hunk 25 -- initial 3 +- hunk 25 -- initial 4 + hunk 25 -- initial 5 + hunk 25 -- initial 6 +- hunk 25 -- initial 7 +- hunk 25 -- initial 8 + hunk 25 -- initial 9 + hunk 26 -- initial 0 +- hunk 26 -- initial 1 +- hunk 26 -- initial 2 +- hunk 26 -- initial 3 + hunk 26 -- initial 4 + hunk 26 -- initial 5 + hunk 26 -- initial 6 +- hunk 26 -- initial 7 +- hunk 26 -- initial 8 + hunk 26 -- initial 9 + hunk 27 -- initial 0 + hunk 27 -- initial 1 +--- 250,262 ---- ============================================================ --- tests/diff_output_formats/J.cdp bb1b2a8556d1750b60933ffb60ef2cbe01621a79 +++ tests/diff_output_formats/J.cdp bb1b2a8556d1750b60933ffb60ef2cbe01621a79 @@ -0,0 +1,211 @@ +*** J cc172a94441af071b19c3eddddc21053634e94bb +--- J 93462d067100103422a0e59722155b3a916770a2 +*************** hunk 1 -- initial 7 +*** 19,41 **** + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 +- hunk 3 -- initial 0 + hunk 3 -- initial 1 +- hunk 3 -- initial 2 + hunk 3 -- initial 3 +- hunk 3 -- initial 4 +- hunk 3 -- initial 5 + hunk 3 -- initial 6 +- hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +--- 19,41 ---- + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 ++ hunk 2 -- insert 4 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 ++ hunk 2 -- insert 2 + hunk 2 -- initial 5 ++ hunk 2 -- insert 0 ++ hunk 2 -- insert 1 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 ++ hunk 2 -- insert 3 + hunk 2 -- initial 9 + hunk 3 -- initial 1 + hunk 3 -- initial 3 + hunk 3 -- initial 6 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +*************** hunk 5 -- initial 6 +*** 58,72 **** + hunk 5 -- initial 7 + hunk 5 -- initial 8 + hunk 5 -- initial 9 +- hunk 6 -- initial 0 +- hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 +- hunk 6 -- initial 6 +- hunk 6 -- initial 7 +- hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 +--- 58,67 ---- +*************** hunk 8 -- initial 1 +*** 83,102 **** +--- 78,107 ---- + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++ hunk 8 -- insert 0 + hunk 8 -- initial 5 ++ hunk 8 -- insert 1 ++ hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++ hunk 8 -- insert 4 + hunk 8 -- initial 8 ++ hunk 8 -- insert 2 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++ hunk 9 -- insert 0 ++ hunk 9 -- insert 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 ++ hunk 9 -- insert 1 + hunk 9 -- initial 8 ++ hunk 9 -- insert 2 ++ hunk 9 -- insert 3 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +*************** hunk 10 -- initial 6 +*** 108,131 **** + hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 +- hunk 11 -- initial 0 + hunk 11 -- initial 1 +- hunk 11 -- initial 2 + hunk 11 -- initial 3 +- hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 +- hunk 11 -- initial 7 +- hunk 11 -- initial 8 + hunk 11 -- initial 9 +- hunk 12 -- initial 0 +- hunk 12 -- initial 1 +- hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +--- 113,126 ---- +*************** hunk 13 -- initial 7 +*** 139,151 **** + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 +- hunk 14 -- initial 1 +- hunk 14 -- initial 2 +- hunk 14 -- initial 3 + hunk 14 -- initial 4 +- hunk 14 -- initial 5 + hunk 14 -- initial 6 +- hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 +--- 134,141 ---- +*************** hunk 18 -- initial 0 +*** 182,192 **** +--- 172,187 ---- + hunk 18 -- initial 1 + hunk 18 -- initial 2 + hunk 18 -- initial 3 ++ hunk 18 -- insert 0 ++ hunk 18 -- insert 3 + hunk 18 -- initial 4 + hunk 18 -- initial 5 ++ hunk 18 -- insert 1 + hunk 18 -- initial 6 + hunk 18 -- initial 7 ++ hunk 18 -- insert 2 + hunk 18 -- initial 8 ++ hunk 18 -- insert 4 + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 +*************** hunk 22 -- initial 7 +*** 229,241 **** +--- 224,241 ---- + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++ hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 ++ hunk 23 -- insert 2 + hunk 23 -- initial 3 ++ hunk 23 -- insert 1 + hunk 23 -- initial 4 + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++ hunk 23 -- insert 0 ++ hunk 23 -- insert 4 + hunk 23 -- initial 8 + hunk 23 -- initial 9 + hunk 24 -- initial 0 +*************** hunk 24 -- initial 8 +*** 250,272 **** + hunk 24 -- initial 9 + hunk 25 -- initial 0 + hunk 25 -- initial 1 +- hunk 25 -- initial 2 +- hunk 25 -- initial 3 +- hunk 25 -- initial 4 + hunk 25 -- initial 5 + hunk 25 -- initial 6 +- hunk 25 -- initial 7 +- hunk 25 -- initial 8 + hunk 25 -- initial 9 + hunk 26 -- initial 0 +- hunk 26 -- initial 1 +- hunk 26 -- initial 2 +- hunk 26 -- initial 3 + hunk 26 -- initial 4 + hunk 26 -- initial 5 + hunk 26 -- initial 6 +- hunk 26 -- initial 7 +- hunk 26 -- initial 8 + hunk 26 -- initial 9 + hunk 27 -- initial 0 + hunk 27 -- initial 1 +--- 250,262 ---- ============================================================ --- tests/diff_output_formats/J.dst 93462d067100103422a0e59722155b3a916770a2 +++ tests/diff_output_formats/J.dst 93462d067100103422a0e59722155b3a916770a2 @@ -0,0 +1,270 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- insert 4 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- insert 2 +hunk 2 -- initial 5 +hunk 2 -- insert 0 +hunk 2 -- insert 1 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- insert 3 +hunk 2 -- initial 9 +hunk 3 -- initial 1 +hunk 3 -- initial 3 +hunk 3 -- initial 6 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- insert 0 +hunk 8 -- initial 5 +hunk 8 -- insert 1 +hunk 8 -- insert 3 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- insert 4 +hunk 8 -- initial 8 +hunk 8 -- insert 2 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- insert 0 +hunk 9 -- insert 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- insert 1 +hunk 9 -- initial 8 +hunk 9 -- insert 2 +hunk 9 -- insert 3 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 1 +hunk 11 -- initial 3 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 9 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 4 +hunk 14 -- initial 6 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- insert 0 +hunk 18 -- insert 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- insert 1 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- insert 2 +hunk 18 -- initial 8 +hunk 18 -- insert 4 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- insert 3 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- insert 2 +hunk 23 -- initial 3 +hunk 23 -- insert 1 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- insert 0 +hunk 23 -- insert 4 +hunk 23 -- initial 8 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 9 +hunk 26 -- initial 0 +hunk 26 -- initial 4 +hunk 26 -- initial 5 +hunk 26 -- initial 6 +hunk 26 -- initial 9 +hunk 27 -- initial 0 +hunk 27 -- initial 1 +hunk 27 -- initial 2 +hunk 27 -- initial 3 +hunk 27 -- initial 4 +hunk 27 -- initial 5 +hunk 27 -- initial 6 +hunk 27 -- initial 7 +hunk 27 -- initial 8 +hunk 27 -- initial 9 ============================================================ --- tests/diff_output_formats/J.src cc172a94441af071b19c3eddddc21053634e94bb +++ tests/diff_output_formats/J.src cc172a94441af071b19c3eddddc21053634e94bb @@ -0,0 +1,280 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 2 +hunk 25 -- initial 3 +hunk 25 -- initial 4 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 7 +hunk 25 -- initial 8 +hunk 25 -- initial 9 +hunk 26 -- initial 0 +hunk 26 -- initial 1 +hunk 26 -- initial 2 +hunk 26 -- initial 3 +hunk 26 -- initial 4 +hunk 26 -- initial 5 +hunk 26 -- initial 6 +hunk 26 -- initial 7 +hunk 26 -- initial 8 +hunk 26 -- initial 9 +hunk 27 -- initial 0 +hunk 27 -- initial 1 +hunk 27 -- initial 2 +hunk 27 -- initial 3 +hunk 27 -- initial 4 +hunk 27 -- initial 5 +hunk 27 -- initial 6 +hunk 27 -- initial 7 +hunk 27 -- initial 8 +hunk 27 -- initial 9 ============================================================ --- tests/diff_output_formats/J.ud dabba4fee19e7f11048c289796e4f836000c517b +++ tests/diff_output_formats/J.ud dabba4fee19e7f11048c289796e4f836000c517b @@ -0,0 +1,177 @@ +--- J cc172a94441af071b19c3eddddc21053634e94bb ++++ J 93462d067100103422a0e59722155b3a916770a2 +@@ -19,23 +19,23 @@ + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 ++hunk 2 -- insert 4 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 ++hunk 2 -- insert 2 + hunk 2 -- initial 5 ++hunk 2 -- insert 0 ++hunk 2 -- insert 1 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 ++hunk 2 -- insert 3 + hunk 2 -- initial 9 +-hunk 3 -- initial 0 + hunk 3 -- initial 1 +-hunk 3 -- initial 2 + hunk 3 -- initial 3 +-hunk 3 -- initial 4 +-hunk 3 -- initial 5 + hunk 3 -- initial 6 +-hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +@@ -58,15 +58,10 @@ + hunk 5 -- initial 7 + hunk 5 -- initial 8 + hunk 5 -- initial 9 +-hunk 6 -- initial 0 +-hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 +-hunk 6 -- initial 6 +-hunk 6 -- initial 7 +-hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 +@@ -83,20 +78,30 @@ + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++hunk 8 -- insert 0 + hunk 8 -- initial 5 ++hunk 8 -- insert 1 ++hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++hunk 8 -- insert 4 + hunk 8 -- initial 8 ++hunk 8 -- insert 2 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++hunk 9 -- insert 0 ++hunk 9 -- insert 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 ++hunk 9 -- insert 1 + hunk 9 -- initial 8 ++hunk 9 -- insert 2 ++hunk 9 -- insert 3 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +@@ -108,24 +113,14 @@ + hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 +-hunk 11 -- initial 0 + hunk 11 -- initial 1 +-hunk 11 -- initial 2 + hunk 11 -- initial 3 +-hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 +-hunk 11 -- initial 7 +-hunk 11 -- initial 8 + hunk 11 -- initial 9 +-hunk 12 -- initial 0 +-hunk 12 -- initial 1 +-hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +@@ -139,13 +134,8 @@ + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 +-hunk 14 -- initial 1 +-hunk 14 -- initial 2 +-hunk 14 -- initial 3 + hunk 14 -- initial 4 +-hunk 14 -- initial 5 + hunk 14 -- initial 6 +-hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 +@@ -182,11 +172,16 @@ + hunk 18 -- initial 1 + hunk 18 -- initial 2 + hunk 18 -- initial 3 ++hunk 18 -- insert 0 ++hunk 18 -- insert 3 + hunk 18 -- initial 4 + hunk 18 -- initial 5 ++hunk 18 -- insert 1 + hunk 18 -- initial 6 + hunk 18 -- initial 7 ++hunk 18 -- insert 2 + hunk 18 -- initial 8 ++hunk 18 -- insert 4 + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 +@@ -229,13 +224,18 @@ + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 ++hunk 23 -- insert 2 + hunk 23 -- initial 3 ++hunk 23 -- insert 1 + hunk 23 -- initial 4 + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++hunk 23 -- insert 0 ++hunk 23 -- insert 4 + hunk 23 -- initial 8 + hunk 23 -- initial 9 + hunk 24 -- initial 0 +@@ -250,23 +250,13 @@ + hunk 24 -- initial 9 + hunk 25 -- initial 0 + hunk 25 -- initial 1 +-hunk 25 -- initial 2 +-hunk 25 -- initial 3 +-hunk 25 -- initial 4 + hunk 25 -- initial 5 + hunk 25 -- initial 6 +-hunk 25 -- initial 7 +-hunk 25 -- initial 8 + hunk 25 -- initial 9 + hunk 26 -- initial 0 +-hunk 26 -- initial 1 +-hunk 26 -- initial 2 +-hunk 26 -- initial 3 + hunk 26 -- initial 4 + hunk 26 -- initial 5 + hunk 26 -- initial 6 +-hunk 26 -- initial 7 +-hunk 26 -- initial 8 + hunk 26 -- initial 9 + hunk 27 -- initial 0 + hunk 27 -- initial 1 ============================================================ --- tests/diff_output_formats/J.udp 29fffc4740f7617713a79f51bf34ca6d9f99af15 +++ tests/diff_output_formats/J.udp 29fffc4740f7617713a79f51bf34ca6d9f99af15 @@ -0,0 +1,177 @@ +--- J cc172a94441af071b19c3eddddc21053634e94bb ++++ J 93462d067100103422a0e59722155b3a916770a2 +@@ -19,23 +19,23 @@ hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 ++hunk 2 -- insert 4 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 ++hunk 2 -- insert 2 + hunk 2 -- initial 5 ++hunk 2 -- insert 0 ++hunk 2 -- insert 1 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 ++hunk 2 -- insert 3 + hunk 2 -- initial 9 +-hunk 3 -- initial 0 + hunk 3 -- initial 1 +-hunk 3 -- initial 2 + hunk 3 -- initial 3 +-hunk 3 -- initial 4 +-hunk 3 -- initial 5 + hunk 3 -- initial 6 +-hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +@@ -58,15 +58,10 @@ hunk 5 -- initial 6 + hunk 5 -- initial 7 + hunk 5 -- initial 8 + hunk 5 -- initial 9 +-hunk 6 -- initial 0 +-hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 +-hunk 6 -- initial 6 +-hunk 6 -- initial 7 +-hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 +@@ -83,20 +78,30 @@ hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++hunk 8 -- insert 0 + hunk 8 -- initial 5 ++hunk 8 -- insert 1 ++hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++hunk 8 -- insert 4 + hunk 8 -- initial 8 ++hunk 8 -- insert 2 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++hunk 9 -- insert 0 ++hunk 9 -- insert 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 ++hunk 9 -- insert 1 + hunk 9 -- initial 8 ++hunk 9 -- insert 2 ++hunk 9 -- insert 3 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +@@ -108,24 +113,14 @@ hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 +-hunk 11 -- initial 0 + hunk 11 -- initial 1 +-hunk 11 -- initial 2 + hunk 11 -- initial 3 +-hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 +-hunk 11 -- initial 7 +-hunk 11 -- initial 8 + hunk 11 -- initial 9 +-hunk 12 -- initial 0 +-hunk 12 -- initial 1 +-hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +@@ -139,13 +134,8 @@ hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 +-hunk 14 -- initial 1 +-hunk 14 -- initial 2 +-hunk 14 -- initial 3 + hunk 14 -- initial 4 +-hunk 14 -- initial 5 + hunk 14 -- initial 6 +-hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 +@@ -182,11 +172,16 @@ hunk 18 -- initial 0 + hunk 18 -- initial 1 + hunk 18 -- initial 2 + hunk 18 -- initial 3 ++hunk 18 -- insert 0 ++hunk 18 -- insert 3 + hunk 18 -- initial 4 + hunk 18 -- initial 5 ++hunk 18 -- insert 1 + hunk 18 -- initial 6 + hunk 18 -- initial 7 ++hunk 18 -- insert 2 + hunk 18 -- initial 8 ++hunk 18 -- insert 4 + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 +@@ -229,13 +224,18 @@ hunk 22 -- initial 7 + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 ++hunk 23 -- insert 2 + hunk 23 -- initial 3 ++hunk 23 -- insert 1 + hunk 23 -- initial 4 + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++hunk 23 -- insert 0 ++hunk 23 -- insert 4 + hunk 23 -- initial 8 + hunk 23 -- initial 9 + hunk 24 -- initial 0 +@@ -250,23 +250,13 @@ hunk 24 -- initial 8 + hunk 24 -- initial 9 + hunk 25 -- initial 0 + hunk 25 -- initial 1 +-hunk 25 -- initial 2 +-hunk 25 -- initial 3 +-hunk 25 -- initial 4 + hunk 25 -- initial 5 + hunk 25 -- initial 6 +-hunk 25 -- initial 7 +-hunk 25 -- initial 8 + hunk 25 -- initial 9 + hunk 26 -- initial 0 +-hunk 26 -- initial 1 +-hunk 26 -- initial 2 +-hunk 26 -- initial 3 + hunk 26 -- initial 4 + hunk 26 -- initial 5 + hunk 26 -- initial 6 +-hunk 26 -- initial 7 +-hunk 26 -- initial 8 + hunk 26 -- initial 9 + hunk 27 -- initial 0 + hunk 27 -- initial 1 ============================================================ --- cmd_diff_log.cc caa41fb44a1e29cf9e989c82afbdf29126d9c951 +++ cmd_diff_log.cc 4c1d8af34b23d751670954077068a74365f7b707 @@ -324,12 +324,17 @@ if (re != reverse_rename_map.end()) src_path = re->second; + std::string pattern(""); + if (app.diff_show_encloser) + app.lua.hook_get_encloser_pattern(file_path(src_path), + pattern); + make_diff(file_path(src_path).as_internal(), file_path(dst_path).as_internal(), delta_entry_src(i), delta_entry_dst(i), old_lines, new_lines, - cout, app); + cout, app.diff_format, pattern); } } } ============================================================ --- cmd_files.cc 442a350ece280378c85d8c4d7ce01ad9af98ae47 +++ cmd_files.cc e1acc00226339ea615f5e87ec82c741a21c4adb0 @@ -75,7 +75,7 @@ } -CMD(fdiff, N_("debug"), N_("[-c, -u, -p] "), +CMD(fdiff, N_("debug"), N_("[-c|-u] [-p] "), N_("diff 2 files and output result"), OPT_CONTEXT_DIFF % OPT_UNIFIED_DIFF % OPT_SHOW_ENCLOSER) { @@ -106,10 +106,14 @@ split_into_lines(src.inner()(), src_lines); split_into_lines(dst.inner()(), dst_lines); + string pattern(""); + if (app.diff_show_encloser) + app.lua.hook_get_encloser_pattern(file_path_external(src_name), pattern); + make_diff(src_name, dst_name, src_id, dst_id, src_lines, dst_lines, - cout, app); + cout, app.diff_format, pattern); } CMD(annotate, N_("informative"), N_("PATH"), ============================================================ --- diff_patch.cc 46b072dce126c4f2447fcfb46f7162aae34fe05a +++ diff_patch.cc 58992acda1d83a73cf86e3051fb9ef6affccf72d @@ -17,6 +17,8 @@ #include #include +#include +#include #include "diff_patch.hh" #include "interner.hh" #include "lcs.hh" @@ -769,8 +771,7 @@ vector const & b; size_t ctx; ostream & ost; - string const & encloser_pattern; - app_state & app; + boost::scoped_ptr encloser_re; size_t a_begin, b_begin, a_len, b_len; long skew; ssize_t encloser_last_search; @@ -786,11 +787,14 @@ vector const & b, size_t ctx, ostream & ost, - string const & encloser_pattern, - app_state & app) - : a(a), b(b), ctx(ctx), ost(ost), encloser_pattern(encloser_pattern), - app(app), a_begin(0), b_begin(0), a_len(0), b_len(0), skew(0), - encloser_last_search(0), encloser_last_match(0) {} + string const & encloser_pattern) + : a(a), b(b), ctx(ctx), ost(ost), encloser_re(0), + a_begin(0), b_begin(0), a_len(0), b_len(0), skew(0), + encloser_last_search(0), encloser_last_match(0) + { + if (encloser_pattern != "") + encloser_re.reset(new boost::regex(encloser_pattern)); + } }; /* Find, and write to ENCLOSER, the nearest line before POS which matches @@ -800,7 +804,7 @@ void hunk_consumer::find_encloser(size_t pos, string & encloser) { - if (encloser_pattern == "") + if (!encloser_re) return; // We need the ability for i and last to go negative so that we do not @@ -808,7 +812,7 @@ ssize_t last = encloser_last_search; encloser_last_search = pos; for (ssize_t i = min(pos, a.size()-1); i >= last; i--) - if (app.lua.patternmatch (a[i], encloser_pattern)) + if (boost::regex_search (a[i], *encloser_re)) { L(FL("find_encloser: from %u matching line %d, \"%s\"") % pos % i % a[i]); @@ -880,28 +884,21 @@ struct unidiff_hunk_writer : public hunk_consumer { vector hunk; - unidiff_hunk_writer(vector const & a, - vector const & b, - size_t ctx, - ostream & ost, - string const & encloser_pattern, - app_state & app); + virtual void flush_hunk(size_t pos); virtual void advance_to(size_t newpos); virtual void insert_at(size_t b_pos); virtual void delete_at(size_t a_pos); virtual ~unidiff_hunk_writer() {} + unidiff_hunk_writer(vector const & a, + vector const & b, + size_t ctx, + ostream & ost, + string const & encloser_pattern) + : hunk_consumer(a, b, ctx, ost, encloser_pattern) + {} }; -unidiff_hunk_writer::unidiff_hunk_writer(vector const & a, - vector const & b, - size_t ctx, - ostream & ost, - string const & encloser_pattern, - app_state & app) - : hunk_consumer(a, b, ctx, ost, encloser_pattern, app) -{} - void unidiff_hunk_writer::insert_at(size_t b_pos) { b_len++; @@ -1003,29 +1000,22 @@ vector to_file; bool have_insertions; bool have_deletions; - cxtdiff_hunk_writer(vector const & a, - vector const & b, - size_t ctx, - ostream & ost, - string const & encloser_pattern, - app_state & app); + virtual void flush_hunk(size_t pos); virtual void advance_to(size_t newpos); virtual void insert_at(size_t b_pos); virtual void delete_at(size_t a_pos); void flush_pending_mods(); virtual ~cxtdiff_hunk_writer() {} -}; - -cxtdiff_hunk_writer::cxtdiff_hunk_writer(vector const & a, - vector const & b, - size_t ctx, - ostream & ost, - string const & encloser_pattern, - app_state & app) - : hunk_consumer(a, b, ctx, ost, encloser_pattern, app), + cxtdiff_hunk_writer(vector const & a, + vector const & b, + size_t ctx, + ostream & ost, + string const & encloser_pattern) + : hunk_consumer(a, b, ctx, ost, encloser_pattern), have_insertions(false), have_deletions(false) -{} + {} +}; void cxtdiff_hunk_writer::insert_at(size_t b_pos) { @@ -1168,7 +1158,8 @@ vector const & lines1, vector const & lines2, ostream & ost, - app_state & app) + diff_type type, + string const & pattern) { vector left_interned; vector right_interned; @@ -1192,18 +1183,14 @@ min(lines1.size(), lines2.size()), back_inserter(lcs)); - string pattern; - if (app.diff_show_encloser) - app.lua.hook_get_encloser_pattern (filename1, pattern); - - switch (app.diff_format) + switch (type) { case unified_diff: { ost << "--- " << filename1 << "\t" << id1 << endl; ost << "+++ " << filename2 << "\t" << id2 << endl; - unidiff_hunk_writer hunks(lines1, lines2, 3, ost, pattern, app); + unidiff_hunk_writer hunks(lines1, lines2, 3, ost, pattern); walk_hunk_consumer(lcs, left_interned, right_interned, hunks); break; } @@ -1212,7 +1199,7 @@ ost << "*** " << filename1 << "\t" << id1 << endl; ost << "--- " << filename2 << "\t" << id2 << endl; - cxtdiff_hunk_writer hunks(lines1, lines2, 3, ost, pattern, app); + cxtdiff_hunk_writer hunks(lines1, lines2, 3, ost, pattern); walk_hunk_consumer(lcs, left_interned, right_interned, hunks); break; } ============================================================ --- diff_patch.hh a963d4afdaa1db93a25924ec994f114e413f69c2 +++ diff_patch.hh e091a6f243dc69e47ea0fa313f5e5bcceb1b049b @@ -35,7 +35,8 @@ std::vector const & lines1, std::vector const & lines2, std::ostream & ost, - app_state & app); + diff_type type, + std::string const & pattern); bool merge3(std::vector const & ancestor, std::vector const & left, ============================================================ --- lua_hooks.cc 5cd3dc9801c357f9127c51fd454332d3d13196bf +++ lua_hooks.cc 0650e44236b780eca2e9bd964b303d08291a5a68 @@ -206,26 +206,6 @@ } } -// utility function, not really a hook -bool -lua_hooks::patternmatch(const string & haystack, const string & needle) -{ - int matchstart; - - // If string.find returned nil, extract_int will fail, so the ok() return - // is the result we want. - return Lua(st) - .push_str("string") - .get_tab() - .push_str("find") - .get_fn(-2) - .push_str(haystack) - .push_str(needle) - .call(2,1) - .extract_int(matchstart) - .ok(); -} - // concrete hooks // nb: if you're hooking lua to return your passphrase, you don't care if we @@ -502,13 +482,13 @@ } bool -lua_hooks::hook_get_encloser_pattern(std::string const & path, +lua_hooks::hook_get_encloser_pattern(file_path const & path, std::string & pattern) { bool exec_ok = Lua(st) .func("get_encloser_pattern") - .push_str(path) + .push_str(path.as_external()) .call(1, 1) .extract_str(pattern) .ok(); ============================================================ --- lua_hooks.hh 6a5820f9ff8d94090bf2d12f5e406b2e32747699 +++ lua_hooks.hh f7acc9339fb54e2093797b8c7192b6846d7b6fe5 @@ -41,10 +41,6 @@ void load_rcfile(utf8 const & file); void load_rcfile(any_path const & file, bool required); - // not a hook, but a convenience wrapper around Lua's str.find(). - // currently only returns yes/no. - bool patternmatch(std::string const & haystack, std::string const & needle); - // cert hooks bool hook_expand_selector(std::string const & sel, std::string & exp); bool hook_expand_date(std::string const & sel, std::string & exp); @@ -101,7 +97,7 @@ std::string const & oldrev, std::string const & newrev); - bool hook_get_encloser_pattern(std::string const & path, + bool hook_get_encloser_pattern(file_path const & path, std::string & pattern); // workspace hooks ============================================================ --- std_hooks.lua 8a7070484c06a9fcc5db1d2288862e99c956f3ae +++ std_hooks.lua 732d295dccfc914b8d6c38deba379f2b148367fb @@ -182,12 +182,11 @@ return guess_binary_file_contents(name) end --- given a file name, return a regular expression which is suitable --- for scanning backward from a diff hunk for the name of the enclosing --- top-level construct. +-- given a file name, return a regular expression which will match +-- lines that name top-level constructs in that file. function get_encloser_pattern(name) -- this default is correct surprisingly often - return "^[%w$_]" + return "^[[:alnum:]$_]" end function edit_comment(basetext, user_log_message) ============================================================ --- tests/diff_output_formats/__driver__.lua 4df984a3a42eaa2b130b96b14d555db1d6082e17 +++ tests/diff_output_formats/__driver__.lua 9cdd663727e0619a1801529674f96b3648860799 @@ -30,4 +30,24 @@ mtn_setup() +-- We do this first so that we can test per-file patterns. +append("test_hooks.lua", + "function get_encloser_pattern(name)\n".. + " if name == \"hello\" then\n".. + " return \"^[[:alnum:]$_]\"\n".. + " else\n".. + " return \"-- initial\"\n".. + " end\n".. + "end\n") + test_one("hello") +test_one("A") +test_one("B") +test_one("C") +test_one("D") +test_one("E") +test_one("F") +test_one("G") +test_one("H") +test_one("I") +test_one("J") ============================================================ --- tests/test_hooks.lua bd224e643fb22b048f55924561045f6d9bab70c4 +++ tests/test_hooks.lua 858d6bfc517923a0a8d006180ac95080599ac1f6 @@ -133,5 +133,5 @@ end function get_encloser_pattern(name) - return "^[%w$_]" + return "^[[:alnum:]$_]" end ============================================================ --- testsuite.lua 5eef9df65c55d57447fb154990c6a165339d8d3b +++ testsuite.lua 56424ca5f48d03687ec4098e6e589eb9fbd69303 @@ -400,7 +400,6 @@ table.insert(tests, "revert_directories") table.insert(tests, "revert_renames") table.insert(tests, "revert_unchanged_file_preserves_mtime") -table.insert(tests, "(minor)_context_diff") table.insert(tests, "rename_cannot_overwrite_files") table.insert(tests, "failed_checkout_is_a_no-op") table.insert(tests, "(todo)_write_monotone-agent")