summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add script to manually create a build-essential staging fillerSam Thursfield2013-01-241-0/+553
* Remove scripts/clean-git-cacheSam Thursfield2013-01-221-240/+0
* Merge branch 'baserock/richardmaw/fix-morph-check-on-squeeze'Richard Maw2013-01-223-0/+42
|\
| * Reinstate check for python 2.7Richard Maw2013-01-222-0/+6
| * Revert "Remove unneded scripts/python-check script"Richard Maw2013-01-221-0/+36
|/
* Fix copyright yearsSam Thursfield2013-01-224-4/+4
* Merge branch 'samthursfield/branch-fixes'Sam Thursfield2013-01-2211-47/+4
|\
| * Remove needless git output from test resultSam Thursfield2013-01-222-14/+4
| * Rename morph tag tests to follow patternSam Thursfield2013-01-229-0/+0
| * Remove superfluous testSam Thursfield2013-01-222-33/+0
|/
* Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/b...Richard Maw2013-01-2125-173/+64
|\
| * Remove unneded scripts/python-check scriptJavier Jardón2013-01-181-36/+0
| * tests.merging/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-186-18/+0
| * tests.branching/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-186-18/+0
| * tests.as-root/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-189-25/+0
| * morph2_tests: checks for python2.7 are not needed anymoreJavier Jardón2013-01-181-33/+27
| * morph2: Improve compatibility with python < 2.7Javier Jardón2013-01-181-20/+9
|/
* Merge remote-tracking branch 'origin/jonathanmaw/ccache-local-fix'Lars Wirzenius2013-01-032-5/+16
|\
| * Make ccache use the same directory for repos that are clonesJonathan Maw2013-01-031-4/+15
* | Merge remote-tracking branch 'origin/samthursfield/stable-glob'Lars Wirzenius2013-01-031-2/+2
|\ \ | |/ |/|
| * Fix sporadic test failures caused by the unstable ordering of glob.glob()Sam Thursfield2013-01-031-2/+2
|/
* Merge branch 'liw/silence-log-messages-during-unit-tests'Sam Thursfield2012-12-182-6/+8
|\
| * Silence log messages during unit testsLars Wirzenius2012-12-182-6/+8
* | Merge branch 'samthursfield/stratum-build-depends'Sam Thursfield2012-12-187-73/+285
|\ \ | |/ |/|
| * Add a stratum build-dependency to all as-root testsSam Thursfield2012-12-182-0/+13
| * morph build: Update repo and ref in stratum build-depends fieldsSam Thursfield2012-12-182-0/+44
| * morph edit: Update build-depends that refer to the edited stratumSam Thursfield2012-12-183-73/+209
| * Validate stratum build-depends against system contentsSam Thursfield2012-12-171-0/+19
|/
* Fix default setting for compiler cache dir; update testsJannis Pohlmann2012-12-172-12/+7
* Add support for ccacheJonathan Maw2012-12-173-17/+30
* Drop committer info from git tag environment; update tag test outputsJannis Pohlmann2012-12-178-28/+30
* Merge branch 'jannispohlmann/cache-resolved-refs-and-morphologies'Jannis Pohlmann2012-12-141-4/+18
|\
| * Cache resolved refs and morphologies when traversing morphsJannis Pohlmann2012-12-131-4/+18
* | Merge remote-tracking branch 'remotes/origin/samthursfield/ambiguous-refs' in...Jannis Pohlmann2012-12-137-56/+79
|\ \
| * | morph branch: Check if the ref already exists before anything elseSam Thursfield2012-12-133-6/+20
| * | Add a test to catch any future use of git show-refSam Thursfield2012-12-131-0/+32
| * | Always use `git rev-parse --verify` to resolve refsSam Thursfield2012-12-136-50/+27
| |/
* | Fix morph tag usage of git commit-tree; fix detecting existing tagsJannis Pohlmann2012-12-131-12/+23
* | Fix bashism in morph tag test scriptsJannis Pohlmann2012-12-134-4/+4
* | Merge remote-tracking branch 'origin/jannispohlmann/morph-tag-v2'Sam Thursfield2012-12-1311-0/+746
|\ \ | |/ |/|
| * Add an initial implementation of "morph tag"Jannis Pohlmann2012-12-1311-0/+746
|/
* Merge branch 'jonathanmaw/find-artifacts-rebase' of ssh://trove.baserock.org/...Richard Maw2012-12-101-0/+123
|\
| * Add find-artifacts scriptJonathan Maw2012-12-101-0/+123
* | Merge branch 'jonathanmaw/cache-key-less-rigorous'Sam Thursfield2012-12-072-0/+49
|\ \
| * | Avoid rebuilds when unimportant morphology contents changeJonathan Maw2012-11-292-0/+49
* | | Merge branch 'baserock/richardmaw/build-less-artifacts'Richard Maw2012-12-032-4/+19
|\ \ \ | |_|/ |/| |
| * | Test source pool having duplicates addedRichard Maw2012-12-031-0/+9
| * | Ensure sourcepool does not contain duplicatesRichard Maw2012-12-031-2/+3
| * | Amend test to not add the same source to the pool twiceRichard Maw2012-12-031-2/+7
|/ /
* | Revert "Merge branch 'liw/hardlink-staging-area-pre-rebase'"Jannis Pohlmann2012-11-303-89/+33
|/