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
|
# File 'lib/m-git/command/pull.rb', line 32
def verbose_pull(argv)
return if do_abort(argv)
Output.puts_start_cmd
Workspace.pre_fetch
config_repo = generate_config_repo
if mgit_try_to_continue?
Foundation.help!("当前并不处于操作中间态,无法进行continue操作!") if !OperationProgressManager.is_in_progress?(Workspace.root, __progress_type)
context, _ = OperationProgressManager.load_context(Workspace.root, __progress_type)
Foundation.help!("缓存指令读取失败,continue无法继续进行,请重新执行完整指令。") if context.nil? || !context.validate?
Foundation.help!("当前主仓库所在分支跟上次操作时所在分支(#{context.branch})不一致,请切换后重试。") if config_repo.status_checker.current_branch(use_cache:true) != context.branch
if !context.repos.nil?
Output.puts_processing_message("加载上次即将操作的子仓库...")
Workspace.update_all_repos(context.repos)
end
Output.puts_success_message("已跳过主仓库。")
else
if OperationProgressManager.is_in_progress?(Workspace.root, __progress_type)
if Output.continue_with_user_remind?("当前处于操作中间态,建议取消操作并执行\"mgit pull --continue\"继续操作子仓库。\n 继续执行将清除中间态并重新操作所有仓库,是否取消?")
Output.puts_cancel_message
return
end
end
config_error = pull_config_repo(argv.cmd, argv.git_opts, config_repo)
if config_error
Output.puts_fail_block([config_repo.name], "主仓库操作失败:#{config_error}")
return
end
end
do_repos = []
diverged_repos = []
no_remote_repos = []
no_tracking_repos = []
dirty_repos = []
detached_repos = []
remote_inconsist_repos = []
do_nothing_repos = []
Output.puts_processing_message("检查各仓库状态...")
Workspace.serial_enumerate_with_progress(all_repos) { |repo|
next if !config_repo.nil? && repo.name == config_repo.name
Timer.start(repo.name)
status = repo.status_checker.status
branch_status = repo.status_checker.branch_status
if branch_status == Repo::Status::GIT_BRANCH_STATUS[:up_to_date] || branch_status == Repo::Status::GIT_BRANCH_STATUS[:ahead]
do_nothing_repos.push(repo)
else
url_consist = repo.url_consist?
is_dirty = status == Repo::Status::GIT_REPO_STATUS[:dirty]
dirty_repos.push(repo) if is_dirty
remote_inconsist_repos.push(repo) if !url_consist
if branch_status == Repo::Status::GIT_BRANCH_STATUS[:diverged] && !is_dirty && url_consist
do_repos.push(repo)
diverged_repos.push(repo.name)
elsif branch_status == Repo::Status::GIT_BRANCH_STATUS[:behind] && !is_dirty && url_consist
do_repos.push(repo)
elsif branch_status == Repo::Status::GIT_BRANCH_STATUS[:no_remote]
no_remote_repos.push(repo)
elsif branch_status == Repo::Status::GIT_BRANCH_STATUS[:no_tracking]
no_tracking_repos.push(repo)
elsif branch_status == Repo::Status::GIT_BRANCH_STATUS[:detached]
detached_repos.push(repo)
end
end
Timer.stop(repo.name)
}
Output.puts_success_message("检查完成!\n")
if Workspace.filter_config.auto_exec
do_repos += dirty_repos
do_repos.uniq! { |repo| repo.name }
elsif no_remote_repos.length > 0 ||
dirty_repos.length > 0 ||
detached_repos.length > 0 ||
no_tracking_repos.length > 0 ||
remote_inconsist_repos.length > 0
remind_repos = []
remind_repos.push(['远程分支不存在', no_remote_repos.map { |e| e.name }]) if no_remote_repos.length > 0
remind_repos.push(['未追踪远程分支(建议:mgit branch -u origin/<branch>)', no_tracking_repos.map { |e| e.name }]) if no_tracking_repos.length > 0
remind_repos.push(['有本地改动', dirty_repos.map { |e| e.name }]) if dirty_repos.length > 0
remind_repos.push(['HEAD游离,当前不在任何分支上', detached_repos.map { |e| e.name }]) if detached_repos.length > 0
remind_repos.push(['实际url与配置不一致', remote_inconsist_repos.map { |e| e.name }]) if remote_inconsist_repos.length > 0
Output.interact_with_multi_selection_combined_repos(remind_repos, "以上仓库状态异常", ['a: 跳过并继续', 'b: 强制执行', 'c: 终止']) { |input|
if input == 'b'
do_repos += dirty_repos
do_repos += detached_repos
do_repos += no_remote_repos
do_repos += no_tracking_repos
do_repos += remote_inconsist_repos
do_repos.uniq! { |repo| repo.name }
elsif input == 'c' || input != 'a'
Output.puts_cancel_message
return
end
}
end
if do_repos.length != 0
error_repos = []
if argv.git_opts.length == 0
skip_repos = do_repos.select { |repo|
branch_status = repo.status_checker.branch_status
branch_status == Repo::Status::GIT_BRANCH_STATUS[:no_remote] ||
branch_status == Repo::Status::GIT_BRANCH_STATUS[:no_tracking] ||
branch_status == Repo::Status::GIT_BRANCH_STATUS[:detached]
}
if skip_repos.length > 0
Output.puts_remind_block(skip_repos.map { |e| e.name }, "以上仓库无法强制执行,已跳过。")
do_repos -= skip_repos
if do_repos.length == 0
Output.puts_success_message("仓库均为最新,无须执行!")
return
end
end
count_msg = ",另有#{do_nothing_repos.length}个仓库无须执行" if do_nothing_repos.length > 0
Output.puts_remind_block(do_repos.map { |repo| repo.name }, "开始为以上仓库合并远程分支#{count_msg}...")
_, error_repos = Workspace.execute_git_cmd_with_repos('', '', do_repos) { |repo|
msg = nil
branch = repo.status_checker.current_branch(strict_mode:false, use_cache:true)
tracking_branch = repo.status_checker.tracking_branch(branch, use_cache:true)
msg = "-m \"【Merge】【0.0.0】【#{branch}】合并远程分支'#{tracking_branch}'。\"" if diverged_repos.include?(repo.name)
["merge", "#{tracking_branch} #{msg}"]
}
else
count_msg = ",另有#{do_nothing_repos.length}个仓库无须执行" if do_nothing_repos.length > 0
Output.puts_remind_block(do_repos.map { |repo| repo.name }, "开始pull以上仓库#{count_msg}...")
_, error_repos = Workspace.execute_git_cmd_with_repos(argv.cmd, argv.git_opts, do_repos)
end
if config_error.nil? && error_repos.length == 0
Output.puts_succeed_cmd(argv.absolute_cmd)
Timer.show_time_consuming_repos
end
else
Output.puts_success_message("仓库均为最新,无须执行!")
end
OperationProgressManager.remove_progress(Workspace.root, __progress_type)
end
|