summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rework the blackbox tests for bare caches.Daniel Silverstone2012-09-149-13/+25
* Update unit tests for bare repo caches.Daniel Silverstone2012-09-142-11/+31
* Rework git caches to be bare mirrors of the repos.Daniel Silverstone2012-09-145-23/+107
* Update .gitignore to ignore tilde files.Daniel Silverstone2012-09-141-0/+1
* Fix tests for previous commitSam Thursfield2012-09-132-2/+2
* Merge branch 'samthursfield/lrc-error-improvements'Sam Thursfield2012-09-132-21/+28
|\
| * Give more useful errors when cloning from local cache failsSam Thursfield2012-09-132-21/+28
* | Merge branch 'samthursfield/S4770-fix-tests-for-git-pre-1.7.9'Lars Wirzenius2012-09-1311-43/+95
|\ \ | |/ |/|
| * Fix things so test suite works on Debian squeezeLars Wirzenius2012-09-139-38/+90
| * Fix whitespace errorSam Thursfield2012-09-131-3/+3
| * morph build: Use pre-v1.7.9 form of git commit-treeSam Thursfield2012-09-131-2/+2
|/
* Merge branch 'samthursfield/S4712-handle-no-git-user-info' of git://roadtrain...Richard Maw2012-09-1310-39/+51
|\
| * tests: Always use fixed git committer infoSam Thursfield2012-09-138-37/+37
| * build: Fail if user hasn't set user.name (or GIT_AUTHOR_NAME)Sam Thursfield2012-09-132-2/+14
|/
* Merge branch 'samthursfield/S4713-merge-message-for-chunks' of git://roadtrai...Richard Maw2012-09-133-16/+25
|\
| * morph merge: Give consistent commit message in chunk reposSam Thursfield2012-09-113-16/+25
* | Fix code format for unicode fixRichard Maw2012-09-131-1/+2
* | Merge branch 'samthursfield/S4556-triplet-consistency' of git://roadtrain.cod...Richard Maw2012-09-1335-182/+177
|\ \
| * | Don't use .morph extension when printing name of tripletsSam Thursfield2012-09-123-127/+128
| * | Don't require .morph in triplet argumentsSam Thursfield2012-09-1232-52/+46
| * | bootstrap: Fix to use morph build-morphologySam Thursfield2012-09-121-3/+3
* | | Encode the root path for os.walk()Daniel Silverstone2012-09-121-1/+1
* | | Merge branch 'danielsilverstone/trove-host-and-prefixes'Daniel Silverstone2012-09-124-10/+178
|\ \ \ | |_|/ |/| |
| * | Test the trove-* support.Daniel Silverstone2012-09-122-0/+103
| * | Add support for Trove hosted content to morph configuration.Daniel Silverstone2012-09-123-10/+75
|/ /
* | Merge branch 'jannis/edit-morphs-less-destructively'Sam Thursfield2012-09-118-126/+199
|\ \ | |/
| * Preserve sort order of morphologies, so they can be edited by MorphSam Thursfield2012-09-108-110/+174
| * Morphology: Only set defaults specific to the morphology kindSam Thursfield2012-09-101-15/+24
|/
* Reorder branch & merge utility functions to top of the classSam Thursfield2012-09-101-40/+40
* Git rid of morphlib.git methods that are not neededSam Thursfield2012-09-102-9/+1
* morph merge: Complain if 'from' branch is not checked outSam Thursfield2012-09-103-0/+35
* morph branch: Fail if branch already exists in the system repoSam Thursfield2012-09-104-0/+53
* morph branch,checkout: Clean up the branch dir on failureSam Thursfield2012-09-105-30/+117
* morph merge: Remove quotes from merge commit messageSam Thursfield2012-09-101-1/+1
* tests.branching: Add test with strata outside the main morphs repoSam Thursfield2012-09-101-0/+149
* Rewrite 'merge' commandSam Thursfield2012-09-105-33/+103
* Reorder functionsSam Thursfield2012-09-101-19/+19
* Merge branch 'jannis/commit-and-push-for-build'Sam Thursfield2012-09-0737-65/+726
|\
| * Add test to verify that building a branch picks up uncommitted changesJannis Pohlmann2012-09-072-0/+80
| * Make commits in root tests reproducible by fixing git meta dataJannis Pohlmann2012-09-071-0/+13
| * Add test to verify that 'morph build' can be run multiple timesJannis Pohlmann2012-09-072-0/+83
| * Add test to verify that 'morph build' creates the right build refsJannis Pohlmann2012-09-072-0/+90
| * Add a new 'morph build' for building from a system branchJannis Pohlmann2012-09-076-31/+409
| * Add 'build-prefix-ref' setting for creating temporary build refsJannis Pohlmann2012-09-071-0/+6
| * Rename 'morph build' command to 'morph build-morphology'Jannis Pohlmann2012-09-0724-34/+45
|/
* Merge remote-tracking branch 'origin/jannis/use-tree-sha1-for-cache-key'Daniel Silverstone2012-09-0514-83/+110
|\
| * Compute cache keys using tree SHA1s instead of commit SHA1sJannis Pohlmann2012-09-051-1/+1
| * Resolve tree SHA1 along with commit SHA1 when resolving refsJannis Pohlmann2012-09-0513-82/+109
|/
* Merge branch 'jannis/rewrite-edit-command'Sam Thursfield2012-09-0412-191/+303
|\
| * Remember system branch name and allow branch to be renamedJannis Pohlmann2012-09-041-21/+32
View Lorry Controller Status