]> git.proxmox.com Git - libgit2.git/log
libgit2.git
10 years agoinit.c example: deploy more helpers
Ben Straub [Wed, 30 Oct 2013 13:09:08 +0000 (06:09 -0700)]
init.c example: deploy more helpers

10 years agoadd.c example: deploy helpers, reorg
Ben Straub [Wed, 30 Oct 2013 13:08:54 +0000 (06:08 -0700)]
add.c example: deploy helpers, reorg

10 years agoinit example: deploy helpers, reorg
Ben Straub [Wed, 30 Oct 2013 12:38:12 +0000 (05:38 -0700)]
init example: deploy helpers, reorg

10 years agoExtract common example helpers and reorg examples
Russell Belfer [Wed, 30 Oct 2013 01:30:49 +0000 (18:30 -0700)]
Extract common example helpers and reorg examples

This reorganizes a few of the examples so that the main function
comes first with the argument parsing extracted into a helper
that can come at the end of the file (so the example focuses more
on the use of libgit2 instead of command line support).  This also
creates a shared examples/common.[ch] so that useful helper funcs
can be shared across examples instead of repeated.

10 years agoMerge pull request #1891 from libgit2/cmn/fix-thin-packs
Vicent Martí [Mon, 28 Oct 2013 16:25:44 +0000 (09:25 -0700)]
Merge pull request #1891 from libgit2/cmn/fix-thin-packs

Add support for thin packs

10 years agoMerge pull request #1912 from ethomson/push_err_messages
Vicent Martí [Mon, 28 Oct 2013 14:05:13 +0000 (07:05 -0700)]
Merge pull request #1912 from ethomson/push_err_messages

Test for failure, but don't test the error message

10 years agoMerge pull request #1904 from libgit2/cmn/ssh-naming
Vicent Martí [Mon, 28 Oct 2013 14:04:58 +0000 (07:04 -0700)]
Merge pull request #1904 from libgit2/cmn/ssh-naming

Rename the ssh credentials

10 years agoMerge pull request #1802 from libgit2/cmn/reflog-backend
Ben Straub [Mon, 28 Oct 2013 13:20:28 +0000 (06:20 -0700)]
Merge pull request #1802 from libgit2/cmn/reflog-backend

Make reflog part of refdb

10 years agoMerge pull request #1915 from zcbenz/common-h-before-config-h
Vicent Martí [Mon, 28 Oct 2013 11:38:08 +0000 (04:38 -0700)]
Merge pull request #1915 from zcbenz/common-h-before-config-h

The "common.h" should be included before "config.h".

10 years agoThe "common.h" should be included before "config.h".
Cheng Zhao [Mon, 28 Oct 2013 04:57:15 +0000 (12:57 +0800)]
The "common.h" should be included before "config.h".

When building libgit2 for ia32 architecture on a x64 machine, including
"config.h" without a "common.h" would result the following error:
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2288): error C2373: 'InterlockedIncrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2295): error C2373: 'InterlockedDecrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2303): error C2373: 'InterlockedExchange' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2314): error C2373: 'InterlockedExchangeAdd' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]

10 years agoMerge pull request #1913 from nvloff/remove_fedora_spec
Vicent Martí [Sat, 26 Oct 2013 11:34:23 +0000 (04:34 -0700)]
Merge pull request #1913 from nvloff/remove_fedora_spec

remove rpm spec file and readme

10 years agoremove rpm spec
Nikolai Vladimirov [Sat, 26 Oct 2013 06:13:29 +0000 (09:13 +0300)]
remove rpm spec

Fedora provides a rpm package for libgit2 -
https://apps.fedoraproject.org/packages/libgit2.

10 years agoTest for failure, but don't test the error message
Edward Thomson [Fri, 25 Oct 2013 18:14:22 +0000 (14:14 -0400)]
Test for failure, but don't test the error message

10 years agoMerge pull request #1910 from ethomson/disable_winhttp
Vicent Martí [Fri, 25 Oct 2013 17:38:30 +0000 (10:38 -0700)]
Merge pull request #1910 from ethomson/disable_winhttp

