delta/git.git, branch tg/diff-no-index-refactor

diff: avoid some nesting

2013-12-16T21:13:05+00:00

Avoid some nesting in builtin/diff.c, to make the code easier to read.
There are no functional changes.

Helped-by: Jonathan Nieder 
Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

diff: add test for --no-index executed outside repo

2013-12-16T21:12:33+00:00

470faf9 diff: move no-index detection to builtin/diff.c breaks the error
message for "git diff --no-index", when the command is executed outside
of a git repository and the wrong number of arguments are given. 6df5762
diff: don't read index when --no-index is given fixes the problem.

Add a test to guard against similar breakages in the future.

Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

diff: don't read index when --no-index is given

2013-12-12T20:23:02+00:00

git diff --no-index ... currently reads the index, during setup, when
calling gitmodules_config().  This results in worse performance when the
index is not actually needed.  This patch avoids calling
gitmodules_config() when the --no-index option is given.  The times for
executing "git diff --no-index" in the WebKit repository are improved as
follows:

Test                      HEAD~3            HEAD
------------------------------------------------------------------
4001.1: diff --no-index   0.24(0.15+0.09)   0.01(0.00+0.00) -95.8%

An additional improvement of this patch is that "git diff --no-index" no
longer breaks when the index file is corrupt, which makes it possible to
use it for investigating the broken repository.

To improve the possible usage as investigation tool for broken
repositories, setup_git_directory_gently() is also not called when the
--no-index option is given.

Also add a test to guard against future breakages, and a performance
test to show the improvements.

Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

diff: move no-index detection to builtin/diff.c

2013-12-12T20:23:02+00:00

Currently the --no-index option is parsed in diff_no_index().  Move the
detection if a no-index diff should be executed to builtin/diff.c, where
we can use it for executing diff_no_index() conditionally.  This will
also allow us to execute other operations conditionally, which will be
done in the next patch.

There are no functional changes.

Helped-by: Jonathan Nieder 
Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

Git 1.8.5

2013-11-27T20:14:45+00:00

Signed-off-by: Junio C Hamano

Sync with maint

2013-11-27T20:13:29+00:00

* maint:
  remote-hg: don't decode UTF-8 paths into Unicode objects

remote-hg: don't decode UTF-8 paths into Unicode objects

2013-11-27T20:09:50+00:00

The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects.  With this change, the test-hg.sh unit tests
pass again.

Signed-off-by: Richard Hansen 
Reviewed-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

Merge branch 'rh/remote-hg-bzr-updates' (early part)

2013-11-25T16:20:02+00:00

Unbreaks a recent breakage due to use of unquote-c-style.

This may need to be cherry-picked down to 1.8.4.x series.

* 'rh/remote-hg-bzr-updates' (early part):
  remote-hg: don't decode UTF-8 paths into Unicode objects

Git 1.8.5-rc3

2013-11-20T19:27:26+00:00

Signed-off-by: Junio C Hamano

Sync with 1.8.4.4

2013-11-20T19:26:59+00:00