Vicent Martí
d3a60dc244
Merge pull request #663 from schu/notes-honor-config
...
Honor core.notesRef config option
2012-05-05 14:14:58 -07:00
Vicent Martí
674a198599
clar: Properly create files in helper
2012-05-04 16:05:14 -07:00
Vicent Martí
1adf8c6a9c
compat: va_copy on Win32 systems
2012-05-04 13:52:38 -07:00
Michael Schubert
630c5a4a54
notes: add git_note_default_ref()
...
Add git_note_default_ref to allow easy retrieval of the currently set
default notes reference.
2012-05-03 22:31:29 +02:00
Michael Schubert
caea5e5433
notes: honor core.notesRef
...
Setting core.notesRef allows to change the default notes reference used
by Git. Check if set before using GIT_NOTES_DEFAULT_REF. Fixes #649 .
2012-05-03 22:31:29 +02:00
Vicent Martí
76873c0905
Silence return value warning
2012-05-03 13:30:14 -07:00
Vicent Martí
2277216613
errors: Use a git_buf for building error strings
2012-05-03 00:04:04 -07:00
Vicent Martí
baaf1c4710
buffer: Add git_buf_vprintf
2012-05-03 00:03:58 -07:00
Vicent Martí
3fbcac89c4
Remove old and unused error codes
2012-05-02 19:56:38 -07:00
Vicent Martí
b02bcd97f8
Boom
2012-05-02 16:57:16 -07:00
Russell Belfer
17f1c9fb33
chmod for writability when writing test files
2012-05-02 16:44:47 -07:00
Vicent Martí
a1d0802576
Backport more test data
2012-05-02 16:33:26 -07:00
Vicent Martí
8c83fead91
Move test resources
2012-05-02 16:18:55 -07:00
Vicent Martí
946a6dc4e6
Update test suite
2012-05-02 16:14:30 -07:00
Vicent Martí
40879facad
Merge branch 'new-error-handling' into development
...
Conflicts:
.travis.yml
include/git2/diff.h
src/config_file.c
src/diff.c
src/diff_output.c
src/mwindow.c
src/path.c
tests-clar/clar_helpers.c
tests-clar/object/tree/frompath.c
tests/t00-core.c
tests/t03-objwrite.c
tests/t08-tag.c
tests/t10-refs.c
tests/t12-repo.c
tests/t18-status.c
tests/test_helpers.c
tests/test_main.c
2012-05-02 15:59:02 -07:00
Russell Belfer
3fd99be98a
Convert from strnlen to git_text_is_binary
...
Since strnlen is not supported on all platforms and since we
now have the shiny new git_text_is_binary in the filtering
code, let's convert diff binary detection to use the new stuff.
2012-05-02 15:36:38 -07:00
Russell Belfer
8b2bcfbe68
Copy values to avoid strict aliasing warning
...
To make this code more resilient to future changes, we'll
explicitly translate the libgit2 structure to the libxdiff
structure.
2012-05-02 15:36:33 -07:00
Russell Belfer
16b83019af
Fix usage of "new" for fieldname in public header
...
This should restore the ability to include libgit2 headers
in C++ projects.
Cherry picked 2de60205df
from
development into new-error-handling.
2012-05-02 15:34:58 -07:00
Vicent Martí
b88021463f
Merge remote-tracking branch 'carlosmn/remaining-errors' into new-error-handling
...
Conflicts:
src/refspec.c
2012-05-01 19:16:14 -07:00
Vicent Martí
5587a9c930
Merge pull request #658 from schu/remote-disconnect
...
remote: don't free transport on disconnect
2012-05-01 17:55:22 -07:00
Michael Schubert
42ea35c061
remote: don't free transport on disconnect
...
Currently, git_remote_disconnect not only closes the connection but also
frees the underlying transport object, making it impossible to write
code like
// fetch stuff
git_remote_download()
// close connection
git_remote_disconnect()
// call user provided callback for each ref
git_remote_update_tips(remote, callback)
because remote->refs points to references owned by the transport object.
This means, we have an idling connection while running the callback for
each reference.
Instead, allow immediate disconnect and free the transport later in
git_remote_free().
2012-05-02 01:06:49 +02:00
Michael Schubert
52877c8975
tests-clar/diff: mark output_len unused
2012-05-01 15:13:14 +02:00
Vicent Martí
960d778619
Merge pull request #655 from nulltoken/topic/cr-normalization-test
...
crlf normalization test coverage
2012-04-30 15:57:20 -07:00
nulltoken
4e7a3c76e7
attr: add test coverage related to crlf normalization while staging
2012-05-01 00:33:25 +02:00
Vicent Martí
ced9da5412
Merge pull request #654 from carlosmn/pkt-err
...
Recognize and report server-side error messages
2012-04-30 14:38:15 -07:00
Russell Belfer
0dc8e95e19
Merge pull request #652 from nulltoken/topic/diff-callbacks
...
diff: provide more context to the consumer of the callbacks
2012-04-30 13:32:09 -07:00
Carlos Martín Nieto
39e6af6a7c
net: recognize and report server-side error messages
...
When e.g. a repository isn't found, the server sends an error saying
so. Put that error message in our error buffer.
2012-04-30 18:24:14 +02:00
nulltoken
2de0652bb6
Leverage GIT_UNUSED macro to explicitly mark a function parameter as purposely unused
2012-04-30 07:41:33 +02:00
nulltoken
fa6420f73e
buf: deploy git_buf_len()
2012-04-30 07:12:37 +02:00
nulltoken
1d2dd864ad
diff: provide more context to the consumer of the callbacks
...
Update the callback to provide some information related to the file change being processed and the range of the hunk, when applicable.
2012-04-30 07:12:26 +02:00
nulltoken
da3c187d5e
buf: add git_buf_len() accessor to expose the current length of the buffer content
2012-04-29 19:16:26 +02:00
Carlos Martín Nieto
8b9ec201ed
Add a travis config file
...
Teach travis how to build the project.
2012-04-29 01:38:36 +02:00
Carlos Martín Nieto
fdc0c5f654
pkt: bring back GIT_ESHORTBUFFER
...
The recent 64-bit Windows fixes changed the return code in
git_pkt_parse_line() so it wouldn't signal a short buffer, breaking
the network code. Bring it back.
2012-04-29 01:21:53 +02:00
Michael Schubert
8af503bc85
remote: add more doc on git_remote_free
2012-04-28 20:49:05 +02:00
Michael Schubert
9738e2cd2c
refs: fix unused-but-set warning
2012-04-27 23:30:08 +02:00
Russell Belfer
821f6bc740
Fix Win32 warnings
2012-04-26 13:04:54 -07:00
Vicent Martí
631ba94e0e
Merge pull request #646 from arrbee/ignore-pat-leading-slash
...
Ignore pat leading slash
2012-04-26 12:08:43 -07:00
Russell Belfer
d58336dda8
Fix leading slash behavior in attrs/ignores
...
We were not following the git behavior for leading slashes
in path names when matching git ignores and git attribute
file patterns. This should fix issue #638 .
2012-04-26 10:51:45 -07:00
Carlos Martín Nieto
3aa351ea0f
error handling: move the missing parts over to the new error handling
2012-04-26 15:38:42 +02:00
nulltoken
eb3d71a5bc
diff: fix generation of the header of a removal patch
2012-04-25 15:37:17 -07:00
Russell Belfer
3fc5c65d1a
Merge pull request #642 from arrbee/mem-pools
...
Memory pools and khash hashtables
2012-04-25 15:24:05 -07:00
Russell Belfer
c2b670436f
Rename git_khash_str to git_strmap, etc.
...
This renamed `git_khash_str` to `git_strmap`, `git_hash_oid` to
`git_oidmap`, and deletes `git_hashtable` from the tree, plus
adds unit tests for `git_strmap`.
2012-04-25 15:20:28 -07:00
Vicent Martí
f50087c03b
Merge pull request #641 from carlosmn/networking
...
More Networking updates
2012-04-25 14:29:45 -07:00
Carlos Martín Nieto
19dd4e2833
Include the new config test file
2012-04-25 20:42:33 +02:00
Russell Belfer
01fed0a8f9
Convert hashtable usage over to khash
...
This updates khash.h with some extra features (like error checking
on allocations, ability to use wrapped malloc, foreach calls, etc),
creates two high-level wrappers around khash: `git_khash_str` and
`git_khash_oid` for string-to-void-ptr and oid-to-void-ptr tables,
then converts all of the old usage of `git_hashtable` over to use
these new hashtables.
For `git_khash_str`, I've tried to create a set of macros that
yield an API not too unlike the old `git_hashtable` API. Since
the oid hashtable is only used in one file, I haven't bother to
set up all those macros and just use the khash APIs directly for
now.
2012-04-25 11:18:08 -07:00
Russell Belfer
ada488bfe7
Import khash.h from attractivechaos/klib
2012-04-25 11:14:34 -07:00
Russell Belfer
c16c8b9a7e
Adding stash to hashtable implementation
...
Adding a small stash of nodes with key conflicts has been
demonstrated to greatly increase the efficiency of a cuckoo
hashtable. See:
http://research.microsoft.com/pubs/73856/stash-full.9-30.pdf
for more details.
2012-04-25 11:14:34 -07:00
Russell Belfer
25f258e735
Moving power-of-two bit utilities into util.h
2012-04-25 11:14:34 -07:00
Russell Belfer
da3b391c32
Convert revwalk to use git_pool
...
This removes the custom paged allocator from revwalk and
replaces it with a `git_pool`.
2012-04-25 11:14:34 -07:00
Russell Belfer
19fa2bc111
Convert attrs and diffs to use string pools
...
This converts the git attr related code (including ignores) and
the git diff related code (and implicitly the status code) to use
`git_pools` for storing strings. This reduces the number of small
blocks allocated dramatically.
2012-04-25 10:42:37 -07:00