Allow -DWINHTTP=OFF to disable WinHTTP

10 years agoMerge pull request #1911 from ethomson/http_headers
Vicent Martí [Fri, 25 Oct 2013 17:37:37 +0000 (10:37 -0700)]
Merge pull request #1911 from ethomson/http_headers

Use two calls to set two headers

10 years agoUse two calls to set two headers
Edward Thomson [Fri, 25 Oct 2013 17:33:42 +0000 (13:33 -0400)]
Use two calls to set two headers

10 years agoAllow -DWINHTTP=OFF to disable WinHTTP
Edward Thomson [Fri, 25 Oct 2013 17:23:46 +0000 (13:23 -0400)]
Allow -DWINHTTP=OFF to disable WinHTTP

10 years agoMerge pull request #1907 from nikai3d/patch-1
Vicent Martí [Thu, 24 Oct 2013 14:45:54 +0000 (07:45 -0700)]
Merge pull request #1907 from nikai3d/patch-1

fix typos in README.md

10 years agofix typos in README.md
Nicolas Kaiser [Thu, 24 Oct 2013 13:30:31 +0000 (15:30 +0200)]
fix typos in README.md

10 years agoReally fix the pc file
Carlos Martín Nieto [Wed, 23 Oct 2013 20:49:52 +0000 (22:49 +0200)]
Really fix the pc file

It turns out that variables have function scope by default. Let's
really set -liconv and add a few libraries that were forgotten in
the previous commit.

We also need to special-case OSX, as they ship zlib but do not provide
a pkg-config file for it.

10 years agoMerge pull request #1905 from libgit2/cmn/list-deps
Vicent Martí [Wed, 23 Oct 2013 15:18:56 +0000 (08:18 -0700)]
Merge pull request #1905 from libgit2/cmn/list-deps

Be explicit about dependencies

10 years agoMerge pull request #1906 from libgit2/cmn/net-cb-errors
Vicent Martí [Wed, 23 Oct 2013 15:17:56 +0000 (08:17 -0700)]
Merge pull request #1906 from libgit2/cmn/net-cb-errors

transport: let the progress output return an error

10 years agotransport: let the progress output return an error
Carlos Martín Nieto [Wed, 23 Oct 2013 13:45:29 +0000 (15:45 +0200)]
transport: let the progress output return an error

There are any number of issues that can come up in the progress
callback, and we should let the user cancel at that point as well.

10 years agoindexer: include the delta stats
Carlos Martín Nieto [Wed, 23 Oct 2013 13:08:18 +0000 (15:08 +0200)]
indexer: include the delta stats

The user is unable to derive the number of deltas in the pack, as that
would require them to capture the stats exactly in the moment between
download and final processing, which is abstracted away in the fetch.

Capture these numbers for the user and expose them in the progress
struct. The clone and fetch examples now also present this information
to the user.

10 years agoexamples: show used local objects in fetch
Carlos Martín Nieto [Wed, 23 Oct 2013 12:22:44 +0000 (14:22 +0200)]
examples: show used local objects in fetch

Show how many local objects were used to fix the thin pack in our fetch
example.

10 years agoREADME: add a note about the optional dependencies
Carlos Martín Nieto [Wed, 23 Oct 2013 11:17:51 +0000 (13:17 +0200)]
README: add a note about the optional dependencies

10 years agoSet the correct dependencies in the pkg-config file
Carlos Martín Nieto [Wed, 23 Oct 2013 10:58:56 +0000 (12:58 +0200)]
Set the correct dependencies in the pkg-config file

When linking statically, the including project needs to know what the
current library build depends on so they can link to it. Store this
information in the pkg-config file.

While here, remove claims that users need to link to zlib or libcrypto.

10 years agoRename the ssh credentials
Carlos Martín Nieto [Wed, 23 Oct 2013 10:08:54 +0000 (12:08 +0200)]
Rename the ssh credentials

