[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.colored-diff: fdfc6375fce192
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone.colored-diff: fdfc6375fce1926cec52bfcdcd22f7e47e6871b8 |
Date: |
Wed, 17 Aug 2011 11:42:49 +0200 (CEST) |
revision: fdfc6375fce1926cec52bfcdcd22f7e47e6871b8
date: 2011-04-14T09:40:01
author: Richard Hopkins <address@hidden>
branch: net.venge.monotone.colored-diff
changelog:
Added invariant for finding colorizer purpose (from
f9c07b67917833501d4e5110553dc2a9799bf8e8)
manifest:
format_version "1"
new_manifest [eda33c029fc897085ec795f79158cf85efc0a906]
old_revision [97069aa29f2f14bfa563da01fdccd6b9f4a5db6f]
patch "src/colorizer.cc"
from [75bf058d81203a6a336bf78c9f17e93a9ec0bd9b]
to [60d92fa4ddcb041736a59baad40b79520b1fab2f]
patch "src/colorizer.hh"
from [d297c5407c6fa949be640656738573dc75ef9f2b]
to [2d607068a3b3c98668efcf03d2b320793c69d6c6]
============================================================
--- src/colorizer.cc 75bf058d81203a6a336bf78c9f17e93a9ec0bd9b
+++ src/colorizer.cc 60d92fa4ddcb041736a59baad40b79520b1fab2f
@@ -136,12 +136,13 @@ colorizer::colorizer(bool enable, lua_ho
}
colorizer::colorizer(bool enable, lua_hooks & lh)
- : lua(lh)
+ : lua(lh),
+ enabled(enable)
{
if (!have_smart_terminal())
- enable = false;
+ enabled = false;
- if (enable)
+ if (enabled)
{
colormap.insert(map_output_color(normal));
colormap.insert(map_output_color(reset));
@@ -164,10 +165,13 @@ colorizer::colorize(string const & in, p
string
colorizer::colorize(string const & in, purpose p) const
{
- if (colormap.find(p) == colormap.end())
+ if (enabled)
+ {
+ I(colormap.find(p) != colormap.end());
+ return get_format(p) + in + get_format(reset);
+ }
+ else
return in;
-
- return get_format(p) + in + get_format(reset);
}
string
============================================================
--- src/colorizer.hh d297c5407c6fa949be640656738573dc75ef9f2b
+++ src/colorizer.hh 2d607068a3b3c98668efcf03d2b320793c69d6c6
@@ -43,6 +43,7 @@ private:
std::map<purpose, boost::tuple<std::string, std::string, std::string> >
colormap;
lua_hooks & lua;
+ bool enabled;
std::pair<purpose, boost::tuple<std::string, std::string, std::string> >
map_output_color(purpose const p);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.colored-diff: fdfc6375fce1926cec52bfcdcd22f7e47e6871b8,
code <=