Permalink
Browse files

Clearer label of branches to display in config

Name them from the branch in which the cherry-picked patches will go
  • Loading branch information...
1 parent 93165b9 commit 05ba669f01d0cd7cfd10179a30615755bb4fe3ae @rgs committed Mar 30, 2012
Showing with 5 additions and 4 deletions.
  1. +2 −2 cherrymaint.pm
  2. +2 −2 config.yml
  3. +1 −0 views/layouts/main.tt
View
@@ -10,7 +10,7 @@ my $TESTING = config->{testing}; # single-user mode, for testing
my $GIT = config->{gitpath};
my $DATAFILE = config->{datafile};
my $LOCK = config->{lock};
-my @BRANCHES = sort keys %{config->{branches}};
+my @BRANCHES = reverse sort keys %{config->{branches}};
$_ = (glob)[0] for $GIT, $BLEADGITHOME, $DATAFILE, $LOCK;
@@ -23,7 +23,7 @@ sub any_eq {
}
sub branchname {
- my $b = params->{branch} // 'blead';
+ my $b = params->{branch} // $BRANCHES[0];
return $b if $b ~~ @BRANCHES;
die "Invalid branch name";
}
View
@@ -6,10 +6,10 @@ gitroot: "/gitroot/perl.git"
datafile: "~/cherrymaint.db"
lock: "~/cherrymaint.lock"
branches:
- blead:
+ "maint-5.14":
- "v5.14.0"
- blead
- "maint-5.14":
+ "maint-5.12":
- "v5.12.0"
- "maint-5.14"
testing: 0
View
@@ -8,6 +8,7 @@
</head>
<body>
<div style="float:right">
+Branch in which cherry-picks will go:
<% FOREACH b IN branches %>
<% IF b == branch %>
[<b><% b %></b>]

0 comments on commit 05ba669

Please sign in to comment.