migrate diffing integration tests

pkg/integration/components/assert.go

@@ -192,6 +192,13 @@ func (self *Assert) InMenu() {
 	})
 }
 
+func (self *Assert) NotInPopup() {
+	self.assertWithRetries(func() (bool, string) {
+		currentViewName := self.gui.CurrentContext().GetView().Name()
+		return currentViewName != "menu" && currentViewName != "confirmation" && currentViewName != "commitMessage", "Expected popup not to be focused"
+	})
+}
+
 func (self *Assert) MatchCurrentViewTitle(matcher *matcher) {
 	self.matchString(matcher, "Unexpected current view title.",
 		func() string {

pkg/integration/tests/diff/diff.go

@@ -0,0 +1,62 @@
+package diff
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var Diff = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "View the diff of two branches, then view the reverse diff",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.NewBranch("branch-a")
+		shell.CreateFileAndAdd("file1", "first line")
+		shell.Commit("first commit")
+
+		shell.NewBranch("branch-b")
+		shell.UpdateFileAndAdd("file1", "first line\nsecond line")
+		shell.Commit("update")
+
+		shell.Checkout("branch-a")
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		input.SwitchToBranchesWindow()
+		assert.CurrentViewName("localBranches")
+
+		assert.MatchSelectedLine(Contains("branch-a"))
+		input.PressKeys(keys.Universal.DiffingMenu)
+		assert.InMenu()
+		assert.MatchCurrentViewTitle(Equals("Diffing"))
+		assert.MatchSelectedLine(Contains("diff branch-a"))
+		input.Confirm()
+
+		assert.CurrentViewName("localBranches")
+
+		assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-a"))
+		input.NextItem()
+		assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-b"))
+		assert.MatchMainViewContent(Contains("+second line"))
+
+		input.Enter()
+		assert.CurrentViewName("subCommits")
+		assert.MatchMainViewContent(Contains("+second line"))
+		assert.MatchSelectedLine(Contains("update"))
+		input.Enter()
+		assert.CurrentViewName("commitFiles")
+		assert.MatchSelectedLine(Contains("file1"))
+		assert.MatchMainViewContent(Contains("+second line"))
+
+		input.PressKeys(keys.Universal.Return)
+		input.PressKeys(keys.Universal.Return)
+		assert.CurrentViewName("localBranches")
+
+		input.PressKeys(keys.Universal.DiffingMenu)
+		assert.InMenu()
+		input.NavigateToListItemContainingText("reverse diff direction")
+		input.Confirm()
+		assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-b -R"))
+		assert.MatchMainViewContent(Contains("-second line"))
+	},
+})

pkg/integration/tests/diff/diff_and_apply_patch.go

@@ -0,0 +1,74 @@
+package diff
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Create a patch from the diff between two branches and apply the patch.",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.NewBranch("branch-a")
+		shell.CreateFileAndAdd("file1", "first line\n")
+		shell.Commit("first commit")
+
+		shell.NewBranch("branch-b")
+		shell.UpdateFileAndAdd("file1", "first line\nsecond line\n")
+		shell.Commit("update")
+
+		shell.Checkout("branch-a")
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		input.SwitchToBranchesWindow()
+		assert.CurrentViewName("localBranches")
+
+		assert.MatchSelectedLine(Contains("branch-a"))
+		input.PressKeys(keys.Universal.DiffingMenu)
+		assert.InMenu()
+		assert.MatchCurrentViewTitle(Equals("Diffing"))
+		assert.MatchSelectedLine(Contains("diff branch-a"))
+		input.Confirm()
+
+		assert.CurrentViewName("localBranches")
+
+		assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-a"))
+		input.NextItem()
+		assert.MatchViewContent("information", Contains("showing output for: git diff branch-a branch-b"))
+		assert.MatchMainViewContent(Contains("+second line"))
+
+		input.Enter()
+		assert.CurrentViewName("subCommits")
+		assert.MatchMainViewContent(Contains("+second line"))
+		assert.MatchSelectedLine(Contains("update"))
+		input.Enter()
+		assert.CurrentViewName("commitFiles")
+		assert.MatchSelectedLine(Contains("file1"))
+		assert.MatchMainViewContent(Contains("+second line"))
+
+		// add the file to the patch
+		input.PrimaryAction()
+
+		input.PressKeys(keys.Universal.DiffingMenu)
+		assert.InMenu()
+		assert.MatchCurrentViewTitle(Equals("Diffing"))
+		input.NavigateToListItemContainingText("exit diff mode")
+		input.Confirm()
+
+		assert.MatchViewContent("information", NotContains("building patch"))
+
+		input.PressKeys(keys.Universal.CreatePatchOptionsMenu)
+		assert.InMenu()
+		assert.MatchCurrentViewTitle(Equals("Patch Options"))
+		// including the keybinding 'a' here to distinguish the menu item from the 'apply patch in reverse' item
+		input.NavigateToListItemContainingText("a apply patch")
+		input.Confirm()
+
+		input.SwitchToFilesWindow()
+
+		assert.MatchSelectedLine(Contains("file1"))
+		assert.MatchMainViewContent(Contains("+second line"))
+	},
+})