The names from libssh2 are somewhat obtuse for us. We can simplify the
usual key/passphrase credential's name, as well as make clearer what the
custom signature function is.

10 years agoMerge pull request #1897 from libgit2/split-patch-from-diff
Vicent Martí [Tue, 22 Oct 2013 18:55:54 +0000 (11:55 -0700)]
Merge pull request #1897 from libgit2/split-patch-from-diff

RFC: Proposed reworking of diff APIs

10 years agoFix typo
Russell Belfer [Tue, 22 Oct 2013 18:12:44 +0000 (11:12 -0700)]
Fix typo

10 years agoImplement `git_odb_object_dup`
Vicent Marti [Tue, 22 Oct 2013 14:05:47 +0000 (16:05 +0200)]
Implement `git_odb_object_dup`

10 years agoImplement patience and minimal diff flags
Russell Belfer [Mon, 21 Oct 2013 22:36:38 +0000 (15:36 -0700)]
Implement patience and minimal diff flags

It seems that to implement these options, we just have to pass
the appropriate flags through to the libxdiff code taken from
core git.  So let's do it (and add a test).

10 years agoFix warnings for win64
Russell Belfer [Mon, 21 Oct 2013 21:16:53 +0000 (14:16 -0700)]
Fix warnings for win64

10 years agoCreate git_diff_line and extend git_diff_hunk
Russell Belfer [Mon, 21 Oct 2013 20:42:42 +0000 (13:42 -0700)]
Create git_diff_line and extend git_diff_hunk

Instead of having functions with so very many parameters to pass
hunk and line data, this takes the existing git_diff_hunk struct
and extends it with more hunk data, plus adds a git_diff_line.
Those structs are used to pass back hunk and line data instead of
the old APIs that took tons of parameters.

Some work that was previously only being done for git_diff_patch
creation (scanning the diff content for exact line counts) is now
done for all callbacks, but the performance difference should not
be noticable.

10 years agoMerge pull request #1903 from ethomson/ssh
Vicent Martí [Mon, 21 Oct 2013 20:06:27 +0000 (13:06 -0700)]
Merge pull request #1903 from ethomson/ssh

Allowed credential types should be a bitfield

10 years agoAllowed credential types should be a bitfield
Edward Thomson [Mon, 21 Oct 2013 16:03:31 +0000 (11:03 -0500)]
Allowed credential types should be a bitfield

10 years agoTweak to git_diff_delta structure for nfiles
Russell Belfer [Mon, 21 Oct 2013 16:07:19 +0000 (09:07 -0700)]
Tweak to git_diff_delta structure for nfiles

While the base git_diff_delta structure always contains two files,
when we introduce conflict data, it will be helpful to have an
indicator when an additional file is involved.

10 years agoMerge pull request #1900 from haneefmubarak/patch-1
Vicent Martí [Fri, 18 Oct 2013 17:00:26 +0000 (10:00 -0700)]
Merge pull request #1900 from haneefmubarak/patch-1

license clarification + formatting all over

10 years agoslightly clarified the "license" portion of `README.md" + formatting all over
Haneef Mubarak [Thu, 17 Oct 2013 23:01:43 +0000 (16:01 -0700)]
slightly clarified the "license" portion of `README.md" + formatting all over

fixed typo `can can` -> `can`

10 years agoslightly clarified the "license" portion of `README.md" + formatting all over
Haneef Mubarak [Thu, 17 Oct 2013 08:52:20 +0000 (01:52 -0700)]
slightly clarified the "license" portion of `README.md" + formatting all over

added the second change suggested by @nulltoken (with two extra words :) )

10 years agoslightly clarified the "license" portion of `README.md" + formatting all over
Haneef Mubarak [Thu, 17 Oct 2013 07:28:08 +0000 (00:28 -0700)]
slightly clarified the "license" portion of `README.md" + formatting all over

There are commercial open source applications, hence proprietary seems to be a better term.

Also:
 - Trimmed header `=`'s to match text length
 - made libgit2 stand out everywhere
 - pretty printing links
 - irc link for those with the correct setup

