[Bps-public-commit] smokingit branch, master, updated. 819f2512dafcd356a96037e38a15c857343fc0d2

[Alex Vandiver]

The branch, master has been updated
       via  819f2512dafcd356a96037e38a15c857343fc0d2 (commit)
       via  c48ecb807df7b6ae5fa3b00f018270189a827137 (commit)
      from  d07b9e480e8516fe6d64dceebad06bf0b2020e56 (commit)

Summary of changes:
 lib/Smokingit/Model/Branch.pm     |    6 +++---
 lib/Smokingit/View/Branch.pm      |    4 +++-
 share/web/static/css/app-late.css |    4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit c48ecb807df7b6ae5fa3b00f018270189a827137
Author: Alex Vandiver <alex at chmrr.net>
Date:   Thu Oct 13 18:00:46 2011 -0400

    Use topo order for better commit locality

diff --git a/lib/Smokingit/Model/Branch.pm b/lib/Smokingit/Model/Branch.pm
index 1c89eb3..b1c2d0f 100644
--- a/lib/Smokingit/Model/Branch.pm
+++ b/lib/Smokingit/Model/Branch.pm
@@ -207,9 +207,9 @@ sub commit_list {
 
     my $first = $self->first_commit->sha;
     my $last = $self->current_commit->sha;
-    my @revs = map {chomp; $_} `git rev-list ^$first $last --max-count=50`;
+    my @revs = map {chomp; $_} `git rev-list ^$first $last --topo-order --max-count=50`;
     my $left = 50 - @revs; $left = 11 if $left > 11;
-    push @revs, map {chomp; $_} `git rev-list $first --max-count=$left`
+    push @revs, map {chomp; $_} `git rev-list $first --topo-order --max-count=$left`
         if $left > 0;
 
     my $commits = Smokingit::Model::CommitCollection->new;
@@ -248,7 +248,7 @@ sub branchpoint {
     my $tip   = $self->current_commit->sha;
 
     local $ENV{GIT_DIR} = $self->project->repository_path;
-    my @branch = map {chomp; $_} `git rev-list $tip ^$trunk --max-count=$max`;
+    my @branch = map {chomp; $_} `git rev-list $tip ^$trunk --topo-order --max-count=$max`;
     return unless @branch;
 
     my $commit = $self->project->sha( $branch[-1] );

commit 819f2512dafcd356a96037e38a15c857343fc0d2
Author: Alex Vandiver <alex at chmrr.net>
Date:   Thu Oct 13 18:01:03 2011 -0400

    Use indentation to show merges better, now that we use topo order

diff --git a/lib/Smokingit/View/Branch.pm b/lib/Smokingit/View/Branch.pm
index 6511889..9014850 100644
--- a/lib/Smokingit/View/Branch.pm
+++ b/lib/Smokingit/View/Branch.pm
@@ -50,8 +50,10 @@ template '/branch' => page {
         class is "commitlist biglist";
         for my $commit (@commits) {
             $commit->hash_results;
+           my $merge = $commit->subject =~ /^Merge branch /
+               ? "merge" : "nonmerge";
             div {
-                {class is "commit ".$commit->status};
+                {class is "$merge commit ".$commit->status};
                 for my $config (@configs) {
                     my ($status, $msg, $in) = $commit->status($config);
                     if ($status =~ /^(untested|testing|queued)$/) {
diff --git a/share/web/static/css/app-late.css b/share/web/static/css/app-late.css
index bd12017..34b2a00 100644
--- a/share/web/static/css/app-late.css
+++ b/share/web/static/css/app-late.css
@@ -318,6 +318,10 @@ li {
   border-bottom: 1px dotted #779;
 }
 
+#branch-commits .nonmerge .subject {
+  margin-left: 2em;
+}
+
 
 /* Commit pages */
 .failingtest .header {

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