pkg/integration/tests/diff/diff_commits.go

@@ -0,0 +1,56 @@
+package diff
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "View the diff between two commits",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("file1", "first line\n")
+		shell.Commit("first commit")
+		shell.UpdateFileAndAdd("file1", "first line\nsecond line\n")
+		shell.Commit("second commit")
+		shell.UpdateFileAndAdd("file1", "first line\nsecond line\nthird line\n")
+		shell.Commit("third commit")
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		input.SwitchToCommitsWindow()
+		assert.CurrentViewName("commits")
+
+		assert.MatchSelectedLine(Contains("third commit"))
+
+		input.PressKeys(keys.Universal.DiffingMenu)
+		assert.InMenu()
+		assert.MatchCurrentViewTitle(Equals("Diffing"))
+		assert.MatchSelectedLine(Contains("diff"))
+		input.Confirm()
+		assert.NotInPopup()
+
+		assert.MatchViewContent("information", Contains("showing output for: git diff"))
+
+		input.NextItem()
+		input.NextItem()
+
+		assert.MatchSelectedLine(Contains("first commit"))
+
+		assert.MatchMainViewContent(Contains("-second line\n-third line"))
+
+		input.PressKeys(keys.Universal.DiffingMenu)
+		assert.InMenu()
+		input.NavigateToListItemContainingText("reverse diff direction")
+		input.Confirm()
+
+		assert.MatchMainViewContent(Contains("+second line\n+third line"))
+
+		input.Enter()
+
+		assert.CurrentViewName("commitFiles")
+		assert.MatchSelectedLine(Contains("file1"))
+		assert.MatchMainViewContent(Contains("+second line\n+third line"))
+	},
+})

pkg/integration/tests/tests.go

@@ -16,6 +16,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/commit"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/config"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/custom_commands"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/diff"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/file"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/interactive_rebase"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/misc"
@@ -57,6 +58,9 @@ var tests = []*components.IntegrationTest{
 	stash.Stash,
 	stash.StashIncludingUntrackedFiles,
 	config.RemoteNamedStar,
+	diff.Diff,
+	diff.DiffAndApplyPatch,
+	diff.DiffCommits,
 }
 
 func GetTests() []*components.IntegrationTest {

test/integration/diffing/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-test

test/integration/diffing/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/branch2

test/integration/diffing/expected/repo/.git_keep/config

@@ -1,10 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-[user]
-	email = CI@example.com
-	name = CI

test/integration/diffing/expected/repo/.git_keep/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

test/integration/diffing/expected/repo/.git_keep/info/exclude

@@ -1,7 +0,0 @@
-# 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

test/integration/diffing/expected/repo/.git_keep/logs/HEAD

@@ -1,9 +0,0 @@
-0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI <CI@example.com> 1617680560 +1000	commit (initial): file0
-5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI <CI@example.com> 1617680560 +1000	commit: file1
-d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI <CI@example.com> 1617680560 +1000	commit: file2
-0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000	commit: file4
-144da8a531224129210249f43dded86056891506 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000	checkout: moving from master to branch2
-144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI <CI@example.com> 1617680561 +1000	commit: file4
-96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI <CI@example.com> 1617680561 +1000	commit: file4
-75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI <CI@example.com> 1617680561 +1000	commit: file2
-f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI <CI@example.com> 1617680570 +1000	commit: test

test/integration/diffing/expected/repo/.git_keep/logs/refs/heads/branch2

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000	branch: Created from HEAD
-144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI <CI@example.com> 1617680561 +1000	commit: file4
-96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI <CI@example.com> 1617680561 +1000	commit: file4
-75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI <CI@example.com> 1617680561 +1000	commit: file2
-f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI <CI@example.com> 1617680570 +1000	commit: test

test/integration/diffing/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,4 +0,0 @@
-0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI <CI@example.com> 1617680560 +1000	commit (initial): file0
-5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI <CI@example.com> 1617680560 +1000	commit: file1
-d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI <CI@example.com> 1617680560 +1000	commit: file2
-0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI <CI@example.com> 1617680561 +1000	commit: file4

test/integration/diffing/expected/repo/.git_keep/objects/14/4da8a531224129210249f43dded86056891506

@@ -1,2 +0,0 @@
-x
�ÎA
-Â0@Q×9Eö‚d’I2"BW=Æ$N°`l)<¾=‚ÛÏ[üºö¾ìOcWµ‘ÅieR ÌU²ÔK–B…°EŸK’æÉ™Mv}ë"0
d¦À
s@*k¨±Fd‡F>ã¹îvšíušïú•¾½ôR×~³� 'r1�=ƒsÎõ˜ú'7my)šéÍ8N