10 years agoMerge pull request #1702 from ethomson/checkout_merge
Vicent Martí [Wed, 16 Oct 2013 20:51:24 +0000 (13:51 -0700)]
Merge pull request #1702 from ethomson/checkout_merge

Checkout merge

10 years agoMove path prefixed help to path.h
Edward Thomson [Wed, 9 Oct 2013 22:26:42 +0000 (18:26 -0400)]
Move path prefixed help to path.h

10 years agoMove functions in checkout_conflicts to checkout.c
Edward Thomson [Mon, 23 Sep 2013 21:52:40 +0000 (17:52 -0400)]
Move functions in checkout_conflicts to checkout.c

It seemed exceptionally silly to have a split there
where no split needed to be.

10 years agoTwo-step conflict checkout (load / perform)
Edward Thomson [Mon, 23 Sep 2013 13:47:47 +0000 (09:47 -0400)]
Two-step conflict checkout (load / perform)

Move conflict handling into two steps: load the conflicts and
then apply the conflicts.  This is more compatible with the
existing checkout implementation and makes progress reporting
more sane.

10 years agoHonor UPDATE_ONLY bit when checking out conflicts
Edward Thomson [Sat, 10 Aug 2013 01:23:36 +0000 (20:23 -0500)]
Honor UPDATE_ONLY bit when checking out conflicts

10 years agoFix warning, fix memory leak
Edward Thomson [Tue, 6 Aug 2013 01:06:09 +0000 (20:06 -0500)]
Fix warning, fix memory leak

10 years agoDon't overwrite ~ files checking out conflicts
Edward Thomson [Thu, 8 Aug 2013 21:46:49 +0000 (16:46 -0500)]
Don't overwrite ~ files checking out conflicts

If a D/F conflict or rename 2->1 conflict occurs,
we write the file sides as filename~branchname.  If
a file with that name already exists in the working
directory, write as filename~branchname_0 instead.
(Incrementing 0 until a unique filename is found.)

10 years agoGet rid of some quick hacks
Edward Thomson [Thu, 8 Aug 2013 18:16:13 +0000 (13:16 -0500)]
Get rid of some quick hacks

10 years agocheckout rename conflicts
Edward Thomson [Tue, 23 Jul 2013 22:32:42 +0000 (15:32 -0700)]
checkout rename conflicts

rename conflict tests for checkout conflicts, don't suffix filenames
when checking out with USE_OURS or USE_THEIRS

10 years agoPrevent checkout_tree when conflicts exist, clear NAME on checkout tree
Edward Thomson [Mon, 22 Jul 2013 15:51:29 +0000 (08:51 -0700)]
Prevent checkout_tree when conflicts exist, clear NAME on checkout tree

Prevent checkout tree when unresolved changes exist (unless FORCE flag
is specified).  Clear NAME table when checking out, to avoid
checkout_conflicts from attempting to manipulate it.  Ensure that NAME
is also cleared at reset.

10 years agocheckout (from index) can write conflicts
Edward Thomson [Wed, 17 Jul 2013 14:49:56 +0000 (09:49 -0500)]
checkout (from index) can write conflicts

10 years agotests for checkout index with conflicts
Edward Thomson [Wed, 17 Jul 2013 14:43:32 +0000 (09:43 -0500)]
tests for checkout index with conflicts

10 years agoDiff API cleanup
Russell Belfer [Tue, 15 Oct 2013 22:10:07 +0000 (15:10 -0700)]
Diff API cleanup

This lays groundwork for separating formatting options from diff
creation options.  This groups the formatting flags separately
from the diff list creation flags and reorders the options.  This
also tweaks some APIs to further separate code that uses patches
from code that just looks at git_diffs.

10 years agoRename diff objects and split patch.h
Russell Belfer [Fri, 11 Oct 2013 21:51:54 +0000 (14:51 -0700)]
Rename diff objects and split patch.h

