diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-11-11 17:06:58 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-06 14:20:33 +0000 |
| commit | 6a0bc4c29b2bd3bbbdf8e765da8dce8490e34ddd (patch) | |
| tree | 743db537cd9092cecc98f3a8c59cbf4dcd32cfb4 /morphlib/app.py | |
| parent | f3197d814a5e883f47631a4f0acfa51bd1285daf (diff) | |
| download | morph-6a0bc4c29b2bd3bbbdf8e765da8dce8490e34ddd.tar.gz | |
Make temporary build branches optional
Not everyone is a fan of the `morph build` magic that collects up your
changes and puts them in a temporary branch. Now you can disable it by
setting 'local-changes=ignore' in your morph.conf file.
This speeds up `morph build` and `morph deploy` by 5-10 seconds on my
machine.
I looked an option to make `morph build` warn if there are uncommitted
changes. I found that with a cold cache, it takes about 5 seconds on my
machine to verify that there are no uncommitted changes to a checkout of
definitions.git. That defeats the main purpose of this patch for me, so
I didn't include the option.
Diffstat (limited to 'morphlib/app.py')
| -rw-r--r-- | morphlib/app.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index 177bce45..0c87f814 100644 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -139,6 +139,14 @@ class Morph(cliapp.Application): 'always push temporary build branches to the ' 'remote repository', group=group_build) + self.settings.choice (['local-changes'], + ['include', 'ignore'], + 'the `build` and `deploy` commands detect ' + 'uncommitted/unpushed local changes and operate ' + 'operate from a temporary branch containing ' + 'those changes. Disable this behaviour with the ' + '`ignore` setting.', + group=group_build) group_storage = 'Storage Options' self.settings.string(['tempdir'], |