Closed Bug 1686869 Opened 4 years ago Closed 4 years ago

[meta] Lando rebase failure messages are not helpful

Categories

(Conduit :: Lando, enhancement, P3)

enhancement

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: glandium, Assigned: zeid)

References

(Blocks 1 open bug)

Details

(Keywords: conduit-triaged)

Attachments

(2 files)

I got an error on https://lando.services.mozilla.com/D101722/. The only details given are:

Details: We're sorry, Lando could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpnmkt5g1z: applying /tmp/tmpnmkt5g1z

patching file toolkit/moz.configure
Hunk #1 FAILED at 2075
Hunk #2 FAILED at 2325
Hunk #3 FAILED at 2340
3 out of 3 hunks FAILED -- saving rejects to file toolkit/moz.configure.rej
patching file moz.configure
Hunk #1 FAILED at 239
Hunk #2 FAILED at 250
2 out of 2 hunks FAILED -- saving rejects to file moz.configure.rej
patching file build/moz.configure/toolchain.configure
Hunk #1 FAILED at 656
1 out of 1 hunks FAILED -- saving rejects to file build/moz.configure/toolchain.configure.rej
patching file build/moz.configure/android-sdk.configure
Hunk #1 FAILED at 6
1 out of 1 hunks FAILED -- saving rejects to file build/moz.configure/android-sdk.configure.rej
patching file build/moz.configure/android-ndk.configure
Hunk #1 FAILED at 4
1 out of 1 hunks FAILED -- saving rejects to file build/moz.configure/android-ndk.configure.rej
abort: patch failed to apply

First and foremost, it doesn't tell on which of the 12 patches failed to apply, although I can guess from the fact that there's only one of them touching two of the files that failed.

However:
a) the patches apply just fine on my end on top of autoland
b) the last time build/moz.configure/android-ndk.configure was touched was in October, so I don't even see how there can be a conflict applying the patch.

The contents of the files for which the patch fails, as well as the .rej files, could be useful in such cases.

a) the patches apply just fine on my end on top of autoland

Okay, turns out this part is wrong because I somehow had dropped the patch after an earlier rebase, so that's what was happening.

This is mainly a duplicate of bug 1649556. The one additional request here is being able to see the contents of the files for which the patch fails. That should be viewable directly in the repo on hgmo, since Lando pulls directly from there before applying any patches, but I can see it being useful to have a link to those files directly in the error.

Keywords: conduit-triaged
Priority: -- → P3
See Also: → 1649556

That should be viewable directly in the repo on hgmo

Not when the patch is the nth in the queue and previous patches touched the file.

The one additional request

There was a second additional request: indicate which specific patch failed to apply.

Right, that's the main ask in the bug. Improving this UI is on my TODO list, and I will make sure these items are part of the improvements.

Depends on: 1687300
Type: defect → enhancement

(In reply to Mike Hommey [:glandium] from comment #3)

That should be viewable directly in the repo on hgmo

Not when the patch is the nth in the queue and previous patches touched the file.

Edit: Message sent too soon. I think what we're getting at from this ask is to show the state of the file at the moment that patching failed, since it can change before or after the landing request.

Depends on: 1649556
See Also: 1649556
Depends on: 1687307
Summary: Lando rebase failure messages are not helpful → [meta] Lando rebase failure messages are not helpful
Blocks: 1693628
Attached file GitHub Pull Request
Assignee: nobody → zeid
Attached file GitHub Pull Request
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: