summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Update Javascript userdiff driver and testsRussell Belfer2014-01-2726-20/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing a sample Javascript driver pointed out some extra whitespace handling that needed to be done in the diff driver. This adds some tests with some sample javascript code that I pulled off of GitHub just to see what would happen. Also, to clean up the userdiff test data, I did a "git gc" and packed up the test objects.
| | * | | | | Got permission from Gustaf for userdiff patternsRussell Belfer2014-01-272-0/+5
| | | | | | |
| | * | | | | Add PHP and Javascript diff driversRussell Belfer2014-01-241-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since I don't have permission yet on the code from Git, I decided I'd take a stab at writing patterns for PHP and Javascript myself. I think these are pretty weak, but probably better than the default behavior without them.
| | * | | | | Move userdiff tests to be data drivenRussell Belfer2014-01-2422-47/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the expected and actual test data along with the source data for the userdiff tests into the tests/resources/userdiff test repo and updates the test to use that.
| | * | | | | Permission for Git code from a couple moreRussell Belfer2014-01-242-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings over the Pascal and CSharp userdiff data.
| | * | | | | Got some permission to use userdiff patternsRussell Belfer2014-01-243-38/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I contacted a number of Git authors and lined up their permission to relicense their work for use in libgit2 and copied over their code for diff driver xfuncname patterns. At this point, the code I've copied is taken verbatim from core Git although Thomas Rast warned me that the C++ patterns, at least, really need an update. I've left off patterns where I don't feel like I have permission at this point until I hear from more authors.
| | * | | | | Update all tests for new pattern extractionRussell Belfer2014-01-241-4/+4
| | | | | | |
| | * | | | | Implement matched pattern extract for fn headersRussell Belfer2014-01-242-5/+10
| | | | | | |
| | * | | | | Fix filemode updating in diff textRussell Belfer2014-01-241-7/+15
| | | | | | |
| | * | | | | Import git drivers and test HTML driverRussell Belfer2014-01-242-40/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize the builtin driver table slightly so that core Git builtin definitions can be imported verbatim. Then take a few of the core Git drivers and pull them in. This also creates a test of diffs with the builtin HTML driver which led to some small error handling fixes in the driver selection logic.
| | * | | | | Initial take on builtin drivers with multilineRussell Belfer2014-01-242-43/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the diff driver parser to support multiline driver definitions along with ! prefixing for negated matches. This brings the driver function pattern parsing in line with core Git. This also adds an internal table of driver definitions and a fallback code path that will look in that table for diff drivers that are set with attributes without having a definition in the config file. Right now, I just populated the table with a kind of simple HTML definition that is similar to the core Git def.
| * | | | | | Merge pull request #2075 from libgit2/cmn/leftover-oidVicent Marti2014-01-2753-277/+277
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Leftover OID -> ID changes
| | * | | | | | merge: rename _oid() -> id()Carlos Martín Nieto2014-01-255-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the rest of the series, use 'id' when refering to the value.
| | * | | | | | diff: change id abbrev option's name to id_abbrevCarlos Martín Nieto2014-01-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as the other commits in the series, we use 'id' when talking about thing rather than the datatype.
| | * | | | | | diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-2514-94/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the same vein as the previous commits in this series.
| | * | | | | | tree: remove legacy 'oid' namingCarlos Martín Nieto2014-01-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename git_tree_entry_byoid() to _byid() as per the convention.
| | * | | | | | commit: remvoe legacy 'oid' namingCarlos Martín Nieto2014-01-252-3/+3
| | | | | | | |
| | * | | | | | index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-2534-118/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was not converted when we converted the rest, so do it now.
| | * | | | | | note: rename the id getter to git_note_id()Carlos Martín Nieto2014-01-245-11/+11
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | This was left over when we did the general switch.
| * | | | | | Merge pull request #2077 from libgit2/cmn/buf-outVicent Marti2014-01-2724-503/+191
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Buff up returning strings
| | * | | | | | refspec: move to git_buf for outputting stringsCarlos Martín Nieto2014-01-279-98/+22
| | | | | | | |
| | * | | | | | messsage: use git_buf in prettify()Carlos Martín Nieto2014-01-274-104/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of the tests were checking for overflow, which we don't have anymore, so we can remove them.
| | * | | | | | config: use git_buf for returning pathsCarlos Martín Nieto2014-01-274-67/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Again, we already did this internally, so simply remove the conversions.
| | * | | | | | branch: move to git_buf when outputting newly-allocated stringsCarlos Martín Nieto2014-01-275-134/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally we already did everything with git_bufs, so this is just exposing those functions with public names.
| | * | | | | | repository: move to use a git_buf for outputting stringsCarlos Martín Nieto2014-01-274-100/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now export that type, we can avoid making the user guess a size.
| * | | | | | | Merge pull request #2078 from linquize/msvcVicent Marti2014-01-271-2/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MSVC doesn't like modern code neither
| | * | | | | | | MSVC doesn't like modern code neitherLinquize2014-01-271-2/+1
| | | | | | | | |
| * | | | | | | | Merge pull request #2079 from linquize/msvc-blame-exampleVicent Marti2014-01-271-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Make blame example compile on MSVC
| | * | | | | | | Make blame example compile on MSVCLinquize2014-01-271-0/+5
| |/ / / / / / /
| * | | | | | | MSVC doesn't like modern codeCarlos Martín Nieto2014-01-271-1/+2
| |/ / / / / /
| * | | | | | Merge pull request #2052 from arthurschreiber/arthur/add-git_remote_dupBen Straub2014-01-263-22/+42
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix git_remote_dup & add missing const
| | * | | | | | Make sure git_remote_dup copies a remote's refspecs correctly.Arthur Schreiber2014-01-263-9/+29
| | | | | | | |
| | * | | | | | Add some missing const declarations.Arthur Schreiber2014-01-262-13/+13
| |/ / / / / /
| * | | | | | Merge pull request #2076 from xtao/fix-zstreamEdward Thomson2014-01-262-5/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix write_object.
| | * | | | | | Fix write_object.XTao2014-01-262-5/+6
| | |/ / / / /
| * | | | | | Merge pull request #2057 from GrahamDennis/local-file-url-push-fixEdward Thomson2014-01-262-11/+77
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fix local push to file:// URL.
| | * | | | | Factor out code to convert local "url" into a path.Graham Dennis2014-01-191-20/+28
| | | | | | | | | | | | | | | | | | | | | Previously this code was shared between `local_push` and `local_connect`.
| | * | | | | Fix a compile warning.Graham Dennis2014-01-181-1/+1
| | | | | | |
| | * | | | | Add test for pushing to a local file:// URL.Graham Dennis2014-01-181-0/+40
| | | | | | |
| | * | | | | Fix local push to file:// URL.Graham Dennis2014-01-181-1/+19
| | | | | | |
| * | | | | | Merge pull request #2074 from linquize/pack-filename-sha1Vicent Marti2014-01-232-6/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Drop parsing pack filename SHA1 part
| | * | | | | | Drop parsing pack filename SHA1 part, no one cares the filenameLinquize2014-01-232-6/+0
| | | | | | | |
| * | | | | | | Merge pull request #2073 from ethomson/zerobytesVicent Marti2014-01-222-1/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Sometimes a zero byte file is just a zero byte file
| | * | | | | | | Sometimes a zero byte file is just a zero byte fileEdward Thomson2014-01-222-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't go to the ODB to resolve zero byte files in the workdir
| * | | | | | | | Plug a small memory leakBen Straub2014-01-221-1/+4
| | | | | | | | |
| * | | | | | | | Merge pull request #2072 from ethomson/commit_summaryVicent Marti2014-01-222-1/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Summarize empty messages
| | * | | | | | | Summarize empty messagesEdward Thomson2014-01-222-1/+8
| |/ / / / / / /
| * | | | | | | Merge pull request #2070 from ethomson/checkout_filemodeVicent Marti2014-01-225-2/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Preserve tree filemode in index during checkout
| | * | | | | | | Preserve tree filemode in index during checkoutEdward Thomson2014-01-225-2/+24
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to determine whether the system supports file modes when putting the tree data in the index during checkout. The tree's mode is canonical and did not come from stat(2) in the first place.
| * | | | | | | Merge pull request #2069 from isilkor/patch_to_bufVicent Marti2014-01-229-107/+101
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Expose patch serialization to git_buf
View Lorry Controller Status