Commit Graph

5563 Commits

Author SHA1 Message Date
Carlos Martín Nieto
d274deea23 reflog: add a convenience append function
Provide a function that reads a reflog, performs an append and writes back to the
backend in one call.
2013-10-02 06:53:24 +02:00
Carlos Martín Nieto
b976f3c2c2 reflog: move the reflog implementation into refdb_fs
References and their logs are logically coupled, let's make it so in
the code by moving the fs-based reflog implementation to live next to
the fs-based refs one.

As part of the change, make the function take names rather than
references, as only the names are relevant when looking up and
handling reflogs.
2013-10-02 06:53:24 +02:00
Vicent Martí
71e33d2649 Merge pull request #1885 from ethomson/transport_register
Add git_transport_register, git_transport_unregister
2013-10-01 14:00:30 -07:00
Philip Kelley
8378695671 Add git_transport_register, git_transport_unregister 2013-10-01 16:49:41 -04:00
Ben Straub
816d28e7bc Mark git__timer as inline on OSX 2013-10-01 12:56:47 -07:00
Vicent Martí
c655aa5209 Merge pull request #1882 from linquize/config-subsection-fix
Config subsection name should allow to have ']' and '\\' should allow to escape any characters
2013-10-01 05:54:54 -07:00
Linquize
8d74125384 Add negative test cases for config header with invalid characters 2013-10-01 09:56:59 +08:00
Linquize
d52a93fab3 Add test case to test ']' and '\\' characters in config subsection 2013-10-01 09:56:59 +08:00
Linquize
566dd8cec0 Config subsection name should allow to have ']' and '\\' should allow to escape any characters 2013-10-01 09:56:17 +08:00
Vicent Martí
fba147631e Merge pull request #1879 from libgit2/redir-refactor
Redir refactor
2013-09-30 15:03:35 -07:00
Vicent Martí
a6884b6fc7 Merge pull request #1412 from jamill/push_progress
Initial Implementation of progress reports during push
2013-09-30 14:58:45 -07:00
Vicent Martí
9acde16266 Merge pull request #1881 from libgit2/ignore-submodules-in-stash
Never consider submodules for stashing
2013-09-30 14:57:48 -07:00
Ben Straub
ae5a935290 Ensure submodule repos and indices are freed
...before the helper's cleanup method tries to delete their files.
2013-09-30 14:47:56 -07:00
Vicent Martí
dc56fea7a3 Merge pull request #1878 from libgit2/ntk/fix/warnings
Fix x86/x64 size_t related warnings
2013-09-30 12:18:19 -07:00
Jameson Miller
b176ededb7 Initial Implementation of progress reports during push
This adds the basics of progress reporting during push. While progress
for all aspects of a push operation are not reported with this change,
it lays the foundation to add these later. Push progress reporting
can be improved in the future - and consumers of the API should
just get more accurate information at that point.

The main areas where this is lacking are:

1) packbuilding progress: does not report progress during deltafication,
   as this involves coordinating progress from multiple threads.

2) network progress: reports progress as objects and bytes are going
   to be written to the subtransport (instead of as client gets
   confirmation that they have been received by the server) and leaves
   out some of the bytes that are transfered as part of the push protocol.
   Basically, this reports the pack bytes that are written to the
   subtransport. It does not report the bytes sent on the wire that
   are received by the server. This should be a good estimate of
   progress (and an improvement over no progress).
