1475649 - Can no longer call ./mach try when untracked files are present (with git)

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Jean-Yves Avenard [:jya]]

Using git.

If untracked files are present, ./mach try will always error like this:

$ ./mach try -b do -p all -u mochitest-media,mochitest-media-e10s,web-platform-tests -t none
ERROR please commit changes before continuing

Comment 1

[Andrew Halberstadt [:ahal]]

This is a bug in mozversioncontrol, the doc string for the "working_directory_clean" function state:
> By default, untracked and ignored files are not considered.

But the git implementation for this function runs:
git status --porcelain

Which *does* consider untracked files by default. Instead, we need to run:
git status --porcelain --untracked-files=no

Bug 1413922 regressed |mach try| as it started using this function in favour of its own implementation.

Comment 3

[Andrew Halberstadt [:ahal]]

Attachment: Bug 1475649 - [mozversioncontrol] Make vcs.working_directory_clean() ignore untracked files by default

The doc string for the "working_directory_clean" function states:
> By default, untracked and ignored files are not considered.

But the git implementation for this function used to run:
git status --porcelain

Which *does* consider untracked files by default. Instead, we need to run:
git status --porcelain --untracked-files=no

Comment 4

[Phabricator Automation]

Comment on attachment 8992011 [details]
Bug 1475649 - [mozversioncontrol] Make vcs.working_directory_clean() ignore untracked files by default

James Graham [:jgraham] has approved the revision.

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

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/a35b188d0e44
[mozversioncontrol] Make vcs.working_directory_clean() ignore untracked files by default r=jgraham

Comment 6

[Gregory Szorc [:gps]]

Attachment: Bug 1475649 - Always use --untracked-files; r?ahal

a35b188d0e44 inadvertently regressed behavior in the case where
the Git status.showUntrackedFiles config option was set and
we want to purge untracked files.

Comment 7

[Jean-Yves Avenard [:jya]]

Can we have a test for that case too?

Comment 8

[Gregory Szorc [:gps]]

I don't have time today to spend more than the ~5 minutes I've already spent on this issue :/ Feel free to commandeer the revision in Phabricator. Or wait until I have time to follow up.

Comment 9

[Natalia Csoregi [:nataliaCs]]

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

Comment 10

[Phabricator Automation]

Comment on attachment 8992076 [details]
Bug 1475649 - Always use --untracked-files; r?ahal

Andrew Halberstadt [:ahal] has approved the revision.

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

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/633b1aae6b2e
Always use --untracked-files; r=ahal

Comment 12

[Bogdan Tara[:bogdan_tara | bogdant]]

https://hg.mozilla.org/mozilla-central/rev/633b1aae6b2e

Comment 13

[Tom Prince [:tomprince]]

https://hg.mozilla.org/releases/mozilla-esr60/rev/7b00581417b4
https://hg.mozilla.org/releases/mozilla-esr60/rev/6968b8256f86