1669295 - moz-phab should be able to submit without updating the working directory

Status: RESOLVED FIXED

(Conduit :: moz-phab, enhancement, P2)

Description

[:glob ✱]

moz-phab should be able to submit without updating the working directory.

This will make submission much faster on large repositories such as mozilla-central.

Comment 2

[Manuel Bucher [:manuel]]

Found a workaround for me:

1. create a temporary branch for the commit to upload. git branch -c tmp
2. go into a different directory created with git-worktree and switch to the branch git switch tmp
3. upload the patches in the other worktree with moz-phab

The files original worktree doesn't get touched and rebuild times stay low :)

Comment 3

[Olivier Mehani [:shtrom]]

Attachment: subprocess_wrapper: correct type hints and add doc (Bug 1669295) r?sheehan

Propagate this to gitcommand.output and git.git_out.

Comment 4

[Olivier Mehani [:shtrom]]

Attachment: test_integration_git: add pathlib.Path type hints (Bug 1669295) r?sheehan

Comment 5

[Olivier Mehani [:shtrom]]

Attachment: git/_get_commits_info: fix type hint (Bug 1669295) r?sheehan

This allows to tailor the output of _get_commits_info for the purpose of
the caller.

Also, fix incorrect typehints for start and end.

Comment 6

[Olivier Mehani [:shtrom]]

Attachment: test_integration_git: reset call_conduit_mock (Bug 1669295) r?sheehan

This is probably a noop, but is good for consistency and may come in
handy if we want to change the order in which tests run.

Comment 7

[Olivier Mehani [:shtrom]]

Attachment: test_integration_git: add test stub to ensure no checkout happens during submission (Bug 1669295) r?sheehan

Comment 8

[Olivier Mehani [:shtrom]]

Attachment: test_integration_git: actually test that no checkout happens during submission (Bug 1669295) r?sheehan

Signed-off-by: Olivier Mehani <[e-mail]>

Comment 9

[Olivier Mehani [:shtrom]]

Attachment: commits: add message (dynamic) property (Bug 1669295) r?sheehan

This gives us a centralised way to rebuild the full commit message, should it be needed.

Comment 10

[Olivier Mehani [:shtrom]]

Attachment: git: add _commit_from_info (Bug 1669295) r?sheehan

Comment 11

[Olivier Mehani [:shtrom]]

Attachment: git: add _rebase_branch (Bug 1669295) r?sheehan

Comment 12

[Olivier Mehani [:shtrom]]

Attachment: submit: remove unecessary checkout (Bug 1669295) r?sheehan

The repo implementations do the checkouts as needed.

We still need to checkout the latest commit to be on the correct branch,
but this should be a noop.

Comment 13

[Olivier Mehani [:shtrom]]

Attachment: commits: rename build_commit_message to build_arc_commit_message (Bug 1669295) r?sheehan

This message format is specific for submission, and we don't necessarily
want it to be used more widely as a commit message.

Comment 14

[Olivier Mehani [:shtrom]]

Attachment: mercurial: checkout target commit before get_diff (Bug 1669295) r?sheehan

This step was removed from the main submit logic, as it was no longer
needed by git, and looked unecessary for hg. Not so!

When computing the diffs, the Hg logic seems to take into account the
current state of the working directory. This leads to incorrect diffs
for anything but the last commit of a stack.

Comment 15

[Phabricator Automation]

Comment on attachment 9433216 [details]
mercurial: checkout target commit before get_diff (Bug 1669295) r?sheehan

Revision D226848 was moved to bug 1926924. Setting attachment 9433216 [details] to obsolete.

Comment 16

[Olivier Mehani [:shtrom]]

Attachment: test_integration_hg: add regression test for diff generation without checkout (Bug 1669295) r?sheehan

Comment 17

[Phabricator Automation]

Comment on attachment 9433240 [details]
test_integration_hg: add regression test for diff generation without checkout (Bug 1669295) r?sheehan

Revision D226862 was moved to bug 1926924. Setting attachment 9433240 [details] to obsolete.