587854 - buildbotcustom: When updating sources, discard uncommitted changes

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P5)

Description

[John Hopkins (:jhopkins)]

In several of the factories in buildbot custom, "hg update" is run in the default mode which preserves uncommitted modifications.  This has caused us issue in the past when making a small change to unbreak a build and that change is forgotten about, thus affecting future build output but never being landed in source control.

Expected:
 Uncommitted modifications to a builder source tree are discarded.

Actual:
 Uncommitted modifications are preserved across an 'hg update'.

Comment 1

[John Hopkins (:jhopkins)]

Attachment: Proposed patch

Comment 2

[Rail Aliiev [:rail]]

Armen, looks like dupe of bug 477095 (which is yours at the moment), but this bug has a patch.

Comment 3

[[e-mail] (:bhearsum)]

Comment on attachment 466476 [details] [diff] [review]
Proposed patch

Can you get the last few instances, too? Around lines 3510, 3630, and 7090.

It looks like the Mercurial Source step uses --clean when it updates, too, so repos checked out with that should be fine.

Comment 5

[Armen [:armenzg]]

Thank you Rail! Good job Hopkins!

Comment 6

[John Hopkins (:jhopkins)]

Attachment: Update to proposed patch with bhearsum's suggestions

Comment 7

[[e-mail] (:bhearsum)]

Comment on attachment 466660 [details] [diff] [review]
Update to proposed patch with bhearsum's suggestions

Let's land this tomorrow in the downtime.

Comment 8

[[e-mail] (:bhearsum)]

landed successfully

Comment 9

[Axel Hecht [:Pike]]

There are quite a few hg updates without -C left, in particular none of the l10n repacks got this.

Comment 10

[[e-mail] (:bhearsum)]

Re-opening based on Axel's comment. John, do you want to fix those up?

Comment 11

[Aki Sasaki (not active)]

Put up a patch in bug 588399 to specifically address those problems; not sure if that's everything.

Comment 12

[John Hopkins (:jhopkins)]

Attachment: Two additional instances caught are added to Aki's patch

Thanks for the patch, Aki.  I've found two more instances which should be all that remains to resolve this bug.

Comment 13

[Aki Sasaki (not active)]

Comment on attachment 469489 [details] [diff] [review]
Two additional instances caught are added to Aki's patch

>+                         'hg -C -R '+self.origSrcDir+' up ;'+

afaict, hg -C update will error out; the -C needs to come after the up/update.
so |'hg -R '+self.origSrcDir+' up -C ;'+| seems correct.


>+                         'hg -C -R '+locale+' up -r '+self.l10nTag+' ; '

here too.

r=me with those changes.

Comment 14

[John Hopkins (:jhopkins)]

Attachment: update with bhearsum's feedback

bhearsum - right you are.  fixed in this patch

Comment 15

[John Hopkins (:jhopkins)]

Sorry, attribution should go to Aki for pointing out flaws in my patch.

Comment 16

[John Hopkins (:jhopkins)]

patch submitted in buildbotcustom rev 5e28c9b74a4a