[Bps-public-commit] SD branch, master, updated. 1dc867e58a83547a7210b5de0bd49607730f508a
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Mon Jun 1 21:37:23 EDT 2009
The branch, master has been updated
via 1dc867e58a83547a7210b5de0bd49607730f508a (commit)
via 0830c1562edb1c49e91ab770bf43a35362b20280 (commit)
via ece879a2f8c9842ffe844dae9ae5a5aabc8dcbe7 (commit)
via 765a8597ee96f9575f6eee3ce55a8cb63a8b550f (commit)
from 150a45689d1d5e382b17db5cc5e18957168e35c4 (commit)
Summary of changes:
lib/App/SD/Replica/gcode.pm | 27 +++++++++++++--------------
lib/App/SD/Replica/gcode/PushEncoder.pm | 9 ++++++++-
2 files changed, 21 insertions(+), 15 deletions(-)
- Log -----------------------------------------------------------------
commit 765a8597ee96f9575f6eee3ce55a8cb63a8b550f
Author: sunnavy <sunnavy at gmail.com>
Date: Tue Jun 2 08:24:00 2009 +0800
add mergedinto prop for gcode
diff --git a/lib/App/SD/Replica/gcode.pm b/lib/App/SD/Replica/gcode.pm
index 660a2d8..fa068ee 100644
--- a/lib/App/SD/Replica/gcode.pm
+++ b/lib/App/SD/Replica/gcode.pm
@@ -13,15 +13,16 @@ use constant push_encoder => 'App::SD::Replica::gcode::PushEncoder';
use Prophet::ChangeSet;
our %PROP_MAP = (
- summary => 'summary',
- status => 'status',
- owner => 'owner',
- reporter => 'reporter',
- cc => 'cc',
- closed => 'completed',
- reported => 'created',
- labels => 'tags',
- priority => 'priority',
+ summary => 'summary',
+ status => 'status',
+ owner => 'owner',
+ reporter => 'reporter',
+ cc => 'cc',
+ closed => 'completed',
+ reported => 'created',
+ labels => 'tags',
+ priority => 'priority',
+ mergedinto => 'mergedinto',
);
commit ece879a2f8c9842ffe844dae9ae5a5aabc8dcbe7
Author: sunnavy <sunnavy at gmail.com>
Date: Tue Jun 2 08:28:31 2009 +0800
make local status be lowercase for gcode
diff --git a/lib/App/SD/Replica/gcode.pm b/lib/App/SD/Replica/gcode.pm
index fa068ee..50ed9e9 100644
--- a/lib/App/SD/Replica/gcode.pm
+++ b/lib/App/SD/Replica/gcode.pm
@@ -95,9 +95,8 @@ sub database_settings {
$issue->load_predefined;
my $status = $issue->predefined_status;
return {
- default_status => 'New',
- active_statuses => $status->{open},
- statuses => [ @{ $status->{open} }, @{ $status->{closed} } ],
+ active_statuses => [ map { lc } @{$status->{open}} ],
+ statuses => [ map { lc } @{ $status->{open} }, @{ $status->{closed} } ],
project_name => $self->project,
};
diff --git a/lib/App/SD/Replica/gcode/PushEncoder.pm b/lib/App/SD/Replica/gcode/PushEncoder.pm
index f8c5548..30e2208 100644
--- a/lib/App/SD/Replica/gcode/PushEncoder.pm
+++ b/lib/App/SD/Replica/gcode/PushEncoder.pm
@@ -165,9 +165,12 @@ sub _recode_props_for_integrate {
my %attr;
for my $key ( keys %props ) {
- if ( $key =~ /^(summary|status|owner|cc)/ ) {
+ if ( $key =~ /^(summary|owner|cc)/ ) {
$attr{$key} = $props{$key};
}
+ elsif ( $key eq 'status' ) {
+ $attr{$key} = ucfirst $props{$key};
+ }
elsif ( $key eq 'tags' ) {
$attr{labels} ||= [];
push @{$attr{labels}}, split /\s*,\s*/, $props{$key};
commit 0830c1562edb1c49e91ab770bf43a35362b20280
Author: sunnavy <sunnavy at gmail.com>
Date: Tue Jun 2 08:38:45 2009 +0800
mergedinto for push of gcode
diff --git a/lib/App/SD/Replica/gcode/PushEncoder.pm b/lib/App/SD/Replica/gcode/PushEncoder.pm
index 30e2208..0838a3c 100644
--- a/lib/App/SD/Replica/gcode/PushEncoder.pm
+++ b/lib/App/SD/Replica/gcode/PushEncoder.pm
@@ -171,6 +171,10 @@ sub _recode_props_for_integrate {
elsif ( $key eq 'status' ) {
$attr{$key} = ucfirst $props{$key};
}
+ elsif ( $key eq 'mergedinto' ) {
+ # yeah, the comment form use 'merge_into' name
+ $attr{merge_into} = $props{$key};
+ }
elsif ( $key eq 'tags' ) {
$attr{labels} ||= [];
push @{$attr{labels}}, split /\s*,\s*/, $props{$key};
commit 1dc867e58a83547a7210b5de0bd49607730f508a
Merge: 0830c15... 150a456...
Author: sunnavy <sunnavy at gmail.com>
Date: Tue Jun 2 09:37:07 2009 +0800
fix the conflicts
diff --cc lib/App/SD/Replica/gcode.pm
index 50ed9e9,8a98ca8..9a81d96
--- a/lib/App/SD/Replica/gcode.pm
+++ b/lib/App/SD/Replica/gcode.pm
@@@ -13,16 -13,16 +13,16 @@@ use constant push_encoder => 'App::SD::
use Prophet::ChangeSet;
our %PROP_MAP = (
- summary => 'summary',
- status => 'status',
- owner => 'owner',
- reporter => 'reporter',
- cc => 'cc',
- closed => 'completed',
- reported => 'created',
- labels => 'tags',
- priority => 'priority',
- mergedinto => 'merged_into'
+ summary => 'summary',
+ status => 'status',
+ owner => 'owner',
+ reporter => 'reporter',
+ cc => 'cc',
+ closed => 'completed',
+ reported => 'created',
+ labels => 'tags',
+ priority => 'priority',
- mergedinto => 'mergedinto',
++ mergedinto => 'merged_into',
);
@@@ -95,9 -95,10 +95,9 @@@ sub database_settings
$issue->load_predefined;
my $status = $issue->predefined_status;
return {
- active_statuses => [ map { lc } @{$status->{open}} ],
- statuses => [ map { lc } @{ $status->{open} }, @{ $status->{closed} } ],
- project_name => $self->project,
- default_status => 'new',
- active_statuses => [map {lc } @{$status->{open}}],
- statuses => [ map { lc } @{ $status->{open} }, @{$status->{closed} } ],
- project_name => $self->project,
++ active_statuses => [ map { lc } @{ $status->{open} } ],
++ statuses => [ map { lc } @{ $status->{open} }, @{ $status->{closed} } ],
++ project_name => $self->project,
};
}
diff --cc lib/App/SD/Replica/gcode/PushEncoder.pm
index 0838a3c,f8c5548..329c772
--- a/lib/App/SD/Replica/gcode/PushEncoder.pm
+++ b/lib/App/SD/Replica/gcode/PushEncoder.pm
@@@ -165,16 -165,9 +165,16 @@@ sub _recode_props_for_integrate
my %attr;
for my $key ( keys %props ) {
- if ( $key =~ /^(summary|status|owner|cc)/ ) {
+ if ( $key =~ /^(summary|owner|cc)/ ) {
$attr{$key} = $props{$key};
}
+ elsif ( $key eq 'status' ) {
+ $attr{$key} = ucfirst $props{$key};
+ }
- elsif ( $key eq 'mergedinto' ) {
++ elsif ( $key eq 'merged_into' ) {
+ # yeah, the comment form use 'merge_into' name
+ $attr{merge_into} = $props{$key};
+ }
elsif ( $key eq 'tags' ) {
$attr{labels} ||= [];
push @{$attr{labels}}, split /\s*,\s*/, $props{$key};
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list