660137 - Ominous ignored error from remote on push to user repository

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Andrew Drake [:adrake]]

I pushed to my user repository as part of my normal workflow (I hadn't done anything interesting on my end) and was greeted with:

[adrake@charonprime patches]$ hg push
pushing to ssh://hg.mozilla.org/users/drakedevel_gmail.com/ionmonkey-regalloc-mq
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 3 changes to 3 files
remote: Sending messages to pulse.mozilla.org
remote: Please do not interrupt...
remote: ERROR: Hook returned an exception: disable-lowering.patch@67edfbf676f8: not found in manifest
remote: Ignoring and continuing the push...
remote: Trying to insert into pushlog.
remote: Please do not interrupt...
remote: Inserted into the pushlog db successfully.

It doesn't seem to have affected anything, I can still pull fine and the file seems to have made it OK.

Comment 1

[LegNeato]

At least I know the "continue on error" behavior works...:-)

Andrew says the file was deleted, I'm probably not handling something correctly.

Comment 2

[LegNeato]

Yep, I'm not dealing with deletes correctly. Reproduced locally and wrote a test. Fix coming.

Comment 3

[LegNeato]

Fixed by https://github.com/LegNeato/hg-broker/commit/66ca32e1cd1bee34b4201038b08ef43fdd1a8f43

Comment 4

[Andrew Drake [:adrake]]

Does this by any chance touch addition?

[adrake@charonprime temp]$ hg push ssh://hg.mozilla.org/users/drakedevel_gmail.com/temp
pushing to ssh://hg.mozilla.org/users/drakedevel_gmail.com/temp
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 2 changesets with 2 changes to 2 files
remote: Sending messages to pulse.mozilla.org
remote: Please do not interrupt...
remote: ERROR: Hook returned an exception: d@7ef2e87605a0: not found in manifest
remote: Ignoring and continuing the push...
remote: Trying to insert into pushlog.
remote: Please do not interrupt...
remote: Inserted into the pushlog db successfully.

This was caused by pushing two commits, one of which added a file 'c' and the other added a file 'd'. Repeating with two more files caused the same behavior. In neitehr case was a message was sent to pulse.

Comment 5

[LegNeato]

I have a test for addition, but it currently only checks one file. I'll write more extensive checks but I think this patch fixes that case as well.

Comment 6

[LegNeato]

I confirmed that my fix also fixes the case where we add files (one in each individual commit and multiple in a single commit)