undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gp/status-rebase-i-info'

Browse Source 
Teach "git status" to show a more detailed information regarding
the "rebase -i" session in progress.

* gp/status-rebase-i-info:
  status: add new tests for status during rebase -i
  status: give more information during rebase -i
  status: differentiate interactive from non-interactive rebases
  status: factor two rebase-related messages together
This commit is contained in:
Junio C Hamano 2015-08-03 11:01:19 -07:00
commit 178d2c7a7f
2 changed files with 346 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
t/t7512-status-help.sh
View File

@ -134,9 +134,13 @@ test_expect_success 'prepare for rebase_i_conflicts' '
test_expect_success 'status during rebase -i when conflicts unresolved' ' test_expect_success 'status during rebase -i when conflicts unresolved' '
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
ONTO=$(git rev-parse --short rebase_i_conflicts) && ONTO=$(git rev-parse --short rebase_i_conflicts) &&
LAST_COMMIT=$(git rev-parse --short rebase_i_conflicts_second) &&
test_must_fail git rebase -i rebase_i_conflicts && test_must_fail git rebase -i rebase_i_conflicts &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last command done (1 command done):
pick $LAST_COMMIT one_second
No commands remaining.
You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''. You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''.
(fix conflicts and then run "git rebase --continue") (fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch) (use "git rebase --skip" to skip this patch)
@ -159,10 +163,14 @@ test_expect_success 'status during rebase -i after resolving conflicts' '
git reset --hard rebase_i_conflicts_second && git reset --hard rebase_i_conflicts_second &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
ONTO=$(git rev-parse --short rebase_i_conflicts) && ONTO=$(git rev-parse --short rebase_i_conflicts) &&
LAST_COMMIT=$(git rev-parse --short rebase_i_conflicts_second) &&
test_must_fail git rebase -i rebase_i_conflicts && test_must_fail git rebase -i rebase_i_conflicts &&
git add main.txt && git add main.txt &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last command done (1 command done):
pick $LAST_COMMIT one_second
No commands remaining.
You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''. You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''.
(all conflicts fixed: run "git rebase --continue") (all conflicts fixed: run "git rebase --continue")
@ -183,14 +191,20 @@ test_expect_success 'status when rebasing -i in edit mode' '
git checkout -b rebase_i_edit && git checkout -b rebase_i_edit &&
test_commit one_rebase_i main.txt one && test_commit one_rebase_i main.txt one &&
test_commit two_rebase_i main.txt two && test_commit two_rebase_i main.txt two &&
COMMIT2=$(git rev-parse --short rebase_i_edit) &&
test_commit three_rebase_i main.txt three && test_commit three_rebase_i main.txt three &&
COMMIT3=$(git rev-parse --short rebase_i_edit) &&
FAKE_LINES="1 edit 2" && FAKE_LINES="1 edit 2" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
ONTO=$(git rev-parse --short HEAD~2) && ONTO=$(git rev-parse --short HEAD~2) &&
git rebase -i HEAD~2 && git rebase -i HEAD~2 &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
pick $COMMIT2 two_rebase_i
edit $COMMIT3 three_rebase_i
No commands remaining.
You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -207,8 +221,11 @@ test_expect_success 'status when splitting a commit' '
git checkout -b split_commit && git checkout -b split_commit &&
test_commit one_split main.txt one && test_commit one_split main.txt one &&
test_commit two_split main.txt two && test_commit two_split main.txt two &&
COMMIT2=$(git rev-parse --short split_commit) &&
test_commit three_split main.txt three && test_commit three_split main.txt three &&
COMMIT3=$(git rev-parse --short split_commit) &&
test_commit four_split main.txt four && test_commit four_split main.txt four &&
COMMIT4=$(git rev-parse --short split_commit) &&
FAKE_LINES="1 edit 2 3" && FAKE_LINES="1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
@ -216,7 +233,13 @@ test_expect_success 'status when splitting a commit' '
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git reset HEAD^ && git reset HEAD^ &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
pick $COMMIT2 two_split
edit $COMMIT3 three_split
Next command to do (1 remaining command):
pick $COMMIT4 four_split
(use "git rebase --edit-todo" to view and edit)
You are currently splitting a commit while rebasing branch '\''split_commit'\'' on '\''$ONTO'\''. You are currently splitting a commit while rebasing branch '\''split_commit'\'' on '\''$ONTO'\''.
(Once your working directory is clean, run "git rebase --continue") (Once your working directory is clean, run "git rebase --continue")
@ -239,7 +262,9 @@ test_expect_success 'status after editing the last commit with --amend during a
test_commit one_amend main.txt one && test_commit one_amend main.txt one &&
test_commit two_amend main.txt two && test_commit two_amend main.txt two &&
test_commit three_amend main.txt three && test_commit three_amend main.txt three &&
COMMIT3=$(git rev-parse --short amend_last) &&
test_commit four_amend main.txt four && test_commit four_amend main.txt four &&
COMMIT4=$(git rev-parse --short amend_last) &&
FAKE_LINES="1 2 edit 3" && FAKE_LINES="1 2 edit 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
@ -247,7 +272,12 @@ test_expect_success 'status after editing the last commit with --amend during a
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git commit --amend -m "foo" && git commit --amend -m "foo" &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (3 commands done):
pick $COMMIT3 three_amend
edit $COMMIT4 four_amend
(see more in file .git/rebase-merge/done)
No commands remaining.
You are currently editing a commit while rebasing branch '\''amend_last'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''amend_last'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -273,11 +303,20 @@ test_expect_success 'status: (continue first edit) second edit' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git rebase --continue && git rebase --continue &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -294,12 +333,21 @@ test_expect_success 'status: (continue first edit) second edit and split' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git rebase --continue && git rebase --continue &&
git reset HEAD^ && git reset HEAD^ &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(Once your working directory is clean, run "git rebase --continue") (Once your working directory is clean, run "git rebase --continue")
@ -321,12 +369,21 @@ test_expect_success 'status: (continue first edit) second edit and amend' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git rebase --continue && git rebase --continue &&
git commit --amend -m "foo" && git commit --amend -m "foo" &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -343,12 +400,21 @@ test_expect_success 'status: (amend first edit) second edit' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git commit --amend -m "a" && git commit --amend -m "a" &&
git rebase --continue && git rebase --continue &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -366,12 +432,21 @@ test_expect_success 'status: (amend first edit) second edit and split' '
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git commit --amend -m "b" && git commit --amend -m "b" &&
git rebase --continue && git rebase --continue &&
git reset HEAD^ && git reset HEAD^ &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(Once your working directory is clean, run "git rebase --continue") (Once your working directory is clean, run "git rebase --continue")
@ -393,13 +468,22 @@ test_expect_success 'status: (amend first edit) second edit and amend' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git commit --amend -m "c" && git commit --amend -m "c" &&
git rebase --continue && git rebase --continue &&
git commit --amend -m "d" && git commit --amend -m "d" &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -416,6 +500,9 @@ test_expect_success 'status: (split first edit) second edit' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git reset HEAD^ && git reset HEAD^ &&
@ -423,7 +510,13 @@ test_expect_success 'status: (split first edit) second edit' '
git commit -m "e" && git commit -m "e" &&
git rebase --continue && git rebase --continue &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -440,6 +533,9 @@ test_expect_success 'status: (split first edit) second edit and split' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git reset HEAD^ && git reset HEAD^ &&
@ -448,7 +544,13 @@ test_expect_success 'status: (split first edit) second edit and split' '
git rebase --continue && git rebase --continue &&
git reset HEAD^ && git reset HEAD^ &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(Once your working directory is clean, run "git rebase --continue") (Once your working directory is clean, run "git rebase --continue")
@ -470,6 +572,9 @@ test_expect_success 'status: (split first edit) second edit and amend' '
FAKE_LINES="edit 1 edit 2 3" && FAKE_LINES="edit 1 edit 2 3" &&
export FAKE_LINES && export FAKE_LINES &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
COMMIT2=$(git rev-parse --short several_edits^^) &&
COMMIT3=$(git rev-parse --short several_edits^) &&
COMMIT4=$(git rev-parse --short several_edits) &&
ONTO=$(git rev-parse --short HEAD~3) && ONTO=$(git rev-parse --short HEAD~3) &&
git rebase -i HEAD~3 && git rebase -i HEAD~3 &&
git reset HEAD^ && git reset HEAD^ &&
@ -478,7 +583,13 @@ test_expect_success 'status: (split first edit) second edit and amend' '
git rebase --continue && git rebase --continue &&
git commit --amend -m "h" && git commit --amend -m "h" &&
cat >expected <<EOF && cat >expected <<EOF &&
rebase in progress; onto $ONTO interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
edit $COMMIT2 two_edits
edit $COMMIT3 three_edits
Next command to do (1 remaining command):
pick $COMMIT4 four_edits
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit) (use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes) (use "git rebase --continue" once you are satisfied with your changes)
@ -745,4 +856,91 @@ EOF
test_i18ncmp expected actual test_i18ncmp expected actual
' '
test_expect_success 'prepare for different number of commits rebased' '
git reset --hard master &&
git checkout -b several_commits &&
test_commit one_commit main.txt one &&
test_commit two_commit main.txt two &&
test_commit three_commit main.txt three &&
test_commit four_commit main.txt four
'
test_expect_success 'status: one command done nothing remaining' '
FAKE_LINES="exec_exit_15" &&
export FAKE_LINES &&
test_when_finished "git rebase --abort" &&
ONTO=$(git rev-parse --short HEAD~3) &&
test_must_fail git rebase -i HEAD~3 &&
cat >expected <<EOF &&
interactive rebase in progress; onto $ONTO
Last command done (1 command done):
exec exit 15
No commands remaining.
You are currently editing a commit while rebasing branch '\''several_commits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
test_i18ncmp expected actual
'
test_expect_success 'status: two commands done with some white lines in done file' '
FAKE_LINES="1 > exec_exit_15 2 3" &&
export FAKE_LINES &&
test_when_finished "git rebase --abort" &&
ONTO=$(git rev-parse --short HEAD~3) &&
COMMIT4=$(git rev-parse --short HEAD) &&
COMMIT3=$(git rev-parse --short HEAD^) &&
COMMIT2=$(git rev-parse --short HEAD^^) &&
test_must_fail git rebase -i HEAD~3 &&
cat >expected <<EOF &&
interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
pick $COMMIT2 two_commit
exec exit 15
Next commands to do (2 remaining commands):
pick $COMMIT3 three_commit
pick $COMMIT4 four_commit
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_commits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
test_i18ncmp expected actual
'
test_expect_success 'status: two remaining commands with some white lines in todo file' '
FAKE_LINES="1 2 exec_exit_15 3 > 4" &&
export FAKE_LINES &&
test_when_finished "git rebase --abort" &&
ONTO=$(git rev-parse --short HEAD~4) &&
COMMIT4=$(git rev-parse --short HEAD) &&
COMMIT3=$(git rev-parse --short HEAD^) &&
COMMIT2=$(git rev-parse --short HEAD^^) &&
test_must_fail git rebase -i HEAD~4 &&
cat >expected <<EOF &&
interactive rebase in progress; onto $ONTO
Last commands done (3 commands done):
pick $COMMIT2 two_commit
exec exit 15
(see more in file .git/rebase-merge/done)
Next commands to do (2 remaining commands):
pick $COMMIT3 three_commit
pick $COMMIT4 four_commit
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch '\''several_commits'\'' on '\''$ONTO'\''.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
test_i18ncmp expected actual
'
test_done test_done

