diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-04 13:44:16 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-04 13:44:16 +0000 |
| commit | 3f0e3e78228e533abd7e051e5103a282a46a645f (patch) | |
| tree | 0047eeb3031dc0af808fc8ce62891cad2420f0dd /tests.branching | |
| parent | be67d3d4c416394588678f67cbc69c879bfc4137 (diff) | |
| download | morph-3f0e3e78228e533abd7e051e5103a282a46a645f.tar.gz | |
b&m: Re-implement morph foreach
The previous version attempted to separate the output of the commands
run with newlines by printing a newline at the beginning if it wasn't
the first repository.
The check it used was for the first repository was flawed by assuming
that the root repository was the first repository processed.
Since the complication was not worth keeping the output identical, it
has been changed to separate by printing a newline after every command
and the test output has been amended to include the extra trailing
newline.
Diffstat (limited to 'tests.branching')
5 files changed, 9 insertions, 0 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout index acfd1c0a..5fbea686 100644 --- a/tests.branching/edit-checkouts-existing-chunk.stdout +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -6,5 +6,6 @@ test:hello * alfred master + Files in hello: hello.morph diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout index b694233b..dd3f00ef 100644 --- a/tests.branching/edit-clones-chunk.stdout +++ b/tests.branching/edit-clones-chunk.stdout @@ -7,6 +7,7 @@ test:hello master * newbranch + Current origins: test:morphs * remote origin @@ -35,3 +36,4 @@ test:hello master merges with remote master Local ref configured for 'git push': master pushes to master (up to date) + diff --git a/tests.branching/foreach-handles-full-urls.stdout b/tests.branching/foreach-handles-full-urls.stdout index 1ef0b5aa..3abae62c 100644 --- a/tests.branching/foreach-handles-full-urls.stdout +++ b/tests.branching/foreach-handles-full-urls.stdout @@ -1,3 +1,4 @@ file://TMP/morphs # On branch master nothing to commit (working directory clean) + diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout index 68623be7..598e28bf 100644 --- a/tests.branching/tag-creates-commit-and-tag.stdout +++ b/tests.branching/tag-creates-commit-and-tag.stdout @@ -38,6 +38,7 @@ index b0fed3b..4c4ee3e 100644 repo: test:morphs + unpetrify-ref: master system-kind: rootfs-tarball + test:morphs commit 9509c9c379f8ba643b2ad9a6ec50ecf96993cbb5 Author: developer <developer@example.com> @@ -54,3 +55,4 @@ Commit: developer <developer@example.com> CommitDate: Tue Jul 31 16:51:54 2012 +0000 initial + diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout index 878eefc1..242b2d4e 100644 --- a/tests.branching/tag-tag-works-as-expected.stdout +++ b/tests.branching/tag-tag-works-as-expected.stdout @@ -1,6 +1,7 @@ test:morphs example-tag tagged-tag + test:morphs tag tagged-tag Tagger: developer <developer@example.com> @@ -41,6 +42,7 @@ index b0fed3b..875d73a 100644 repo: test:morphs + unpetrify-ref: master system-kind: rootfs-tarball + test:morphs commit ca7594f436da55bda2cfff2c6484d11aa0ea4cbc Author: developer <developer@example.com> @@ -57,3 +59,4 @@ Commit: developer <developer@example.com> CommitDate: Tue Jul 31 16:51:54 2012 +0000 initial + |