test/integration/diffing/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -1,2 +0,0 @@
-x
+)JMU03c040031QHﾋﾌI5`ｰｱｺｲ燹ﾖｶwﾁ�w.ｽ��ﾓ[H
-矢y�5�来ﾐ(桍ｧ
^-ﾝW
(x9

test/integration/diffing/expected/repo/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf

@@ -1,2 +0,0 @@
-x
ŤŽK
-�0@»Î)f_(3ů�Rpĺ1&ăHSERčń+=AwŹÇ[<Ůj]P¶—v¨Â„)ŠdĚ,Ěvrq.’8‡yrjFź}ôdv>ôŐ ¤@ÉQqźe§%xöĄ8ôÁZáŕ˛ţĐđ»=·†úa|č‡ëľęM¶zŠ”b‡!"\	ÍiĎ©¦ćf^V%óHr8â

test/integration/diffing/expected/repo/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc

@@ -1,3 +0,0 @@
-x
�ÎM
-Â0@a×9Eö‚dò33¡«cšL°ÐØR"x|{·�oñòÖÚÒ-þÒU«D˜¼—ì™Ñ¯³`Õ�«Ä*Iiàƒ˜]}wKiPJ‰�‰|ÄÀe.Aj¥ÀRÊH>#ŸþÚ;Nö>NOýJÛW½å­=, ²Kö
-Î9sÖsªëŸÜÔeUo~b,9O

test/integration/diffing/expected/repo/.git_keep/refs/heads/branch2

@@ -1 +0,0 @@
-a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676

test/integration/diffing/expected/repo/.git_keep/refs/heads/master

@@ -1 +0,0 @@
-144da8a531224129210249f43dded86056891506

test/integration/diffing/expected/repo/file0

@@ -1 +0,0 @@
-test0

test/integration/diffing/expected/repo/file1

@@ -1 +0,0 @@
-test1

test/integration/diffing/expected/repo/file2

@@ -1 +0,0 @@
-test2

test/integration/diffing/expected/repo/file4

@@ -1 +0,0 @@
-line one

test/integration/diffing/recording.json

