Commit Graph

6779 Commits

Author SHA1 Message Date
Vicent Martí
274f2c213f Merge pull request #193 from carlosmn/config
A couple of config improvements
2011-05-19 14:18:57 -07:00
Vicent Martí
44d16d6fb2 Merge pull request #198 from sschuberth/fix-typos
Fix a few minor typos in comments and error messages
2011-05-19 11:21:22 -07:00
Vicent Marti
f4e2aca29c index: Fix issues in the unmerged entries API 2011-05-19 20:38:17 +03:00
Sebastian Schuberth
8133afefe3 Fix a few minor typos in comments and error messages
Regarding "initialize" vs. "initialise", www.dict.cc says the first is American
English whereas the latter in British English. For consistency, we should
stick to American English.
2011-05-19 09:34:58 +02:00
Vicent Martí
7b134cfebe Merge pull request #141 from jpfender/unmerged
index: Add API for unmerged entries
2011-05-18 17:04:12 -07:00
Vicent Martí
7d6274baa9 Merge pull request #197 from schu/errors
Move odb.c to the new error handling
2011-05-18 17:00:20 -07:00
Vicent Martí
05e5857614 Merge pull request #194 from schu/must-pass-ret
test_lib: add return value to git_test
2011-05-18 16:59:09 -07:00
Vicent Martí
ba9cc91fd7 Merge pull request #195 from RomainMuller/master
Consider environment-specified CFLAGS
2011-05-18 16:58:24 -07:00
Vicent Martí
975eda2d56 Merge pull request #196 from sschuberth/cmake-msvc2010
Cmake msvc2010
2011-05-18 16:57:36 -07:00
schu
12de98c1c8 Move odb.c to the new error handling
Add missing free in git_odb_new().

Signed-off-by: schu <schu-github@schulog.org>
2011-05-18 18:11:25 +02:00
Sebastian Schuberth
765fdf4a0e Use "__inline" instead of "inline" with MSVC
MSVC supports "inline" only in C++ code, not in C code.
2011-05-18 17:31:24 +02:00
Sebastian Schuberth
072347166f Define str(n)casecmp for MSVC
MSVC has _str(n)icmp instead.
2011-05-18 17:31:23 +02:00
Sebastian Schuberth
875a5c2df7 Ignore CMake files and generated Visual Studio files 2011-05-18 17:31:18 +02:00
Sebastian Schuberth
49041e78f2 Fix mixed line endings in .gitignore 2011-05-18 17:31:11 +02:00
Romain Muller
d1685ac7e9 Have wscript use the environment-provided CFLAGS as per WAF's documented behavior. 2011-05-18 17:20:08 +02:00
schu
6628c2560c test_lib: add return value to git_test
Save the return value of functions not passing must_pass() and report
the returned error.