This makes no functional change to diff but renames a couple of
the objects and splits the new git_patch (formerly git_diff_patch)
into a new header file.

10 years agoMerge pull request #1562 from libgit2/cmn/refs-namespace-lookup
Vicent Martí [Fri, 11 Oct 2013 16:47:05 +0000 (09:47 -0700)]
Merge pull request #1562 from libgit2/cmn/refs-namespace-lookup

Provide the user with a more useful error code when a looking up a reference which name points to a namepace

10 years agoindexer: clearer stats for thin packs
Carlos Martín Nieto [Fri, 11 Oct 2013 15:24:29 +0000 (17:24 +0200)]
indexer: clearer stats for thin packs

Don't increase the number of total objects, as it can produce
suprising progress output. The only addition compared to pre-thin is
the addition of local_objects to allow an output similar to git's
"completed with %d local objects".

10 years agofutils: return GIT_ENOTFOUND when trying to read a directory
Carlos Martín Nieto [Sat, 17 Aug 2013 05:11:31 +0000 (07:11 +0200)]
futils: return GIT_ENOTFOUND when trying to read a directory

This lets the reference code return not-found when the user asks to
look up a reference when in fact they pass a namespace.

10 years agoMerge pull request #1898 from arthurschreiber/patch-2
Ben Straub [Thu, 10 Oct 2013 22:29:57 +0000 (15:29 -0700)]
Merge pull request #1898 from arthurschreiber/patch-2

Fix a typo in the rpm build instructions.

10 years agoFix a typo in the rpm build instructions.
Arthur Schreiber [Thu, 10 Oct 2013 22:06:08 +0000 (00:06 +0200)]
Fix a typo in the rpm build instructions.

10 years agoAfter iconv init reset ref normalize error
Russell Belfer [Wed, 9 Oct 2013 18:57:03 +0000 (11:57 -0700)]
After iconv init reset ref normalize error

The iconv init was accidentally clearing the default error state
during reference normalization. This resets so that normalization
errors will be detected correctly.

10 years agoMerge pull request #1886 from libgit2/precompose-utf8
Vicent Martí [Wed, 9 Oct 2013 00:03:12 +0000 (17:03 -0700)]
Merge pull request #1886 from libgit2/precompose-utf8

Add support for core.precomposeunicode on Mac

10 years agoRename new fn to git_repository_reinit_filesystem
Russell Belfer [Tue, 8 Oct 2013 23:59:59 +0000 (16:59 -0700)]
Rename new fn to git_repository_reinit_filesystem

10 years agoMake reference lookups apply precomposeunicode
Russell Belfer [Tue, 8 Oct 2013 23:35:57 +0000 (16:35 -0700)]
Make reference lookups apply precomposeunicode

Before these changes, looking up a reference would return the
same precomposed or decomposed form of the reference name that
was used to look it up, so on MacOS which ignores the difference
between the two, a single reference could be looked up either way
and git_reference_name would return the form of the name that was
used to look it up!  This change makes lookup always return the
precomposed name if core.precomposeunicode is set regardless of
which version was used to look it up.  The reference iterator was
already returning the precomposed form from earlier work.

This also updates the CMakeLists.txt rules for enabling iconv
usage because the clar tests for this code were actually not being
activated properly with the old version.

Finally, this moves git_repository_reset_filesystem from include/
git2/repository.h to include/git2/sys/repository.h since it is not
really a function that normal library users should have to think
about very often.

10 years agoMerge pull request #1895 from libgit2/winhttp-accept
Vicent Martí [Tue, 8 Oct 2013 23:32:06 +0000 (16:32 -0700)]
Merge pull request #1895 from libgit2/winhttp-accept

WinHTTP: set Accept header for POSTs

10 years agoCombine WinHTTP API calls
Ben Straub [Tue, 8 Oct 2013 22:52:37 +0000 (15:52 -0700)]
Combine WinHTTP API calls

10 years agoCase sensitivity issues on Linux
Russell Belfer [Tue, 8 Oct 2013 21:41:32 +0000 (14:41 -0700)]
Case sensitivity issues on Linux

