diff --git a/test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/diffing/expected/.git_keep/FETCH_HEAD b/test/integration/diffing/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/diffing/expected/.git_keep/HEAD b/test/integration/diffing/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/diffing/expected/.git_keep/config b/test/integration/diffing/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/diffing/expected/.git_keep/description b/test/integration/diffing/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/diffing/expected/.git_keep/index b/test/integration/diffing/expected/.git_keep/index new file mode 100644 index 000000000..a119ab59e Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/index differ diff --git a/test/integration/diffing/expected/.git_keep/info/exclude b/test/integration/diffing/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/diffing/expected/.git_keep/logs/HEAD b/test/integration/diffing/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..6d2ab7ba5 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI 1617680560 +1000 commit (initial): file0 +5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI 1617680560 +1000 commit: file1 +d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI 1617680560 +1000 commit: file2 +0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 commit: file4 +144da8a531224129210249f43dded86056891506 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 checkout: moving from master to branch2 +144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI 1617680561 +1000 commit: file4 +96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI 1617680561 +1000 commit: file4 +75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI 1617680561 +1000 commit: file2 +f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI 1617680570 +1000 commit: test diff --git a/test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..ea8f0f0b7 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 branch: Created from HEAD +144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI 1617680561 +1000 commit: file4 +96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI 1617680561 +1000 commit: file4 +75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI 1617680561 +1000 commit: file2 +f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI 1617680570 +1000 commit: test diff --git a/test/integration/diffing/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..7427bd7e9 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI 1617680560 +1000 commit (initial): file0 +5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI 1617680560 +1000 commit: file1 +d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI 1617680560 +1000 commit: file2 +0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 commit: file4 diff --git a/test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 b/test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 new file mode 100644 index 000000000..dc7f756dd Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 b/test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 new file mode 100644 index 000000000..f0e0252c6 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 @@ -0,0 +1,2 @@ +xA +0@Q9EdI2"BW=$N`l)<=[ OcWieR UKBEKəMv}"0d s@*kFdF>vuR~ 'r1=s'7my)8N \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 b/test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 new file mode 100644 index 000000000..802ec4155 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd b/test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd new file mode 100644 index 000000000..e14a460c2 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd differ diff --git a/test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c b/test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c new file mode 100644 index 000000000..5f97ec479 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c differ diff --git a/test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 b/test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 new file mode 100644 index 000000000..8c6e41957 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf b/test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf new file mode 100644 index 000000000..e6f554e7f --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf @@ -0,0 +1,2 @@ +xK +0@)f_(3Rp1&HSER+=Aw[ @Qqe%x8Z=a|Mzb!"\ iϩf^V%Hr8 \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc b/test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc new file mode 100644 index 000000000..1380ed286 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc @@ -0,0 +1,3 @@ +xM +0@a9Ed33cLR"x|{o- UD`Ձ*Ii]}wKiPJ|e.AjRH>#;N>NOJW=, K +9sseUo~b,9O \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..dcc322cf6 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 diff --git a/test/integration/diffing/expected/.git_keep/refs/heads/master b/test/integration/diffing/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..bb48ea2cc --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +144da8a531224129210249f43dded86056891506 diff --git a/test/integration/diffing/expected/file0 b/test/integration/diffing/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/diffing/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/diffing/expected/file1 b/test/integration/diffing/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/diffing/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/diffing/expected/file2 b/test/integration/diffing/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/diffing/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/diffing/expected/file4 b/test/integration/diffing/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/diffing/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/diffing/recording.json b/test/integration/diffing/recording.json new file mode 100644 index 000000000..e3e075780 --- /dev/null +++ b/test/integration/diffing/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":497,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1570,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1882,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2258,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2514,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3602,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5057,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5250,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5410,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6010,"Mod":2,"Key":16,"Ch":16},{"Timestamp":6730,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7106,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8090,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8330,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8545,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8601,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8778,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8809,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9074,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9722,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/diffing/setup.sh b/test/integration/diffing/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/diffing/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/diffing/test.json b/test/integration/diffing/test.json new file mode 100644 index 000000000..8ffc90df2 --- /dev/null +++ b/test/integration/diffing/test.json @@ -0,0 +1 @@ +{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 } diff --git a/test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..d72af3146 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +asd diff --git a/test/integration/diffing2/expected/.git_keep/FETCH_HEAD b/test/integration/diffing2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/diffing2/expected/.git_keep/HEAD b/test/integration/diffing2/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/diffing2/expected/.git_keep/config b/test/integration/diffing2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/diffing2/expected/.git_keep/description b/test/integration/diffing2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/diffing2/expected/.git_keep/index b/test/integration/diffing2/expected/.git_keep/index new file mode 100644 index 000000000..f8944878d Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/index differ diff --git a/test/integration/diffing2/expected/.git_keep/info/exclude b/test/integration/diffing2/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/diffing2/expected/.git_keep/logs/HEAD b/test/integration/diffing2/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..2b9fe8586 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 7bf3d13079ced18f5b00e29c48c777e23f687d0a CI 1617680651 +1000 commit (initial): file0 +7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI 1617680651 +1000 commit: file1 +e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI 1617680651 +1000 commit: file2 +c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 commit: file4 +06da465196938ea235323950ee451ffb36a431cf 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 checkout: moving from master to branch2 +06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI 1617680651 +1000 commit: file4 +6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI 1617680651 +1000 commit: file4 +a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI 1617680651 +1000 commit: file2 +1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI 1617680662 +1000 commit: asd diff --git a/test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..a67589ac2 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 branch: Created from HEAD +06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI 1617680651 +1000 commit: file4 +6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI 1617680651 +1000 commit: file4 +a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI 1617680651 +1000 commit: file2 +1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI 1617680662 +1000 commit: asd diff --git a/test/integration/diffing2/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..c435fd1a6 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 7bf3d13079ced18f5b00e29c48c777e23f687d0a CI 1617680651 +1000 commit (initial): file0 +7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI 1617680651 +1000 commit: file1 +e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI 1617680651 +1000 commit: file2 +c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 commit: file4 diff --git a/test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf b/test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf new file mode 100644 index 000000000..d7e70107c Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b b/test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b new file mode 100644 index 000000000..eea371cdc Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 b/test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 new file mode 100644 index 000000000..16181d57a --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 @@ -0,0 +1,3 @@ +x1 +0 @>BHBCeH\#tm]!fbdBԌ" +ڤ\-Iվjh1IIݮW",&e"^j&2.ƩCr09vaa|W}[և_!zN5:/?9 \ No newline at end of file diff --git a/test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 b/test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 new file mode 100644 index 000000000..8728705f8 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a b/test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a new file mode 100644 index 000000000..7404048eb Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 b/test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 new file mode 100644 index 000000000..8d1c80d70 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 b/test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 new file mode 100644 index 000000000..3869825cb Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e b/test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e new file mode 100644 index 000000000..7dc95dfed Binary files /dev/null and b/test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e differ diff --git a/test/integration/diffing2/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing2/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..da38abcfa --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +0804f2069f5af172770da3d231be982ca320bf8b diff --git a/test/integration/diffing2/expected/.git_keep/refs/heads/master b/test/integration/diffing2/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..168b462cc --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +06da465196938ea235323950ee451ffb36a431cf diff --git a/test/integration/diffing2/expected/file0 b/test/integration/diffing2/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/diffing2/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/diffing2/expected/file1 b/test/integration/diffing2/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/diffing2/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/diffing2/expected/file2 b/test/integration/diffing2/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/diffing2/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/diffing2/expected/file4 b/test/integration/diffing2/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/diffing2/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/diffing2/recording.json b/test/integration/diffing2/recording.json new file mode 100644 index 000000000..c560496f6 --- /dev/null +++ b/test/integration/diffing2/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":819,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1236,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1491,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1899,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3115,"Mod":0,"Key":256,"Ch":87},{"Timestamp":3539,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3875,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4315,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5291,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6643,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7211,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7475,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7627,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8227,"Mod":2,"Key":16,"Ch":16},{"Timestamp":8770,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8963,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9227,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9947,"Mod":0,"Key":260,"Ch":0},{"Timestamp":10379,"Mod":0,"Key":256,"Ch":99},{"Timestamp":10635,"Mod":0,"Key":256,"Ch":97},{"Timestamp":10674,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10731,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11203,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11715,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/diffing2/setup.sh b/test/integration/diffing2/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/diffing2/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/diffing2/test.json b/test/integration/diffing2/test.json new file mode 100644 index 000000000..8ffc90df2 --- /dev/null +++ b/test/integration/diffing2/test.json @@ -0,0 +1 @@ +{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 } diff --git a/test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..d72af3146 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +asd diff --git a/test/integration/diffing3/expected/.git_keep/FETCH_HEAD b/test/integration/diffing3/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/diffing3/expected/.git_keep/HEAD b/test/integration/diffing3/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/diffing3/expected/.git_keep/config b/test/integration/diffing3/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/diffing3/expected/.git_keep/description b/test/integration/diffing3/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/diffing3/expected/.git_keep/index b/test/integration/diffing3/expected/.git_keep/index new file mode 100644 index 000000000..3af23eb39 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/index differ diff --git a/test/integration/diffing3/expected/.git_keep/info/exclude b/test/integration/diffing3/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/diffing3/expected/.git_keep/logs/HEAD b/test/integration/diffing3/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..0c3bb8fa2 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI 1617680695 +1000 commit (initial): file0 +13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI 1617680695 +1000 commit: file1 +57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI 1617680695 +1000 commit: file2 +4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 commit: file4 +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 checkout: moving from master to branch2 +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI 1617680695 +1000 commit: file4 +ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI 1617680695 +1000 commit: file4 +275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI 1617680695 +1000 commit: file2 +1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI 1617680702 +1000 commit: asd diff --git a/test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..388d6e906 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 branch: Created from HEAD +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI 1617680695 +1000 commit: file4 +ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI 1617680695 +1000 commit: file4 +275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI 1617680695 +1000 commit: file2 +1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI 1617680702 +1000 commit: asd diff --git a/test/integration/diffing3/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..2eee36176 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI 1617680695 +1000 commit (initial): file0 +13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI 1617680695 +1000 commit: file1 +57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI 1617680695 +1000 commit: file2 +4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 commit: file4 diff --git a/test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 b/test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 new file mode 100644 index 000000000..0b6ffa3fc --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 @@ -0,0 +1,2 @@ +xA +0@Q9IDz`!Dn?j];f@v7 IUs!Hdc*\Ч\+wi4mi $dD۟ܕu3t?+ \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a b/test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a new file mode 100644 index 000000000..d27019b84 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a @@ -0,0 +1,2 @@ +xA +@ Fas 6#Nb~+L5rS݁3mEHJJ:"ћ5XN gx(B= P!L<1n0\-=v}u__.ʦ4D=*8͐?b9 \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 b/test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 new file mode 100644 index 000000000..4ce25a568 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 @@ -0,0 +1,2 @@ +xA +0E]dfҤ("tc$qƖ#{|އZ$|i*gb -f"b bdxA)숬>e';Xv ?0/0C^@FߏJhڣn:38 \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/diffing3/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee b/test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee new file mode 100644 index 000000000..49d0ec6d7 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee @@ -0,0 +1,3 @@ +xA +0a9ELL2#L`l)<9Ǔ[LtꇪMʜ#T +cY"$fχ1$)%& *h))Mvii~7b<ÀugnR2?/8 \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 b/test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 new file mode 100644 index 000000000..6fe16bc3d Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 b/test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 new file mode 100644 index 000000000..1dbb386fc Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b b/test/integration/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b new file mode 100644 index 000000000..7840a7939 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing3/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 b/test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 new file mode 100644 index 000000000..41ee689ed Binary files /dev/null and b/test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 differ diff --git a/test/integration/diffing3/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing3/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..0fd67f431 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +93b73046d6820607f1da09399b55a145d5389ab8 diff --git a/test/integration/diffing3/expected/.git_keep/refs/heads/master b/test/integration/diffing3/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..1ae5bbe93 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b diff --git a/test/integration/diffing3/expected/file0 b/test/integration/diffing3/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/diffing3/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/diffing3/expected/file1 b/test/integration/diffing3/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/diffing3/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/diffing3/expected/file2 b/test/integration/diffing3/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/diffing3/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/diffing3/recording.json b/test/integration/diffing3/recording.json new file mode 100644 index 000000000..3075a9b2f --- /dev/null +++ b/test/integration/diffing3/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":487,"Mod":0,"Key":259,"Ch":0},{"Timestamp":768,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1039,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1303,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1599,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1791,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1975,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2151,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2384,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3335,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3527,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3679,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4214,"Mod":2,"Key":16,"Ch":16},{"Timestamp":5111,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5327,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6006,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6223,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6447,"Mod":0,"Key":256,"Ch":99},{"Timestamp":6631,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6671,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6743,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7111,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7559,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/diffing3/setup.sh b/test/integration/diffing3/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/diffing3/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/diffing3/test.json b/test/integration/diffing3/test.json new file mode 100644 index 000000000..7ce255921 --- /dev/null +++ b/test/integration/diffing3/test.json @@ -0,0 +1 @@ +{ "description": "diffing two branches and making a patch from their diff files", "speed": 1 }