diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-08-07 14:55:08 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-09-10 11:39:30 -0400 |
| commit | d3c06bb023c5fe47d29721af732d7c52ff31c792 (patch) | |
| tree | a512648cdc5e4d1c13e31873eae0e817f83aad0f /mesonbuild/mesonlib.py | |
| parent | 8cb5e3d7d2a325bfe3d02e87650d47f9e9d06234 (diff) | |
| download | meson-d3c06bb023c5fe47d29721af732d7c52ff31c792.zip meson-d3c06bb023c5fe47d29721af732d7c52ff31c792.tar.gz meson-d3c06bb023c5fe47d29721af732d7c52ff31c792.tar.bz2 | |
msubprojects: Rework update command
Besides refactoring code into smaller functions:
- Makes the --rebase behaviour the default for consistency: it was
already rebasing when current branch and revision are the same, it is
less confusing to rebase when they are different too.
- Add --reset mode that checkout the new branch and hard reset that
branch to remote commit. This new mode guarantees that every
subproject are exactly at the wrap's revision.
- Local changes are always stashed first to avoid any data loss. In the
worst case scenario the user can always check reflog and stash list to
rollback.
Fixes: #7526
Diffstat (limited to 'mesonbuild/mesonlib.py')
0 files changed, 0 insertions, 0 deletions