A couple of tests were actually dealing incorrectly with case
sensitivity issues on Linux because they were relying on having
core.ignorecase set to true.  Now that the fixture initialization
sets the case sensitivity to be accurate for the platform, it
exposed bugs in these tests.

10 years agoAdd Assembla unit test
Ben Straub [Tue, 8 Oct 2013 20:59:43 +0000 (13:59 -0700)]
Add Assembla unit test

10 years agoWinHTTP: set Accept header for POSTs
Ben Straub [Tue, 8 Oct 2013 20:40:52 +0000 (13:40 -0700)]
WinHTTP: set Accept header for POSTs

10 years agoMore filemode cleanups for FAT on MacOS
Russell Belfer [Tue, 8 Oct 2013 19:45:43 +0000 (12:45 -0700)]
More filemode cleanups for FAT on MacOS

This cleans up some additional issues.  The main change is that
on a filesystem that doesn't support mode bits, libgit2 will now
create new blobs with GIT_FILEMODE_BLOB always instead of being
at the mercy to the filesystem driver to report executable or not.
This means that if "core.filemode" lies and claims that filemode
is not supported, then we will ignore the executable bit from the
filesystem.  Previously we would have allowed it.

This adds an option to the new git_repository_reset_filesystem to
recurse through submodules if desired.  There may be other types
of APIs that would like a "recurse submodules" option, but this
one is particularly useful.

This also has a number of cleanups, etc., for related things
including trying to give better error messages when problems come
up from the filesystem.  For example, the FAT filesystem driver on
MacOS appears to return errno EINVAL if you attempt to write a
filename with invalid UTF-8 in it.  We try to capture that with a
better error message now.

10 years agoMerge pull request #1894 from libgit2/cmn/tree-raw
Vicent Martí [Tue, 8 Oct 2013 11:31:26 +0000 (04:31 -0700)]
Merge pull request #1894 from libgit2/cmn/tree-raw

tree: allow retrieval of raw attributes

10 years agoindexer: inject one base at a time
Carlos Martín Nieto [Tue, 8 Oct 2013 09:54:50 +0000 (11:54 +0200)]
indexer: inject one base at a time

There may be multiple deltas referencing the same base as well as OFS
deltas which rely on a thin delta. Deal with both at the same time by
injecting a single object and going back up to the main
delta-resolving loop.

10 years agotree: allow retrieval of raw attributes
Carlos Martín Nieto [Mon, 15 Apr 2013 07:07:57 +0000 (09:07 +0200)]
tree: allow retrieval of raw attributes

When a tool needs to recreate the tree object (for example an
interface to another VCS), it needs to use the raw attributes,
forgoing any normalization.

10 years agoMerge pull request #1890 from libgit2/multiple-init
Vicent Martí [Sat, 5 Oct 2013 14:56:03 +0000 (07:56 -0700)]
Merge pull request #1890 from libgit2/multiple-init

Multiple init

10 years agoDon't use git_atomic as an integer
Ben Straub [Sat, 5 Oct 2013 02:35:32 +0000 (19:35 -0700)]
Don't use git_atomic as an integer

10 years agoUse InterlockedCompareExchange for the lock
Philip Kelley [Fri, 4 Oct 2013 22:38:37 +0000 (18:38 -0400)]
Use InterlockedCompareExchange for the lock

10 years agoPosix synchronized init, prototype win32 version
Ben Straub [Sat, 5 Oct 2013 02:33:48 +0000 (19:33 -0700)]
Posix synchronized init, prototype win32 version

10 years agoAdd test for multiple thread init/shutdown
Ben Straub [Thu, 3 Oct 2013 19:44:34 +0000 (12:44 -0700)]
Add test for multiple thread init/shutdown

10 years agoAdd git_repository_reset_filesystem and fix tests
Russell Belfer [Fri, 4 Oct 2013 23:32:16 +0000 (16:32 -0700)]
Add git_repository_reset_filesystem and fix tests

