Skip to content

Commit

Permalink
Only warn about .data files when showing reports (#3473)
Browse files Browse the repository at this point in the history
* Only warn about .data files when showing reports

This avoids the warning appearing in shell completion, for example.

* Update src/commands/CmdCustom.cpp

Co-authored-by: ryneeverett <ryneeverett@gmail.com>

---------

Co-authored-by: ryneeverett <ryneeverett@gmail.com>
  • Loading branch information
djmitche and ryneeverett committed Jun 19, 2024
1 parent 9788798 commit 24f56b6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/TDB2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ TDB2::TDB2 ()
////////////////////////////////////////////////////////////////////////////////
void TDB2::open_replica (const std::string& location, bool create_if_missing)
{
File pending_data = File (location + "/pending.data");
if (pending_data.exists()) {
Color warning = Color (Context::getContext ().config.get ("color.warning"));
std::cerr << warning.colorize (
format ("Found existing '*.data' files in {1}", location)) << "\n";
std::cerr << " Taskwarrior's storage format changed in 3.0, requiring a manual migration.\n";
std::cerr << " See https://github.com/GothenburgBitFactory/taskwarrior/releases.\n";
}
replica = tc::Replica(location, create_if_missing);
}

Expand Down
10 changes: 10 additions & 0 deletions src/commands/CmdCustom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <sstream>
#include <map>
#include <vector>
#include <iostream>
#include <algorithm>
#include <stdlib.h>
#include <Context.h>
Expand Down Expand Up @@ -272,6 +273,15 @@ int CmdCustom::execute (std::string& output)
}
}

std::string location = (Context::getContext ().data_dir);
File pending_data = File (location + "/pending.data");
if (pending_data.exists()) {
Color warning = Color (Context::getContext ().config.get ("color.warning"));
std::cerr << warning.colorize (
format ("Found existing '*.data' files in {1}", location)) << "\n";
std::cerr << " Taskwarrior's storage format changed in 3.0, requiring a manual migration.\n";
std::cerr << " See https://github.com/GothenburgBitFactory/taskwarrior/releases.\n";
}

feedback_backlog ();
output = out.str ();
Expand Down

0 comments on commit 24f56b6

Please sign in to comment.