Make the buildtool work with Git

RESOLVED FIXED

Status

Cloud Services
Server: Other
RESOLVED FIXED
7 years ago
7 years ago

People

(Reporter: tarek, Assigned: tarek)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

(Whiteboard: [qa-])

Attachments

(1 attachment, 1 obsolete attachment)

(Assignee)

Description

7 years ago
It'll be based on auto-detection for the main repo and for the deps
(Assignee)

Comment 1

7 years ago
Created attachment 563070 [details] [diff] [review]
Git support

Seems to work fine, but please double-check that I've used the proper Git calls
Attachment #563070 - Flags: review?(rmiller)
Comment on attachment 563070 [details] [diff] [review]
Git support

Review of attachment 563070 [details] [diff] [review]:
-----------------------------------------------------------------

::: mopytools/util.py
@@ -185,3 +199,4 @@
> >                 force=False):
> >      if force and channel != 'dev':
> > -        cmd = 'hg up -C'
> > +        if is_git():
> > +            cmd = 'git clean'

`git clean` isn't what you want here... I think `git checkout --force` is what you want, which will overwrite any local changes in the working tree.

@@ -190,2 +211,3 @@
> >      else:
> > -        cmd = 'hg up'
> > +        if is_git():
> > +            cmd = 'git checkout --force'

And here `git checkout --force` will overwrite local changes, is that really what we want in this case?
Attachment #563070 - Flags: review?(rmiller) → review-
(Assignee)

Comment 3

7 years ago
Created attachment 563689 [details] [diff] [review]
Git support v2
Attachment #563070 - Attachment is obsolete: true
Attachment #563689 - Flags: review?(rmiller)
Comment on attachment 563689 [details] [diff] [review]
Git support v2

Review of attachment 563689 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM
Attachment #563689 - Flags: review?(rmiller) → review+
(Assignee)

Comment 5

7 years ago
https://hg.mozilla.org/services/server-devtools/rev/cbf50f29865a
Status: NEW → RESOLVED
Last Resolved: 7 years ago
Resolution: --- → FIXED
Whiteboard: [qa-
Whiteboard: [qa- → [qa-]
You need to log in before you can comment on or make changes to this bug.