1304469 - hg wip should exclude all old esrs

Status: RESOLVED FIXED

(Developer Services :: Mercurial: configwizard, defect)

Description

[:Gijs (he/him)]

Nobody cares about esr10-38 when looking at hg wip.

Comment 1

[:Gijs (he/him)]

Attachment: Bug 1304469 - ignore old esr versions in 'hg wip' alias,

Review commit: https://reviewboard.mozilla.org/r/80184/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/80184/

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8793447 [details]
Bug 1304469 - ignore old esr versions in 'hg wip' alias,

https://reviewboard.mozilla.org/r/80184/#review79732

I'm not a super huge fan of making `hg wip` Mozilla centric. But I agree this is an improvement for most developers. So r+. Thank you for improving things.

FWIW, we're trying to add an official Mercurial command to do what `hg wip` is doing today. We already considered the case of ignoring heads older than N days. Maybe we also need the ability to ignore a user-defined revset.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/6bee91118fe1
ignore old esr versions in 'hg wip' alias, r=gps

Comment 4

[Gregory Szorc [:gps]]

I had to back this out because it broke non-Firefox repos with "abort: unknown revision 'esr10'!" :(

Comment 5

[Pulsebot]

Backout by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/f15b587920ec
Backed out changeset 6bee91118fe1 for breaking `hg wip` on non-Firefox repo

Comment 6

[:Gijs (he/him)]

(In reply to Gregory Szorc [:gps] from comment #4)
> I had to back this out because it broke non-Firefox repos with "abort:
> unknown revision 'esr10'!" :(

Is there a usable way around this? What are these aliases added by firefoxtree, anyway? Are they revsets or bookmarks or something else? Is there a different ("failsafe") way to test for them? Or could we use the "older than N days" thing to test for them, assuming they're basically dead at this point?

Comment 7

[Gregory Szorc [:gps]]

Those labels are bookmarks on the mozilla-unified repo. But if you have firefoxtree enabled, they are converted to a separate "namespace" which is managed by firefoxtree and is read-only. You can select these revisions via `hg log -r 'named(fxtree)'`. But for some reason that's not working (bug in firefoxtree or mercurial).

firefoxtree does have a 'fxheads()' revset that predates Mercurial's "namespace" support and that does work. So we could filter out revisions by doing something like the following:

  X - (fxheads() - date(-90))
  X - (public() - date(-90))

Comment 8

[:Gijs (he/him)]

Comment on attachment 8793447 [details]
Bug 1304469 - ignore old esr versions in 'hg wip' alias,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/80184/diff/1-2/

Comment 9

[:Gijs (he/him)]

Used the fxheads thing, which seems to work. mozreview and re-requesting review is painful, if this looks OK can you re-autoland? Thanks.

Comment 10

[Gregory Szorc [:gps]]

Comment on attachment 8793447 [details]
Bug 1304469 - ignore old esr versions in 'hg wip' alias,

https://reviewboard.mozilla.org/r/80184/#review80352

This looks good.

Something else I thought of: this will cause problems for people that don't have firefoxtrees enabled globally. We can cross that bridge if people complain.

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/7721ac703c18
ignore old esr versions in 'hg wip' alias, r=gps

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/bdc65fcc54a8
configwizard: glob path in test