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
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
using System;
using System.Runtime.InteropServices;
namespace LibGit2Sharp.Core
{
[Flags]
internal enum CheckoutStrategy
{
/// <summary>
/// Default is a dry run, no actual updates.
/// </summary>
GIT_CHECKOUT_NONE = 0,
/// <summary>
/// Allow safe updates that cannot overwrite uncommited data.
/// </summary>
GIT_CHECKOUT_SAFE = (1 << 0),
/// <summary>
/// Allow update of entries in working dir that are modified from HEAD.
/// </summary>
GIT_CHECKOUT_FORCE = (1 << 1),
/// <summary>
/// Allow checkout to recreate missing files.
/// </summary>
GIT_CHECKOUT_RECREATE_MISSING = (1 << 2),
/// <summary>
/// Allow checkout to make safe updates even if conflicts are found
/// </summary>
GIT_CHECKOUT_ALLOW_CONFLICTS = (1 << 4),
/// <summary>
/// Remove untracked files not in index (that are not ignored)
/// </summary>
GIT_CHECKOUT_REMOVE_UNTRACKED = (1 << 5),
/// <summary>
/// Remove ignored files not in index
/// </summary>
GIT_CHECKOUT_REMOVE_IGNORED = (1 << 6),
/// <summary>
/// Only update existing files, don't create new ones
/// </summary>
GIT_CHECKOUT_UPDATE_ONLY = (1 << 7),
/// <summary>
/// Normally checkout updates index entries as it goes; this stops that
/// Implies `GIT_CHECKOUT_DONT_WRITE_INDEX`.
/// </summary>
GIT_CHECKOUT_DONT_UPDATE_INDEX = (1 << 8),
/// <summary>
/// Don't refresh index/config/etc before doing checkout
/// </summary>
GIT_CHECKOUT_NO_REFRESH = (1 << 9),
///Allow checkout to skip unmerged files
GIT_CHECKOUT_SKIP_UNMERGED = (1 << 10),
/// <summary>
/// For unmerged files, checkout stage 2 from index
/// </summary>
GIT_CHECKOUT_USE_OURS = (1 << 11),
/// <summary>
/// For unmerged files, checkout stage 3 from index
/// </summary>
GIT_CHECKOUT_USE_THEIRS = (1 << 12),
/// <summary>
/// Treat pathspec as simple list of exact match file paths
/// </summary>
GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = (1 << 13),
/// <summary>
/// Ignore directories in use, they will be left empty
/// </summary>
GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = (1 << 18),
/// <summary>
/// Don't overwrite ignored files that exist in the checkout target
/// </summary>
GIT_CHECKOUT_DONT_OVERWRITE_IGNORED = (1 << 19),
/// <summary>
/// Write normal merge files for conflicts
/// </summary>
GIT_CHECKOUT_CONFLICT_STYLE_MERGE = (1 << 20),
/// <summary>
/// Include common ancestor data in diff3 format files for conflicts
/// </summary>
GIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = (1 << 21),
/// <summary>
/// Don't overwrite existing files or folders
/// </summary>
GIT_CHECKOUT_DONT_REMOVE_EXISTING = (1 << 22),
/// <summary>
/// Normally checkout writes the index upon completion; this prevents that.
/// </summary>
GIT_CHECKOUT_DONT_WRITE_INDEX = (1 << 23),
// THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED
/// <summary>
/// Recursively checkout submodules with same options (NOT IMPLEMENTED)
/// </summary>
GIT_CHECKOUT_UPDATE_SUBMODULES = (1 << 16),
/// <summary>
/// Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED)
/// </summary>
GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1 << 17),
}
internal delegate int checkout_notify_cb(
CheckoutNotifyFlags why,
IntPtr path,
IntPtr baseline,
IntPtr target,
IntPtr workdir,
IntPtr payload);
internal delegate void progress_cb(
IntPtr strPtr,
UIntPtr completed_steps,
UIntPtr total_steps,
IntPtr payload);
internal delegate int perfdata_cb(
IntPtr perfdata,
IntPtr payload);
[StructLayout(LayoutKind.Sequential)]
internal struct GitCheckoutOpts
{
public uint version;
public CheckoutStrategy checkout_strategy;
public int DisableFilters;
public uint DirMode;
public uint FileMode;
public int FileOpenFlags;
public CheckoutNotifyFlags notify_flags;
public checkout_notify_cb notify_cb;
public IntPtr notify_payload;
public progress_cb progress_cb;
public IntPtr progress_payload;
public GitStrArray paths;
public IntPtr baseline;
public IntPtr baseline_index;
public IntPtr target_directory;
public IntPtr ancestor_label;
public IntPtr our_label;
public IntPtr their_label;
public perfdata_cb perfdata_cb;
public IntPtr perfdata_payload;
}
/// <summary>
/// An inteface for objects that specify parameters from which a
/// GitCheckoutOpts struct can be populated.
/// </summary>
internal interface IConvertableToGitCheckoutOpts
{
CheckoutCallbacks GenerateCallbacks();
CheckoutStrategy CheckoutStrategy { get; }
CheckoutNotifyFlags CheckoutNotifyFlags { get; }
}
/// <summary>
/// This wraps an IConvertableToGitCheckoutOpts object and can tweak the
/// properties so that they are appropriate for a checkout performed as
/// part of a FastForward merge. Most properties are passthrough to the
/// wrapped object.
/// </summary>
internal class FastForwardCheckoutOptionsAdapter : IConvertableToGitCheckoutOpts
{
private IConvertableToGitCheckoutOpts internalOptions;
internal FastForwardCheckoutOptionsAdapter(IConvertableToGitCheckoutOpts internalOptions)
{
this.internalOptions = internalOptions;
}
/// <summary>
/// Passthrough to the wrapped object.
/// </summary>
/// <returns></returns>
public CheckoutCallbacks GenerateCallbacks()
{
return internalOptions.GenerateCallbacks();
}
/// <summary>
/// There should be no resolvable conflicts in a FastForward merge.
/// Just perform checkout with the safe checkout strategy.
/// </summary>
public CheckoutStrategy CheckoutStrategy
{
get
{
return CheckoutStrategy.GIT_CHECKOUT_SAFE;
}
}
/// <summary>
/// Passthrough to the wrapped object.
/// </summary>
/// <returns></returns>
public CheckoutNotifyFlags CheckoutNotifyFlags
{
get { return internalOptions.CheckoutNotifyFlags; }
}
}
}
|
