diff options
| author | Michael Merickel <mmerickel@users.noreply.github.com> | 2016-09-28 22:52:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 22:52:08 -0500 |
| commit | 9060dffe29e60e7528aab8d6d2006eee3cd72522 (patch) | |
| tree | 491df3e7b1dff094e4ed603b10ecb6767e1f9c4a | |
| parent | 4ce8d4f2894819f17385e835b0b329fbc793fac6 (diff) | |
| parent | 20c92a00a704c87242005d9ebcc7e6f5ae5093b2 (diff) | |
| download | pyramid-9060dffe29e60e7528aab8d6d2006eee3cd72522.tar.gz pyramid-9060dffe29e60e7528aab8d6d2006eee3cd72522.tar.bz2 pyramid-9060dffe29e60e7528aab8d6d2006eee3cd72522.zip | |
Merge pull request #2775 from mmerickel/pcreate-interactive-default
make --interactive the default for pcreate
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | pyramid/scripts/pcreate.py | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 8f971b2ee..d4afe5f7a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -16,6 +16,12 @@ Backward Incompatibilities See https://github.com/Pylons/pyramid/pull/2615 +- ``pcreate`` is now interactive by default. You will be prompted if it + a file already exists with different content. Previously if there were + similar files it would silently skip them unless you specified + ``--interactive`` or ``--overwrite``. + See https://github.com/Pylons/pyramid/pull/2775 + Features -------- diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py index 1e8074fc5..f3121a915 100644 --- a/pyramid/scripts/pcreate.py +++ b/pyramid/scripts/pcreate.py @@ -56,7 +56,9 @@ class PCreateCommand(object): parser.add_option('--interactive', dest='interactive', action='store_true', - help='When a file would be overwritten, interrogate') + help='When a file would be overwritten, interrogate ' + '(this is the default, but you may specify it to ' + 'override --overwrite)') parser.add_option('--ignore-conflicting-name', dest='force_bad_name', action='store_true', @@ -70,6 +72,8 @@ class PCreateCommand(object): def __init__(self, argv, quiet=False): self.quiet = quiet self.options, self.args = self.parser.parse_args(argv[1:]) + if not self.options.interactive and not self.options.overwrite: + self.options.interactive = True self.scaffolds = self.all_scaffolds() def run(self): |