-
Notifications
You must be signed in to change notification settings - Fork 5
Expand file tree
/
Copy pathcheckout_subcommand.cpp
More file actions
217 lines (191 loc) · 6.84 KB
/
checkout_subcommand.cpp
File metadata and controls
217 lines (191 loc) · 6.84 KB
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
#include "../subcommand/checkout_subcommand.hpp"
#include <filesystem>
#include <iostream>
#include <set>
#include "../subcommand/status_subcommand.hpp"
#include "../utils/git_exception.hpp"
#include "../wrapper/repository_wrapper.hpp"
#include "../wrapper/status_wrapper.hpp"
checkout_subcommand::checkout_subcommand(const libgit2_object&, CLI::App& app)
{
auto* sub = app.add_subcommand("checkout", "Switch branches or restore working tree files");
// "-- file" lands in m_positional_args because CLI11 consumes "--" silently.
sub->add_option("<branch|files>", m_positional_args, "Branch to checkout, or one/many file path(s)");
sub->add_flag("-b", m_create_flag, "Create a new branch before checking it out");
sub->add_flag("-B", m_force_create_flag, "Create a new branch or reset it if it exists before checking it out");
sub->add_flag(
"-f, --force",
m_force_checkout_flag,
"When switching branches, proceed even if the index or the working tree differs from HEAD, and even if there are untracked files in the way"
);
sub->callback(
[this]()
{
this->run();
}
);
}
namespace
{
void print_no_switch(status_list_wrapper& sl)
{
std::cout << "Your local changes to the following files would be overwritten by checkout:" << std::endl;
for (const auto* entry : sl.get_entry_list(GIT_STATUS_WT_MODIFIED))
{
std::cout << "\t" << entry->index_to_workdir->new_file.path << std::endl;
}
for (const auto* entry : sl.get_entry_list(GIT_STATUS_WT_DELETED))
{
std::cout << "\t" << entry->index_to_workdir->old_file.path << std::endl;
}
std::cout << "Please commit your changes or stash them before you switch branches.\nAborting"
<< std::endl;
return;
}
}
void checkout_subcommand::checkout_files(
const repository_wrapper& repo,
const std::vector<std::string>& files,
const git_checkout_options& base_options
)
{
std::vector<const char*> pathspec_strings;
pathspec_strings.reserve(files.size());
for (const auto& f : files)
{
pathspec_strings.push_back(f.c_str());
}
git_checkout_options options = base_options;
options.paths.strings = const_cast<char**>(pathspec_strings.data());
options.paths.count = pathspec_strings.size();
throw_if_error(git_checkout_head(repo, &options));
}
void checkout_subcommand::run()
{
auto directory = get_current_git_path();
auto repo = repository_wrapper::open(directory);
if (repo.state() != GIT_REPOSITORY_STATE_NONE)
{
throw std::runtime_error("Cannot checkout, repository is in unexpected state");
}
git_checkout_options options;
git_checkout_options_init(&options, GIT_CHECKOUT_OPTIONS_VERSION);
if (m_force_checkout_flag)
{
options.checkout_strategy = GIT_CHECKOUT_FORCE;
}
else
{
options.checkout_strategy = GIT_CHECKOUT_SAFE;
}
if (m_positional_args.empty())
{
throw std::runtime_error("error: no branch or file specified");
}
std::string branch_name = m_positional_args[0];
if (m_create_flag || m_force_create_flag)
{
auto annotated_commit = create_local_branch(repo, branch_name, m_force_create_flag);
checkout_tree(repo, annotated_commit, branch_name, options);
update_head(repo, annotated_commit, branch_name);
std::cout << "Switched to a new branch '" << branch_name << "'" << std::endl;
}
else
{
auto optional_commit = repo.resolve_local_ref(branch_name);
if (!optional_commit)
{
// TODO: handle remote refs
// Fall back to file restore only if at least one path exists on disk.
// If none do, it's an unresolvable branch name — report it as such.
bool any_exists = std::any_of(
m_positional_args.begin(),
m_positional_args.end(),
[&](const std::string& p)
{
return std::filesystem::exists(std::filesystem::path(directory) / p);
}
);
if (!any_exists)
{
std::ostringstream buffer;
buffer << "error: could not resolve pathspec '" << branch_name << "'" << std::endl;
throw std::runtime_error(buffer.str());
}
options.checkout_strategy = GIT_CHECKOUT_FORCE;
checkout_files(repo, m_positional_args, options);
return;
}
auto sl = status_list_wrapper::status_list(repo);
try
{
checkout_tree(repo, *optional_commit, branch_name, options);
update_head(repo, *optional_commit, branch_name);
}
catch (const git_exception& e)
{
if (sl.has_notstagged_header())
{
print_no_switch(sl);
}
throw e;
}
if (sl.has_notstagged_header())
{
bool is_long = false;
bool is_coloured = false;
std::set<std::string> tracked_dir_set{};
print_notstagged(sl, tracked_dir_set, is_long, is_coloured);
}
if (sl.has_tobecommited_header())
{
bool is_long = false;
bool is_coloured = false;
std::set<std::string> tracked_dir_set{};
print_tobecommited(sl, tracked_dir_set, is_long, is_coloured);
}
std::cout << "Switched to branch '" << branch_name << "'" << std::endl;
print_tracking_info(repo, sl, true, false);
}
}
annotated_commit_wrapper
checkout_subcommand::create_local_branch(repository_wrapper& repo, const std::string_view target_name, bool force)
{
auto branch = repo.create_branch(target_name, force);
return repo.find_annotated_commit(branch);
}
void checkout_subcommand::checkout_tree(
const repository_wrapper& repo,
const annotated_commit_wrapper& target_annotated_commit,
const std::string_view target_name,
const git_checkout_options& options
)
{
auto target_commit = repo.find_commit(target_annotated_commit.oid());
throw_if_error(git_checkout_tree(repo, target_commit, &options));
}
void checkout_subcommand::update_head(
repository_wrapper& repo,
const annotated_commit_wrapper& target_annotated_commit,
const std::string_view target_name
)
{
std::string_view annotated_ref = target_annotated_commit.reference_name();
if (!annotated_ref.empty())
{
auto ref = repo.find_reference(annotated_ref);
if (ref.is_remote())
{
auto branch = repo.create_branch(target_name, target_annotated_commit);
repo.set_head(branch.reference_name());
}
else
{
repo.set_head(annotated_ref);
}
}
else
{
repo.set_head_detached(target_annotated_commit);
}
}