Signed-off-by: schu <schu-github@schulog.org>
2011-05-18 12:36:41 +02:00
Carlos Martín Nieto
6421c49a37 Fix variable name normalization
When I changed it over to use different strings for the variable and
the name, cvar_name_normalize was left behind. Fix this and rename to
cvar_normalize_name to reflect the incompatible change.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
2011-05-17 19:03:42 +02:00
Jakob Pfender
9d27fd3bee index.c: Fix typo
git__rethrow was missing an underscore.
2011-05-17 16:51:37 +02:00
Jakob Pfender
c90bfec7aa Move index.c to new error handling mechanism 2011-05-17 16:21:14 +02:00
Jakob Pfender
050e8877dd Merge branch 'development' into unmerged 2011-05-17 15:31:05 +02:00
Carlos Martín Nieto
f44cbec479 Add documentation for git_config_add_backend 2011-05-17 14:59:23 +02:00
Carlos Martín Nieto
32234541f6 Implement git_config_open_global
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
2011-05-17 14:31:57 +02:00
Vicent Marti
c9662061f2 t15: Remove unused variable 2011-05-17 15:12:25 +03:00
Vicent Marti
124fbb3d74 tests: Update NAMING file 2011-05-17 15:11:43 +03:00
Vicent Marti
0da2c70067 utils: Move git__str[n]tolower 2011-05-17 15:11:19 +03:00
Vicent Marti
128d37316b config_file: Fix compilation 2011-05-17 15:11:19 +03:00
Vicent Marti
6adcb5f3d2 utils: Implement git__strndup 2011-05-17 15:11:19 +03:00
Vicent Marti
b3d94069b4 repository: Properly free the index on close 2011-05-17 15:11:19 +03:00
Vicent Martí
62845c903e Merge pull request #116 from carlosmn/test-naming
tests: update NAMING file
2011-05-17 05:11:06 -07:00
Vicent Martí
587926efa4 Merge pull request #110 from carlosmn/config
Implement config parsing. Finally!
2011-05-17 04:54:25 -07:00
Carlos Martín Nieto
29dca0883f Move config to the new error methods
Take this opportunity to fix an instance of returning
GIT_EOBJCORRUPTED when malloc failed.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
2011-05-17 13:41:42 +02:00
Carlos Martín Nieto
94711cad3b Merge upstream/development 2011-05-17 12:12:59 +02:00
Vicent Marti
335d6c9980 cache: Drop cuckoo hashing
Now we use a simple closed-addressing cache. Cuckoo hashing was creating
too many issues with race conditions. Fuck that.

Let's see what happens performance wise, we may have to roll back or
come up with another way to implement an efficient multi-threaded cache.
2011-05-17 01:46:07 +03:00
Vicent Marti
3de79280e3 cache: Fix deadlock
Do not try to adquire the same node lock twice when the cuckoo hashing
resolves to the same node.
2011-05-17 00:51:52 +03:00
Vicent Martí
1e70b96e66 Merge pull request #190 from alco/patch-1
Fix a typo in README.md
2011-05-16 08:05:10 -07:00
Alexei Sholik
cce225bfac Fix a typo in README.md 2011-05-16 01:56:20 -07:00
Vicent Marti
5ca2f58057 Do not set error message on GIT_EREVWALKOVER
This is not really an error, just a special return code to mark the end
of an iteration.
2011-05-15 23:48:05 +03:00
Vicent Marti
f87d9beb8d Change error codes from DEFINEs to an enum 2011-05-15 23:46:39 +03:00
Vicent Marti
7cadd1f6a7 Check error code from git_cache_init 2011-05-15 23:46:22 +03:00
Vicent Marti
4edf3e099a Return success code on git_cache_init 2011-05-15 23:45:24 +03:00
Vicent Martí
3fe2e770ca Merge pull request #184 from nulltoken/repo-error-handling
Updated fileops.c and repository.c to new error handling mechanism
2011-05-15 13:34:43 -07:00
Vicent Martí
b12b77231f Merge pull request #185 from chobie/development
fix git_otype typo when calling `git_odb_read_header`.
2011-05-15 10:16:36 -07:00
Shuhei Tanuma
71747bcae0 fix git_otype typo when calling git_odb_read_header. 2011-05-15 20:07:54 +09:00
nulltoken
81201a4c4d Move cache.c to the new error handling 2011-05-15 06:57:34 +02:00
nulltoken
3abe3bba5a Move repository.c to the new error handling 2011-05-14 16:05:33 +02:00
nulltoken
77c3999ca9 Move fileops.c to the new error handling 2011-05-14 14:46:22 +02:00
Vicent Martí
f02f4b536c Merge pull request #183 from schu/errors
Replace errors
2011-05-13 15:25:19 -07:00
Vicent Marti
098173c52a Check Redis replies for NULL 2011-05-13 04:19:53 +03:00
Vicent Marti
f31bd03f7e Include "common.h" in "errors.h" 2011-05-13 04:19:50 +03:00
Vicent Martí
c4ddcb7812 Merge pull request #182 from darkhelmet/patch-1
Add --with-redis flag to list of available build flags in README.
2011-05-11 11:49:45 -07:00