1480034 - Bookmarks on mozilla-unified aren't updating (fetching with cinnabar broken)

Status: RESOLVED FIXED

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

Description

[James Graham [:jgraham]]

Trying to fetch from mozilla-unified with cinnabar is broken:

jgraham@flitwick:~/develop/gecko$ git remote -v
mozilla	hg::https://hg.mozilla.org/mozilla-unified (fetch)
mozilla	hg::ssh://hg.mozilla.org/integration/mozilla-inbound (push)
try	hg::https://hg.mozilla.org/try (fetch)
try	hg::ssh://hg.mozilla.org/try (push)

jgraham@flitwick:~/develop/gecko$ git fetch -v mozilla
From hg::https://hg.mozilla.org/mozilla-unified
 = [up-to-date]                  bookmarks/aurora  -> mozilla/aurora
 = [up-to-date]                  bookmarks/beta    -> mozilla/beta
 = [up-to-date]                  bookmarks/central -> mozilla/central
 = [up-to-date]                  bookmarks/esr10   -> mozilla/esr10
 = [up-to-date]                  bookmarks/esr17   -> mozilla/esr17
 = [up-to-date]                  bookmarks/esr24   -> mozilla/esr24
 = [up-to-date]                  bookmarks/esr31   -> mozilla/esr31
 = [up-to-date]                  bookmarks/esr38   -> mozilla/esr38
 = [up-to-date]                  bookmarks/esr45   -> mozilla/esr45
 = [up-to-date]                  bookmarks/esr52   -> mozilla/esr52
 = [up-to-date]                  bookmarks/esr60   -> mozilla/esr60
 = [up-to-date]                  bookmarks/fx-team -> mozilla/fx-team
 = [up-to-date]                  bookmarks/inbound -> mozilla/inbound
 = [up-to-date]                  bookmarks/release -> mozilla/release

jgraham@flitwick:~/develop/gecko$ git cinnabar git2hg mozilla/inbound
08753fa05058dc1ac0f5e3100eb6f412967dab75

So the last fetched commit to inbound was https://hg.mozilla.org/mozilla-unified/rev/08753fa05058 which was pushed at Tue Jul 31 17:43:51 2018 +0000. Looking at https://hg.mozilla.org/mozilla-unified/bookmarks this is also the commit that hg thinks the bookmark is pointing at. So presumably some change between that push and the next one broke the bookmarks extension in this repo.

Comment 1

[Andreas Tolfsen ❲:ato❳]

I am also seeing this problem.  I basically cannot pull from
mozilla-central at all.

Comment 2

[Emilio Cobos Álvarez (:emilio)]

So looks like the central bookmark isn't updated, but you can pull from central using:

   git fetch mozilla branches/default/tip
   git rebase FETCH_HEAD

(or something like that). Though that's a bit annoying.

Comment 3

[James Graham [:jgraham]]

Yeah, locally it's possible to work around, but the wpt sync is using the bookmarks and so is blocked on this issue (I should have mentioned that in Comment #0)

Comment 4

[Kim Moir [:kmoir] ET]

Assigning to Connor since he is investigating

Comment 5

[Connor Sheehan [:sheehan]]

Attachment: unifyrepo: change `bookmarks.update` to `bookmarks.applychanges` (Bug 1480034) r?gps

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/0bfe9e054ec5
unifyrepo: change `bookmarks.update` to `bookmarks.applychanges` r=gps

Comment 7

[Phabricator Automation]

Comment on attachment 8996734 [details]
unifyrepo: change `bookmarks.update` to `bookmarks.applychanges` (Bug 1480034)
 r?gps

Gregory Szorc [:gps] has approved the revision.

https://phabricator.services.mozilla.com/D2606

Comment 8

[Connor Sheehan [:sheehan]]

Re-opening until the fix is verified.

Comment 9

[Connor Sheehan [:sheehan]]

The issue arose from a deprecation of the bookmarks API that was not changed in the unifyrepo extension before upgrading hg.mozilla.org to Mercurial 4.6.2 yesterday. I deployed the fix from D2606 and manually ran `hg unifyrepo` and `hg replicatesync` to fix the bookmarks and propagate them to hgweb heads. Bookmarks are now at their correct location.