Nirbheek Chauhan
4d60e89a99
git-update: Use --force when checking out manifest
...
When we have a manifest, we DEFINITELY want exactly that, please throw
away any local changes, thanks. Fixes CI:
https://gitlab.freedesktop.org/alatiera/gst-ci/-/jobs/3105690
```
Checking out f5b44d3128
in gst-devtools
Could not rebase subprojects\gst-devtools, please fix and try again. Error:
error: Your local changes to the following files would be overwritten by checkout:
docs/plugins/fakesrc.simple.validatetest.yaml
Please commit your changes or stash them before you switch branches.
Aborting
Command '['git', 'checkout', '--detach', 'f5b44d31284cfa1b6d029fdfe69d6cdb9a8aeb36']' returned non-zero exit status 1.
```
This is probably caused by some shared cache shenanigans, but forcing
is also what we want anyway in this case.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/162 >
2020-06-16 00:38:53 +05:30
Stéphane Cerveau
bc5c73e651
git-update: fix typo in message
2020-02-27 09:01:57 +01:00
Stéphane Cerveau
b9acfcace8
git-update: provides a check status option
...
Add --check-status to git-update python script
to provide the list of subprojects with their
git status (branch and state).
2020-02-19 21:53:05 +01:00
Guillaume Desmottes
1e8cdbf137
git-update: try updating cargo deps
...
May prevent build errors if a newer version gstreamer-rs or
gst-plugins-rs depend on an updated version of a git dependency.
2019-12-24 15:08:02 +05:30
Jan Alexander Steffens (heftig)
49fea2520f
python: Avoid using 'is' to compare strings
...
This is the wrong operator to use, which only seems to work because
`os.name` and `'nt'` happen to be the same object. Python 3.8 also
produces a `SyntaxWarning` when encountering this pattern.
2019-11-11 12:41:44 +01:00
Thibault Saunier
b46c29525f
git-update: Make sure to download all subproject before applying manifest
...
Otherwise we might be missing some subprojects update
2019-05-13 11:42:42 -04:00
Thibault Saunier
fda8379411
scripts: Add a script to check that all repos are clean
...
This is useful to check that a build didn't result in changes in the
code/generated files
This will be used to check that the plugins documentation cache file is
properly commited, and that necessary workaround for particular case
are adopted.
2019-05-13 11:42:15 -04:00
Nirbheek Chauhan
124098adc4
scripts: Auto-detect whether we can enable colors
...
Also do the setup necessary on Windows to enable ANSI colours on the
console (if available). That code is copied from Meson and is Apache2
licensed.
2019-02-05 17:23:49 +05:30
Thibault Saunier
9689fa0a45
update: Re add support for manifests without a refname
2018-12-06 10:47:12 -03:00
Thibault Saunier
d1425b0307
update: Fetch the refname before checking out the specified sha
...
Working around freedesktop/freedesktop#95
2018-12-06 07:56:05 -03:00
Thibault Saunier
b174f7a9a1
update: Take into account the path attribute of projects
2018-11-21 20:41:46 -03:00
Thibault Saunier
0b36fc55c7
update: Make sure to detach branch when checking out a specific revision
...
Avoiding to get spammed about the fact that the branch is detached
2018-11-08 11:51:27 -03:00
Thibault Saunier
acb77ccb0a
update: Enhance logging about what kind of update is happening
2018-11-05 09:52:41 -03:00
Thibault Saunier
57f8844958
update: Ensure that a revision is used when updating a detached repo
...
For the case it was not guaranteed
2018-11-05 09:43:50 -03:00
Thibault Saunier
52c0086c5a
update: Fix the manifest commit dictionnary format
...
The structure was changed in last commit but a code path was not properly updated
2018-11-05 09:42:29 -03:00
Thibault Saunier
7db3c6b0ce
gst-update: Handle specified remotes in manifest
2018-11-03 10:32:01 -03:00
Nirbheek Chauhan
1a75371b8b
git-update: Get the revision of the right repository
...
Typo, should fix the gst-build CI failures.
2018-10-02 13:39:49 +05:30
Nirbheek Chauhan
0f21cf4740
git-update: Don't try to pull --rebase repos that are not on master
...
This fixes updating of repos that are at a specific commit and
a detached HEAD, such as openh264.
2018-10-02 09:51:11 +05:30
Víctor Manuel Jáquez Leal
d3ea533b20
Don't process the whole commit
...
https://bugzilla.gnome.org/show_bug.cgi?id=796655
2018-08-30 17:17:57 +02:00
Edward Hervey
13996d5244
git-update: Close stdin if non-interactive
...
To be 100% certain that any usage of stdin will actually fail
instead of silently waiting for input.
2017-10-20 12:22:57 +02:00
Arun Raghavan
225419e030
git-update: Update submodules too
...
More correct than not doing it, and prevents careless people from
mistakenly pushing changes to submodules.
2017-01-11 17:29:33 +05:30
Scott D Phillips
978f107a0b
git-update: fixes for running on windows
...
when running git-update as `py git-update` (which is convenient on
windows), SCRIPTDIR is '' instead of '.'. Fix that with normpath.
Printing emdash (U+2014) doesn't work on windows because it isn't in
cp437. Change it to hyphen.
https://bugzilla.gnome.org/show_bug.cgi?id=774636
2016-11-17 17:49:17 -03:00
Nirbheek Chauhan
30a35c3d60
git-update: Use git config to set autostash
...
The build bots don't like it; probably because the git version is
ancient there. Bots should ignore the unknown config variable.
2016-11-10 01:10:58 +05:30
Thibault Saunier
c843f48740
Add 'update' and git-update
targets to update git repos
2016-11-08 15:16:57 -03:00
Thibault Saunier
ac383f6b68
git-update: Also update gst-build
2016-11-08 15:10:50 -03:00
Thibault Saunier
a6e6feac3e
Add a way to skip updating a particular repo
...
When entering a shell to fix the rebasing you can just `exit 255`
and we concider it means 'skip update'.
Also support entering shell on windows
2016-11-08 15:10:50 -03:00
Nirbheek Chauhan
6707b41d08
git-update: Use --autosquash during pull --rebase
...
This option has existed forever and allows people to automatically
update and autosquash/pop changes in subproject git repositories.
2016-11-08 23:30:16 +05:30
Thibault Saunier
6a1d489cc5
Minor improvement in the git function
2016-10-11 02:05:39 +02:00
Thibault Saunier
76e946465f
Add meson as a submodule for now
...
Allowing us to control the meson version in use so that it just works.
2016-10-11 02:00:32 +02:00
Thibault Saunier
5428359c31
git-update: Add a way for user to fix any rebasing issue interactively
2016-09-30 10:54:36 -03:00
Thibault Saunier
0b58ccccbb
Allow passing a manifest to update subprojects repository
...
Allowing to have reproducible builds on the CI server, and locally.
2016-09-14 10:01:25 -03:00
Thibault Saunier
7e7caeec93
Add an helper to update subprojects git repos
2016-09-09 09:01:58 -03:00