151
wt-status.c
View File

@ -1027,21 +1027,142 @@ static int split_commit_in_progress(struct wt_status *s)
return split_in_progress; return split_in_progress;
} }
/*
* Turn
* "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
* into
* "pick d6a2f03 some message"
*
* The function assumes that the line does not contain useless spaces
* before or after the command.
*/
static void abbrev_sha1_in_line(struct strbuf *line)
{
struct strbuf **split;
int i;
if (starts_with(line->buf, "exec ") ||
starts_with(line->buf, "x "))
return;
split = strbuf_split_max(line, ' ', 3);
if (split[0] && split[1]) {
unsigned char sha1[20];
const char *abbrev;
/*
* strbuf_split_max left a space. Trim it and re-add
* it after abbreviation.
*/
strbuf_trim(split[1]);
if (!get_sha1(split[1]->buf, sha1)) {
abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
strbuf_reset(split[1]);
strbuf_addf(split[1], "%s ", abbrev);
strbuf_reset(line);
for (i = 0; split[i]; i++)
strbuf_addf(line, "%s", split[i]->buf);
}
}
for (i = 0; split[i]; i++)
strbuf_release(split[i]);
}
static void read_rebase_todolist(const char *fname, struct string_list *lines)
{
struct strbuf line = STRBUF_INIT;
FILE *f = fopen(git_path("%s", fname), "r");
if (!f)
die_errno("Could not open file %s for reading",
git_path("%s", fname));
while (!strbuf_getline(&line, f, '\n')) {
if (line.len && line.buf[0] == comment_line_char)
continue;
strbuf_trim(&line);
if (!line.len)
continue;
abbrev_sha1_in_line(&line);
string_list_append(lines, line.buf);
}
}
static void show_rebase_information(struct wt_status *s,
struct wt_status_state *state,
const char *color)
{
if (state->rebase_interactive_in_progress) {
int i;
int nr_lines_to_show = 2;
struct string_list have_done = STRING_LIST_INIT_DUP;
struct string_list yet_to_do = STRING_LIST_INIT_DUP;
read_rebase_todolist("rebase-merge/done", &have_done);
read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
if (have_done.nr == 0)
status_printf_ln(s, color, _("No commands done."));
else {
status_printf_ln(s, color,
Q_("Last command done (%d command done):",
"Last commands done (%d commands done):",
have_done.nr),
have_done.nr);
for (i = (have_done.nr > nr_lines_to_show)
? have_done.nr - nr_lines_to_show : 0;
i < have_done.nr;
i++)
status_printf_ln(s, color, " %s", have_done.items[i].string);
if (have_done.nr > nr_lines_to_show && s->hints)
status_printf_ln(s, color,
_(" (see more in file %s)"), git_path("rebase-merge/done"));
}
if (yet_to_do.nr == 0)
status_printf_ln(s, color,
_("No commands remaining."));
else {
status_printf_ln(s, color,
Q_("Next command to do (%d remaining command):",
"Next commands to do (%d remaining commands):",
yet_to_do.nr),
yet_to_do.nr);
for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
if (s->hints)
status_printf_ln(s, color,
_(" (use \"git rebase --edit-todo\" to view and edit)"));
}
string_list_clear(&yet_to_do, 0);
string_list_clear(&have_done, 0);
}
}
static void print_rebase_state(struct wt_status *s,
struct wt_status_state *state,
const char *color)
{
if (state->branch)
status_printf_ln(s, color,
_("You are currently rebasing branch '%s' on '%s'."),
state->branch,
state->onto);
else
status_printf_ln(s, color,
_("You are currently rebasing."));
}
static void show_rebase_in_progress(struct wt_status *s, static void show_rebase_in_progress(struct wt_status *s,
struct wt_status_state *state, struct wt_status_state *state,
const char *color) const char *color)
{ {
struct stat st; struct stat st;
show_rebase_information(s, state, color);
if (has_unmerged(s)) { if (has_unmerged(s)) {
if (state->branch) print_rebase_state(s, state, color);
status_printf_ln(s, color,
_("You are currently rebasing branch '%s' on '%s'."),
state->branch,
state->onto);
else
status_printf_ln(s, color,
_("You are currently rebasing."));
if (s->hints) { if (s->hints) {
status_printf_ln(s, color, status_printf_ln(s, color,
_(" (fix conflicts and then run \"git rebase --continue\")")); _(" (fix conflicts and then run \"git rebase --continue\")"));
@ -1051,14 +1172,7 @@ static void show_rebase_in_progress(struct wt_status *s,
_(" (use \"git rebase --abort\" to check out the original branch)")); _(" (use \"git rebase --abort\" to check out the original branch)"));
} }
} else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) { } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
if (state->branch) print_rebase_state(s, state, color);
status_printf_ln(s, color,
_("You are currently rebasing branch '%s' on '%s'."),
state->branch,
state->onto);
else
status_printf_ln(s, color,
_("You are currently rebasing."));
if (s->hints) if (s->hints)
status_printf_ln(s, color, status_printf_ln(s, color,
_(" (all conflicts fixed: run \"git rebase --continue\")")); _(" (all conflicts fixed: run \"git rebase --continue\")"));
@ -1328,7 +1442,10 @@ void wt_status_print(struct wt_status *s)
else if (!strcmp(branch_name, "HEAD")) { else if (!strcmp(branch_name, "HEAD")) {
branch_status_color = color(WT_STATUS_NOBRANCH, s); branch_status_color = color(WT_STATUS_NOBRANCH, s);
if (state.rebase_in_progress || state.rebase_interactive_in_progress) { if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
on_what = _("rebase in progress; onto "); if (state.rebase_interactive_in_progress)
on_what = _("interactive rebase in progress; onto ");
else
on_what = _("rebase in progress; onto ");
branch_name = state.onto; branch_name = state.onto;
} else if (state.detached_from) { } else if (state.detached_from) {
branch_name = state.detached_from; branch_name = state.detached_from;