diff --git a/collects/meta/drdr/analyze.rkt b/collects/meta/drdr/analyze.ss similarity index 100% rename from collects/meta/drdr/analyze.rkt rename to collects/meta/drdr/analyze.ss diff --git a/collects/meta/drdr/archive-test.rkt b/collects/meta/drdr/archive-test.ss similarity index 100% rename from collects/meta/drdr/archive-test.rkt rename to collects/meta/drdr/archive-test.ss diff --git a/collects/meta/drdr/archive.rkt b/collects/meta/drdr/archive.ss similarity index 100% rename from collects/meta/drdr/archive.rkt rename to collects/meta/drdr/archive.ss diff --git a/collects/meta/drdr/cache.rkt b/collects/meta/drdr/cache.ss similarity index 100% rename from collects/meta/drdr/cache.rkt rename to collects/meta/drdr/cache.ss diff --git a/collects/meta/drdr/config.rkt b/collects/meta/drdr/config.ss similarity index 100% rename from collects/meta/drdr/config.rkt rename to collects/meta/drdr/config.ss diff --git a/collects/meta/drdr/diff.rkt b/collects/meta/drdr/diff.ss similarity index 100% rename from collects/meta/drdr/diff.rkt rename to collects/meta/drdr/diff.ss diff --git a/collects/meta/drdr/diffcmd.rkt b/collects/meta/drdr/diffcmd.ss similarity index 100% rename from collects/meta/drdr/diffcmd.rkt rename to collects/meta/drdr/diffcmd.ss diff --git a/collects/meta/drdr/dirstruct.rkt b/collects/meta/drdr/dirstruct.ss similarity index 100% rename from collects/meta/drdr/dirstruct.rkt rename to collects/meta/drdr/dirstruct.ss diff --git a/collects/meta/drdr/formats.rkt b/collects/meta/drdr/formats.ss similarity index 100% rename from collects/meta/drdr/formats.rkt rename to collects/meta/drdr/formats.ss diff --git a/collects/meta/drdr/graphs/build-graph.rkt b/collects/meta/drdr/graphs/build-graph.ss similarity index 100% rename from collects/meta/drdr/graphs/build-graph.rkt rename to collects/meta/drdr/graphs/build-graph.ss diff --git a/collects/meta/drdr/graphs/constants.rkt b/collects/meta/drdr/graphs/constants.ss similarity index 100% rename from collects/meta/drdr/graphs/constants.rkt rename to collects/meta/drdr/graphs/constants.ss diff --git a/collects/meta/drdr/graphs/mk-img.rkt b/collects/meta/drdr/graphs/mk-img.ss similarity index 100% rename from collects/meta/drdr/graphs/mk-img.rkt rename to collects/meta/drdr/graphs/mk-img.ss diff --git a/collects/meta/drdr/info.rkt b/collects/meta/drdr/info.ss similarity index 100% rename from collects/meta/drdr/info.rkt rename to collects/meta/drdr/info.ss diff --git a/collects/meta/drdr/list-count.rkt b/collects/meta/drdr/list-count.ss similarity index 100% rename from collects/meta/drdr/list-count.rkt rename to collects/meta/drdr/list-count.ss diff --git a/collects/meta/drdr/main.rkt b/collects/meta/drdr/main.ss similarity index 100% rename from collects/meta/drdr/main.rkt rename to collects/meta/drdr/main.ss diff --git a/collects/meta/drdr/make-archive.rkt b/collects/meta/drdr/make-archive.ss similarity index 100% rename from collects/meta/drdr/make-archive.rkt rename to collects/meta/drdr/make-archive.ss diff --git a/collects/meta/drdr/metadata.rkt b/collects/meta/drdr/metadata.ss similarity index 100% rename from collects/meta/drdr/metadata.rkt rename to collects/meta/drdr/metadata.ss diff --git a/collects/meta/drdr/monitor-scm.rkt b/collects/meta/drdr/monitor-scm.ss similarity index 100% rename from collects/meta/drdr/monitor-scm.rkt rename to collects/meta/drdr/monitor-scm.ss diff --git a/collects/meta/drdr/notify.rkt b/collects/meta/drdr/notify.ss similarity index 100% rename from collects/meta/drdr/notify.rkt rename to collects/meta/drdr/notify.ss diff --git a/collects/meta/drdr/path-utils.rkt b/collects/meta/drdr/path-utils.ss similarity index 100% rename from collects/meta/drdr/path-utils.rkt rename to collects/meta/drdr/path-utils.ss diff --git a/collects/meta/drdr/plt-build.rkt b/collects/meta/drdr/plt-build.ss similarity index 100% rename from collects/meta/drdr/plt-build.rkt rename to collects/meta/drdr/plt-build.ss diff --git a/collects/meta/drdr/render.rkt b/collects/meta/drdr/render.ss similarity index 99% rename from collects/meta/drdr/render.rkt rename to collects/meta/drdr/render.ss index 591ee20696..76a459b964 100644 --- a/collects/meta/drdr/render.rkt +++ b/collects/meta/drdr/render.ss @@ -124,11 +124,13 @@ ,@(append-map (match-lambda [(struct git-merge (hash author date msg from to)) - `((tr ([class "hash"]) (td "Commit:") (td (a ([href ,(format "http://github.com/plt/racket/commit/~a" hash)]) ,hash))) + #;`((tr ([class "hash"]) (td "Commit:") (td (a ([href ,(format "http://github.com/plt/racket/commit/~a" hash)]) ,hash))) (tr ([class "date"]) (td "Date:") (td ,(git-date->nice-date date))) (tr ([class "author"]) (td "Author:") (td ,author)) (tr ([class "msg"]) (td "Log:") (td (pre ,@msg))) - (tr ([class "merge"]) (td "Merge:") (td "From " ,from " to " ,to)))] + (tr ([class "merge"]) (td "Merge:") (td "From " ,from " to " ,to))) + ; Don't display these "meaningless" commits + empty] [(struct git-diff (hash author date msg mfiles)) (define cg-id (symbol->string (gensym 'changes))) (define ccss-id (symbol->string (gensym 'changes))) @@ -544,7 +546,7 @@ (define log->committer+title (match-lambda [(struct git-push (num author commits)) - (define lines (append-map git-commit-msg commits)) + (define lines (append-map (λ (c) (if (git-merge? c) empty (git-commit-msg c))) commits)) (define title (if (empty? lines) "" diff --git a/collects/meta/drdr/rendering.rkt b/collects/meta/drdr/rendering.ss similarity index 100% rename from collects/meta/drdr/rendering.rkt rename to collects/meta/drdr/rendering.ss diff --git a/collects/meta/drdr/replay-log.rkt b/collects/meta/drdr/replay-log.ss similarity index 100% rename from collects/meta/drdr/replay-log.rkt rename to collects/meta/drdr/replay-log.ss diff --git a/collects/meta/drdr/replay.rkt b/collects/meta/drdr/replay.ss similarity index 100% rename from collects/meta/drdr/replay.rkt rename to collects/meta/drdr/replay.ss diff --git a/collects/meta/drdr/retry.rkt b/collects/meta/drdr/retry.ss similarity index 100% rename from collects/meta/drdr/retry.rkt rename to collects/meta/drdr/retry.ss diff --git a/collects/meta/drdr/rewriting.rkt b/collects/meta/drdr/rewriting.ss similarity index 100% rename from collects/meta/drdr/rewriting.rkt rename to collects/meta/drdr/rewriting.ss diff --git a/collects/meta/drdr/run-collect.rkt b/collects/meta/drdr/run-collect.ss similarity index 100% rename from collects/meta/drdr/run-collect.rkt rename to collects/meta/drdr/run-collect.ss diff --git a/collects/meta/drdr/scm.rkt b/collects/meta/drdr/scm.ss similarity index 100% rename from collects/meta/drdr/scm.rkt rename to collects/meta/drdr/scm.ss diff --git a/collects/meta/drdr/sema.rkt b/collects/meta/drdr/sema.ss similarity index 100% rename from collects/meta/drdr/sema.rkt rename to collects/meta/drdr/sema.ss diff --git a/collects/meta/drdr/set-browser.rkt b/collects/meta/drdr/set-browser.ss similarity index 100% rename from collects/meta/drdr/set-browser.rkt rename to collects/meta/drdr/set-browser.ss diff --git a/collects/meta/drdr/status.rkt b/collects/meta/drdr/status.ss similarity index 100% rename from collects/meta/drdr/status.rkt rename to collects/meta/drdr/status.ss diff --git a/collects/meta/drdr/svn.rkt b/collects/meta/drdr/svn.ss similarity index 100% rename from collects/meta/drdr/svn.rkt rename to collects/meta/drdr/svn.ss diff --git a/collects/meta/drdr/time-file.rkt b/collects/meta/drdr/time-file.ss similarity index 100% rename from collects/meta/drdr/time-file.rkt rename to collects/meta/drdr/time-file.ss diff --git a/collects/meta/drdr/time.rkt b/collects/meta/drdr/time.ss similarity index 100% rename from collects/meta/drdr/time.rkt rename to collects/meta/drdr/time.ss diff --git a/collects/meta/drdr/vdbm.rkt b/collects/meta/drdr/vdbm.ss similarity index 100% rename from collects/meta/drdr/vdbm.rkt rename to collects/meta/drdr/vdbm.ss