@@ -1 +0,0 @@
-{"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}]}

test/integration/diffing/setup.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-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

test/integration/diffing/test.json

@@ -1 +0,0 @@
-{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 }

test/integration/diffing2/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-asd

test/integration/diffing2/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/branch2

test/integration/diffing2/expected/repo/.git_keep/config

@@ -1,10 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-[user]
-	email = CI@example.com
-	name = CI

test/integration/diffing2/expected/repo/.git_keep/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

test/integration/diffing2/expected/repo/.git_keep/info/exclude

@@ -1,7 +0,0 @@
-# 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

test/integration/diffing2/expected/repo/.git_keep/logs/HEAD

@@ -1,9 +0,0 @@
-0000000000000000000000000000000000000000 7bf3d13079ced18f5b00e29c48c777e23f687d0a CI <CI@example.com> 1617680651 +1000	commit (initial): file0
-7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI <CI@example.com> 1617680651 +1000	commit: file1
-e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI <CI@example.com> 1617680651 +1000	commit: file2
-c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000	commit: file4
-06da465196938ea235323950ee451ffb36a431cf 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000	checkout: moving from master to branch2
-06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI <CI@example.com> 1617680651 +1000	commit: file4
-6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI <CI@example.com> 1617680651 +1000	commit: file4
-a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI <CI@example.com> 1617680651 +1000	commit: file2
-1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI <CI@example.com> 1617680662 +1000	commit: asd

test/integration/diffing2/expected/repo/.git_keep/logs/refs/heads/branch2

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000	branch: Created from HEAD
-06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI <CI@example.com> 1617680651 +1000	commit: file4
-6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI <CI@example.com> 1617680651 +1000	commit: file4
-a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI <CI@example.com> 1617680651 +1000	commit: file2
-1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI <CI@example.com> 1617680662 +1000	commit: asd

test/integration/diffing2/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,4 +0,0 @@
-0000000000000000000000000000000000000000 7bf3d13079ced18f5b00e29c48c777e23f687d0a CI <CI@example.com> 1617680651 +1000	commit (initial): file0
-7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI <CI@example.com> 1617680651 +1000	commit: file1
-e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI <CI@example.com> 1617680651 +1000	commit: file2
-c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI <CI@example.com> 1617680651 +1000	commit: file4

test/integration/diffing2/expected/repo/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7

@@ -1,3 +0,0 @@
-x
�Î1
-Ã0@ÑÎ>…÷B±”H–¡”B¦C±eHš\èñ›#tý¼áçm]çæ!á¥fÞbdBÔŒ"
-Ú¤\-IÕ¾jáh1IIÝ®‡½›W€",&¢e"Ò^j&2ƒ.Æ©C¢ré09ý´×vøaô÷a|ÚW×}±[ÞÖ‡†È˜À_!„àÎzN5û“»:/†î”?9ª

test/integration/diffing2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -1,2 +0,0 @@
-x
+)JMU03c040031QHﾋﾌI5`ｰｱｺｲ燹ﾖｶwﾁ�w.ｽ��ﾓ[H
-矢y�5�来ﾐ(桍ｧ
^-ﾝW
(x9

test/integration/diffing2/expected/repo/.git_keep/refs/heads/branch2

@@ -1 +0,0 @@
-0804f2069f5af172770da3d231be982ca320bf8b

test/integration/diffing2/expected/repo/.git_keep/refs/heads/master

@@ -1 +0,0 @@
-06da465196938ea235323950ee451ffb36a431cf

test/integration/diffing2/expected/repo/file0

@@ -1 +0,0 @@
-test0

test/integration/diffing2/expected/repo/file1

@@ -1 +0,0 @@
-test1

test/integration/diffing2/expected/repo/file2

@@ -1 +0,0 @@
-test2

test/integration/diffing2/expected/repo/file4

@@ -1 +0,0 @@
-line one

test/integration/diffing2/recording.json

@@ -1 +0,0 @@
-{"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}]}

test/integration/diffing2/setup.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-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

test/integration/diffing2/test.json

@@ -1 +0,0 @@
-{ "description": "diffing two branches (again) and making a patch from their diff files", "speed": 10 }

test/integration/diffing3/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-asd

test/integration/diffing3/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/branch2

test/integration/diffing3/expected/repo/.git_keep/config

@@ -1,10 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-[user]
-	email = CI@example.com
-	name = CI

test/integration/diffing3/expected/repo/.git_keep/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

test/integration/diffing3/expected/repo/.git_keep/info/exclude

@@ -1,7 +0,0 @@
-# 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

test/integration/diffing3/expected/repo/.git_keep/logs/HEAD

@@ -1,9 +0,0 @@
-0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI <CI@example.com> 1617680695 +1000	commit (initial): file0
-13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI <CI@example.com> 1617680695 +1000	commit: file1
-57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI <CI@example.com> 1617680695 +1000	commit: file2
-4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000	commit: file4
-b25b8446022fb5fcded2bab1ed2b02828a5c4d0b b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000	checkout: moving from master to branch2
-b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI <CI@example.com> 1617680695 +1000	commit: file4
-ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI <CI@example.com> 1617680695 +1000	commit: file4
-275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI <CI@example.com> 1617680695 +1000	commit: file2
-1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI <CI@example.com> 1617680702 +1000	commit: asd

test/integration/diffing3/expected/repo/.git_keep/logs/refs/heads/branch2

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000	branch: Created from HEAD
-b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI <CI@example.com> 1617680695 +1000	commit: file4
-ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI <CI@example.com> 1617680695 +1000	commit: file4
-275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI <CI@example.com> 1617680695 +1000	commit: file2
-1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI <CI@example.com> 1617680702 +1000	commit: asd

test/integration/diffing3/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,4 +0,0 @@
-0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI <CI@example.com> 1617680695 +1000	commit (initial): file0
-13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI <CI@example.com> 1617680695 +1000	commit: file1
-57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI <CI@example.com> 1617680695 +1000	commit: file2
-4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI <CI@example.com> 1617680695 +1000	commit: file4

test/integration/diffing3/expected/repo/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5

@@ -1,2 +0,0 @@
-x
�ΝA
-Β0@QΧ9Ε왉ΣID„®z�¤™`΅!¥Dπψφn?ώ�j];σ¥f@v7	IUsΆ!HΜd†c*\Π§\Ό+³wρΣίν€i†Η4ΏμλΎΩmiυ	$dDΡ
®„�ξ¬η¤Ϋ�ά•u3t?έ�+ό