[Go to site: main page, start]

Closed Bug 2074122 Opened 24 days ago Closed 21 hours ago

moz-phab --apply-to here --no-branch changed my tree and branch without prompting

Categories

(Conduit :: moz-phab, defect)

defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: robwu, Assigned: padenot, NeedInfo)

Details

Attachments

(1 file)

moz-phab version: 2.19.1

I use moz-phab --apply-to here --no-branch with the intent of checking out a patch and applying it on top of whatever my branch is at, and explicitly keep the amount of tree changes to the bare minimum. This is to avoid the need for recompiling again.

Today, when I ran moz-phab patch D325923 --apply-to here --no-branch, I was unpleasantly surprised that it did a whole lot without any confirmation. Chronologically:

  • (bug 1658817 : fetching a whole stack of patches without prompting: Patching revisions: D326408 D326409 D326507 D326508 D326557 D326565 D326991 D326992 D326993 D326994 D326995 D326997 D326998 D325052 D325923 )
  • (minor: it ran git fetch origin and imported a whole bunch of tags; I usually run git fetch origin main manually)
  • It then switched my local branch to a detached head to try and apply:
Multiple remotes found. Defaulting to 'origin'.
Set `git.remote` in your moz-phab config to specify another remote.
Failed to apply at 65639bf02ce2; retrying at e456b7606970, then rebasing.
If you want to create a new branch to retain created commits,
you may do so by calling `git checkout -b <new-branch-name>`
Checked out e456b7606970
...
Could not apply c521d77e69759... # Bug 2069848 - Show the more settings menu item in browser screen's menu r=#android-reviewers
Failed to rebase the patches to 65639bf02ce2; they have been left applied at e456b7606970.

I don't want moz-phab to automatically change my worktree other than applying the patches I requested. If it wants to make such invasive changes, it should prompt me first. In bug 2071003 I see that there is sometimes a prompt, but I never saw that one in my case.

Whatever my previous branch was, it is not shown by moz-phab when it destroyed my worktree. Yes, it did show the specific hash (65639bf02ce2), and I can recover the branch in multiple ways (git log -n1 65639bf02ce2 and git reflog to name some examples), but that requires the user to know about that.

Paul, could this be a potential regression from bug 1987220 ? What are your thoughts on this one?

Flags: needinfo?(padenot)
Assignee: nobody → padenot
Attachment #9650726 - Attachment description: WIP: Bug 2074122 - Confirm patch fallback for --apply-to here → Bug 2074122 - Confirm patch fallback for --apply-to here. r?sheehan
Status: NEW → ASSIGNED

Authored by https://github.com/padenot
https://github.com/mozilla-conduit/review/commit/3b33ebc89640ac5176990e9641e3c84f02b4fc68
[main] Bug 2074122 - Confirm patch fallback for --apply-to here. r=sheehan,moz-phab-reviewers

(via GitHub webhook, authenticated as shared-secret)

Status: ASSIGNED → RESOLVED
Closed: 21 hours ago
Resolution: --- → FIXED

Authored by https://github.com/cgsheeh
https://github.com/mozilla-conduit/review/commit/b0f44d4389e9d937db90f88442ea3036aeb37835
[main] style: fix formatting issues from Bug 2074122 (Bug 2082222)

(via GitHub webhook, authenticated as shared-secret)

You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: