Fix display of conflicts in the main view when 'show-changes' is enabled
[tig.git] / test / main / show-changes-test
blobe6139d9c1c1f7e0b8fd37b0fc49fb1db720a2c5e
1 #!/bin/sh
3 # Test main view display of index changes and interaction with the stage view.
5 . libtest.sh
6 . libgit.sh
7 . "$source_dir/util.sh"
9 export LINES=16
11 steps '
12 :view-main
13 :save-display main-with-unstaged.screen
14 :enter
15 :save-display main-with-unstaged-split.screen
17 :status-update
18 :save-display main-with-staged.screen
20 :enter
21 :save-display main-with-staged-split.screen
23 :view-close
24 <F1>
25 :refresh
26 :save-display main-with-staged-and-unstaged.screen
28 <F2>
29 :refresh
30 :save-display main-with-conflict.screen
33 tigrc <<EOF
34 set vertical-split = no
35 bind generic <F1> @sh -c 'git reset a b.c'
36 bind generic <F2> @setup-conflict.sh
37 EOF
39 in_work_dir create_dirty_workdir
41 test_tig
43 main_replace_index_changes_date
45 assert_equals 'main-with-unstaged.screen' <<EOF
46 $YYY_MM_DD_HH_MM Unknown o Unstaged changes
47 2009-02-13 23:31 A. U. Thor I [master] Initial commit
60 [main] Unstaged changes 100%
61 EOF
63 assert_equals 'main-with-unstaged-split.screen' <<EOF
64 $YYY_MM_DD_HH_MM Unknown o Unstaged changes
65 2009-02-13 23:31 A. U. Thor I [master] Initial commit
68 [main] Unstaged changes 100%
69 .j | 6 ++----
70 a | 6 ++----
71 b.c | 6 ++----
72 e/f | 6 ++----
73 g h | 6 ++----
74 5 files changed, 10 insertions(+), 20 deletions(-)
76 diff --git a/.j b/.j
77 index e697dfd..9d8ef3d 100644
78 [stage] Unstaged changes - line 1 of 107 8%
79 EOF
81 assert_equals 'main-with-staged.screen' <<EOF
82 $YYY_MM_DD_HH_MM Unknown o Staged changes
83 2009-02-13 23:31 A. U. Thor I [master] Initial commit
96 [main] Staged changes 100%
97 EOF
99 assert_equals 'main-with-staged-split.screen' <<EOF
100 $YYY_MM_DD_HH_MM Unknown o Staged changes
101 2009-02-13 23:31 A. U. Thor I [master] Initial commit
104 [main] Staged changes 100%
105 .j | 6 ++----
106 a | 6 ++----
107 b.c | 6 ++----
108 e/f | 6 ++----
109 g h | 6 ++----
110 5 files changed, 10 insertions(+), 20 deletions(-)
112 diff --git a/.j b/.j
113 index e697dfd..9d8ef3d 100644
114 [stage] Staged changes - line 1 of 107 8%
117 assert_equals 'main-with-staged-and-unstaged.screen' <<EOF
118 $YYY_MM_DD_HH_MM Unknown o Staged changes
119 $YYY_MM_DD_HH_MM Unknown o Unstaged changes
120 2009-02-13 23:31 A. U. Thor I [master] Initial commit
132 [main] Staged changes 100%
135 assert_equals 'main-with-conflict.screen' <<EOF
136 $YYY_MM_DD_HH_MM Unknown o Unstaged changes
137 2009-03-03 00:15 Committer o [conflict-master] Change: c
138 2009-02-13 23:31 Committer o Change: a
139 2009-02-13 23:31 A. U. Thor I [master] Initial commit
150 [main] Unstaged changes 100%