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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
using LibGit2Sharp.Core;
using LibGit2Sharp.Handlers;
namespace LibGit2Sharp
{
/// <summary>
/// Options controlling Merge behavior.
/// </summary>
public sealed class MergeOptions : IConvertableToGitCheckoutOpts
{
/// <summary>
/// Initializes a new instance of the <see cref="MergeOptions"/> class.
/// <para>
/// Default behavior:
/// A fast-forward merge will be performed if possible, unless the merge.ff configuration option is set.
/// A merge commit will be committed, if one was created.
/// Merge will attempt to find renames.
/// </para>
/// </summary>
public MergeOptions()
{
CommitOnSuccess = true;
FindRenames = true;
// TODO: libgit2 should provide reasonable defaults for these
// values, but it currently does not.
RenameThreshold = 50;
TargetLimit = 200;
}
/// <summary>
/// The Flags specifying what conditions are
/// reported through the OnCheckoutNotify delegate.
/// </summary>
public CheckoutNotifyFlags CheckoutNotifyFlags { get; set; }
/// <summary>
/// Commit the merge if the merge is successful and this is a non-fast-forward merge.
/// If this is a fast-forward merge, then there is no merge commit and this option
/// will not affect the merge.
/// </summary>
public bool CommitOnSuccess { get; set; }
/// <summary>
/// The type of merge to perform.
/// </summary>
public FastForwardStrategy FastForwardStrategy { get; set; }
/// <summary>
/// How conflicting index entries should be written out during checkout.
/// </summary>
public CheckoutFileConflictStrategy FileConflictStrategy { get; set; }
/// <summary>
/// Find renames. Default is true.
/// </summary>
public bool FindRenames { get; set; }
/// <summary>
/// Similarity to consider a file renamed.
/// </summary>
public int RenameThreshold;
/// <summary>
/// Maximum similarity sources to examine (overrides
/// 'merge.renameLimit' config (default 200)
/// </summary>
public int TargetLimit;
/// <summary>
/// How to handle conflicts encountered during a merge.
/// </summary>
public MergeFileFavor MergeFileFavor { get; set; }
/// <summary>
/// Delegate that the checkout will report progress through.
/// </summary>
public CheckoutProgressHandler OnCheckoutProgress { get; set; }
/// <summary>
/// Delegate that checkout will notify callers of
/// certain conditions. The conditions that are reported is
/// controlled with the CheckoutNotifyFlags property.
/// </summary>
public CheckoutNotifyHandler OnCheckoutNotify { get; set; }
#region IConvertableToGitCheckoutOpts
CheckoutCallbacks IConvertableToGitCheckoutOpts.GenerateCallbacks()
{
return CheckoutCallbacks.From(OnCheckoutProgress, OnCheckoutNotify);
}
CheckoutStrategy IConvertableToGitCheckoutOpts.CheckoutStrategy
{
get
{
return CheckoutStrategy.GIT_CHECKOUT_SAFE |
GitCheckoutOptsWrapper.CheckoutStrategyFromFileConflictStrategy(FileConflictStrategy);
}
}
#endregion
}
/// <summary>
/// Strategy used for merging.
/// </summary>
public enum FastForwardStrategy
{
/// <summary>
/// Default fast-forward strategy. If the merge.ff configuration option is set,
/// it will be used. If it is not set, this will perform a fast-forward merge if
/// possible, otherwise a non-fast-forward merge that results in a merge commit.
/// </summary>
Default = 0,
/// <summary>
/// Do not fast-forward. Always creates a merge commit.
/// </summary>
NoFastFoward = 1, /* GIT_MERGE_NO_FASTFORWARD */
/// <summary>
/// Only perform fast-forward merges.
/// </summary>
FastForwardOnly = 2, /* GIT_MERGE_FASTFORWARD_ONLY */
}
/// <summary>
/// Enum specifying how merge should deal with conflicting regions
/// of the files.
/// </summary>
public enum MergeFileFavor
{
/// <summary>
/// When a region of a file is changed in both branches, a conflict
/// will be recorded in the index so that the checkout operation can produce
/// a merge file with conflict markers in the working directory.
/// This is the default.
/// </summary>
Normal = 0,
/// <summary>
/// When a region of a file is changed in both branches, the file
/// created in the index will contain the "ours" side of any conflicting
/// region. The index will not record a conflict.
/// </summary>
Ours = 1,
/// <summary>
/// When a region of a file is changed in both branches, the file
/// created in the index will contain the "theirs" side of any conflicting
/// region. The index will not record a conflict.
/// </summary>
Theirs = 2,
/// <summary>
/// When a region of a file is changed in both branches, the file
/// created in the index will contain each unique line from each side,
/// which has the result of combining both files. The index will not
/// record a conflict.
/// </summary>
Union = 3,
}
}
|
