diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-23 17:33:49 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-12-03 10:23:27 +0000 |
| commit | 2dc11594d5b95d876c9997ca40dfb08bf06c830b (patch) | |
| tree | c2752f38b17e765416dad9ea64688aad0e60d60a /tests.branching | |
| parent | bb1960c7711a8a48bbaabd188158a3c5d7f0ff04 (diff) | |
| download | morph-2dc11594d5b95d876c9997ca40dfb08bf06c830b.tar.gz | |
Rework CachedRepo to use the GitDirectory class where possible
This consolidates a bunch of code paths that were previously duplicated.
This also changes the API for local cached repos to match the
function names GitDirectory uses. Note that the remote repo cache still
uses the old names, and should be fixed when time permits.
Some unit tests that use the CachedRepo module required a bit of
inelegant monkey-patching in order that they continue to work. A better
way to do this would be with the 'mock' library (which would need to be
added to Baserock 'build' and 'devel' systems before we could use it).
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/branch-cleans-up-on-failure.stderr | 2 | ||||
| -rw-r--r-- | tests.branching/checkout-cleans-up-on-failure.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/branch-cleans-up-on-failure.stderr b/tests.branching/branch-cleans-up-on-failure.stderr index 37533408..959226d8 100644 --- a/tests.branching/branch-cleans-up-on-failure.stderr +++ b/tests.branching/branch-cleans-up-on-failure.stderr @@ -1 +1 @@ -ERROR: Ref invalid-ref is an invalid reference for repo file://TMP/morphs +ERROR: Git directory TMP/morphs has no commit at ref invalid-ref^{commit}. diff --git a/tests.branching/checkout-cleans-up-on-failure.stderr b/tests.branching/checkout-cleans-up-on-failure.stderr index 5b6a5645..14ed130c 100644 --- a/tests.branching/checkout-cleans-up-on-failure.stderr +++ b/tests.branching/checkout-cleans-up-on-failure.stderr @@ -1 +1 @@ -ERROR: Ref i/do/not/exist is an invalid reference for repo file://TMP/morphs +ERROR: Git directory TMP/morphs has no commit at ref i/do/not/exist^{commit}. |