When a repository is transferred from one file system to another,
many of the config settings that represent the properties of the
file system may be wrong.  This adds a new public API that will
refresh the config settings of the repository to account for the
change of file system.  This doesn't do a full "reinitialize" and
operates on a existing git_repository object refreshing the config
when done.

This commit then makes use of the new API in clar as each test
repository is set up.

This commit also has a number of other clar test fixes where we
were making assumptions about the type of filesystem, either based
on outdated config data or based on the OS instead of the FS.

10 years agoMerge pull request #1892 from libgit2/ntk/topic/index_read
Vicent Martí [Fri, 4 Oct 2013 15:50:44 +0000 (08:50 -0700)]
Merge pull request #1892 from libgit2/ntk/topic/index_read

Make git_index_read() cope with external additions and removals of the index file

10 years agoindex: Make _read() cope with index file creation
nulltoken [Fri, 4 Oct 2013 12:03:12 +0000 (14:03 +0200)]
index: Make _read() cope with index file creation

10 years agonet: advertise our support for fixing thin packs
Carlos Martín Nieto [Fri, 4 Oct 2013 08:27:45 +0000 (10:27 +0200)]
net: advertise our support for fixing thin packs

10 years agoindexer: fix thin packs
Carlos Martín Nieto [Wed, 2 Oct 2013 11:39:35 +0000 (13:39 +0200)]
indexer: fix thin packs

When given an ODB from which to read objects, the indexer will attempt
to inject the missing bases at the end of the pack and update the
header and trailer to reflect the new contents.

10 years agoindex: Enhance documentation
nulltoken [Fri, 4 Oct 2013 11:49:26 +0000 (13:49 +0200)]
index: Enhance documentation

10 years agoTabify indentations
nulltoken [Fri, 4 Oct 2013 09:36:40 +0000 (11:36 +0200)]
Tabify indentations

10 years agopack: move the object header function here
Carlos Martín Nieto [Thu, 3 Oct 2013 14:54:25 +0000 (16:54 +0200)]
pack: move the object header function here

10 years agoindexer: do multiple passes over the delta list
Carlos Martín Nieto [Wed, 2 Oct 2013 10:22:54 +0000 (12:22 +0200)]
indexer: do multiple passes over the delta list

Though unusual, a packfile may contain a delta whose base is a delta
that comes later. In order index such a packfile, we must not give up
on the first failure to resolve a delta, but keep it around.

If there is a pass which makes no progress, this indicates that the
packfile is broken, so fail accordingly.

10 years agoMore cleanups to remove WIN assumptions
Russell Belfer [Thu, 3 Oct 2013 22:16:06 +0000 (15:16 -0700)]
More cleanups to remove WIN assumptions

This cleans up more of the test suite to check actual filesystem
behavior instead of relying on Windows vs. Mac vs. Linux to test.

10 years agoUpdate repo init with fewer platform assumptions
Russell Belfer [Thu, 3 Oct 2013 21:42:37 +0000 (14:42 -0700)]
Update repo init with fewer platform assumptions

The repo init code was assuming Windows == no filemode, and
Mac or Windows == no case sensitivity.  Those assumptions are not
consistently true depending on the mounted file system.  This is a
first step to removing those assumptions.  It focuses on the repo
init code and the tests of that code.  There are still many other
tests that are broken when those assumptions don't hold true, but
this clears up one area of the code.

Also, this moves the core.precomposeunicode logic to be closer to
the current logic in core Git where it will be set to true on any
filesystem where composed unicode is decomposed when read back.

10 years agoClean up annoying warnings
Russell Belfer [Wed, 2 Oct 2013 21:13:11 +0000 (14:13 -0700)]
Clean up annoying warnings

The indexer code was generating warnings on Windows 64-bit.  I
looked closely at the logic and was able to simplify it a bit.

Also this fixes some other Windows and Linux warnings.

10 years agoWrap iconv stuff and write tests
Russell Belfer [Wed, 2 Oct 2013 19:06:26 +0000 (12:06 -0700)]
Wrap iconv stuff and write tests

