From 140edbb5eb8e3b5a5b6ca0c1bfc2240dd6ca234b Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 28 Sep 2016 22:12:36 -0500 Subject: make --interactive the default for pcreate --- pyramid/scripts/pcreate.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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): -- cgit v1.2.3 From 20c92a00a704c87242005d9ebcc7e6f5ae5093b2 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 28 Sep 2016 22:20:56 -0500 Subject: add changelog for #2775 --- CHANGES.txt | 6 ++++++ 1 file changed, 6 insertions(+) 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 -------- -- cgit v1.2.3