diff options
author | Adrian Kummerlaender | 2015-12-24 00:37:32 +0100 |
---|---|---|
committer | Adrian Kummerlaender | 2015-12-24 00:37:32 +0100 |
commit | ce1460dd98185f80db479c7dc7ca19026149a255 (patch) | |
tree | 1936a524076c93511c23cc640466a8f5a26443e2 /src/tracking/change_tracker.cc | |
parent | f47dc6ba1a17052ad4dde1d685772b83f23a8477 (diff) | |
download | change-ce1460dd98185f80db479c7dc7ca19026149a255.tar change-ce1460dd98185f80db479c7dc7ca19026149a255.tar.gz change-ce1460dd98185f80db479c7dc7ca19026149a255.tar.bz2 change-ce1460dd98185f80db479c7dc7ca19026149a255.tar.lz change-ce1460dd98185f80db479c7dc7ca19026149a255.tar.xz change-ce1460dd98185f80db479c7dc7ca19026149a255.tar.zst change-ce1460dd98185f80db479c7dc7ca19026149a255.zip |
Add support for changing the `diff` command via an environment variable
While the file arguments remain fixed the actual `diff` application and its output style can be changed using the `CHANGE_LOG_DIFF_CMD` environment variable.
Diffstat (limited to 'src/tracking/change_tracker.cc')
-rw-r--r-- | src/tracking/change_tracker.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/tracking/change_tracker.cc b/src/tracking/change_tracker.cc index 913604e..9bbdcb6 100644 --- a/src/tracking/change_tracker.cc +++ b/src/tracking/change_tracker.cc @@ -24,10 +24,14 @@ boost::process::context getDefaultContext() { namespace tracking { -ChangeTracker::ChangeTracker(utility::Logger* logger): +ChangeTracker::ChangeTracker(utility::Logger* logger, const std::string& diff_cmd): + diff_cmd_(diff_cmd), logger_(logger), children_() { } +ChangeTracker::ChangeTracker(utility::Logger* logger): + ChangeTracker(logger, "diff -p") { } + ChangeTracker::~ChangeTracker() { for ( auto&& tracked : this->children_ ) { std::get<DIFF_PROCESS>(tracked)->get_stdin().close(); @@ -70,7 +74,10 @@ bool ChangeTracker::track(const std::string& file_path) { auto result = this->children_.emplace( file_path, std::make_unique<boost::process::child>( - boost::process::launch_shell("diff -p - " + file_path, getDefaultContext()) + boost::process::launch_shell( + this->diff_cmd_ + " - " + file_path, + getDefaultContext() + ) ) ); |