File: 189-merge-conflict.2.diff

package info (click to toggle)
git-delta 0.18.2-8
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 5,452 kB
  • sloc: sh: 751; makefile: 117
file content (100 lines) | stat: -rw-r--r-- 5,482 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
 
diff --cc src/paint.rs
index 79b44db1,0f429d5c..00000000
--- a/src/paint.rs
+++ b/src/paint.rs
@@@ -387,30 -457,36 +387,88 @@@ impl<'p> Painter<'p> 
      ) -> (Option<BgFillMethod>, Style) {
          // style:          for right fill if line contains no emph sections
          // non_emph_style: for right fill if line contains emph sections
++<<<<<<< HEAD
 +        let (style, non_emph_style) = match state {
 +            State::HunkMinus(None) | State::HunkMinusWrapped => {
 +                (config.minus_style, config.minus_non_emph_style)
 +            }
 +            State::HunkZero | State::HunkZeroWrapped => (config.zero_style, config.zero_style),
 +            State::HunkPlus(None) | State::HunkPlusWrapped => {
 +                (config.plus_style, config.plus_non_emph_style)
 +            }
 +            State::HunkMinus(Some(_)) | State::HunkPlus(Some(_)) => {
 +                let style = if !diff_sections.is_empty() {
 +                    diff_sections[diff_sections.len() - 1].0
++||||||| parent of 4d4b19ca (Always use non-emph style for right fill)
++        let (style, non_emph_style) = match state {
++            State::HunkMinus(None) | State::HunkMinusWrapped => {
++                (config.minus_style, config.minus_non_emph_style)
++            }
++            State::HunkMinus(Some(raw_line)) => {
++                // TODO: This is the second time we are parsing the ANSI sequences
++                if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
++                    let style = Style {
++                        ansi_term_style,
++                        ..Style::new()
++                    };
++                    (style, style)
++                } else {
++                    (config.minus_style, config.minus_non_emph_style)
++                }
++            }
++            State::HunkZero | State::HunkZeroWrapped => (config.zero_style, config.zero_style),
++            State::HunkPlus(None) | State::HunkPlusWrapped => {
++                (config.plus_style, config.plus_non_emph_style)
++            }
++            State::HunkPlus(Some(raw_line)) => {
++                // TODO: This is the second time we are parsing the ANSI sequences
++                if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
++                    let style = Style {
++                        ansi_term_style,
++                        ..Style::new()
++                    };
++                    (style, style)
++=======
+         let non_emph_style = match state {
+             State::HunkMinus(None) | State::HunkMinusWrapped => config.minus_non_emph_style,
+             State::HunkMinus(Some(raw_line)) => {
+                 // TODO: This is the second time we are parsing the ANSI sequences
+                 if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
+                     Style {
+                         ansi_term_style,
+                         ..Style::new()
+                     }
+                 } else {
+                     config.minus_non_emph_style
+                 }
+             }
+             State::HunkZero | State::HunkZeroWrapped => config.zero_style,
+             State::HunkPlus(None) | State::HunkPlusWrapped => config.plus_non_emph_style,
+             State::HunkPlus(Some(raw_line)) => {
+                 // TODO: This is the second time we are parsing the ANSI sequences
+                 if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
+                     Style {
+                         ansi_term_style,
+                         ..Style::new()
+                     }
++>>>>>>> 4d4b19ca (Always use non-emph style for right fill)
                  } else {
++<<<<<<< HEAD
 +                    config.null_style
 +                };
 +                (style, style)
++||||||| parent of 4d4b19ca (Always use non-emph style for right fill)
++                    (config.plus_style, config.plus_non_emph_style)
++                }
++=======
+                     config.plus_non_emph_style
+                 }
++>>>>>>> 4d4b19ca (Always use non-emph style for right fill)
              }
-             State::Blame(_, _) => (diff_sections[0].0, diff_sections[0].0),
-             _ => (config.null_style, config.null_style),
-         };
-         let fill_style = if style_sections_contain_more_than_one_style(diff_sections) {
-             non_emph_style // line contains an emph section
-         } else {
-             style
+             State::Blame(_, _) => diff_sections[0].0,
+             _ => config.null_style,
          };
+         let fill_style = non_emph_style;
  
          match (
              fill_style.get_background_color().is_some(),