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
use std::fmt::Write;
use std::time::SystemTime;
use eyre::Context;
use itertools::Itertools;
use tracing::instrument;
use crate::commands::restack;
use crate::opts::MoveOptions;
use lib::core::config::get_restack_preserve_timestamps;
use lib::core::effects::Effects;
use lib::core::eventlog::{Event, EventLogDb};
use lib::core::formatting::Pluralize;
use lib::core::gc::mark_commit_reachable;
use lib::git::{AmendFastOptions, FileStatus, GitRunInfo, Repo};
#[instrument]
pub fn amend(
effects: &Effects,
git_run_info: &GitRunInfo,
move_options: &MoveOptions,
) -> eyre::Result<isize> {
let now = SystemTime::now();
let repo = Repo::from_current_dir()?;
let conn = repo.get_db_conn()?;
let mut event_log_db = EventLogDb::new(&conn)?;
let head_oid = match repo.get_head_info()?.oid {
Some(oid) => oid,
None => {
writeln!(
effects.get_output_stream(),
"No commit is currently checked out. Check out a commit to amend and then try again.",
)?;
return Ok(1);
}
};
let head_commit = repo.find_commit_or_fail(head_oid)?;
let index = repo.get_index()?;
if index.has_conflicts() {
writeln!(
effects.get_output_stream(),
"Cannot amend, because there are unresolved merge conflicts. Resolve the merge conflicts and try again."
)?;
return Ok(1);
}
let event_tx_id = event_log_db.make_transaction_id(now, "amend")?;
let staged_index_paths = repo.get_staged_paths()?;
let (opts, dirty_working_tree) = if !staged_index_paths.is_empty() {
let dirty_working_tree = repo.has_changed_files(effects, git_run_info)?;
let opts = AmendFastOptions::FromIndex {
paths: staged_index_paths.into_iter().collect_vec(),
};
(opts, dirty_working_tree)
} else {
let status = repo.get_status(git_run_info, Some(event_tx_id))?;
let entries_to_amend = status
.into_iter()
.filter(|entry| match entry.working_copy_status {
FileStatus::Added
| FileStatus::Copied
| FileStatus::Deleted
| FileStatus::Modified
| FileStatus::Renamed => true,
FileStatus::Ignored
| FileStatus::Unmerged
| FileStatus::Unmodified
| FileStatus::Untracked => false,
})
.collect_vec();
let opts = AmendFastOptions::FromWorkingCopy {
status_entries: entries_to_amend,
};
(opts, true)
};
if opts.is_empty() {
writeln!(
effects.get_output_stream(),
"There are no uncommitted or staged changes. Nothing to amend."
)?;
return Ok(0);
}
let amended_tree = repo.amend_fast(&head_commit, &opts)?;
let timestamp = now.duration_since(SystemTime::UNIX_EPOCH)?.as_secs_f64();
let (author, committer) = (head_commit.get_author(), head_commit.get_committer());
let (author, committer) = if get_restack_preserve_timestamps(&repo)? {
(author, committer)
} else {
(
author.update_timestamp(now)?,
committer.update_timestamp(now)?,
)
};
let amended_commit_oid = head_commit.amend_commit(
Some("HEAD"),
Some(&author),
Some(&committer),
None,
Some(&amended_tree),
)?;
mark_commit_reachable(&repo, amended_commit_oid)
.wrap_err("Marking commit as reachable for GC purposes.")?;
event_log_db.add_events(vec![Event::RewriteEvent {
timestamp,
event_tx_id,
old_commit_oid: head_oid.into(),
new_commit_oid: amended_commit_oid.into(),
}])?;
if let AmendFastOptions::FromWorkingCopy { .. } = opts {
git_run_info.run(effects, Some(event_tx_id), &["reset"])?;
}
let restack_exit_code = restack::restack(
effects,
git_run_info,
vec![head_oid.to_string()],
move_options,
)?;
if restack_exit_code != 0 {
return Ok(restack_exit_code);
}
match opts {
AmendFastOptions::FromIndex { paths } => {
let staged_changes = Pluralize {
determiner: None,
amount: paths.len(),
unit: ("staged change", "staged changes"),
};
let mut message = format!("Amended with {}.", staged_changes);
if dirty_working_tree {
message += " (Some uncommitted changes were not amended.)";
}
writeln!(effects.get_output_stream(), "{}", message)?;
}
AmendFastOptions::FromWorkingCopy { status_entries } => {
let uncommitted_changes = Pluralize {
determiner: None,
amount: status_entries.len(),
unit: ("uncommitted change", "uncommitted changes"),
};
writeln!(
effects.get_output_stream(),
"Amended with {}.",
uncommitted_changes,
)?;
}
}
Ok(0)
}
