Commit 294d3867e6ef20f89020d744c091a42cd3992eed
- Date: Mon Apr 28 23:28:31 +0000 2008
- Committer: Tim Harper (timcharper@gmail.com)
- Author: Tim Harper (timcharper@gmail.com)
- Commit SHA1: 294d3867e6ef20f89020d744c091a42cd3992eed
- Tree SHA1: 21094857a7bd0ffbe68ea8bf16be523890f55415
Merge branch 'master' of git://github.com/henrik/git-tmbundle into release
Commit diff
| | |
| 48 | 48 | * <b>Geoff Cheshire</b> - Textile'd the README to make it look good on GitHub. |
| 49 | 49 | * <b>Martin Kühl</b> - Patch to allow committing into a git repository that's not the project root. |
| 50 | 50 | * <b>Diego Barros</b> - new config options, usability improvements |
| 51 | | * <b>Thomas Aylott</b> - Git commit langauge folding |
| 52 | | * <b>Michael Sheets</b> - Usability improvements |
| 51 | * <b>Thomas Aylott</b> - Git commit language folding |
| 52 | * <b>Michael Sheets</b> - Usability improvements |
| 53 | * <b>Henrik Nyh</b> - Spelling |
| toggle raw diff |
--- a/README.textile
+++ b/README.textile
@@ -48,5 +48,6 @@ git clone git://gitorious.org/git-tmbundle/mainline.git Git.tmbundle
* <b>Geoff Cheshire</b> - Textile'd the README to make it look good on GitHub.
* <b>Martin Kühl</b> - Patch to allow committing into a git repository that's not the project root.
* <b>Diego Barros</b> - new config options, usability improvements
-* <b>Thomas Aylott</b> - Git commit langauge folding
-* <b>Michael Sheets</b> - Usability improvements
\ No newline at end of file
+* <b>Thomas Aylott</b> - Git commit language folding
+* <b>Michael Sheets</b> - Usability improvements
+* <b>Henrik Nyh</b> - Spelling |
| | |
| 4 | 4 | show_diff_title unless params[:layout].to_s=="false" |
| 5 | 5 | @rev = params[:rev] |
| 6 | 6 | @title = params[:title] || "Uncomitted changes" |
| 7 | | |
| 8 | | diff_params = extract_diff_params(params) |
| 9 | | render("_diff_results", :locals => {:diff_results => git.diff(diff_params)}) |
| 7 | params[:context_lines] = git.config["git-tmbundle.log.context-lines"] if git.config["git-tmbundle.log.context-lines"] |
| 8 | render("_diff_results", :locals => {:diff_results => git.diff(params)}) |
| 10 | 9 | end |
| 11 | 10 | |
| 12 | 11 | def uncommitted_changes |
| … | … | |
| 16 | 16 | git.paths(:fallback => :current_file, :unique => true) |
| 17 | 17 | end |
| 18 | 18 | base = git.git_base |
| 19 | | puts "<h2>Uncomitted Changes for ‘#{htmlize(paths.map{|path| shorten(path, base)} * ', ')}’</h2>" |
| 19 | puts "<h2>Uncommitted Changes for ‘#{htmlize(paths.map{|path| shorten(path, base)} * ', ')}’</h2>" |
| 20 | 20 | open_in_tm_link |
| 21 | 21 | |
| 22 | 22 | paths.each do |path| |
| toggle raw diff |
--- a/Support/app/controllers/diff_controller.rb
+++ b/Support/app/controllers/diff_controller.rb
@@ -4,9 +4,8 @@ class DiffController < ApplicationController
show_diff_title unless params[:layout].to_s=="false"
@rev = params[:rev]
@title = params[:title] || "Uncomitted changes"
-
- diff_params = extract_diff_params(params)
- render("_diff_results", :locals => {:diff_results => git.diff(diff_params)})
+ params[:context_lines] = git.config["git-tmbundle.log.context-lines"] if git.config["git-tmbundle.log.context-lines"]
+ render("_diff_results", :locals => {:diff_results => git.diff(params)})
end
def uncommitted_changes
@@ -17,7 +16,7 @@ class DiffController < ApplicationController
git.paths(:fallback => :current_file, :unique => true)
end
base = git.git_base
- puts "<h2>Uncomitted Changes for ‘#{htmlize(paths.map{|path| shorten(path, base)} * ', ')}’</h2>"
+ puts "<h2>Uncommitted Changes for ‘#{htmlize(paths.map{|path| shorten(path, base)} * ', ')}’</h2>"
open_in_tm_link
paths.each do |path| |
| | |
| 48 | 48 | @@ -15,7 +15,7 @@ base = git.nca(paths) |
| 49 | 49 | Formatters::Diff.new(base) do |f| |
| 50 | 50 | paths.each do |path| |
| 51 | | f.header("Uncomitted Changes for ‘#{htmlize(shorten(path, base))}’") |
| 51 | f.header("Uncommitted Changes for ‘#{htmlize(shorten(path, base))}’") |
| 52 | 52 | - f.content(git.diff(path, base)) |
| 53 | 53 | + f.content(git.diff_file(ENV["TM_PROJECT_DIRECTORY"], base)) |
| 54 | 54 | end |
| toggle raw diff |
--- a/Support/spec/fixtures/changed_files_with_break.diff
+++ b/Support/spec/fixtures/changed_files_with_break.diff
@@ -48,7 +48,7 @@ index 18a505b..af13ba3 100644
@@ -15,7 +15,7 @@ base = git.nca(paths)
Formatters::Diff.new(base) do |f|
paths.each do |path|
- f.header("Uncomitted Changes for ‘#{htmlize(shorten(path, base))}’")
+ f.header("Uncommitted Changes for ‘#{htmlize(shorten(path, base))}’")
- f.content(git.diff(path, base))
+ f.content(git.diff_file(ENV["TM_PROJECT_DIRECTORY"], base))
end |
