1083011 - Update services-central to tip of m-c

Status: RESOLVED WONTFIX

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

Description

[Richard Newman [:rnewman]]

I just tried (including push -f), and:

searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 12295 changesets with 81608 changes to 32400 files
remote:
remote:
remote: ************************** ERROR ****************************
remote: Rev e520de935cba contains git-format-patch "[PATCH]" cruft. Use git-format-patch -k to avoid this.
remote: Trevor Saunders <[e-mail]>
remote: [PATCH] bug 1049781 - add move ctor version of
remote:
remote: From 43dccd4d360dd2e43182c2f39002dc14567f15c0 Mon Sep 17 00:00:00 2001
remote:  nsTArray::InsertElementAt
remote: ---
remote:  xpcom/glue/nsTArray.h | 13 +++++++++++++
remote:  1 file changed, 13 insertions(+)
remote: *************************************************************
remote:
remote:
remote:
remote:
remote: ************************** ERROR ****************************
remote: Rev 10146132cfa4 contains git-format-patch "[PATCH]" cruft. Use git-format-patch -k to avoid this.
remote: George Wright <[e-mail]>
remote: [PATCH 15/15] Bug 1017113 - Use RefPtrSkia instead of SkRefPtr as it no longer exists. r=mattwoodrow
remote: *************************************************************


Could you please get s-c back to the modern age?

Ta!

Comment 1

[Gregory Szorc [:gps]]

If you include "IGNORE BAD COMMIT MESSAGES" in a commit that's a descendant of this one, the hook will allow the push. However, if you do that, now you have an extraneous commit on services-central.

It's probably easiest to make that extra commit tip, push, and in this bug ask someone to strip that extra commit from services-central.

Comment 2

[Ed Morley [:emorley]]

That shouldn't be necessary - there are more recent commits that contain "IGNORE BAD COMMIT MESSAGES", eg:

[/c/src-gecko/mozilla-central]$ hg log -k 'IGNORE BAD COMMIT MESSAGES'
changeset:   161522:b3d4af4ec2df
user:        Tim Taubert <[e-mail]>
date:        Sat Dec 21 01:36:09 2013 +0100
summary:     merge elm to m-c IGNORE BAD COMMIT MESSAGES

Seems like the hook might need fixing - ie the reversed() not working as expected:
https://hg.mozilla.org/hgcustom/version-control-tools/file/a15c08c2fac1/hghooks/mozhghooks/commit-message.py#l80

Comment 3

[Ed Morley [:emorley]]

Actually sorry the commit in comment 0 is more recent, I just read the datetime from the extended commit message there:
>  From 43dccd4d360dd2e43182c2f39002dc14567f15c0 Mon Sep 17 00:00:00 2001

https://hg.mozilla.org/mozilla-central/rev/e520de935cba

Comment 4

[Ed Morley [:emorley]]

I'm happy to land a dummy commit on mozilla-central to avoid you having to strip the repo, since it will fix the problem for any other project repos too. I'll just wait until bug 1083177 deploys bug 1053002, since otherwise we'll have the same problem again for "b=" style commit messages.

Comment 5

[Richard Newman [:rnewman]]

philor pointed out:

22:17:04 < philor> rnewman: but your next s-c hurdle is going to be the insurmountable one: s-c got commented out in buildbot last May, for capacity, and they don't currently have the capacity to be able
                   to turn it back on

so perhaps this is a WONTFIX?

Comment 6

[Gregory Szorc [:gps]]

Don't think this is relevant any more.