nix copy: make recursive by default

This commit is contained in:
Eelco Dolstra 2017-09-27 18:28:54 +02:00
parent b8875213dc
commit 5421ad243e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 16 additions and 3 deletions

View file

@ -100,9 +100,21 @@ void StoreCommand::run()
run(getStore()); run(getStore());
} }
StorePathsCommand::StorePathsCommand() StorePathsCommand::StorePathsCommand(bool recursive)
: recursive(recursive)
{ {
mkFlag('r', "recursive", "apply operation to closure of the specified paths", &recursive); if (recursive)
mkFlag()
.longName("no-recursive")
.description("apply operation to specified paths only")
.set(&this->recursive, false);
else
mkFlag()
.longName("recursive")
.shortName('r')
.description("apply operation to closure of the specified paths")
.set(&this->recursive, true);
mkFlag(0, "all", "apply operation to the entire store", &all); mkFlag(0, "all", "apply operation to the entire store", &all);
} }

View file

@ -141,7 +141,7 @@ private:
public: public:
StorePathsCommand(); StorePathsCommand(bool recursive = false);
using StoreCommand::run; using StoreCommand::run;

View file

@ -17,6 +17,7 @@ struct CmdCopy : StorePathsCommand
SubstituteFlag substitute = NoSubstitute; SubstituteFlag substitute = NoSubstitute;
CmdCopy() CmdCopy()
: StorePathsCommand(true)
{ {
mkFlag(0, "from", "store-uri", "URI of the source Nix store", &srcUri); mkFlag(0, "from", "store-uri", "URI of the source Nix store", &srcUri);
mkFlag(0, "to", "store-uri", "URI of the destination Nix store", &dstUri); mkFlag(0, "to", "store-uri", "URI of the destination Nix store", &dstUri);