chore: Update dependencies

Author: epage

Cargo.toml

@@ -36,5 +36,5 @@ itertools = "0.10"
 which = "4"
 
 [dev-dependencies]
-git-fixture = { version = "0.2" }
+git-fixture = { version = "0.3", features = ["yaml"] }
 assert_fs = "1"

tests/fixtures/branches.yml

@@ -1,56 +1,61 @@
 init: true
-events:
+commands:
 - tree:
-    tracked:
+    files:
       "file_a.txt": "1"
     message: "1"
-    branch: initial
+- branch: initial
 - tree:
-    tracked:
+    files:
       "file_a.txt": "2"
     message: "2"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
     message: "3"
-    branch: base
-- children:
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "1"
-        message: "4"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "2"
-        message: "5"
-        branch: master
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "3"
-        message: "6"
-        branch: off_master
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "1"
-        message: "7"
-        branch: feature1
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "2"
-        message: "8"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "3"
-        message: "9"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "4"
-        message: "10"
-        branch: feature2
+- branch: base
+- label: base
+
+- reset: base
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "1"
+    message: "4"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "2"
+    message: "5"
+- branch: master
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "3"
+    message: "6"
+- branch: off_master
+
+- reset: base
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "1"
+    message: "7"
+- branch: feature1
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "2"
+    message: "8"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "3"
+    message: "9"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "4"
+    message: "10"
+- branch: feature2
+- head:

tests/fixtures/conflict.yml

@@ -1,31 +1,35 @@
 init: true
-events:
+commands:
 - tree:
-    tracked:
+    files:
       "file_a.txt": "1"
     message: "1"
-    branch: initial
+- branch: initial
 - tree:
-    tracked:
+    files:
       "file_a.txt": "2"
     message: "2"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
     message: "3"
-    branch: base
-- children:
-  - - tree:
-        tracked:
-          "file_a.txt": "4"
-        message: "4"
-    - tree:
-        tracked:
-          "file_a.txt": "5"
-        message: "5"
-        branch: master
-  - - tree:
-        tracked:
-          "file_a.txt": "6"
-        message: "7"
-        branch: feature1
+- branch: base
+- label: base
+
+- reset: base
+- tree:
+    files:
+      "file_a.txt": "4"
+    message: "4"
+- tree:
+    files:
+      "file_a.txt": "5"
+    message: "5"
+- branch: master
+
+- reset: base
+- tree:
+    files:
+      "file_a.txt": "6"
+    message: "7"
+- branch: feature1

tests/fixtures/fixup.yml

@@ -1,60 +1,60 @@
 init: true
-events:
+commands:
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
     message: "commit 1"
-    branch: base
+- branch: base
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_b.txt": "1"
     message: "commit 2"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_b.txt": "2"
     message: "master commit"
-    branch: master
+- branch: master
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_b.txt": "3"
     message: "feature1 commit 1"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_b.txt": "5"
     message: "feature1 commit 2"
-    branch: feature1
+- branch: feature1
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_c.txt": "1"
     message: "fixup! feature1 commit 1"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_c.txt": "4"
     message: "feature1 commit 3"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_c.txt": "1"
     message: "fixup! feature1 commit 1"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_c.txt": "2"
     message: "fixup! feature1 commit 2"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_c.txt": "4"
     message: "feature2 commit"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
       "file_c.txt": "1"
     message: "fixup! feature1 commit 1"
-    branch: feature2
+- branch: feature2

tests/fixtures/git_rebase_existing.yml

@@ -1,35 +1,39 @@
 init: true
-events:
+commands:
 - tree:
-    tracked:
+    files:
       "file_a.txt": "1"
     message: "1"
-    branch: initial
+- branch: initial
 - tree:
-    tracked:
+    files:
       "file_a.txt": "2"
     message: "2"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
     message: "3"
-    branch: master
-- children:
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "1"
-        message: "7"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "2"
-        message: "8"
-        branch: feature2
-  # `git rebase master` caused the history to split
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "1"
-        message: "7"
-        branch: feature1
+- branch: master
+- label: master
+
+- reset: master
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "1"
+    message: "7"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "2"
+    message: "8"
+- branch: feature2
+
+# `git rebase master` caused the history to split
+- reset: master
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "1"
+    message: "7"
+- branch: feature1

tests/fixtures/git_rebase_new.yml

@@ -1,36 +1,40 @@
 init: true
-events:
+commands:
 - tree:
-    tracked:
+    files:
       "file_a.txt": "1"
     message: "1"
-    branch: initial
+- branch: initial
 - tree:
-    tracked:
+    files:
       "file_a.txt": "2"
     message: "2"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
     message: "3"
-    branch: master
-- children:
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "1"
-        message: "7"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "1"
-          "file_c.txt": "1"
-        message: "8"
-        branch: feature2
-  # `git rebase master` caused the history to split
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "1"
-        message: "7"
-        branch: feature1
+- branch: master
+- label: master
+
+- reset: master
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "1"
+    message: "7"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "1"
+      "file_c.txt": "1"
+    message: "8"
+- branch: feature2
+
+# `git rebase master` caused the history to split
+- reset: master
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "1"
+    message: "7"
+- branch: feature1