GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

reorder code to be in same order as comments (intuitive order)

Browse source
This commit is contained in:
Julien Rabinow 2020-12-03 01:30:02 -08:00 • committed by Tomas Babej
parent 1aa77c9ede
commit 46b553dd8c
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Context.cpp
View file

@ -455,7 +455,8 @@ int Context::initialize (int argc, const char** argv)
//
////////////////////////////////////////////////////////////////////////////
bool taskrc_overridden = CLI2::getOverride (argc, argv, home_dir, rc_file);
bool taskrc_overridden = false;
if (! taskrc_overridden)
{
char *override = getenv ("TASKRC");
@ -466,6 +467,9 @@ int Context::initialize (int argc, const char** argv)
}
}
taskrc_overridden =
CLI2::getOverride (argc, argv, rc_file) || taskrc_overridden;
// Artificial scope for timing purposes.
{
Timer timer;
@ -490,7 +494,8 @@ int Context::initialize (int argc, const char** argv)
//
////////////////////////////////////////////////////////////////////////////
bool taskdata_overridden = CLI2::getDataLocation (argc, argv, data_dir);
bool taskdata_overridden = false;
if (! taskdata_overridden)
{
char *override = getenv("TASKDATA");
@ -501,6 +506,10 @@ int Context::initialize (int argc, const char** argv)
taskdata_overridden = true;
}
}
taskdata_overridden =
CLI2::getDataLocation (argc, argv, data_dir) || taskdata_overridden;
if (taskdata_overridden && verbose ("override"))
header (format ("TASKDATA override: {1}", data_dir._data));