mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-20 04:13:07 +02:00
Merge branch 'master' into 2.3.0
Conflicts: AUTHORS CMakeLists.txt INSTALL NEWS cmake.h.in doc/man/task-faq.5.in package-config/osx/README scripts/utils/verify_l10n src/API.h src/Config.cpp src/Context.cpp src/DOM.cpp src/Hooks.cpp src/TransportShell.h src/commands/CmdDiagnostics.cpp src/commands/CmdShell.cpp src/commands/CmdVersion.cpp src/en-US.h src/shell/Readline.h src/wcwidth6.cpp test/CMakeLists.txt test/color.uda.t test/duration.t.cpp test/hook.on-launch.t test/template.t test/uuid.t
This commit is contained in:
commit
8af0a7f3ba
548 changed files with 13752 additions and 2435 deletions
|
@ -2,7 +2,7 @@
|
|||
################################################################################
|
||||
## taskwarrior - a command line task list manager.
|
||||
##
|
||||
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
|
||||
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
|
||||
##
|
||||
## Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
## of this software and associated documentation files (the "Software"), to deal
|
||||
|
@ -35,6 +35,7 @@ if (open my $fh, '>', 'verbose.rc')
|
|||
{
|
||||
print $fh "data.location=.\n",
|
||||
"echo.command=off\n";
|
||||
print $fh "print.empty.columns=yes\n";
|
||||
close $fh;
|
||||
ok (-r 'verbose.rc', 'Created verbose.rc');
|
||||
}
|
||||
|
@ -48,7 +49,7 @@ unlike ($output, qr/Created task \d/, '\'new-id\' verbosity good');
|
|||
|
||||
# Verbosity: 'label'
|
||||
$output = qx{../src/task rc:verbose.rc ls rc.verbose:label 2>&1};
|
||||
like ($output, qr/ID.+Project.+Pri.+Description/, '\'label\' verbosity good');
|
||||
like ($output, qr/ID.+Proj.+Pri.+Description/, '\'label\' verbosity good');
|
||||
|
||||
# Verbosity: 'affected'
|
||||
$output = qx{../src/task rc:verbose.rc ls rc.verbose:affected 2>&1};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue