[Bps-public-commit] SD branch, master, updated. 0.74-70-g675dd49

[Christine Spang]

The branch, master has been updated
       via  675dd496b02f8366f2f1180e87b0b36bfb18df6d (commit)
       via  34c9addca3a8ab1df877d48d6797ee7384affe9a (commit)
      from  8ed511b4b361c97e064a8a0f8838809352802f4a (commit)

Summary of changes:
 .../SD/CLI/Command/Help/ticket_summary_format.pm   |   38 +++++++++++++++----
 lib/App/SD/Replica/rt/PullEncoder.pm               |    2 +-
 2 files changed, 31 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 34c9addca3a8ab1df877d48d6797ee7384affe9a
Author: Christine Spang <christine at debian.org>
Date:   Mon Jan 10 12:28:08 2011 -0500

    add missing newline in RT sync warning

diff --git a/lib/App/SD/Replica/rt/PullEncoder.pm b/lib/App/SD/Replica/rt/PullEncoder.pm
index 049665a..0c24fcd 100644
--- a/lib/App/SD/Replica/rt/PullEncoder.pm
+++ b/lib/App/SD/Replica/rt/PullEncoder.pm
@@ -160,7 +160,7 @@ sub transcode_one_txn {
     if ( $txn->{'Ticket'} ne $ticket->{$self->sync_source->uuid . '-id'}
         && $txn->{'Type'} !~ /^(?:Comment|Correspond)$/
     ) {
-        warn "Skipping a data change from a merged ticket" . $txn->{'Ticket'} .' vs '. $ticket->{$self->sync_source->uuid . '-id'};
+        warn "Skipping a data change from a merged ticket " . $txn->{'Ticket'} .' vs '. $ticket->{$self->sync_source->uuid . '-id'} . "\n";
         return;
     }
 

commit 675dd496b02f8366f2f1180e87b0b36bfb18df6d
Author: Christine Spang <christine at debian.org>
Date:   Mon Jan 10 13:48:42 2011 -0500

    update documentation for ticket_summary_format for color examples

diff --git a/lib/App/SD/CLI/Command/Help/ticket_summary_format.pm b/lib/App/SD/CLI/Command/Help/ticket_summary_format.pm
index 8150fe3..bc6d726 100644
--- a/lib/App/SD/CLI/Command/Help/ticket_summary_format.pm
+++ b/lib/App/SD/CLI/Command/Help/ticket_summary_format.pm
@@ -8,29 +8,51 @@ sub run {
 
 print <<EOF
 The ticket.summary-format configuration directive consists of any number
-of comma-separated pairs, with each pair separated from the next by a vertical
-bar (|). Any amount of whitespace may appear before or after the | and will not
-affect the summary format.
+of comma-separated groups, with each group separated from the next by a
+vertical bar (|). Any amount of whitespace may appear before or after the | and
+will not affect the summary format.
 
 Here is an example:
 
     [ticket]
-        summary-format = %5.5s },\$luid | %8.8s,status | %-52.52s,summary
+        summary-format = %5.5s },\$luid | %8.8s,status,bold green | %-52.52s,summary
 
-Let's deconstruct this example. It consists of three pairs. The first pair is
-'%5.5s },\$luid'. The first item of the pair should look somewhat familiar to
+Let's deconstruct this example. It consists of three groups. The first group is
+'%5.5s },\$luid'. The first item of the group should look somewhat familiar to
 anyone who's programmed in Perl or C before. It consists of a format string,
 like that used in Perl's and C's printf function, and can be prefixed or
 followed by any other characters (' }' in this case).
 
 The second item is the property to be formatted. It can be any ticket property,
 but if you want the local uid (luid) or the universal uid (uuid), it must be
-prefixed with the \$ character (see the first pair in the example).
+prefixed with the \$ character (see the first group in the example).
+
+The third (optional) item is the color to print the text for the given
+property in, using the grammer
+"<modifier> <foreground color> <background color>" and drawing from the
+options:
+
+modifiers:
+
+    bold, dark, underline, underscore, reverse, concealed
+
+foreground colors:
+
+    black, red, green, yellow, blue, magenta, cyan, white
+
+background colors:
+
+    on_black, on_red, on_green, on_yellow, on_blue, on_magenta, on_cyan,
+    on_white
+
+Modifiers, foreground colors, and background colors can be specified
+individually or just two of three, rather than having to specify all
+three.
 
 When printing the summary format for the ticket, the value of the given
 property for that ticket will be subbed into the format string (e.g. '%s') and
 any non-format characters in the format field will be printed as-is. If no
-format field is supplied with a given pair, '%s' is assumed.
+format field is supplied with a given atom, '%s' is assumed.
 
 For more help on format strings, see
 http://perldoc.perl.org/functions/sprintf.html.

-----------------------------------------------------------------------