summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wiptraveltissues/fix-Nonetype-guardDarius Makovsky2020-07-061-0/+38
* _project: Guard against addition of None to listDarius Makovsky2020-07-061-1/+1
* Merge branch 'tristan/update-mailing-list' into 'master'bst-marge-bot2020-07-035-11/+10
|\
| * All: Update all references to the mailing list.Tristan van Berkom2020-07-035-11/+10
|/
* Merge branch 'juerg/push' into 'master'bst-marge-bot2020-07-022-7/+48
|\
| * tests/frontend/push.py: Add test_push_update_after_rebuildJürg Billeter2020-06-301-0/+40
| * _artifactcache.py: Skip push only if server has identical artifactJürg Billeter2020-06-301-7/+8
|/
* Merge branch 'juerg/cas' into 'master'bst-marge-bot2020-06-302-5/+21
|\
| * casserver.py: Fix error handling for requests forwarded to casdJürg Billeter2020-06-251-5/+20
| * casdprocessmanager.py: Set `_bytestream` to `None` when closing channelJürg Billeter2020-06-251-0/+1
|/
* Merge branch 'tristan/junction-jungle' into 'master'bst-marge-bot2020-06-24463-550/+2719
|\
| * docs: Updating documentation regarding junctions and conflicts.Tristan van Berkom2020-06-242-37/+250
| * tests/format/junctions.py: Adding tests for internal junctionsTristan van Berkom2020-06-2482-0/+356
| * _project.py: Implement internal junctionsTristan van Berkom2020-06-242-13/+77
| * tests/format/junctions.py: Adding tests for duplicate junctionsTristan van Berkom2020-06-24180-7/+761
| * _loader: Add support for duplicate junctionsTristan van Berkom2020-06-243-45/+299
| * tests/format/junctions.py: Adding tests for the overrides featureTristan van Berkom2020-06-2399-6/+565
| * junctions: Replace coalescing with explicit overridesTristan van Berkom2020-06-235-44/+156
| * doc/examples/junction-includes: Renamed project to avoid name conflictTristan van Berkom2020-06-191-1/+1
| * tests/frontend: Renaming some projects to avoid new conflictsTristan van Berkom2020-06-192-2/+2
| * tests/format/junctions.py: Major refactorTristan van Berkom2020-06-1995-454/+305
| * _loader: Fix invalid junction error to include provenanceTristan van Berkom2020-06-192-4/+10
|/
* Merge branch 'bschubert/cleanups' into 'master'bst-marge-bot2020-06-182-11/+4
|\
| * conftest.py: Ensure the `basetemp` is a resolved pathbschubert/cleanupsBenjamin Schubert2020-06-171-1/+1
| * _signals.py: Remove code for python3.5 supportBenjamin Schubert2020-06-171-10/+3
|/
* Merge branch 'tristan/load-context' into 'master'bst-marge-bot2020-06-169-138/+166
|\
| * _loader: Adding LoadContexttristan/load-contextTristan van Berkom2020-06-169-138/+166
|/
* Merge branch 'tristan/nuke-pickle-jobber' into 'master'Tristan Van Berkom2020-06-1619-573/+1
|\
| * Completely abolish job pickling.tristan/nuke-pickle-jobberTristan van Berkom2020-06-1519-573/+1
|/
* NEWS: Preparing for 1.93.4 snapshot1.93.4Tristan van Berkom2020-06-121-3/+10
* Merge branch 'tristan/remove-some-internal-api' into 'master'Tristan Van Berkom2020-06-124-96/+46
|\
| * _project.py: Reorganize methodstristan/remove-some-internal-apiTristan van Berkom2020-06-111-31/+46
| * _project.py: Remove invoked_from_workspace_element()Tristan van Berkom2020-06-111-8/+0
| * _stream.py: Remove workspace_is_required()Tristan van Berkom2020-06-111-14/+0
| * _frontent/cli.py: Removed message to user informing the workspace is closed.Tristan van Berkom2020-06-111-13/+0
| * tests/frontend/workspace.py: Removing testsTristan van Berkom2020-06-111-30/+0
|/
* Merge branch 'tristan/reorganize-project-context-init' into 'master'bst-marge-bot2020-06-102-11/+8
|\
| * _project.py: reorganize __init__()Tristan van Berkom2020-06-101-8/+5
| * _context.py: Put the source_cache_specs close to the other cache specsTristan van Berkom2020-06-101-3/+3
|/
* Merge branch 'juerg/buildbox' into 'master'bst-marge-bot2020-06-101-5/+5
|\
| * .gitlab-ci.yml: Update BuildBox components to 0.0.9Jürg Billeter2020-06-101-5/+5
|/
* Merge branch 'juerg/object-file-mode' into 'master'bst-marge-bot2020-06-104-36/+45
|\
| * cascache.py: Fix file modes in checkout()Jürg Billeter2020-06-103-19/+25
| * utils.py: Make copystat optional in safe_copy()Jürg Billeter2020-06-101-15/+17
| * utils.py: Fix error handling in safe_copy()Jürg Billeter2020-06-101-4/+5
|/
* Merge branch 'scottclarke/remote-build-message' into 'master'bst-marge-bot2020-06-101-27/+30
|\
| * sandbox/_sandboxremote.py: Improved log messagesscottclarke/remote-build-messageScott Clarke2020-06-101-27/+30
|/
* Merge branch 'tristan/get-loader-provenance' into 'master'bst-marge-bot2020-06-105-34/+25
|\
| * _loader/loader.py: Make provenance a positional argumentTristan van Berkom2020-06-103-8/+6
| * _includes.py: Propagate provenance through Loader.get_loader()Tristan van Berkom2020-06-102-26/+19