This adds a simple wrapper around the iconv APIs and uses it
instead of the old code that was inlining the iconv stuff.  This
makes it possible for me to test the iconv logic in isolation.
A "no iconv" version of the API was defined with macros so that
I could have fewer ifdefs in the code itself.

10 years agoSimplify git_path_is_empty_dir implementation
Russell Belfer [Wed, 2 Oct 2013 18:07:18 +0000 (11:07 -0700)]
Simplify git_path_is_empty_dir implementation

This simplifies git_path_is_empty_dir on both Windows (getting rid
of git_buf allocation inside the function) and other platforms (by
just using git_path_direach), and adds tests for the function, and
uses the function to simplify some existing tests.

10 years agoAdd to Git authors who have agreed to relicense
Russell Belfer [Tue, 1 Oct 2013 23:41:07 +0000 (16:41 -0700)]
Add to Git authors who have agreed to relicense

In email, Torsten Bögershausen agreed that we could use his code
from core Git in libgit2 under the modified license.  Also, since
his work is the basis for much of the precompose unicode support,
I have added him to the AUTHORS file as well.

10 years agoInitial iconv hookup for precomposed unicode
Russell Belfer [Tue, 1 Oct 2013 23:12:15 +0000 (16:12 -0700)]
Initial iconv hookup for precomposed unicode

This hooks up git_path_direach and git_path_dirload so that they
will take a flag indicating if directory entry names should be
tested and converted from decomposed unicode to precomposed form.
This code will only come into play on the Apple platform and even
then, only when certain types of filesystems are used.

This involved adding a flag to these functions which involved
changing a lot of places in the code.

This was an opportunity to do a bit of code cleanup here and there,
for example, getting rid of the git_futils_cleanupdir_r function in
favor of a simple flag to git_futils_rmdir_r to not remove the top
level entry.  That ended up adding depth tracking during rmdir_r
which led to a safety check for infinite directory recursion.  Yay.

This hasn't actually been tested on the Mac filesystems where the
issue occurs.  I still need to get test environment for that.

10 years agoPut hooks in place for precompose in dirload fn
Russell Belfer [Mon, 30 Sep 2013 23:58:33 +0000 (16:58 -0700)]
Put hooks in place for precompose in dirload fn

This doesn't actual do string precompose but it puts the hooks in
place into the iterators and the git_path_dirload function so that
the actual precompose work is ready to go.

10 years agoAdd check if we need to precompose unicode on Mac
Russell Belfer [Mon, 30 Sep 2013 23:13:53 +0000 (16:13 -0700)]
Add check if we need to precompose unicode on Mac

This adds initialization of core.precomposeunicode to repo init
on Mac.  This is necessary because when a Mac accesses a repo on
a VFAT or SAMBA file system, it will return directory entries in
decomposed unicode even if the filesystem entry is precomposed.

This also removes caching of a number of repo properties from the
repo init pipeline because these are properties of the specific
filesystem on which the repo is created, not of the system as a
whole.

10 years agoMerge pull request #1888 from jamill/network_cancellation
Vicent Martí [Thu, 3 Oct 2013 15:18:41 +0000 (08:18 -0700)]
Merge pull request #1888 from jamill/network_cancellation

network cancellation improvements

10 years agoStyle tweaks and changes for code review feedback
Jameson Miller [Wed, 2 Oct 2013 19:39:18 +0000 (15:39 -0400)]
Style tweaks and changes for code review feedback

10 years agoMerge pull request #1887 from libgit2/ntk/topic/git_message_raw
Vicent Martí [Thu, 3 Oct 2013 11:36:29 +0000 (04:36 -0700)]
Merge pull request #1887 from libgit2/ntk/topic/git_message_raw

commit: Introduce git_commit_message_raw()

10 years agocommit: Introduce git_commit_message_raw()
nulltoken [Wed, 2 Oct 2013 10:42:41 +0000 (12:42 +0200)]
commit: Introduce git_commit_message_raw()