2013-09-30 13:22:28 -04:00
Vicent Martí
5b09db15d1 Merge pull request #1883 from libgit2/ntk/fix/empty_first_commit_line
Remove leading newlines from commit message
2013-09-30 09:40:15 -07:00
nulltoken
d27a441dde commit: Trim message leading newlines
Fix libgit2/libgit2sharp#522
2013-09-30 11:33:58 +02:00
nulltoken
27c8eb2a1a Tabify indentations 2013-09-30 11:31:35 +02:00
Justin Spahr-Summers
526d4c949c Test that submodules don't affect stashing 2013-09-27 21:39:28 -07:00
Justin Spahr-Summers
4fe0b0b34b Never consider submodules for stashing 2013-09-27 17:07:06 -07:00
Vicent Martí
e6a1d9a248 Merge pull request #1880 from ethomson/refdb_h_oopsie
Add refdb.h to git2.h, reorder git2.h sanely
2013-09-27 13:27:11 -07:00
Edward Thomson
7d69245415 Add refdb.h to git2.h, reorder git2.h sanely 2013-09-27 16:08:24 -04:00
Ben Straub
b59344bf83 Tighten up url-connection utility 2013-09-26 16:48:46 -07:00
Ben Straub
256961e45d WHOOPS 2013-09-26 16:36:05 -07:00
Ben Straub
0049d4d1d2 Make sure utility doesn't leak memory 2013-09-26 16:25:34 -07:00
Ben Straub
1b02baf40b Adjust to new utility signature 2013-09-26 16:25:05 -07:00
Ben Straub
ea59f65977 Deploy gitno_connection_data into transport (winhttp)
...and have that call manage replaced memory in the output structure.
2013-09-26 16:20:30 -07:00
Ben Straub
83fbd36869 Deploy gitno_connection_data into transport 2013-09-26 15:58:41 -07:00
nulltoken
8a1e925dde Fix warnings 2013-09-26 20:44:43 +02:00
Ben Straub
f30d91ce48 Refactor URL handling to use library call 2013-09-26 11:03:27 -07:00
Ben Straub
8988688c47 Migrate redirect URL handling to common utility 2013-09-25 20:41:56 -07:00
Ben Straub
ac316e7438 Why are we disabling redirects? 2013-09-25 14:25:38 -07:00
Ben Straub
11f8336ec9 Merge pull request #1877 from libgit2/win32-redirects
Win32: handle http->https redirects
2013-09-25 14:12:07 -07:00
Vicent Martí
0ab832fa70 Merge pull request #1876 from arrbee/fix-error-handling-docs
Bring error handling docs up to date
2013-09-25 14:08:32 -07:00
Ben Straub
4a88eb20b9 Win32: handle http->https redirects 2013-09-25 12:13:09 -07:00
Russell Belfer
aa94acf0bc The error handling docs are out of date
The error handling docs date back to the early error redesign
work and don't match up with the route we actually took.  This
brings them in line with actual practice both for external users
and internal implementors, and notes some of the exceptions and
possible bugs.
2013-09-25 11:53:02 -07:00
Vicent Martí
e4ad52b60f Merge pull request #1875 from ethomson/refdb_not_odb
That's the refdb, it's not the odb...
2013-09-25 09:36:09 -07:00
Edward Thomson
e0b267afa8 That's the refdb, it's not the odb... 2013-09-25 10:49:25 -04:00
Vicent Martí
b294f97e11 Merge pull request #1873 from mikeando/doc_cleanup
Cleaned up some tables in checkout-internals doc
2013-09-25 01:41:17 -07:00
Vicent Martí
a955412e77 Merge pull request #1874 from mikeando/doc_cleanup2
Fixed formatting of diff-internals.md
2013-09-25 01:40:43 -07:00
Mike Anderson
6918d81e2c Fixed formatting of diff-internals.md
Indentation for lists was not working correctly.
2013-09-25 11:14:06 +08:00
Mike Anderson
53e0636cbd Cleaned up some tables in checkout-internals doc
The markdown wasn't rendering correctly.
2013-09-25 11:06:05 +08:00
Vicent Martí
d8de5c42d0 Merge pull request #1872 from libgit2/config-isolate-xdg
Make tests pass if XDG config exists
2013-09-24 15:55:51 -07:00
Russell Belfer
1c8de38004 Make tests pass if XDG config exists 2013-09-24 15:46:20 -07:00
Vicent Martí
4dbdbf6489 Merge pull request #1871 from libgit2/cross-protocol-redirects-alt
Alternative fix for cross protocol redirects
2013-09-24 15:21:44 -07:00
Russell Belfer
46fbc88ee5 Prevent HTTPS to HTTP redirect 2013-09-24 14:50:06 -07:00
Russell Belfer
eb0ff13071 Disconnect path string to preserve after redirect
The subtransport path was relying on pointing to data owned by
the remote which meant that after a redirect, the updated path
was getting lost for future requests.  This updates the http
transport to strdup the path and maintain its own lifetime.

This also pulls responsibility for parsing the URL back into the
http transport and isolates the functions that parse and free that
connection data so that they can be reused between the initial
parsing and the redirect parsing.
2013-09-24 14:07:08 -07:00
Vicent Martí
95bff9d443 Merge pull request #1869 from ethomson/fs_iterator_race_2
Ignore files that disappear while iterating
2013-09-24 12:01:24 -07:00
Edward Thomson
5c3b8ef48b Ignore files that disappear while iterating
On occasion, files can disappear while we're iterating the
filesystem, between calls to readdir and stat.  Let's pretend
those didn't exist in the first place.
2013-09-24 14:52:58 -04:00
Ben Straub
c91444055a Properly parse urls that include protocol:// 2013-09-24 11:18:43 -07:00