diff options
55 files changed, 1107 insertions, 2522 deletions
@@ -37,8 +37,8 @@ _ReSharper*/ *.DotSettings #Ignore custom generated files LibGit2Sharp/Core/UniqueIdentifier.cs +LibGit2Sharp/Core/NativeDllName.cs -!Lib/NativeBinaries/*/*.pdb !nuget.package/build/ _NCrunch_LibGit2Sharp/ packages/ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 30eb68a2..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libgit2"] - path = libgit2 - url = https://github.com/libgit2/libgit2.git diff --git a/CI/build.msbuild b/CI/build.msbuild index f7bb2ee6..89a3ead0 100644 --- a/CI/build.msbuild +++ b/CI/build.msbuild @@ -37,7 +37,7 @@ </Target> <Target Name="Test" DependsOnTargets="Build"> - <xunit Assembly="$(TestBuildDir)/LibGit2Sharp.Tests.dll" Xml="$(DeployFolder)/Test-result.xml" /> + <xunit Assembly="$(TestBuildDir)/LibGit2Sharp.Tests.dll" ShadowCopy="false" Xml="$(DeployFolder)/Test-result.xml" /> </Target> <Target Name="Deploy" DependsOnTargets="Test"> diff --git a/Lib/CustomBuildTasks/CustomBuildTasks.csproj b/Lib/CustomBuildTasks/CustomBuildTasks.csproj index 2da37037..1c50a44a 100644 --- a/Lib/CustomBuildTasks/CustomBuildTasks.csproj +++ b/Lib/CustomBuildTasks/CustomBuildTasks.csproj @@ -37,6 +37,7 @@ </ItemGroup>
<ItemGroup>
<Compile Include="GenerateUniqueIdentifierTask.cs" />
+ <Compile Include="GenerateNativeDllNameTask.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
diff --git a/Lib/CustomBuildTasks/CustomBuildTasks.dll b/Lib/CustomBuildTasks/CustomBuildTasks.dll Binary files differindex 3cd023b8..5bc63169 100644 --- a/Lib/CustomBuildTasks/CustomBuildTasks.dll +++ b/Lib/CustomBuildTasks/CustomBuildTasks.dll diff --git a/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs b/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs new file mode 100644 index 00000000..f6872497 --- /dev/null +++ b/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs @@ -0,0 +1,43 @@ +using System;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace CustomBuildTasks
+{
+ public class GenerateNativeDllNameTask : Task
+ {
+ public ITaskItem InputHashFile { get; set; }
+
+ public string OutputFile { get; set; }
+
+ public override bool Execute()
+ {
+ var fileName = InputHashFile.GetMetadata("FullPath");
+ string hash;
+
+ using (var sr = new StreamReader(fileName))
+ {
+ hash = sr.ReadLine();
+ }
+
+ var shortHash = hash.Substring(0, 7);
+
+ var nativeDllName = @"namespace LibGit2Sharp.Core
+{{
+ internal static class NativeDllName
+ {{
+ public const string Name = ""git2-{0}"";
+ }}
+}}
+";
+
+ using (var sw = new StreamWriter(OutputFile))
+ {
+ sw.Write(nativeDllName, shortHash);
+ }
+
+ return true;
+ }
+ }
+}
diff --git a/Lib/NativeBinaries/amd64/git2-9bbc8f3.dll b/Lib/NativeBinaries/amd64/git2-9bbc8f3.dll Binary files differdeleted file mode 100644 index f162e6c6..00000000 --- a/Lib/NativeBinaries/amd64/git2-9bbc8f3.dll +++ /dev/null diff --git a/Lib/NativeBinaries/amd64/git2-9bbc8f3.pdb b/Lib/NativeBinaries/amd64/git2-9bbc8f3.pdb Binary files differdeleted file mode 100644 index 43f4171f..00000000 --- a/Lib/NativeBinaries/amd64/git2-9bbc8f3.pdb +++ /dev/null diff --git a/Lib/NativeBinaries/libgit2.license.txt b/Lib/NativeBinaries/libgit2.license.txt deleted file mode 100644 index d1ca4d40..00000000 --- a/Lib/NativeBinaries/libgit2.license.txt +++ /dev/null @@ -1,930 +0,0 @@ - libgit2 is Copyright (C) the libgit2 contributors, - unless otherwise stated. See the AUTHORS file for details. - - Note that the only valid version of the GPL as far as this project - is concerned is _this_ particular version of the license (ie v2, not - v2.2 or v3.x or whatever), unless explicitly otherwise stated. - ----------------------------------------------------------------------- - - LINKING EXCEPTION - - In addition to the permissions in the GNU General Public License, - the authors give you unlimited permission to link the compiled - version of this library into combinations with other programs, - and to distribute those combinations without any restriction - coming from the use of this file. (The General Public License - restrictions do apply in other respects; for example, they cover - modification of the file, and distribution when not linked into - a combined executable.) - ----------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - ----------------------------------------------------------------------- - -The bundled ZLib code is licensed under the ZLib license: - -Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - ----------------------------------------------------------------------- - -The priority queue implementation is based on code licensed under the -Apache 2.0 license: - - Copyright 2010 Volkan Yazıcı <volkan.yazici@gmail.com> - Copyright 2006-2010 The Apache Software Foundation - -The full text of the Apache 2.0 license is available at: - - http://www.apache.org/licenses/LICENSE-2.0 - ----------------------------------------------------------------------- - -The Clay framework is licensed under the MIT license: - -Copyright (C) 2011 by Vicent Marti - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - ----------------------------------------------------------------------- - -The regex library (deps/regex/) is licensed under the GNU LGPL - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/Lib/NativeBinaries/x86/git2-9bbc8f3.dll b/Lib/NativeBinaries/x86/git2-9bbc8f3.dll Binary files differdeleted file mode 100644 index db04bb5b..00000000 --- a/Lib/NativeBinaries/x86/git2-9bbc8f3.dll +++ /dev/null diff --git a/Lib/NativeBinaries/x86/git2-9bbc8f3.pdb b/Lib/NativeBinaries/x86/git2-9bbc8f3.pdb Binary files differdeleted file mode 100644 index 89c4624f..00000000 --- a/Lib/NativeBinaries/x86/git2-9bbc8f3.pdb +++ /dev/null diff --git a/LibGit2Sharp.Tests/FetchFixture.cs b/LibGit2Sharp.Tests/FetchFixture.cs index 3b0d6597..89a7e8a6 100644 --- a/LibGit2Sharp.Tests/FetchFixture.cs +++ b/LibGit2Sharp.Tests/FetchFixture.cs @@ -134,6 +134,18 @@ namespace LibGit2Sharp.Tests var expectedFetchState = new ExpectedFetchState(remoteName); expectedFetchState.AddExpectedBranch(localBranchName, ObjectId.Zero, remoteInfo.BranchTips[remoteBranchName]); + // Let's account for opportunistic updates during the Fetch() call + if (!string.Equals("master", localBranchName, StringComparison.OrdinalIgnoreCase)) + { + expectedFetchState.AddExpectedBranch("master", ObjectId.Zero, remoteInfo.BranchTips["master"]); + } + + if (string.Equals("master", localBranchName, StringComparison.OrdinalIgnoreCase) + && !string.Equals("master", remoteBranchName, StringComparison.OrdinalIgnoreCase)) + { + expectedFetchState.AddExpectedBranch(remoteBranchName, ObjectId.Zero, remoteInfo.BranchTips[remoteBranchName]); + } + // Perform the actual fetch repo.Network.Fetch(remote, new string[] { refSpec }, new FetchOptions { TagFetchMode = TagFetchMode.None, diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj index f608ab44..6a700f01 100644 --- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj +++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj @@ -139,10 +139,6 @@ <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <NativeBinariesDirectory>$(MSBuildProjectDirectory)\..\Lib\NativeBinaries</NativeBinariesDirectory> - </PropertyGroup> - <Import Project="..\LibGit2Sharp\CopyWindowsNativeDependencies.targets" /> <Import Project="..\LibGit2Sharp\ExtraDefine.targets" /> <Import Project="VisualStudio.Tests.targets" /> <PropertyGroup> diff --git a/LibGit2Sharp.Tests/RefSpecFixture.cs b/LibGit2Sharp.Tests/RefSpecFixture.cs index ea78f4eb..dc82a5fc 100644 --- a/LibGit2Sharp.Tests/RefSpecFixture.cs +++ b/LibGit2Sharp.Tests/RefSpecFixture.cs @@ -183,7 +183,7 @@ namespace LibGit2Sharp.Tests var remote = repo.Network.Remotes["origin"]; var oldRefSpecs = remote.RefSpecs.Select(r => r.Specification).ToList(); - Assert.Throws<LibGit2SharpException>(() => + Assert.Throws<InvalidSpecificationException>(() => repo.Network.Remotes.Update(remote, r => r.FetchRefSpecs.Add(refSpec))); var newRemote = repo.Network.Remotes["origin"]; diff --git a/LibGit2Sharp/Configuration.cs b/LibGit2Sharp/Configuration.cs index 078ad14f..47b14fb3 100644 --- a/LibGit2Sharp/Configuration.cs +++ b/LibGit2Sharp/Configuration.cs @@ -151,6 +151,16 @@ namespace LibGit2Sharp } } + internal void UnsetMultivar(string key, ConfigurationLevel level) + { + Ensure.ArgumentNotNullOrEmptyString(key, "key"); + + using (ConfigurationSafeHandle h = RetrieveConfigurationHandle(level, true, configHandle)) + { + Proxy.git_config_delete_multivar(h, key); + } + } + /// <summary> /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. /// </summary> diff --git a/LibGit2Sharp/CopyWindowsNativeDependencies.targets b/LibGit2Sharp/CopyWindowsNativeDependencies.targets deleted file mode 100644 index 3a7d6199..00000000 --- a/LibGit2Sharp/CopyWindowsNativeDependencies.targets +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="AfterBuild" Condition="'$(OS)' == 'Windows_NT'"> - <ItemGroup> - <NativeBinaries Include="$(NativeBinariesDirectory)\**\*.*" /> - </ItemGroup> - - <Copy - SourceFiles="@(NativeBinaries)" - DestinationFiles="@(NativeBinaries->'$(OutputPath)NativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" - SkipUnchangedFiles="true" /> - </Target> -</Project> diff --git a/LibGit2Sharp/Core/FetchPruneStrategy.cs b/LibGit2Sharp/Core/FetchPruneStrategy.cs new file mode 100644 index 00000000..69570942 --- /dev/null +++ b/LibGit2Sharp/Core/FetchPruneStrategy.cs @@ -0,0 +1,25 @@ +namespace LibGit2Sharp.Core +{ + /// <summary> + /// Specify how the remote tracking branches should be locally dealt with + /// when their upstream countepart doesn't exist anymore. + /// </summary> + internal enum FetchPruneStrategy + { + /// <summary> + /// Use the setting from the configuration + /// or, when there isn't any, fallback to default behavior. + /// </summary> + FromConfigurationOrDefault = 0, + + /// <summary> + /// Force pruning on + /// </summary> + Prune, + + /// <summary> + /// Force pruning off + /// </summary> + NoPrune, + } +} diff --git a/LibGit2Sharp/Core/GitCheckoutOpts.cs b/LibGit2Sharp/Core/GitCheckoutOpts.cs index 4416aa60..3424094b 100644 --- a/LibGit2Sharp/Core/GitCheckoutOpts.cs +++ b/LibGit2Sharp/Core/GitCheckoutOpts.cs @@ -158,6 +158,7 @@ namespace LibGit2Sharp.Core public GitStrArray paths; public IntPtr baseline; + public IntPtr baseline_index; public IntPtr target_directory; public IntPtr ancestor_label; diff --git a/LibGit2Sharp/Core/GitCloneOptions.cs b/LibGit2Sharp/Core/GitCloneOptions.cs index 803bc8b3..bed647e3 100644 --- a/LibGit2Sharp/Core/GitCloneOptions.cs +++ b/LibGit2Sharp/Core/GitCloneOptions.cs @@ -17,7 +17,7 @@ namespace LibGit2Sharp.Core public uint Version; public GitCheckoutOpts CheckoutOpts; - public GitRemoteCallbacks RemoteCallbacks; + public GitFetchOptions FetchOpts; public int Bare; public GitCloneLocal Local; diff --git a/LibGit2Sharp/Core/GitDiff.cs b/LibGit2Sharp/Core/GitDiff.cs index 7ce4eafd..1c71fbb5 100644 --- a/LibGit2Sharp/Core/GitDiff.cs +++ b/LibGit2Sharp/Core/GitDiff.cs @@ -80,6 +80,13 @@ namespace LibGit2Sharp.Core /// </summary> GIT_DIFF_IGNORE_CASE = (1 << 10), + + /// <summary> + /// May be combined with `GIT_DIFF_IGNORE_CASE` to specify that a file + /// that has changed case will be returned as an add/delete pair. + /// </summary> + GIT_DIFF_INCLUDE_CASECHANGE = (1 << 11), + /// <summary> /// If the pathspec is set in the diff options, this flags means to /// apply it as an exact match instead of as an fnmatch pattern. diff --git a/LibGit2Sharp/Core/GitFetchOptions.cs b/LibGit2Sharp/Core/GitFetchOptions.cs new file mode 100644 index 00000000..02f996df --- /dev/null +++ b/LibGit2Sharp/Core/GitFetchOptions.cs @@ -0,0 +1,14 @@ +using System.Runtime.InteropServices; + +namespace LibGit2Sharp.Core +{ + [StructLayout(LayoutKind.Sequential)] + internal class GitFetchOptions + { + public int Version = 1; + public GitRemoteCallbacks RemoteCallbacks; + public FetchPruneStrategy Prune; + public bool UpdateFetchHead = true; + public TagFetchMode download_tags; + } +} diff --git a/LibGit2Sharp/Core/GitIndexEntry.cs b/LibGit2Sharp/Core/GitIndexEntry.cs index 05904c84..11bee09e 100644 --- a/LibGit2Sharp/Core/GitIndexEntry.cs +++ b/LibGit2Sharp/Core/GitIndexEntry.cs @@ -15,7 +15,7 @@ namespace LibGit2Sharp.Core public uint Mode; public uint Uid; public uint Gid; - public Int64 file_size; + public uint file_size; public GitOid Id; public ushort Flags; public ushort ExtendedFlags; diff --git a/LibGit2Sharp/Core/GitIndexTime.cs b/LibGit2Sharp/Core/GitIndexTime.cs index fb47f294..9f16c512 100644 --- a/LibGit2Sharp/Core/GitIndexTime.cs +++ b/LibGit2Sharp/Core/GitIndexTime.cs @@ -5,7 +5,7 @@ namespace LibGit2Sharp.Core [StructLayout(LayoutKind.Sequential)] internal class GitIndexTime { - public long seconds; + public int seconds; public uint nanoseconds; } } diff --git a/LibGit2Sharp/Core/GitMergeOpts.cs b/LibGit2Sharp/Core/GitMergeOpts.cs index a2ebe979..e122cbdc 100644 --- a/LibGit2Sharp/Core/GitMergeOpts.cs +++ b/LibGit2Sharp/Core/GitMergeOpts.cs @@ -31,6 +31,11 @@ namespace LibGit2Sharp.Core /// Flags for automerging content. /// </summary> public MergeFileFavor MergeFileFavorFlags; + + /// <summary> + /// File merging flags. + /// </summary> + public GitMergeFileFlags FileFlags; } /// <summary> @@ -63,11 +68,11 @@ namespace LibGit2Sharp.Core /// </summary> GIT_MERGE_ANALYSIS_FASTFORWARD = (1 << 2), - /** - * The HEAD of the current repository is "unborn" and does not point to - * a valid commit. No merge can be performed, but the caller may wish - * to simply set HEAD to the target commit(s). - */ + /// <summary> + /// The HEAD of the current repository is "unborn" and does not point to + /// a valid commit. No merge can be performed, but the caller may wish + /// to simply set HEAD to the target commit(s). + /// </summary> GIT_MERGE_ANALYSIS_UNBORN = (1 << 3), } @@ -105,4 +110,53 @@ namespace LibGit2Sharp.Core /// </summary> GIT_MERGE_TREE_FIND_RENAMES = (1 << 0), } + + [Flags] + internal enum GitMergeFileFlags + { + /// <summary> + /// Defaults + /// </summary> + GIT_MERGE_FILE_DEFAULT = 0, + + /// <summary> + /// Create standard conflicted merge files + /// </summary> + GIT_MERGE_FILE_STYLE_MERGE = (1 << 0), + + /// <summary> + /// Create diff3-style files + /// </summary> + GIT_MERGE_FILE_STYLE_DIFF3 = (1 << 1), + + /// <summary> + /// Condense non-alphanumeric regions for simplified diff file + /// </summary> + GIT_MERGE_FILE_SIMPLIFY_ALNUM = (1 << 2), + + /// <summary> + /// Ignore all whitespace + /// </summary> + GIT_MERGE_FILE_IGNORE_WHITESPACE = (1 << 3), + + /// <summary> + /// Ignore changes in amount of whitespace + /// </summary> + GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = (1 << 4), + + /// <summary> + /// Ignore whitespace at end of line + /// </summary> + GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = (1 << 5), + + /// <summary> + /// Use the "patience diff" algorithm + /// </summary> + GIT_MERGE_FILE_DIFF_PATIENCE = (1 << 6), + + /// <summary> + /// Take extra time to find minimal diff + /// </summary> + GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7), + } } diff --git a/LibGit2Sharp/Core/GitOdbBackend.cs b/LibGit2Sharp/Core/GitOdbBackend.cs index a7b0acf4..e36cdc53 100644 --- a/LibGit2Sharp/Core/GitOdbBackend.cs +++ b/LibGit2Sharp/Core/GitOdbBackend.cs @@ -130,7 +130,7 @@ namespace LibGit2Sharp.Core public delegate int writestream_callback( out IntPtr stream_out, IntPtr backend, - UIntPtr length, + Int64 length, GitObjectType type); /// <summary> diff --git a/LibGit2Sharp/Core/GitOdbBackendStream.cs b/LibGit2Sharp/Core/GitOdbBackendStream.cs index 82f6ce89..f7eec27d 100644 --- a/LibGit2Sharp/Core/GitOdbBackendStream.cs +++ b/LibGit2Sharp/Core/GitOdbBackendStream.cs @@ -22,8 +22,8 @@ namespace LibGit2Sharp.Core public GitOdbBackendStreamMode Mode; public IntPtr HashCtx; - public UIntPtr DeclaredSize; - public UIntPtr ReceivedBytes; + public Int64 DeclaredSize; + public Int64 ReceivedBytes; public read_callback Read; public write_callback Write; diff --git a/LibGit2Sharp/Core/GitPushOptions.cs b/LibGit2Sharp/Core/GitPushOptions.cs index baebabee..d4bbcdc3 100644 --- a/LibGit2Sharp/Core/GitPushOptions.cs +++ b/LibGit2Sharp/Core/GitPushOptions.cs @@ -7,5 +7,6 @@ namespace LibGit2Sharp.Core { public int Version = 1; public int PackbuilderDegreeOfParallelism; + public GitRemoteCallbacks RemoteCallbacks; } } diff --git a/LibGit2Sharp/Core/GitPushUpdate.cs b/LibGit2Sharp/Core/GitPushUpdate.cs new file mode 100644 index 00000000..f38697a4 --- /dev/null +++ b/LibGit2Sharp/Core/GitPushUpdate.cs @@ -0,0 +1,14 @@ +using System; +using System.Runtime.InteropServices; + +namespace LibGit2Sharp.Core +{ + [StructLayout(LayoutKind.Sequential)] + internal class GitPushUpdate + { + IntPtr src_refname; + IntPtr dst_refname; + GitOid src; + GitOid dst; + } +} diff --git a/LibGit2Sharp/Core/GitRemoteCallbacks.cs b/LibGit2Sharp/Core/GitRemoteCallbacks.cs index e23d115b..71537f76 100644 --- a/LibGit2Sharp/Core/GitRemoteCallbacks.cs +++ b/LibGit2Sharp/Core/GitRemoteCallbacks.cs @@ -29,6 +29,10 @@ namespace LibGit2Sharp.Core internal NativeMethods.push_update_reference_callback push_update_reference; + internal NativeMethods.push_negotiation_callback push_negotiation; + + internal IntPtr transport; + internal IntPtr payload; } } diff --git a/LibGit2Sharp/Core/GitSmartSubtransportRegistration.cs b/LibGit2Sharp/Core/GitSmartSubtransportRegistration.cs index 724c6c41..e721c1e7 100644 --- a/LibGit2Sharp/Core/GitSmartSubtransportRegistration.cs +++ b/LibGit2Sharp/Core/GitSmartSubtransportRegistration.cs @@ -8,9 +8,11 @@ namespace LibGit2Sharp.Core { public IntPtr SubtransportCallback; public uint Rpc; + public uint Param; public delegate int create_callback( out IntPtr subtransport, - IntPtr transport); + IntPtr owner, + IntPtr param); } } diff --git a/LibGit2Sharp/Core/GitSubmoduleOptions.cs b/LibGit2Sharp/Core/GitSubmoduleOptions.cs index 1b64aa1f..4fb07411 100644 --- a/LibGit2Sharp/Core/GitSubmoduleOptions.cs +++ b/LibGit2Sharp/Core/GitSubmoduleOptions.cs @@ -9,7 +9,7 @@ namespace LibGit2Sharp.Core public GitCheckoutOpts CheckoutOptions; - public GitRemoteCallbacks RemoteCallbacks; + public GitFetchOptions FetchOptions; public CheckoutStrategy CloneCheckoutStrategy; } diff --git a/LibGit2Sharp/Core/NativeDllName.cs b/LibGit2Sharp/Core/NativeDllName.cs deleted file mode 100644 index 01f148a9..00000000 --- a/LibGit2Sharp/Core/NativeDllName.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace LibGit2Sharp.Core -{ - internal static class NativeDllName - { - public const string Name = "git2-9bbc8f3"; - } -} diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs index a9453529..9b4e818f 100644 --- a/LibGit2Sharp/Core/NativeMethods.cs +++ b/LibGit2Sharp/Core/NativeMethods.cs @@ -272,7 +272,15 @@ namespace LibGit2Sharp.Core internal static extern OidSafeHandle git_commit_tree_id(GitObjectSafeHandle commit); [DllImport(libgit2)] - internal static extern int git_config_delete_entry(ConfigurationSafeHandle cfg, string name); + internal static extern int git_config_delete_entry( + ConfigurationSafeHandle cfg, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name); + + [DllImport(libgit2)] + internal static extern int git_config_delete_multivar( + ConfigurationSafeHandle cfg, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof (StrictUtf8Marshaler))] string name, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string regexp); [DllImport(libgit2)] internal static extern int git_config_find_global(GitBuf global_config_path); @@ -744,7 +752,7 @@ namespace LibGit2Sharp.Core [DllImport(libgit2)] internal static extern int git_note_default_ref( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))] out string notes_ref, + GitBuf notes_ref, RepositorySafeHandle repo); internal delegate int git_note_foreach_cb( @@ -779,7 +787,7 @@ namespace LibGit2Sharp.Core IntPtr payload); [DllImport(libgit2)] - internal static extern int git_odb_open_wstream(out OdbStreamSafeHandle stream, ObjectDatabaseSafeHandle odb, UIntPtr size, GitObjectType type); + internal static extern int git_odb_open_wstream(out OdbStreamSafeHandle stream, ObjectDatabaseSafeHandle odb, Int64 size, GitObjectType type); [DllImport(libgit2)] internal static extern void git_odb_free(IntPtr odb); @@ -996,7 +1004,10 @@ namespace LibGit2Sharp.Core internal static extern int git_remote_autotag(RemoteSafeHandle remote); [DllImport(libgit2)] - internal static extern int git_remote_connect(RemoteSafeHandle remote, GitDirection direction); + internal static extern int git_remote_connect( + RemoteSafeHandle remote, + GitDirection direction, + ref GitRemoteCallbacks callbacks); [DllImport(libgit2)] internal static extern int git_remote_create( @@ -1009,8 +1020,7 @@ namespace LibGit2Sharp.Core internal static extern int git_remote_create_anonymous( out RemoteSafeHandle remote, RepositorySafeHandle repo, - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url, - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string refspec); + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url); [DllImport(libgit2)] @@ -1030,6 +1040,7 @@ namespace LibGit2Sharp.Core internal static extern int git_remote_fetch( RemoteSafeHandle remote, ref GitStrArray refspecs, + GitFetchOptions fetch_opts, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string log_message); [DllImport(libgit2)] @@ -1061,12 +1072,26 @@ namespace LibGit2Sharp.Core [DllImport(libgit2)] internal static extern int git_remote_set_url( - RemoteSafeHandle remote, + RepositorySafeHandle repo, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string remote, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url); + + [DllImport(libgit2)] + internal static extern int git_remote_add_fetch( + RepositorySafeHandle repo, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string remote, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url); [DllImport(libgit2)] internal static extern int git_remote_set_pushurl( - RemoteSafeHandle remote, + RepositorySafeHandle repo, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string remote, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url); + + [DllImport(libgit2)] + internal static extern int git_remote_add_push( + RepositorySafeHandle repo, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string remote, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url); [DllImport(libgit2)] @@ -1092,9 +1117,6 @@ namespace LibGit2Sharp.Core internal static extern string git_remote_name(RemoteSafeHandle remote); [DllImport(libgit2)] - internal static extern int git_remote_save(RemoteSafeHandle remote); - - [DllImport(libgit2)] [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))] internal static extern string git_remote_url(RemoteSafeHandle remote); @@ -1103,12 +1125,10 @@ namespace LibGit2Sharp.Core internal static extern string git_remote_pushurl(RemoteSafeHandle remote); [DllImport(libgit2)] - internal static extern void git_remote_set_autotag(RemoteSafeHandle remote, TagFetchMode option); - - [DllImport(libgit2)] - internal static extern int git_remote_set_callbacks( - RemoteSafeHandle remote, - ref GitRemoteCallbacks callbacks); + internal static extern void git_remote_set_autotag( + RepositorySafeHandle repo, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name, + TagFetchMode option); internal delegate int remote_progress_callback(IntPtr str, int len, IntPtr data); @@ -1120,6 +1140,12 @@ namespace LibGit2Sharp.Core ref GitOid newId, IntPtr data); + internal delegate int push_negotiation_callback( + IntPtr updates, // GitPushUpdate? + UIntPtr len, + IntPtr payload + ); + internal delegate int push_update_reference_callback( IntPtr refName, IntPtr status, diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs index 68888cae..65a389a0 100644 --- a/LibGit2Sharp/Core/Proxy.cs +++ b/LibGit2Sharp/Core/Proxy.cs @@ -5,7 +5,6 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using System.Threading; using LibGit2Sharp.Core.Handles; using LibGit2Sharp.Handlers; @@ -100,13 +99,10 @@ namespace LibGit2Sharp.Core FilePath path, GitBlameOptions options) { - using (ThreadAffinity()) - { - BlameSafeHandle handle; - int res = NativeMethods.git_blame_file(out handle, repo, path, options); - Ensure.ZeroResult(res); - return handle; - } + BlameSafeHandle handle; + int res = NativeMethods.git_blame_file(out handle, repo, path, options); + Ensure.ZeroResult(res); + return handle; } public static GitBlameHunk git_blame_get_hunk_byindex(BlameSafeHandle blame, uint idx) @@ -125,44 +121,35 @@ namespace LibGit2Sharp.Core public static ObjectId git_blob_create_fromchunks(RepositorySafeHandle repo, FilePath hintpath, NativeMethods.source_callback fileCallback) { - using (ThreadAffinity()) - { - var oid = new GitOid(); - int res = NativeMethods.git_blob_create_fromchunks(ref oid, repo, hintpath, fileCallback, IntPtr.Zero); + var oid = new GitOid(); + int res = NativeMethods.git_blob_create_fromchunks(ref oid, repo, hintpath, fileCallback, IntPtr.Zero); - if (res == (int)GitErrorCode.User) - { - throw new EndOfStreamException("The stream ended unexpectedly"); - } + if (res == (int)GitErrorCode.User) + { + throw new EndOfStreamException("The stream ended unexpectedly"); + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return oid; - } + return oid; } public static ObjectId git_blob_create_fromdisk(RepositorySafeHandle repo, FilePath path) { - using (ThreadAffinity()) - { - var oid = new GitOid(); - int res = NativeMethods.git_blob_create_fromdisk(ref oid, repo, path); - Ensure.ZeroResult(res); + var oid = new GitOid(); + int res = NativeMethods.git_blob_create_fromdisk(ref oid, repo, path); + Ensure.ZeroResult(res); - return oid; - } + return oid; } public static ObjectId git_blob_create_fromfile(RepositorySafeHandle repo, FilePath path) { - using (ThreadAffinity()) - { - var oid = new GitOid(); - int res = NativeMethods.git_blob_create_fromworkdir(ref oid, repo, path); - Ensure.ZeroResult(res); + var oid = new GitOid(); + int res = NativeMethods.git_blob_create_fromworkdir(ref oid, repo, path); + Ensure.ZeroResult(res); - return oid; - } + return oid; } public static UnmanagedMemoryStream git_blob_filtered_content_stream(RepositorySafeHandle repo, ObjectId id, FilePath path, bool check_for_binary_data) @@ -204,27 +191,21 @@ namespace LibGit2Sharp.Core public static ReferenceSafeHandle git_branch_create_from_annotated(RepositorySafeHandle repo, string branch_name, string targetIdentifier, bool force) { - using (ThreadAffinity()) - { - ReferenceSafeHandle reference; + ReferenceSafeHandle reference; - using (var annotatedCommit = git_annotated_commit_from_revspec(repo, targetIdentifier)) - { - int res = NativeMethods.git_branch_create_from_annotated(out reference, repo, branch_name, annotatedCommit, force); - Ensure.ZeroResult(res); - } - - return reference; + using (var annotatedCommit = git_annotated_commit_from_revspec(repo, targetIdentifier)) + { + int res = NativeMethods.git_branch_create_from_annotated(out reference, repo, branch_name, annotatedCommit, force); + Ensure.ZeroResult(res); } + + return reference; } public static void git_branch_delete(ReferenceSafeHandle reference) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_branch_delete(reference); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_branch_delete(reference); + Ensure.ZeroResult(res); } public static IEnumerable<Branch> git_branch_iterator(Repository repo, GitBranchType branchType) @@ -253,18 +234,14 @@ namespace LibGit2Sharp.Core public static ReferenceSafeHandle git_branch_move(ReferenceSafeHandle reference, string new_branch_name, bool force) { - using (ThreadAffinity()) - { - ReferenceSafeHandle ref_out; - int res = NativeMethods.git_branch_move(out ref_out, reference, new_branch_name, force); - Ensure.ZeroResult(res); - return ref_out; - } + ReferenceSafeHandle ref_out; + int res = NativeMethods.git_branch_move(out ref_out, reference, new_branch_name, force); + Ensure.ZeroResult(res); + return ref_out; } public static string git_branch_remote_name(RepositorySafeHandle repo, string canonical_branch_name, bool shouldThrowIfNotFound) { - using (ThreadAffinity()) using (var buf = new GitBuf()) { int res = NativeMethods.git_branch_remote_name(buf, repo, canonical_branch_name); @@ -282,7 +259,6 @@ namespace LibGit2Sharp.Core public static string git_branch_upstream_name(RepositorySafeHandle handle, string canonicalReferenceName) { - using (ThreadAffinity()) using (var buf = new GitBuf()) { int res = NativeMethods.git_branch_upstream_name(buf, handle, canonicalReferenceName); @@ -314,7 +290,6 @@ namespace LibGit2Sharp.Core ObjectId treeId, ref GitCheckoutOpts opts) { - using (ThreadAffinity()) using (var osw = new ObjectSafeWrapper(treeId, repo)) { int res = NativeMethods.git_checkout_tree(repo, osw.ObjectPtr, ref opts); @@ -324,11 +299,8 @@ namespace LibGit2Sharp.Core public static void git_checkout_index(RepositorySafeHandle repo, GitObjectSafeHandle treeish, ref GitCheckoutOpts opts) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_checkout_index(repo, treeish, ref opts); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_checkout_index(repo, treeish, ref opts); + Ensure.ZeroResult(res); } #endregion @@ -337,7 +309,6 @@ namespace LibGit2Sharp.Core internal static void git_cherrypick(RepositorySafeHandle repo, ObjectId commit, GitCherryPickOptions options) { - using (ThreadAffinity()) using (var nativeCommit = git_object_lookup(repo, commit, GitObjectType.Commit)) { int res = NativeMethods.git_cherrypick(repo, nativeCommit, options); @@ -353,13 +324,10 @@ namespace LibGit2Sharp.Core string workdir, ref GitCloneOptions opts) { - using (ThreadAffinity()) - { - RepositorySafeHandle repo; - int res = NativeMethods.git_clone(out repo, url, workdir, ref opts); - Ensure.ZeroResult(res); - return repo; - } + RepositorySafeHandle repo; + int res = NativeMethods.git_clone(out repo, url, workdir, ref opts); + Ensure.ZeroResult(res); + return repo; } #endregion @@ -385,7 +353,6 @@ namespace LibGit2Sharp.Core Tree tree, GitOid[] parentIds) { - using (ThreadAffinity()) using (SignatureSafeHandle authorHandle = author.BuildHandle()) using (SignatureSafeHandle committerHandle = committer.BuildHandle()) using (var parentPtrs = new ArrayMarshaler<GitOid>(parentIds)) @@ -449,27 +416,36 @@ namespace LibGit2Sharp.Core public static void git_config_add_file_ondisk(ConfigurationSafeHandle config, FilePath path, ConfigurationLevel level) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_config_add_file_ondisk(config, path, (uint)level, true); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_config_add_file_ondisk(config, path, (uint)level, true); + Ensure.ZeroResult(res); } public static bool git_config_delete(ConfigurationSafeHandle config, string name) { - using (ThreadAffinity()) + int res = NativeMethods.git_config_delete_entry(config, name); + + if (res == (int)GitErrorCode.NotFound) { - int res = NativeMethods.git_config_delete_entry(config, name); + return false; + } - if (res == (int)GitErrorCode.NotFound) - { - return false; - } + Ensure.ZeroResult(res); + return true; + } - Ensure.ZeroResult(res); - return true; + const string anyValue = ".*"; + + public static bool git_config_delete_multivar(ConfigurationSafeHandle config, string name) + { + int res = NativeMethods.git_config_delete_multivar(config, name, anyValue); + + if (res == (int)GitErrorCode.NotFound) + { + return false; } + + Ensure.ZeroResult(res); + return true; } public static FilePath git_config_find_global() @@ -510,18 +486,15 @@ namespace LibGit2Sharp.Core try { - using (ThreadAffinity()) + var res = NativeMethods.git_config_get_entry(out handle, config, key); + if (res == (int)GitErrorCode.NotFound) { - var res = NativeMethods.git_config_get_entry(out handle, config, key); - if (res == (int)GitErrorCode.NotFound) - { - return null; - } + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - entry = handle.MarshalAsGitConfigEntry(); - } + entry = handle.MarshalAsGitConfigEntry(); } finally { @@ -535,104 +508,77 @@ namespace LibGit2Sharp.Core public static ConfigurationSafeHandle git_config_new() { - using (ThreadAffinity()) - { - ConfigurationSafeHandle handle; - int res = NativeMethods.git_config_new(out handle); - Ensure.ZeroResult(res); + ConfigurationSafeHandle handle; + int res = NativeMethods.git_config_new(out handle); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static ConfigurationSafeHandle git_config_open_level(ConfigurationSafeHandle parent, ConfigurationLevel level) { - using (ThreadAffinity()) - { - ConfigurationSafeHandle handle; - int res = NativeMethods.git_config_open_level(out handle, parent, (uint)level); + ConfigurationSafeHandle handle; + int res = NativeMethods.git_config_open_level(out handle, parent, (uint)level); - if (res == (int)GitErrorCode.NotFound) - { - return null; - } + if (res == (int)GitErrorCode.NotFound) + { + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static bool git_config_parse_bool(string value) { - using (ThreadAffinity()) - { - bool outVal; - var res = NativeMethods.git_config_parse_bool(out outVal, value); + bool outVal; + var res = NativeMethods.git_config_parse_bool(out outVal, value); - Ensure.ZeroResult(res); - return outVal; - } + Ensure.ZeroResult(res); + return outVal; } public static int git_config_parse_int32(string value) { - using (ThreadAffinity()) - { - int outVal; - var res = NativeMethods.git_config_parse_int32(out outVal, value); + int outVal; + var res = NativeMethods.git_config_parse_int32(out outVal, value); - Ensure.ZeroResult(res); - return outVal; - } + Ensure.ZeroResult(res); + return outVal; } public static long git_config_parse_int64(string value) { - using (ThreadAffinity()) - { - long outVal; - var res = NativeMethods.git_config_parse_int64(out outVal, value); + long outVal; + var res = NativeMethods.git_config_parse_int64(out outVal, value); - Ensure.ZeroResult(res); - return outVal; - } + Ensure.ZeroResult(res); + return outVal; } public static void git_config_set_bool(ConfigurationSafeHandle config, string name, bool value) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_config_set_bool(config, name, value); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_config_set_bool(config, name, value); + Ensure.ZeroResult(res); } public static void git_config_set_int32(ConfigurationSafeHandle config, string name, int value) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_config_set_int32(config, name, value); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_config_set_int32(config, name, value); + Ensure.ZeroResult(res); } public static void git_config_set_int64(ConfigurationSafeHandle config, string name, long value) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_config_set_int64(config, name, value); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_config_set_int64(config, name, value); + Ensure.ZeroResult(res); } public static void git_config_set_string(ConfigurationSafeHandle config, string name, string value) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_config_set_string(config, name, value); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_config_set_string(config, name, value); + Ensure.ZeroResult(res); } public static ICollection<TResult> git_config_foreach<TResult>( @@ -669,14 +615,11 @@ namespace LibGit2Sharp.Core public static ConfigurationSafeHandle git_config_snapshot(ConfigurationSafeHandle config) { - using (ThreadAffinity()) - { - ConfigurationSafeHandle handle; - int res = NativeMethods.git_config_snapshot(out handle, config); - Ensure.ZeroResult(res); + ConfigurationSafeHandle handle; + int res = NativeMethods.git_config_snapshot(out handle, config); + Ensure.ZeroResult(res); - return handle; - } + return handle; } #endregion @@ -691,7 +634,6 @@ namespace LibGit2Sharp.Core Ensure.ArgumentPositiveInt32(options.MinimumCommitIdAbbreviatedSize, "options.MinimumCommitIdAbbreviatedSize"); - using (ThreadAffinity()) using (var osw = new ObjectSafeWrapper(committishId, repo)) { GitDescribeOptions opts = new GitDescribeOptions @@ -754,7 +696,6 @@ namespace LibGit2Sharp.Core NativeMethods.git_diff_hunk_cb hunkCallback, NativeMethods.git_diff_line_cb lineCallback) { - using (ThreadAffinity()) using (var osw1 = new ObjectSafeWrapper(oldBlob, repo, true)) using (var osw2 = new ObjectSafeWrapper(newBlob, repo, true)) { @@ -772,11 +713,8 @@ namespace LibGit2Sharp.Core NativeMethods.git_diff_hunk_cb hunkCallback, NativeMethods.git_diff_line_cb lineCallback) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_diff_foreach(diff, fileCallback, hunkCallback, lineCallback, IntPtr.Zero); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_diff_foreach(diff, fileCallback, hunkCallback, lineCallback, IntPtr.Zero); + Ensure.ZeroResult(res); } public static DiffSafeHandle git_diff_tree_to_index( @@ -785,7 +723,6 @@ namespace LibGit2Sharp.Core ObjectId oldTree, GitDiffOptions options) { - using (ThreadAffinity()) using (var osw = new ObjectSafeWrapper(oldTree, repo, true)) { DiffSafeHandle diff; @@ -803,11 +740,8 @@ namespace LibGit2Sharp.Core public static void git_diff_merge(DiffSafeHandle onto, DiffSafeHandle from) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_diff_merge(onto, from); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_diff_merge(onto, from); + Ensure.ZeroResult(res); } public static DiffSafeHandle git_diff_tree_to_tree( @@ -816,7 +750,6 @@ namespace LibGit2Sharp.Core ObjectId newTree, GitDiffOptions options) { - using (ThreadAffinity()) using (var osw1 = new ObjectSafeWrapper(oldTree, repo, true)) using (var osw2 = new ObjectSafeWrapper(newTree, repo, true)) { @@ -833,14 +766,11 @@ namespace LibGit2Sharp.Core IndexSafeHandle index, GitDiffOptions options) { - using (ThreadAffinity()) - { - DiffSafeHandle diff; - int res = NativeMethods.git_diff_index_to_workdir(out diff, repo, index, options); - Ensure.ZeroResult(res); + DiffSafeHandle diff; + int res = NativeMethods.git_diff_index_to_workdir(out diff, repo, index, options); + Ensure.ZeroResult(res); - return diff; - } + return diff; } public static DiffSafeHandle git_diff_tree_to_workdir( @@ -848,7 +778,6 @@ namespace LibGit2Sharp.Core ObjectId oldTree, GitDiffOptions options) { - using (ThreadAffinity()) using (var osw = new ObjectSafeWrapper(oldTree, repo, true)) { DiffSafeHandle diff; @@ -861,11 +790,8 @@ namespace LibGit2Sharp.Core public static void git_diff_find_similar(DiffSafeHandle diff, GitDiffFindOptions options) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_diff_find_similar(diff, options); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_diff_find_similar(diff, options); + Ensure.ZeroResult(res); } public static int git_diff_num_deltas(DiffSafeHandle diff) @@ -892,32 +818,25 @@ namespace LibGit2Sharp.Core GitOid oid1 = first.Id.Oid; GitOid oid2 = second.Id.Oid; - using (ThreadAffinity()) - { - UIntPtr ahead; - UIntPtr behind; + UIntPtr ahead; + UIntPtr behind; - int res = NativeMethods.git_graph_ahead_behind(out ahead, out behind, repo, ref oid1, ref oid2); + int res = NativeMethods.git_graph_ahead_behind(out ahead, out behind, repo, ref oid1, ref oid2); - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return new Tuple<int?, int?>((int)ahead, (int)behind); - } + return new Tuple<int?, int?>((int)ahead, (int)behind); } public static bool git_graph_descendant_of(RepositorySafeHandle repo, ObjectId commitId, ObjectId ancestorId) { GitOid oid1 = commitId.Oid; GitOid oid2 = ancestorId.Oid; + int res = NativeMethods.git_graph_descendant_of(repo, ref oid1, ref oid2); - using (ThreadAffinity()) - { - int res = NativeMethods.git_graph_descendant_of(repo, ref oid1, ref oid2); - - Ensure.BooleanResult(res); + Ensure.BooleanResult(res); - return (res == 1); - } + return (res == 1); } #endregion @@ -926,32 +845,23 @@ namespace LibGit2Sharp.Core public static void git_ignore_add_rule(RepositorySafeHandle repo, string rules) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_ignore_add_rule(repo, rules); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_ignore_add_rule(repo, rules); + Ensure.ZeroResult(res); } public static void git_ignore_clear_internal_rules(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_ignore_clear_internal_rules(repo); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_ignore_clear_internal_rules(repo); + Ensure.ZeroResult(res); } public static bool git_ignore_path_is_ignored(RepositorySafeHandle repo, string path) { - using (ThreadAffinity()) - { - int ignored; - int res = NativeMethods.git_ignore_path_is_ignored(out ignored, repo, path); - Ensure.ZeroResult(res); + int ignored; + int res = NativeMethods.git_ignore_path_is_ignored(out ignored, repo, path); + Ensure.ZeroResult(res); - return (ignored != 0); - } + return (ignored != 0); } #endregion @@ -960,20 +870,14 @@ namespace LibGit2Sharp.Core public static void git_index_add(IndexSafeHandle index, GitIndexEntry entry) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_add(index, entry); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_index_add(index, entry); + Ensure.ZeroResult(res); } public static void git_index_add_bypath(IndexSafeHandle index, FilePath path) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_add_bypath(index, path); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_index_add_bypath(index, path); + Ensure.ZeroResult(res); } public static Conflict git_index_conflict_get( @@ -1000,40 +904,34 @@ namespace LibGit2Sharp.Core public static ConflictIteratorSafeHandle git_index_conflict_iterator_new(IndexSafeHandle index) { - using (ThreadAffinity()) - { - ConflictIteratorSafeHandle iter; - int res = NativeMethods.git_index_conflict_iterator_new(out iter, index); - Ensure.ZeroResult(res); + ConflictIteratorSafeHandle iter; + int res = NativeMethods.git_index_conflict_iterator_new(out iter, index); + Ensure.ZeroResult(res); - return iter; - } + return iter; } public static Conflict git_index_conflict_next(ConflictIteratorSafeHandle iterator) { IndexEntrySafeHandle ancestor, ours, theirs; - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_conflict_next(out ancestor, out ours, out theirs, iterator); + int res = NativeMethods.git_index_conflict_next(out ancestor, out ours, out theirs, iterator); - if (res == (int)GitErrorCode.IterOver) - { - return null; - } + if (res == (int)GitErrorCode.IterOver) + { + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - using (ancestor) - using (ours) - using (theirs) - { - return new Conflict( - IndexEntry.BuildFromPtr(ancestor), - IndexEntry.BuildFromPtr(ours), - IndexEntry.BuildFromPtr(theirs)); - } + using (ancestor) + using (ours) + using (theirs) + { + return new Conflict( + IndexEntry.BuildFromPtr(ancestor), + IndexEntry.BuildFromPtr(ours), + IndexEntry.BuildFromPtr(theirs)); } } @@ -1091,32 +989,23 @@ namespace LibGit2Sharp.Core public static IndexSafeHandle git_index_open(FilePath indexpath) { - using (ThreadAffinity()) - { - IndexSafeHandle handle; - int res = NativeMethods.git_index_open(out handle, indexpath); - Ensure.ZeroResult(res); + IndexSafeHandle handle; + int res = NativeMethods.git_index_open(out handle, indexpath); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static void git_index_read(IndexSafeHandle index) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_read(index, false); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_index_read(index, false); + Ensure.ZeroResult(res); } public static void git_index_remove_bypath(IndexSafeHandle index, FilePath path) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_remove_bypath(index, path); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_index_remove_bypath(index, path); + Ensure.ZeroResult(res); } public static int git_index_reuc_entrycount(IndexSafeHandle index) @@ -1137,53 +1026,38 @@ namespace LibGit2Sharp.Core public static void git_index_write(IndexSafeHandle index) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_write(index); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_index_write(index); + Ensure.ZeroResult(res); } public static ObjectId git_index_write_tree(IndexSafeHandle index) { - using (ThreadAffinity()) - { - GitOid treeOid; - int res = NativeMethods.git_index_write_tree(out treeOid, index); - Ensure.ZeroResult(res); + GitOid treeOid; + int res = NativeMethods.git_index_write_tree(out treeOid, index); + Ensure.ZeroResult(res); - return treeOid; - } + return treeOid; } public static ObjectId git_index_write_tree_to(IndexSafeHandle index, RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - GitOid treeOid; - int res = NativeMethods.git_index_write_tree_to(out treeOid, index, repo); - Ensure.ZeroResult(res); + GitOid treeOid; + int res = NativeMethods.git_index_write_tree_to(out treeOid, index, repo); + Ensure.ZeroResult(res); - return treeOid; - } + return treeOid; } public static void git_index_read_fromtree(Index index, GitObjectSafeHandle tree) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_read_tree(index.Handle, tree); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_index_read_tree(index.Handle, tree); + Ensure.ZeroResult(res); } public static void git_index_clear(Index index) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_index_clear(index.Handle); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_index_clear(index.Handle); + Ensure.ZeroResult(res); } #endregion @@ -1192,106 +1066,85 @@ namespace LibGit2Sharp.Core public static IndexSafeHandle git_merge_commits(RepositorySafeHandle repo, GitObjectSafeHandle ourCommit, GitObjectSafeHandle theirCommit, GitMergeOpts opts) { - using (ThreadAffinity()) - { - IndexSafeHandle index; - int res = NativeMethods.git_merge_commits(out index, repo, ourCommit, theirCommit, ref opts); - Ensure.ZeroResult(res); + IndexSafeHandle index; + int res = NativeMethods.git_merge_commits(out index, repo, ourCommit, theirCommit, ref opts); + Ensure.ZeroResult(res); - return index; - } + return index; } public static ObjectId git_merge_base_many(RepositorySafeHandle repo, GitOid[] commitIds) { - using (ThreadAffinity()) - { - GitOid ret; - int res = NativeMethods.git_merge_base_many(out ret, repo, commitIds.Length, commitIds); + GitOid ret; + int res = NativeMethods.git_merge_base_many(out ret, repo, commitIds.Length, commitIds); - if (res == (int)GitErrorCode.NotFound) - { - return null; - } + if (res == (int)GitErrorCode.NotFound) + { + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return ret; - } + return ret; } public static ObjectId git_merge_base_octopus(RepositorySafeHandle repo, GitOid[] commitIds) { - using (ThreadAffinity()) - { - GitOid ret; - int res = NativeMethods.git_merge_base_octopus(out ret, repo, commitIds.Length, commitIds); + GitOid ret; + int res = NativeMethods.git_merge_base_octopus(out ret, repo, commitIds.Length, commitIds); - if (res == (int)GitErrorCode.NotFound) - { - return null; - } + if (res == (int)GitErrorCode.NotFound) + { + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return ret; - } + return ret; } public static GitAnnotatedCommitHandle git_annotated_commit_from_fetchhead(RepositorySafeHandle repo, string branchName, string remoteUrl, GitOid oid) { - using (ThreadAffinity()) - { - GitAnnotatedCommitHandle merge_head; + GitAnnotatedCommitHandle merge_head; - int res = NativeMethods.git_annotated_commit_from_fetchhead(out merge_head, repo, branchName, remoteUrl, ref oid); + int res = NativeMethods.git_annotated_commit_from_fetchhead(out merge_head, repo, branchName, remoteUrl, ref oid); - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return merge_head; - } + return merge_head; } public static GitAnnotatedCommitHandle git_annotated_commit_lookup(RepositorySafeHandle repo, GitOid oid) { - using (ThreadAffinity()) - { - GitAnnotatedCommitHandle their_head; + GitAnnotatedCommitHandle their_head; - int res = NativeMethods.git_annotated_commit_lookup(out their_head, repo, ref oid); + int res = NativeMethods.git_annotated_commit_lookup(out their_head, repo, ref oid); - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return their_head; - } + return their_head; } public static GitAnnotatedCommitHandle git_annotated_commit_from_ref(RepositorySafeHandle repo, ReferenceSafeHandle reference) { - using (ThreadAffinity()) - { - GitAnnotatedCommitHandle their_head; + GitAnnotatedCommitHandle their_head; - int res = NativeMethods.git_annotated_commit_from_ref(out their_head, repo, reference); + int res = NativeMethods.git_annotated_commit_from_ref(out their_head, repo, reference); - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return their_head; - } + return their_head; } public static GitAnnotatedCommitHandle git_annotated_commit_from_revspec(RepositorySafeHandle repo, string revspec) { - using (ThreadAffinity()) - { - GitAnnotatedCommitHandle their_head; + GitAnnotatedCommitHandle their_head; - int res = NativeMethods.git_annotated_commit_from_revspec(out their_head, repo, revspec); + int res = NativeMethods.git_annotated_commit_from_revspec(out their_head, repo, revspec); - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return their_head; - } + return their_head; } public static ObjectId git_annotated_commit_id(GitAnnotatedCommitHandle mergeHead) @@ -1301,19 +1154,16 @@ namespace LibGit2Sharp.Core public static void git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions) { - using (ThreadAffinity()) - { - IntPtr[] their_heads = heads.Select(head => head.DangerousGetHandle()).ToArray(); + IntPtr[] their_heads = heads.Select(head => head.DangerousGetHandle()).ToArray(); - int res = NativeMethods.git_merge( - repo, - their_heads, - (UIntPtr)their_heads.Length, - ref mergeOptions, - ref checkoutOptions); + int res = NativeMethods.git_merge( + repo, + their_heads, + (UIntPtr)their_heads.Length, + ref mergeOptions, + ref checkoutOptions); - Ensure.ZeroResult(res); - } + Ensure.ZeroResult(res); } public static void git_merge_analysis( @@ -1322,19 +1172,16 @@ namespace LibGit2Sharp.Core out GitMergeAnalysis analysis_out, out GitMergePreference preference_out) { - using (ThreadAffinity()) - { - IntPtr[] their_heads = heads.Select(head => head.DangerousGetHandle()).ToArray(); + IntPtr[] their_heads = heads.Select(head => head.DangerousGetHandle()).ToArray(); - int res = NativeMethods.git_merge_analysis( - out analysis_out, - out preference_out, - repo, - their_heads, - their_heads.Length); + int res = NativeMethods.git_merge_analysis( + out analysis_out, + out preference_out, + repo, + their_heads, + their_heads.Length); - Ensure.ZeroResult(res); - } + Ensure.ZeroResult(res); } public static void git_annotated_commit_free(IntPtr handle) @@ -1359,7 +1206,6 @@ namespace LibGit2Sharp.Core throw new InvalidOperationException("Only single byte characters are allowed as commentary characters in a message (eg. '#')."); } - using (ThreadAffinity()) using (var buf = new GitBuf()) { int res = NativeMethods.git_message_prettify(buf, message, false, (sbyte)comment); @@ -1382,7 +1228,6 @@ namespace LibGit2Sharp.Core string note, bool force) { - using (ThreadAffinity()) using (SignatureSafeHandle authorHandle = author.BuildHandle()) using (SignatureSafeHandle committerHandle = committer.BuildHandle()) { @@ -1398,13 +1243,12 @@ namespace LibGit2Sharp.Core public static string git_note_default_ref(RepositorySafeHandle repo) { - using (ThreadAffinity()) + using (var buf = new GitBuf()) { - string notes_ref; - int res = NativeMethods.git_note_default_ref(out notes_ref, repo); + int res = NativeMethods.git_note_default_ref(buf, repo); Ensure.ZeroResult(res); - return notes_ref; + return LaxUtf8Marshaler.FromNative(buf.ptr); } } @@ -1431,27 +1275,23 @@ namespace LibGit2Sharp.Core public static NoteSafeHandle git_note_read(RepositorySafeHandle repo, string notes_ref, ObjectId id) { - using (ThreadAffinity()) - { - GitOid oid = id.Oid; - NoteSafeHandle note; + GitOid oid = id.Oid; + NoteSafeHandle note; - int res = NativeMethods.git_note_read(out note, repo, notes_ref, ref oid); + int res = NativeMethods.git_note_read(out note, repo, notes_ref, ref oid); - if (res == (int)GitErrorCode.NotFound) - { - return null; - } + if (res == (int)GitErrorCode.NotFound) + { + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return note; - } + return note; } public static void git_note_remove(RepositorySafeHandle repo, string notes_ref, Signature author, Signature committer, ObjectId targetId) { - using (ThreadAffinity()) using (SignatureSafeHandle authorHandle = author.BuildHandle()) using (SignatureSafeHandle committerHandle = committer.BuildHandle()) { @@ -1484,52 +1324,46 @@ namespace LibGit2Sharp.Core public static GitObjectSafeHandle git_object_lookup(RepositorySafeHandle repo, ObjectId id, GitObjectType type) { - using (ThreadAffinity()) - { - GitObjectSafeHandle handle; - GitOid oid = id.Oid; - - int res = NativeMethods.git_object_lookup(out handle, repo, ref oid, type); - switch (res) - { - case (int)GitErrorCode.NotFound: - return null; + GitObjectSafeHandle handle; + GitOid oid = id.Oid; - default: - Ensure.ZeroResult(res); - break; - } + int res = NativeMethods.git_object_lookup(out handle, repo, ref oid, type); + switch (res) + { + case (int)GitErrorCode.NotFound: + return null; - return handle; + default: + Ensure.ZeroResult(res); + break; } + + return handle; } public static GitObjectSafeHandle git_object_peel(RepositorySafeHandle repo, ObjectId id, GitObjectType type, bool throwsIfCanNotPeel) { - using (ThreadAffinity()) - { - GitObjectSafeHandle peeled; - int res; - - using (var obj = new ObjectSafeWrapper(id, repo)) - { - res = NativeMethods.git_object_peel(out peeled, obj.ObjectPtr, type); - } + GitObjectSafeHandle peeled; + int res; - if (!throwsIfCanNotPeel && - (res == (int)GitErrorCode.NotFound || res == (int)GitErrorCode.Ambiguous || res == (int)GitErrorCode.InvalidSpecification || res == (int)GitErrorCode.Peel)) - { - return null; - } + using (var obj = new ObjectSafeWrapper(id, repo)) + { + res = NativeMethods.git_object_peel(out peeled, obj.ObjectPtr, type); + } - Ensure.ZeroResult(res); - return peeled; + if (!throwsIfCanNotPeel && + (res == (int)GitErrorCode.NotFound || res == (int)GitErrorCode.Ambiguous || + res == (int)GitErrorCode.InvalidSpecification || res == (int)GitErrorCode.Peel)) + { + return null; } + + Ensure.ZeroResult(res); + return peeled; } public static string git_object_short_id(RepositorySafeHandle repo, ObjectId id) { - using (ThreadAffinity()) using (var obj = new ObjectSafeWrapper(id, repo)) using (var buf = new GitBuf()) { @@ -1571,30 +1405,24 @@ namespace LibGit2Sharp.Core public static bool git_odb_exists(ObjectDatabaseSafeHandle odb, ObjectId id) { - using (ThreadAffinity()) - { - GitOid oid = id.Oid; + GitOid oid = id.Oid; - int res = NativeMethods.git_odb_exists(odb, ref oid); - Ensure.BooleanResult(res); + int res = NativeMethods.git_odb_exists(odb, ref oid); + Ensure.BooleanResult(res); - return (res == 1); - } + return (res == 1); } public static GitObjectMetadata git_odb_read_header(ObjectDatabaseSafeHandle odb, ObjectId id) { - using (ThreadAffinity()) - { - GitOid oid = id.Oid; - UIntPtr length; - GitObjectType objectType; + GitOid oid = id.Oid; + UIntPtr length; + GitObjectType objectType; - int res = NativeMethods.git_odb_read_header(out length, out objectType, odb, ref oid); - Ensure.ZeroResult(res); + int res = NativeMethods.git_odb_read_header(out length, out objectType, odb, ref oid); + Ensure.ZeroResult(res); - return new GitObjectMetadata((long)length, objectType); - } + return new GitObjectMetadata((long)length, objectType); } public static ICollection<TResult> git_odb_foreach<TResult>( @@ -1609,16 +1437,13 @@ namespace LibGit2Sharp.Core IntPtr.Zero)); } - public static OdbStreamSafeHandle git_odb_open_wstream(ObjectDatabaseSafeHandle odb, UIntPtr size, GitObjectType type) + public static OdbStreamSafeHandle git_odb_open_wstream(ObjectDatabaseSafeHandle odb, long size, GitObjectType type) { - using (ThreadAffinity()) - { - OdbStreamSafeHandle stream; - int res = NativeMethods.git_odb_open_wstream(out stream, odb, size, type); - Ensure.ZeroResult(res); + OdbStreamSafeHandle stream; + int res = NativeMethods.git_odb_open_wstream(out stream, odb, size, type); + Ensure.ZeroResult(res); - return stream; - } + return stream; } public static void git_odb_free(IntPtr odb) @@ -1628,31 +1453,25 @@ namespace LibGit2Sharp.Core public static void git_odb_stream_write(OdbStreamSafeHandle stream, byte[] data, int len) { - using (ThreadAffinity()) + int res; + unsafe { - int res; - unsafe + fixed (byte* p = data) { - fixed (byte *p = data) - { - res = NativeMethods.git_odb_stream_write(stream, (IntPtr) p, (UIntPtr) len); - } + res = NativeMethods.git_odb_stream_write(stream, (IntPtr)p, (UIntPtr)len); } - - Ensure.ZeroResult(res); } + + Ensure.ZeroResult(res); } public static ObjectId git_odb_stream_finalize_write(OdbStreamSafeHandle stream) { - using (ThreadAffinity()) - { - GitOid id; - int res = NativeMethods.git_odb_stream_finalize_write(out id, stream); - Ensure.ZeroResult(res); + GitOid id; + int res = NativeMethods.git_odb_stream_finalize_write(out id, stream); + Ensure.ZeroResult(res); - return id; - } + return id; } public static void git_odb_stream_free(IntPtr stream) @@ -1671,33 +1490,24 @@ namespace LibGit2Sharp.Core public static PatchSafeHandle git_patch_from_diff(DiffSafeHandle diff, int idx) { - using (ThreadAffinity()) - { - PatchSafeHandle handle; - int res = NativeMethods.git_patch_from_diff(out handle, diff, (UIntPtr) idx); - Ensure.ZeroResult(res); - return handle; - } + PatchSafeHandle handle; + int res = NativeMethods.git_patch_from_diff(out handle, diff, (UIntPtr)idx); + Ensure.ZeroResult(res); + return handle; } public static void git_patch_print(PatchSafeHandle patch, NativeMethods.git_diff_line_cb printCallback) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_patch_print(patch, printCallback, IntPtr.Zero); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_patch_print(patch, printCallback, IntPtr.Zero); + Ensure.ZeroResult(res); } public static Tuple<int, int> git_patch_line_stats(PatchSafeHandle patch) { - using (ThreadAffinity()) - { - UIntPtr ctx, add, del; - int res = NativeMethods.git_patch_line_stats(out ctx, out add, out del, patch); - Ensure.ZeroResult(res); - return new Tuple<int, int>((int)add, (int)del); - } + UIntPtr ctx, add, del; + int res = NativeMethods.git_patch_line_stats(out ctx, out add, out del, patch); + Ensure.ZeroResult(res); + return new Tuple<int, int>((int)add, (int)del); } #endregion @@ -1707,29 +1517,24 @@ namespace LibGit2Sharp.Core public static ReferenceSafeHandle git_reference_create(RepositorySafeHandle repo, string name, ObjectId targetId, bool allowOverwrite, string logMessage) { - using (ThreadAffinity()) - { - GitOid oid = targetId.Oid; - ReferenceSafeHandle handle; + GitOid oid = targetId.Oid; + ReferenceSafeHandle handle; - int res = NativeMethods.git_reference_create(out handle, repo, name, ref oid, allowOverwrite, logMessage); - Ensure.ZeroResult(res); + int res = NativeMethods.git_reference_create(out handle, repo, name, ref oid, allowOverwrite, logMessage); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static ReferenceSafeHandle git_reference_symbolic_create(RepositorySafeHandle repo, string name, string target, bool allowOverwrite, string logMessage) { - using (ThreadAffinity()) - { - ReferenceSafeHandle handle; - int res = NativeMethods.git_reference_symbolic_create(out handle, repo, name, target, allowOverwrite, logMessage); - Ensure.ZeroResult(res); + ReferenceSafeHandle handle; + int res = NativeMethods.git_reference_symbolic_create(out handle, repo, name, target, allowOverwrite, + logMessage); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static ICollection<TResult> git_reference_foreach_glob<TResult>( @@ -1755,40 +1560,34 @@ namespace LibGit2Sharp.Core public static IList<string> git_reference_list(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - var array = new GitStrArrayNative(); + var array = new GitStrArrayNative(); - try - { - int res = NativeMethods.git_reference_list(out array.Array, repo); - Ensure.ZeroResult(res); + try + { + int res = NativeMethods.git_reference_list(out array.Array, repo); + Ensure.ZeroResult(res); - return array.ReadStrings(); - } - finally - { - array.Dispose(); - } + return array.ReadStrings(); + } + finally + { + array.Dispose(); } } public static ReferenceSafeHandle git_reference_lookup(RepositorySafeHandle repo, string name, bool shouldThrowIfNotFound) { - using (ThreadAffinity()) - { - ReferenceSafeHandle handle; - int res = NativeMethods.git_reference_lookup(out handle, repo, name); + ReferenceSafeHandle handle; + int res = NativeMethods.git_reference_lookup(out handle, repo, name); - if (!shouldThrowIfNotFound && res == (int)GitErrorCode.NotFound) - { - return null; - } + if (!shouldThrowIfNotFound && res == (int)GitErrorCode.NotFound) + { + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static string git_reference_name(ReferenceSafeHandle reference) @@ -1798,11 +1597,8 @@ namespace LibGit2Sharp.Core public static void git_reference_remove(RepositorySafeHandle repo, string name) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_reference_remove(repo, name); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_reference_remove(repo, name); + Ensure.ZeroResult(res); } public static ObjectId git_reference_target(ReferenceSafeHandle reference) @@ -1813,42 +1609,33 @@ namespace LibGit2Sharp.Core public static ReferenceSafeHandle git_reference_rename(ReferenceSafeHandle reference, string newName, bool allowOverwrite, string logMessage) { - using (ThreadAffinity()) - { - ReferenceSafeHandle ref_out; + ReferenceSafeHandle ref_out; - int res = NativeMethods.git_reference_rename(out ref_out, reference, newName, allowOverwrite, logMessage); - Ensure.ZeroResult(res); + int res = NativeMethods.git_reference_rename(out ref_out, reference, newName, allowOverwrite, logMessage); + Ensure.ZeroResult(res); - return ref_out; - } + return ref_out; } public static ReferenceSafeHandle git_reference_set_target(ReferenceSafeHandle reference, ObjectId id, string logMessage) { - using (ThreadAffinity()) - { - GitOid oid = id.Oid; - ReferenceSafeHandle ref_out; + GitOid oid = id.Oid; + ReferenceSafeHandle ref_out; - int res = NativeMethods.git_reference_set_target(out ref_out, reference, ref oid, logMessage); - Ensure.ZeroResult(res); + int res = NativeMethods.git_reference_set_target(out ref_out, reference, ref oid, logMessage); + Ensure.ZeroResult(res); - return ref_out; - } + return ref_out; } public static ReferenceSafeHandle git_reference_symbolic_set_target(ReferenceSafeHandle reference, string target, string logMessage) { - using (ThreadAffinity()) - { - ReferenceSafeHandle ref_out; + ReferenceSafeHandle ref_out; - int res = NativeMethods.git_reference_symbolic_set_target(out ref_out, reference, target, logMessage); - Ensure.ZeroResult(res); + int res = NativeMethods.git_reference_symbolic_set_target(out ref_out, reference, target, logMessage); + Ensure.ZeroResult(res); - return ref_out; - } + return ref_out; } public static string git_reference_symbolic_target(ReferenceSafeHandle reference) @@ -1863,11 +1650,8 @@ namespace LibGit2Sharp.Core public static void git_reference_ensure_log(RepositorySafeHandle repo, string refname) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_reference_ensure_log(repo, refname); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_reference_ensure_log(repo, refname); + Ensure.ZeroResult(res); } #endregion @@ -1881,15 +1665,12 @@ namespace LibGit2Sharp.Core public static ReflogSafeHandle git_reflog_read(RepositorySafeHandle repo, string canonicalName) { - using (ThreadAffinity()) - { - ReflogSafeHandle reflog_out; + ReflogSafeHandle reflog_out; - int res = NativeMethods.git_reflog_read(out reflog_out, repo, canonicalName); - Ensure.ZeroResult(res); + int res = NativeMethods.git_reflog_read(out reflog_out, repo, canonicalName); + Ensure.ZeroResult(res); - return reflog_out; - } + return reflog_out; } public static int git_reflog_entrycount(ReflogSafeHandle reflog) @@ -1928,7 +1709,6 @@ namespace LibGit2Sharp.Core public static string git_refspec_rtransform(GitRefSpecHandle refSpecPtr, string name) { - using (ThreadAffinity()) using (var buf = new GitBuf()) { int res = NativeMethods.git_refspec_rtransform(buf, refSpecPtr, name); @@ -1974,62 +1754,47 @@ namespace LibGit2Sharp.Core public static RemoteSafeHandle git_remote_create(RepositorySafeHandle repo, string name, string url) { - using (ThreadAffinity()) - { - RemoteSafeHandle handle; - int res = NativeMethods.git_remote_create(out handle, repo, name, url); - Ensure.ZeroResult(res); + RemoteSafeHandle handle; + int res = NativeMethods.git_remote_create(out handle, repo, name, url); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static RemoteSafeHandle git_remote_create_with_fetchspec(RepositorySafeHandle repo, string name, string url, string refspec) { - using (ThreadAffinity()) - { - RemoteSafeHandle handle; - int res = NativeMethods.git_remote_create_with_fetchspec(out handle, repo, name, url, refspec); - Ensure.ZeroResult(res); + RemoteSafeHandle handle; + int res = NativeMethods.git_remote_create_with_fetchspec(out handle, repo, name, url, refspec); + Ensure.ZeroResult(res); - return handle; - } + return handle; } - public static RemoteSafeHandle git_remote_create_anonymous(RepositorySafeHandle repo, string url, string refspec) + public static RemoteSafeHandle git_remote_create_anonymous(RepositorySafeHandle repo, string url) { - using (ThreadAffinity()) - { - RemoteSafeHandle handle; - int res = NativeMethods.git_remote_create_anonymous(out handle, repo, url, refspec); - Ensure.ZeroResult(res); + RemoteSafeHandle handle; + int res = NativeMethods.git_remote_create_anonymous(out handle, repo, url); + Ensure.ZeroResult(res); - return handle; - } + return handle; } - public static void git_remote_connect(RemoteSafeHandle remote, GitDirection direction) + public static void git_remote_connect(RemoteSafeHandle remote, GitDirection direction, ref GitRemoteCallbacks remoteCallbacks) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_remote_connect(remote, direction); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_remote_connect(remote, direction, ref remoteCallbacks); + Ensure.ZeroResult(res); } public static void git_remote_delete(RepositorySafeHandle repo, string name) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_remote_delete(repo, name); - - if (res == (int)GitErrorCode.NotFound) - { - return; - } + int res = NativeMethods.git_remote_delete(repo, name); - Ensure.ZeroResult(res); + if (res == (int)GitErrorCode.NotFound) + { + return; } + + Ensure.ZeroResult(res); } public static GitRefSpecHandle git_remote_get_refspec(RemoteSafeHandle remote, int n) @@ -2044,137 +1809,95 @@ namespace LibGit2Sharp.Core public static IList<string> git_remote_get_fetch_refspecs(RemoteSafeHandle remote) { - using (ThreadAffinity()) - { - var array = new GitStrArrayNative(); + var array = new GitStrArrayNative(); - try - { - int res = NativeMethods.git_remote_get_fetch_refspecs(out array.Array, remote); - Ensure.ZeroResult(res); + try + { + int res = NativeMethods.git_remote_get_fetch_refspecs(out array.Array, remote); + Ensure.ZeroResult(res); - return array.ReadStrings(); - } - finally - { - array.Dispose(); - } + return array.ReadStrings(); + } + finally + { + array.Dispose(); } } public static IList<string> git_remote_get_push_refspecs(RemoteSafeHandle remote) { - using (ThreadAffinity()) - { - var array = new GitStrArrayNative(); + var array = new GitStrArrayNative(); - try - { - int res = NativeMethods.git_remote_get_push_refspecs(out array.Array, remote); - Ensure.ZeroResult(res); + try + { + int res = NativeMethods.git_remote_get_push_refspecs(out array.Array, remote); + Ensure.ZeroResult(res); - return array.ReadStrings(); - } - finally - { - array.Dispose(); - } + return array.ReadStrings(); + } + finally + { + array.Dispose(); } } public static void git_remote_push(RemoteSafeHandle remote, IEnumerable<string> refSpecs, GitPushOptions opts) { - using (ThreadAffinity()) - { - var array = new GitStrArrayManaged(); + var array = new GitStrArrayManaged(); - try - { - array = GitStrArrayManaged.BuildFrom(refSpecs.ToArray()); + try + { + array = GitStrArrayManaged.BuildFrom(refSpecs.ToArray()); - int res = NativeMethods.git_remote_push(remote, ref array.Array, opts); - Ensure.ZeroResult(res); - } - finally - { - array.Dispose(); - } + int res = NativeMethods.git_remote_push(remote, ref array.Array, opts); + Ensure.ZeroResult(res); } - } - - public static void git_remote_set_fetch_refspecs(RemoteSafeHandle remote, IEnumerable<string> refSpecs) - { - using (ThreadAffinity()) + finally { - var array = new GitStrArrayManaged(); - - try - { - array = GitStrArrayManaged.BuildFrom(refSpecs.ToArray()); - - int res = NativeMethods.git_remote_set_fetch_refspecs(remote, ref array.Array); - Ensure.ZeroResult(res); - } - finally - { - array.Dispose(); - } + array.Dispose(); } } - public static void git_remote_set_push_refspecs(RemoteSafeHandle remote, IEnumerable<string> refSpecs) + public static void git_remote_set_url(RepositorySafeHandle repo, string remote, string url) { - using (ThreadAffinity()) - { - var array = new GitStrArrayManaged(); - - try - { - array = GitStrArrayManaged.BuildFrom(refSpecs.ToArray()); + int res = NativeMethods.git_remote_set_url(repo, remote, url); + Ensure.ZeroResult(res); + } - int res = NativeMethods.git_remote_set_push_refspecs(remote, ref array.Array); - Ensure.ZeroResult(res); - } - finally - { - array.Dispose(); - } - } + public static void git_remote_add_fetch(RepositorySafeHandle repo, string remote, string url) + { + int res = NativeMethods.git_remote_add_fetch(repo, remote, url); + Ensure.ZeroResult(res); } - public static void git_remote_set_url(RemoteSafeHandle remote, string url) + public static void git_remote_set_pushurl(RepositorySafeHandle repo, string remote, string url) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_remote_set_url(remote, url); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_remote_set_pushurl(repo, remote, url); + Ensure.ZeroResult(res); } - public static void git_remote_set_pushurl(RemoteSafeHandle remote, string url) + public static void git_remote_add_push(RepositorySafeHandle repo, string remote, string url) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_remote_set_pushurl(remote, url); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_remote_add_push(repo, remote, url); + Ensure.ZeroResult(res); } - public static void git_remote_fetch(RemoteSafeHandle remote, string logMessage) + public static void git_remote_fetch( + RemoteSafeHandle remote, IEnumerable<string> refSpecs, + GitFetchOptions fetchOptions, string logMessage) { - using (ThreadAffinity()) + var array = new GitStrArrayManaged(); + + try { - var array = new GitStrArrayNative(); + array = GitStrArrayManaged.BuildFrom(refSpecs.ToArray()); - try - { - int res = NativeMethods.git_remote_fetch(remote, ref array.Array, logMessage); - Ensure.ZeroResult(res); - } - finally - { - array.Dispose(); - } + int res = NativeMethods.git_remote_fetch(remote, ref array.Array, fetchOptions, logMessage); + Ensure.ZeroResult(res); + } + finally + { + array.Dispose(); } } @@ -2193,21 +1916,18 @@ namespace LibGit2Sharp.Core public static IList<string> git_remote_list(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - var array = new GitStrArrayNative(); + var array = new GitStrArrayNative(); - try - { - int res = NativeMethods.git_remote_list(out array.Array, repo); - Ensure.ZeroResult(res); + try + { + int res = NativeMethods.git_remote_list(out array.Array, repo); + Ensure.ZeroResult(res); - return array.ReadStrings(); - } - finally - { - array.Dispose(); - } + return array.ReadStrings(); + } + finally + { + array.Dispose(); } } @@ -2216,11 +1936,8 @@ namespace LibGit2Sharp.Core IntPtr heads; UIntPtr count; - using (ThreadAffinity()) - { - int res = NativeMethods.git_remote_ls(out heads, out count, remote); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_remote_ls(out heads, out count, remote); + Ensure.ZeroResult(res); var intCount = (int)count.ToUInt32(); @@ -2254,19 +1971,16 @@ namespace LibGit2Sharp.Core public static RemoteSafeHandle git_remote_lookup(RepositorySafeHandle repo, string name, bool throwsIfNotFound) { - using (ThreadAffinity()) - { - RemoteSafeHandle handle; - int res = NativeMethods.git_remote_lookup(out handle, repo, name); + RemoteSafeHandle handle; + int res = NativeMethods.git_remote_lookup(out handle, repo, name); - if (res == (int)GitErrorCode.NotFound && !throwsIfNotFound) - { - return null; - } - - Ensure.ZeroResult(res); - return handle; + if (res == (int)GitErrorCode.NotFound && !throwsIfNotFound) + { + return null; } + + Ensure.ZeroResult(res); + return handle; } public static string git_remote_name(RemoteSafeHandle remote) @@ -2276,64 +1990,43 @@ namespace LibGit2Sharp.Core public static void git_remote_rename(RepositorySafeHandle repo, string name, string new_name, RemoteRenameFailureHandler callback) { - using (ThreadAffinity()) + if (callback == null) { - if (callback == null) - { - callback = problem => {}; - } + callback = problem => { }; + } - var array = new GitStrArrayNative(); + var array = new GitStrArrayNative(); - try - { - int res = NativeMethods.git_remote_rename( - ref array.Array, - repo, - name, - new_name); + try + { + int res = NativeMethods.git_remote_rename( + ref array.Array, + repo, + name, + new_name); - if (res == (int)GitErrorCode.NotFound) - { - throw new NotFoundException( - string.Format("Remote '{0}' does not exist and cannot be renamed.", name)); - } + if (res == (int)GitErrorCode.NotFound) + { + throw new NotFoundException( + string.Format("Remote '{0}' does not exist and cannot be renamed.", name)); + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - foreach (var item in array.ReadStrings()) - { - callback(item); - } - } - finally + foreach (var item in array.ReadStrings()) { - array.Dispose(); + callback(item); } } - } - - public static void git_remote_save(RemoteSafeHandle remote) - { - using (ThreadAffinity()) + finally { - int res = NativeMethods.git_remote_save(remote); - Ensure.ZeroResult(res); + array.Dispose(); } } - public static void git_remote_set_autotag(RemoteSafeHandle remote, TagFetchMode value) - { - NativeMethods.git_remote_set_autotag(remote, value); - } - - public static void git_remote_set_callbacks(RemoteSafeHandle remote, ref GitRemoteCallbacks callbacks) + public static void git_remote_set_autotag(RepositorySafeHandle repo, string remote, TagFetchMode value) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_remote_set_callbacks(remote, ref callbacks); - Ensure.ZeroResult(res); - } + NativeMethods.git_remote_set_autotag(repo, remote, value); } public static string git_remote_url(RemoteSafeHandle remote) @@ -2385,14 +2078,11 @@ namespace LibGit2Sharp.Core public static IndexSafeHandle git_repository_index(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - IndexSafeHandle handle; - int res = NativeMethods.git_repository_index(out handle, repo); - Ensure.ZeroResult(res); + IndexSafeHandle handle; + int res = NativeMethods.git_repository_index(out handle, repo); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static RepositorySafeHandle git_repository_init_ext( @@ -2400,7 +2090,6 @@ namespace LibGit2Sharp.Core FilePath gitdirPath, bool isBare) { - using (ThreadAffinity()) using (var opts = GitRepositoryInitOptions.BuildFrom(workdirPath, isBare)) { RepositorySafeHandle repo; @@ -2423,11 +2112,8 @@ namespace LibGit2Sharp.Core public static void git_repository_state_cleanup(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_repository_state_cleanup(repo); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_repository_state_cleanup(repo); + Ensure.ZeroResult(res); } public static ICollection<TResult> git_repository_mergehead_foreach<TResult>( @@ -2443,7 +2129,6 @@ namespace LibGit2Sharp.Core public static string git_repository_message(RepositorySafeHandle repo) { - using (ThreadAffinity()) using (var buf = new GitBuf()) { int res = NativeMethods.git_repository_message(buf, repo); @@ -2459,52 +2144,45 @@ namespace LibGit2Sharp.Core public static ObjectDatabaseSafeHandle git_repository_odb(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - ObjectDatabaseSafeHandle handle; - int res = NativeMethods.git_repository_odb(out handle, repo); - Ensure.ZeroResult(res); + ObjectDatabaseSafeHandle handle; + int res = NativeMethods.git_repository_odb(out handle, repo); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static RepositorySafeHandle git_repository_open(string path) { - using (ThreadAffinity()) - { - RepositorySafeHandle repo; - int res = NativeMethods.git_repository_open(out repo, path); + RepositorySafeHandle repo; + int res = NativeMethods.git_repository_open(out repo, path); - if (res == (int)GitErrorCode.NotFound) - { - throw new RepositoryNotFoundException(String.Format(CultureInfo.InvariantCulture, "Path '{0}' doesn't point at a valid Git repository or workdir.", path)); - } + if (res == (int)GitErrorCode.NotFound) + { + throw new RepositoryNotFoundException(String.Format(CultureInfo.InvariantCulture, + "Path '{0}' doesn't point at a valid Git repository or workdir.", path)); + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return repo; - } + return repo; } public static void git_repository_open_ext(string path, RepositoryOpenFlags flags, string ceilingDirs) { - using (ThreadAffinity()) - { - int res; + int res; - using (var repo = new NullRepositorySafeHandle()) - { - res = NativeMethods.git_repository_open_ext(repo, path, flags, ceilingDirs); - } - - if (res == (int)GitErrorCode.NotFound) - { - throw new RepositoryNotFoundException(String.Format(CultureInfo.InvariantCulture, "Path '{0}' doesn't point at a valid Git repository or workdir.", path)); - } + using (var repo = new NullRepositorySafeHandle()) + { + res = NativeMethods.git_repository_open_ext(repo, path, flags, ceilingDirs); + } - Ensure.ZeroResult(res); + if (res == (int)GitErrorCode.NotFound) + { + throw new RepositoryNotFoundException(String.Format(CultureInfo.InvariantCulture, + "Path '{0}' doesn't point at a valid Git repository or workdir.", path)); } + + Ensure.ZeroResult(res); } public static FilePath git_repository_path(RepositorySafeHandle repo) @@ -2519,11 +2197,8 @@ namespace LibGit2Sharp.Core public static void git_repository_set_ident(RepositorySafeHandle repo, string name, string email) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_repository_set_ident(repo, name, email); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_repository_set_ident(repo, name, email); + Ensure.ZeroResult(res); } public static void git_repository_set_index(RepositorySafeHandle repo, IndexSafeHandle index) @@ -2533,21 +2208,15 @@ namespace LibGit2Sharp.Core public static void git_repository_set_workdir(RepositorySafeHandle repo, FilePath workdir) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_repository_set_workdir(repo, workdir, false); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_repository_set_workdir(repo, workdir, false); + Ensure.ZeroResult(res); } public static CurrentOperation git_repository_state(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_repository_state(repo); - Ensure.Int32Result(res); - return (CurrentOperation)res; - } + int res = NativeMethods.git_repository_state(repo); + Ensure.Int32Result(res); + return (CurrentOperation)res; } public static FilePath git_repository_workdir(RepositorySafeHandle repo) @@ -2557,30 +2226,21 @@ namespace LibGit2Sharp.Core public static void git_repository_set_head_detached(RepositorySafeHandle repo, ObjectId commitish) { - using (ThreadAffinity()) - { - GitOid oid = commitish.Oid; - int res = NativeMethods.git_repository_set_head_detached(repo, ref oid); - Ensure.ZeroResult(res); - } + GitOid oid = commitish.Oid; + int res = NativeMethods.git_repository_set_head_detached(repo, ref oid); + Ensure.ZeroResult(res); } public static void git_repository_set_head_detached_from_annotated(RepositorySafeHandle repo, GitAnnotatedCommitHandle commit) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_repository_set_head_detached_from_annotated(repo, commit); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_repository_set_head_detached_from_annotated(repo, commit); + Ensure.ZeroResult(res); } public static void git_repository_set_head(RepositorySafeHandle repo, string refname) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_repository_set_head(repo, refname); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_repository_set_head(repo, refname); + Ensure.ZeroResult(res); } #endregion @@ -2593,7 +2253,6 @@ namespace LibGit2Sharp.Core ResetMode resetKind, ref GitCheckoutOpts checkoutOptions) { - using (ThreadAffinity()) using (var osw = new ObjectSafeWrapper(committishId, repo)) { int res = NativeMethods.git_reset(repo, osw.ObjectPtr, resetKind, ref checkoutOptions); @@ -2610,7 +2269,6 @@ namespace LibGit2Sharp.Core ObjectId commit, GitRevertOpts opts) { - using (ThreadAffinity()) using (var nativeCommit = git_object_lookup(repo, commit, GitObjectType.Commit)) { int res = NativeMethods.git_revert(repo, nativeCommit, opts); @@ -2624,27 +2282,25 @@ namespace LibGit2Sharp.Core public static Tuple<GitObjectSafeHandle, ReferenceSafeHandle> git_revparse_ext(RepositorySafeHandle repo, string objectish) { - using (ThreadAffinity()) - { - GitObjectSafeHandle obj; - ReferenceSafeHandle reference; - int res = NativeMethods.git_revparse_ext(out obj, out reference, repo, objectish); - - switch (res) - { - case (int)GitErrorCode.NotFound: - return null; + GitObjectSafeHandle obj; + ReferenceSafeHandle reference; + int res = NativeMethods.git_revparse_ext(out obj, out reference, repo, objectish); - case (int)GitErrorCode.Ambiguous: - throw new AmbiguousSpecificationException(string.Format(CultureInfo.InvariantCulture, "Provided abbreviated ObjectId '{0}' is too short.", objectish)); + switch (res) + { + case (int)GitErrorCode.NotFound: + return null; - default: - Ensure.ZeroResult(res); - break; - } + case (int)GitErrorCode.Ambiguous: + throw new AmbiguousSpecificationException(string.Format(CultureInfo.InvariantCulture, + "Provided abbreviated ObjectId '{0}' is too short.", objectish)); - return new Tuple<GitObjectSafeHandle, ReferenceSafeHandle>(obj, reference); + default: + Ensure.ZeroResult(res); + break; } + + return new Tuple<GitObjectSafeHandle, ReferenceSafeHandle>(obj, reference); } public static GitObjectSafeHandle git_revparse_single(RepositorySafeHandle repo, string objectish) @@ -2672,52 +2328,40 @@ namespace LibGit2Sharp.Core public static void git_revwalk_hide(RevWalkerSafeHandle walker, ObjectId commit_id) { - using (ThreadAffinity()) - { - GitOid oid = commit_id.Oid; - int res = NativeMethods.git_revwalk_hide(walker, ref oid); - Ensure.ZeroResult(res); - } + GitOid oid = commit_id.Oid; + int res = NativeMethods.git_revwalk_hide(walker, ref oid); + Ensure.ZeroResult(res); } public static RevWalkerSafeHandle git_revwalk_new(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - RevWalkerSafeHandle handle; - int res = NativeMethods.git_revwalk_new(out handle, repo); - Ensure.ZeroResult(res); + RevWalkerSafeHandle handle; + int res = NativeMethods.git_revwalk_new(out handle, repo); + Ensure.ZeroResult(res); - return handle; - } + return handle; } public static ObjectId git_revwalk_next(RevWalkerSafeHandle walker) { - using (ThreadAffinity()) - { - GitOid ret; - int res = NativeMethods.git_revwalk_next(out ret, walker); + GitOid ret; + int res = NativeMethods.git_revwalk_next(out ret, walker); - if (res == (int)GitErrorCode.IterOver) - { - return null; - } + if (res == (int)GitErrorCode.IterOver) + { + return null; + } - Ensure.ZeroResult(res); + Ensure.ZeroResult(res); - return ret; - } + return ret; } public static void git_revwalk_push(RevWalkerSafeHandle walker, ObjectId id) { - using (ThreadAffinity()) - { - GitOid oid = id.Oid; - int res = NativeMethods.git_revwalk_push(walker, ref oid); - Ensure.ZeroResult(res); - } + GitOid oid = id.Oid; + int res = NativeMethods.git_revwalk_push(walker, ref oid); + Ensure.ZeroResult(res); } public static void git_revwalk_reset(RevWalkerSafeHandle walker) @@ -2746,26 +2390,22 @@ namespace LibGit2Sharp.Core public static SignatureSafeHandle git_signature_new(string name, string email, DateTimeOffset when) { - using (ThreadAffinity()) - { - SignatureSafeHandle handle; - int res = NativeMethods.git_signature_new(out handle, name, email, when.ToSecondsSinceEpoch(), - (int)when.Offset.TotalMinutes); - Ensure.ZeroResult(res); + SignatureSafeHandle handle; - return handle; - } + int res = NativeMethods.git_signature_new(out handle, name, email, when.ToSecondsSinceEpoch(), + (int)when.Offset.TotalMinutes); + + Ensure.ZeroResult(res); + + return handle; } public static IntPtr git_signature_dup(IntPtr sig) { - using (ThreadAffinity()) - { - IntPtr handle; - int res = NativeMethods.git_signature_dup(out handle, sig); - Ensure.ZeroResult(res); - return handle; - } + IntPtr handle; + int res = NativeMethods.git_signature_dup(out handle, sig); + Ensure.ZeroResult(res); + return handle; } #endregion @@ -2778,7 +2418,6 @@ namespace LibGit2Sharp.Core string prettifiedMessage, StashModifiers options) { - using (ThreadAffinity()) using (SignatureSafeHandle sigHandle = stasher.BuildHandle()) { GitOid stashOid; @@ -2809,11 +2448,8 @@ namespace LibGit2Sharp.Core public static void git_stash_drop(RepositorySafeHandle repo, int index) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_stash_drop(repo, (UIntPtr) index); - Ensure.BooleanResult(res); - } + int res = NativeMethods.git_stash_drop(repo, (UIntPtr)index); + Ensure.BooleanResult(res); } #endregion @@ -2822,47 +2458,41 @@ namespace LibGit2Sharp.Core public static FileStatus git_status_file(RepositorySafeHandle repo, FilePath path) { - using (ThreadAffinity()) - { - FileStatus status; - int res = NativeMethods.git_status_file(out status, repo, path); + FileStatus status; + int res = NativeMethods.git_status_file(out status, repo, path); - switch (res) - { - case (int)GitErrorCode.NotFound: - return FileStatus.Nonexistent; + switch (res) + { + case (int)GitErrorCode.NotFound: + return FileStatus.Nonexistent; - case (int)GitErrorCode.Ambiguous: - throw new AmbiguousSpecificationException(string.Format(CultureInfo.InvariantCulture, "More than one file matches the pathspec '{0}'. You can either force a literal path evaluation (GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH), or use git_status_foreach().", path)); + case (int)GitErrorCode.Ambiguous: + throw new AmbiguousSpecificationException(string.Format(CultureInfo.InvariantCulture, + "More than one file matches the pathspec '{0}'. " + + "You can either force a literal path evaluation (GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH), or use git_status_foreach().", + path)); - default: - Ensure.ZeroResult(res); - break; - } - - return status; + default: + Ensure.ZeroResult(res); + break; } + + return status; } public static StatusListSafeHandle git_status_list_new(RepositorySafeHandle repo, GitStatusOptions options) { - using (ThreadAffinity()) - { - StatusListSafeHandle handle; - int res = NativeMethods.git_status_list_new(out handle, repo, options); - Ensure.ZeroResult(res); - return handle; - } + StatusListSafeHandle handle; + int res = NativeMethods.git_status_list_new(out handle, repo, options); + Ensure.ZeroResult(res); + return handle; } public static int git_status_list_entrycount(StatusListSafeHandle list) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_status_list_entrycount(list); - Ensure.Int32Result(res); - return res; - } + int res = NativeMethods.git_status_list_entrycount(list); + Ensure.Int32Result(res); + return res; } public static StatusEntrySafeHandle git_status_byindex(StatusListSafeHandle list, long idx) @@ -2885,28 +2515,24 @@ namespace LibGit2Sharp.Core /// </summary> public static SubmoduleSafeHandle git_submodule_lookup(RepositorySafeHandle repo, FilePath name) { - using (ThreadAffinity()) - { - SubmoduleSafeHandle reference; - var res = NativeMethods.git_submodule_lookup(out reference, repo, name); + SubmoduleSafeHandle reference; + var res = NativeMethods.git_submodule_lookup(out reference, repo, name); - switch (res) - { - case (int)GitErrorCode.NotFound: - case (int)GitErrorCode.Exists: - case (int)GitErrorCode.OrphanedHead: - return null; + switch (res) + { + case (int)GitErrorCode.NotFound: + case (int)GitErrorCode.Exists: + case (int)GitErrorCode.OrphanedHead: + return null; - default: - Ensure.ZeroResult(res); - return reference; - } + default: + Ensure.ZeroResult(res); + return reference; } } public static string git_submodule_resolve_url(RepositorySafeHandle repo, string url) { - using (ThreadAffinity()) using (var buf = new GitBuf()) { int res = NativeMethods.git_submodule_resolve_url(buf, repo, url); @@ -2923,29 +2549,20 @@ namespace LibGit2Sharp.Core public static void git_submodule_add_to_index(SubmoduleSafeHandle submodule, bool write_index) { - using (ThreadAffinity()) - { - var res = NativeMethods.git_submodule_add_to_index(submodule, write_index); - Ensure.ZeroResult(res); - } + var res = NativeMethods.git_submodule_add_to_index(submodule, write_index); + Ensure.ZeroResult(res); } public static void git_submodule_save(SubmoduleSafeHandle submodule) { - using (ThreadAffinity()) - { - var res = NativeMethods.git_submodule_save(submodule); - Ensure.ZeroResult(res); - } + var res = NativeMethods.git_submodule_save(submodule); + Ensure.ZeroResult(res); } public static void git_submodule_update(SubmoduleSafeHandle submodule, bool init, ref GitSubmoduleOptions options) { - using (ThreadAffinity()) - { - var res = NativeMethods.git_submodule_update(submodule, init, ref options); - Ensure.ZeroResult(res); - } + var res = NativeMethods.git_submodule_update(submodule, init, ref options); + Ensure.ZeroResult(res); } public static void git_submodule_free(IntPtr submodule) @@ -2995,31 +2612,22 @@ namespace LibGit2Sharp.Core public static void git_submodule_reload(SubmoduleSafeHandle submodule) { - using (ThreadAffinity()) - { - var res = NativeMethods.git_submodule_reload(submodule, false); - Ensure.ZeroResult(res); - } + var res = NativeMethods.git_submodule_reload(submodule, false); + Ensure.ZeroResult(res); } public static SubmoduleStatus git_submodule_status(SubmoduleSafeHandle submodule) { - using (ThreadAffinity()) - { - SubmoduleStatus status; - var res = NativeMethods.git_submodule_status(out status, submodule); - Ensure.ZeroResult(res); - return status; - } + SubmoduleStatus status; + var res = NativeMethods.git_submodule_status(out status, submodule); + Ensure.ZeroResult(res); + return status; } public static void git_submodule_init(SubmoduleSafeHandle submodule, bool overwrite) { - using (ThreadAffinity()) - { - var res = NativeMethods.git_submodule_init(submodule, overwrite); - Ensure.ZeroResult(res); - } + var res = NativeMethods.git_submodule_init(submodule, overwrite); + Ensure.ZeroResult(res); } #endregion @@ -3033,7 +2641,6 @@ namespace LibGit2Sharp.Core Signature tagger, string message) { - using (ThreadAffinity()) using (var objectPtr = new ObjectSafeWrapper(target.Id, repo)) using (SignatureSafeHandle sigHandle = tagger.BuildHandle()) { @@ -3053,7 +2660,6 @@ namespace LibGit2Sharp.Core string message, bool allowOverwrite) { - using (ThreadAffinity()) using (var objectPtr = new ObjectSafeWrapper(target.Id, repo)) using (SignatureSafeHandle sigHandle = tagger.BuildHandle()) { @@ -3067,7 +2673,6 @@ namespace LibGit2Sharp.Core public static ObjectId git_tag_create_lightweight(RepositorySafeHandle repo, string name, GitObject target, bool allowOverwrite) { - using (ThreadAffinity()) using (var objectPtr = new ObjectSafeWrapper(target.Id, repo)) { GitOid oid; @@ -3080,30 +2685,24 @@ namespace LibGit2Sharp.Core public static void git_tag_delete(RepositorySafeHandle repo, string name) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_tag_delete(repo, name); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_tag_delete(repo, name); + Ensure.ZeroResult(res); } public static IList<string> git_tag_list(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - var array = new GitStrArrayNative(); + var array = new GitStrArrayNative(); - try - { - int res = NativeMethods.git_tag_list(out array.Array, repo); - Ensure.ZeroResult(res); + try + { + int res = NativeMethods.git_tag_list(out array.Array, repo); + Ensure.ZeroResult(res); - return array.ReadStrings(); - } - finally - { - array.Dispose(); - } + return array.ReadStrings(); + } + finally + { + array.Dispose(); } } @@ -3160,11 +2759,8 @@ namespace LibGit2Sharp.Core /// </summary> public static void git_trace_set(LogLevel level, NativeMethods.git_trace_cb callback) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_trace_set(level, callback); - Ensure.ZeroResult(res); - } + int res = NativeMethods.git_trace_set(level, callback); + Ensure.ZeroResult(res); } #endregion @@ -3173,32 +2769,27 @@ namespace LibGit2Sharp.Core public static void git_transport_register(String prefix, IntPtr transport_cb, IntPtr param) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_transport_register(prefix, transport_cb, param); + int res = NativeMethods.git_transport_register(prefix, transport_cb, param); - if (res == (int)GitErrorCode.Exists) - { - throw new EntryExistsException(String.Format("A custom transport for '{0}' is already registered", prefix)); - } - - Ensure.ZeroResult(res); + if (res == (int)GitErrorCode.Exists) + { + throw new EntryExistsException(String.Format("A custom transport for '{0}' is already registered", + prefix)); } + + Ensure.ZeroResult(res); } public static void git_transport_unregister(String prefix) { - using (ThreadAffinity()) - { - int res = NativeMethods.git_transport_unregister(prefix); + int res = NativeMethods.git_transport_unregister(prefix); - if (res == (int)GitErrorCode.NotFound) - { - throw new NotFoundException("The given transport was not found"); - } - - Ensure.ZeroResult(res); + if (res == (int)GitErrorCode.NotFound) + { + throw new NotFoundException("The given transport was not found"); } + + Ensure.ZeroResult(res); } #endregion @@ -3217,7 +2808,6 @@ namespace LibGit2Sharp.Core public static TreeEntrySafeHandle_Owned git_tree_entry_bypath(RepositorySafeHandle repo, ObjectId id, FilePath treeentry_path) { - using (ThreadAffinity()) using (var obj = new ObjectSafeWrapper(id, repo)) { TreeEntrySafeHandle_Owned treeEntryPtr; @@ -3265,14 +2855,11 @@ namespace LibGit2Sharp.Core public static TreeBuilderSafeHandle git_treebuilder_new(RepositorySafeHandle repo) { - using (ThreadAffinity()) - { - TreeBuilderSafeHandle builder; - int res = NativeMethods.git_treebuilder_new(out builder, repo, IntPtr.Zero); - Ensure.ZeroResult(res); + TreeBuilderSafeHandle builder; + int res = NativeMethods.git_treebuilder_new(out builder, repo, IntPtr.Zero); + Ensure.ZeroResult(res); - return builder; - } + return builder; } public static void git_treebuilder_free(IntPtr bld) @@ -3282,24 +2869,19 @@ namespace LibGit2Sharp.Core public static void git_treebuilder_insert(TreeBuilderSafeHandle builder, string treeentry_name, TreeEntryDefinition treeEntryDefinition) { - using (ThreadAffinity()) - { - GitOid oid = treeEntryDefinition.TargetId.Oid; - int res = NativeMethods.git_treebuilder_insert(IntPtr.Zero, builder, treeentry_name, ref oid, (uint)treeEntryDefinition.Mode); - Ensure.ZeroResult(res); - } + GitOid oid = treeEntryDefinition.TargetId.Oid; + int res = NativeMethods.git_treebuilder_insert(IntPtr.Zero, builder, treeentry_name, ref oid, + (uint)treeEntryDefinition.Mode); + Ensure.ZeroResult(res); } public static ObjectId git_treebuilder_write(TreeBuilderSafeHandle bld) { - using (ThreadAffinity()) - { - GitOid oid; - int res = NativeMethods.git_treebuilder_write(out oid, bld); - Ensure.ZeroResult(res); + GitOid oid; + int res = NativeMethods.git_treebuilder_write(out oid, bld); + Ensure.ZeroResult(res); - return oid; - } + return oid; } #endregion @@ -3321,23 +2903,20 @@ namespace LibGit2Sharp.Core Func<Func<T, IntPtr, int>, int> iterator, params GitErrorCode[] ignoredErrorCodes) { - using (ThreadAffinity()) + var result = new List<TResult>(); + var res = iterator((x, payload) => { - var result = new List<TResult>(); - var res = iterator((x, payload) => - { - result.Add(resultSelector(x)); - return 0; - }); - - if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) - { - return new TResult[0]; - } + result.Add(resultSelector(x)); + return 0; + }); - Ensure.ZeroResult(res); - return result; + if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) + { + return new TResult[0]; } + + Ensure.ZeroResult(res); + return result; } private static ICollection<TResult> git_foreach<T1, T2, TResult>( @@ -3345,23 +2924,20 @@ namespace LibGit2Sharp.Core Func<Func<T1, T2, IntPtr, int>, int> iterator, params GitErrorCode[] ignoredErrorCodes) { - using (ThreadAffinity()) + var result = new List<TResult>(); + var res = iterator((x, y, payload) => { - var result = new List<TResult>(); - var res = iterator((x, y, payload) => - { - result.Add(resultSelector(x, y)); - return 0; - }); + result.Add(resultSelector(x, y)); + return 0; + }); - if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) - { - return new TResult[0]; - } - - Ensure.ZeroResult(res); - return result; + if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) + { + return new TResult[0]; } + + Ensure.ZeroResult(res); + return result; } private static ICollection<TResult> git_foreach<T1, T2, T3, TResult>( @@ -3369,23 +2945,20 @@ namespace LibGit2Sharp.Core Func<Func<T1, T2, T3, IntPtr, int>, int> iterator, params GitErrorCode[] ignoredErrorCodes) { - using (ThreadAffinity()) + var result = new List<TResult>(); + var res = iterator((w, x, y, payload) => { - var result = new List<TResult>(); - var res = iterator((w, x, y, payload) => - { - result.Add(resultSelector(w, x, y)); - return 0; - }); + result.Add(resultSelector(w, x, y)); + return 0; + }); - if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) - { - return new TResult[0]; - } - - Ensure.ZeroResult(res); - return result; + if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) + { + return new TResult[0]; } + + Ensure.ZeroResult(res); + return result; } public delegate TResult Func<T1, T2, T3, T4, T5, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5); @@ -3395,23 +2968,20 @@ namespace LibGit2Sharp.Core Func<Func<T1, T2, T3, T4, IntPtr, int>, int> iterator, params GitErrorCode[] ignoredErrorCodes) { - using (ThreadAffinity()) + var result = new List<TResult>(); + var res = iterator((w, x, y, z, payload) => { - var result = new List<TResult>(); - var res = iterator((w, x, y, z, payload) => - { - result.Add(resultSelector(w, x, y, z)); - return 0; - }); - - if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) - { - return new TResult[0]; - } + result.Add(resultSelector(w, x, y, z)); + return 0; + }); - Ensure.ZeroResult(res); - return result; + if (ignoredErrorCodes != null && ignoredErrorCodes.Contains((GitErrorCode)res)) + { + return new TResult[0]; } + + Ensure.ZeroResult(res); + return result; } private delegate int IteratorNew<THandle>(out THandle iter); @@ -3463,32 +3033,25 @@ namespace LibGit2Sharp.Core where TIterator : SafeHandleBase where THandle : SafeHandleBase { - using (ThreadAffinity()) + using (var iter = git_iterator_new(newFunc)) { - using (var iter = git_iterator_new(newFunc)) + foreach (var next in git_iterator_next(iter, nextFunc, resultSelector)) { - foreach (var next in git_iterator_next(iter, nextFunc, resultSelector)) - { - yield return next; - } + yield return next; } } } private static bool RepositoryStateChecker(RepositorySafeHandle repo, Func<RepositorySafeHandle, int> checker) { - using (ThreadAffinity()) - { - int res = checker(repo); - Ensure.BooleanResult(res); + int res = checker(repo); + Ensure.BooleanResult(res); - return (res == 1); - } + return (res == 1); } private static FilePath ConvertPath(Func<GitBuf, int> pathRetriever) { - using (ThreadAffinity()) using (var buf = new GitBuf()) { int result = pathRetriever(buf); @@ -3503,36 +3066,6 @@ namespace LibGit2Sharp.Core } } - private static Func<IDisposable> ThreadAffinity = WithoutThreadAffinity; - - internal static void EnableThreadAffinity() - { - ThreadAffinity = WithThreadAffinity; - } - - private static IDisposable WithoutThreadAffinity() - { - return null; - } - - private static IDisposable WithThreadAffinity() - { - return new DisposableThreadAffinityWrapper(); - } - - private class DisposableThreadAffinityWrapper : IDisposable - { - public DisposableThreadAffinityWrapper() - { - Thread.BeginThreadAffinity(); - } - - public void Dispose() - { - Thread.EndThreadAffinity(); - } - } - private static readonly IDictionary<Type, Func<string, object>> configurationParser = new Dictionary<Type, Func<string, object>> { { typeof(int), value => git_config_parse_int32(value) }, diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index 4b7bfd93..c20b0933 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.51\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.51\build\LibGit2Sharp.NativeBinaries.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -69,6 +70,8 @@ <Compile Include="CommitSortStrategies.cs" /> <Compile Include="CompareOptions.cs" /> <Compile Include="Core\FileHistory.cs" /> + <Compile Include="Core\GitFetchOptions.cs" /> + <Compile Include="Core\GitPushUpdate.cs" /> <Compile Include="Core\Platform.cs" /> <Compile Include="Core\Handles\ConflictIteratorSafeHandle.cs" /> <Compile Include="DescribeOptions.cs" /> @@ -82,6 +85,7 @@ <Compile Include="DiffAlgorithm.cs" /> <Compile Include="EntryExistsException.cs" /> <Compile Include="FetchOptionsBase.cs" /> + <Compile Include="Core\FetchPruneStrategy.cs" /> <Compile Include="LogEntry.cs" /> <Compile Include="FollowFilter.cs" /> <Compile Include="IBelongToARepository.cs" /> @@ -358,22 +362,25 @@ <CodeAnalysisDictionary Include="CustomDictionary.xml" /> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="libgit2_hash.txt" /> + <EmbeddedResource Include="libgit2sharp_hash.txt" /> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="libgit2sharp_hash.txt" /> + <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="UniqueIdentifier.targets" /> - <PropertyGroup> - <NativeBinariesDirectory>$(MSBuildProjectDirectory)\..\Lib\NativeBinaries</NativeBinariesDirectory> - </PropertyGroup> - <Import Project="CopyWindowsNativeDependencies.targets" /> + <Import Project="NativeDllName.targets" /> <Import Project="ExtraDefine.targets" /> <PropertyGroup> <PreBuildEvent> </PreBuildEvent> </PropertyGroup> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.51\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.51\build\LibGit2Sharp.NativeBinaries.props'))" /> + </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> diff --git a/LibGit2Sharp/LibGit2Sharp.v2.ncrunchproject b/LibGit2Sharp/LibGit2Sharp.v2.ncrunchproject index bb672793..cc3cf212 100644 --- a/LibGit2Sharp/LibGit2Sharp.v2.ncrunchproject +++ b/LibGit2Sharp/LibGit2Sharp.v2.ncrunchproject @@ -22,5 +22,4 @@ <UseCPUArchitecture>AutoDetect</UseCPUArchitecture> <MSTestThreadApartmentState>STA</MSTestThreadApartmentState> <BuildProcessArchitecture>x86</BuildProcessArchitecture> - <AdditionalFilesToInclude>..\Lib\NativeBinaries\**.*</AdditionalFilesToInclude> </ProjectConfiguration>
\ No newline at end of file diff --git a/LibGit2Sharp/MergeOptionsBase.cs b/LibGit2Sharp/MergeOptionsBase.cs index 7501bd90..2dda65e6 100644 --- a/LibGit2Sharp/MergeOptionsBase.cs +++ b/LibGit2Sharp/MergeOptionsBase.cs @@ -1,8 +1,4 @@ -using LibGit2Sharp.Core; -using LibGit2Sharp.Handlers; -using System; - -namespace LibGit2Sharp +namespace LibGit2Sharp { /// <summary> /// Options controlling the behavior of actions that use merge (merge @@ -14,7 +10,7 @@ namespace LibGit2Sharp /// Initializes a new instance of the <see cref="MergeOptionsBase"/> class. /// The default behavior is to attempt to find renames. /// </summary> - public MergeOptionsBase() + protected MergeOptionsBase() { FindRenames = true; RenameThreshold = 50; diff --git a/LibGit2Sharp/NativeDllName.targets b/LibGit2Sharp/NativeDllName.targets new file mode 100644 index 00000000..33261d59 --- /dev/null +++ b/LibGit2Sharp/NativeDllName.targets @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <UsingTask TaskName="GenerateNativeDllNameTask" AssemblyFile="..\Lib\CustomBuildTasks\CustomBuildTasks.dll" /> + + <PropertyGroup> + <LibGit2SharpPath Condition="'$(MSBuildThisFileDirectory)' == ''">.</LibGit2SharpPath> + <LibGit2SharpPath Condition="'$(MSBuildThisFileDirectory)' != ''">$(MSBuildThisFileDirectory)</LibGit2SharpPath> + <NativeDllNamePath>$(LibGit2SharpPath)\Core\NativeDllName.cs</NativeDllNamePath> + <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateNativeDllNameCs</CoreCompileDependsOn> + <CoreCleanDependsOn>$(CoreCleanDependsOn);CleanNativeDllNameCs</CoreCleanDependsOn> + </PropertyGroup> + + <Target Name="GenerateNativeDllNameCs" + Inputs="@(EmbeddedResource)" + Outputs="$(NativeDllNamePath)"> + <GenerateNativeDllNameTask InputHashFile="@(EmbeddedResource)" Condition=" '%(Filename)%(Extension)' == 'libgit2_hash.txt' " OutputFile="$(NativeDllNamePath)" /> + </Target> + + <Target Name="CleanNativeDllNameCs"> + <Delete Files="$(NativeDllNamePath)" /> + </Target> +</Project> diff --git a/LibGit2Sharp/Network.cs b/LibGit2Sharp/Network.cs index 5eb1720c..edfe2fd7 100644 --- a/LibGit2Sharp/Network.cs +++ b/LibGit2Sharp/Network.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Globalization; using System.Linq; using LibGit2Sharp.Core; @@ -70,14 +71,15 @@ namespace LibGit2Sharp using (RemoteSafeHandle remoteHandle = Proxy.git_remote_lookup(repository.Handle, remote.Name, true)) { + var gitCallbacks = new GitRemoteCallbacks {version = 1}; + if (credentialsProvider != null) { var callbacks = new RemoteCallbacks(credentialsProvider); - GitRemoteCallbacks gitCallbacks = callbacks.GenerateCallbacks(); - Proxy.git_remote_set_callbacks(remoteHandle, ref gitCallbacks); + gitCallbacks = callbacks.GenerateCallbacks(); } - Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch); + Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch, ref gitCallbacks); return Proxy.git_remote_ls(repository, remoteHandle); } } @@ -97,39 +99,67 @@ namespace LibGit2Sharp { Ensure.ArgumentNotNull(url, "url"); - using (RemoteSafeHandle remoteHandle = Proxy.git_remote_create_anonymous(repository.Handle, url, null)) + using (RemoteSafeHandle remoteHandle = Proxy.git_remote_create_anonymous(repository.Handle, url)) { - Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch); + GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 }; + Proxy.git_remote_connect(remoteHandle, GitDirection.Fetch, ref gitCallbacks); return Proxy.git_remote_ls(repository, remoteHandle); } } - static void DoFetch(RemoteSafeHandle remoteHandle, FetchOptions options, string logMessage) + static RemoteSafeHandle BuildRemoteSafeHandle(RepositorySafeHandle repoHandle, Remote remote, string url) { - if (options == null) + Debug.Assert((remote == null) ^ (url == null)); + + RemoteSafeHandle remoteHandle; + + if (url != null) { - options = new FetchOptions(); + remoteHandle = Proxy.git_remote_create_anonymous(repoHandle, url); + } + else + { + remoteHandle = Proxy.git_remote_lookup(repoHandle, remote.Name, true); } - if (options.TagFetchMode.HasValue) + return remoteHandle; + } + + static void DoFetch(RepositorySafeHandle repoHandle, Remote remote, string url, + FetchOptions options, string logMessage, + IEnumerable<string> refspecs) + { + if (options == null) { - Proxy.git_remote_set_autotag(remoteHandle, options.TagFetchMode.Value); + options = new FetchOptions(); } - var callbacks = new RemoteCallbacks(options); - GitRemoteCallbacks gitCallbacks = callbacks.GenerateCallbacks(); + using (RemoteSafeHandle remoteHandle = BuildRemoteSafeHandle(repoHandle, remote, url)) + { + var callbacks = new RemoteCallbacks(options); + GitRemoteCallbacks gitCallbacks = callbacks.GenerateCallbacks(); - // It is OK to pass the reference to the GitCallbacks directly here because libgit2 makes a copy of - // the data in the git_remote_callbacks structure. If, in the future, libgit2 changes its implementation - // to store a reference to the git_remote_callbacks structure this would introduce a subtle bug - // where the managed layer could move the git_remote_callbacks to a different location in memory, - // but libgit2 would still reference the old address. - // - // Also, if GitRemoteCallbacks were a class instead of a struct, we would need to guard against - // GC occuring in between setting the remote callbacks and actual usage in one of the functions afterwords. - Proxy.git_remote_set_callbacks(remoteHandle, ref gitCallbacks); + // It is OK to pass the reference to the GitCallbacks directly here because libgit2 makes a copy of + // the data in the git_remote_callbacks structure. If, in the future, libgit2 changes its implementation + // to store a reference to the git_remote_callbacks structure this would introduce a subtle bug + // where the managed layer could move the git_remote_callbacks to a different location in memory, + // but libgit2 would still reference the old address. + // + // Also, if GitRemoteCallbacks were a class instead of a struct, we would need to guard against + // GC occuring in between setting the remote callbacks and actual usage in one of the functions afterwords. + var fetchOptions = new GitFetchOptions + { + RemoteCallbacks = gitCallbacks, + download_tags = Proxy.git_remote_autotag(remoteHandle), + }; + + if (options.TagFetchMode.HasValue) + { + fetchOptions.download_tags = options.TagFetchMode.Value; + } - Proxy.git_remote_fetch(remoteHandle, logMessage); + Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage); + } } /// <summary> @@ -171,10 +201,7 @@ namespace LibGit2Sharp { Ensure.ArgumentNotNull(remote, "remote"); - using (RemoteSafeHandle remoteHandle = Proxy.git_remote_lookup(repository.Handle, remote.Name, true)) - { - DoFetch(remoteHandle, options, logMessage); - } + DoFetch(repository.Handle, remote, null, options, logMessage, new string[0]); } /// <summary> @@ -221,12 +248,7 @@ namespace LibGit2Sharp Ensure.ArgumentNotNull(remote, "remote"); Ensure.ArgumentNotNull(refspecs, "refspecs"); - using (RemoteSafeHandle remoteHandle = Proxy.git_remote_lookup(repository.Handle, remote.Name, true)) - { - Proxy.git_remote_set_fetch_refspecs(remoteHandle, refspecs); - - DoFetch(remoteHandle, options, logMessage); - } + DoFetch(repository.Handle, remote, null, options, logMessage, refspecs); } /// <summary> @@ -285,12 +307,7 @@ namespace LibGit2Sharp Ensure.ArgumentNotNull(url, "url"); Ensure.ArgumentNotNull(refspecs, "refspecs"); - using (RemoteSafeHandle remoteHandle = Proxy.git_remote_create_anonymous(repository.Handle, url, null)) - { - Proxy.git_remote_set_fetch_refspecs(remoteHandle, refspecs); - - DoFetch(remoteHandle, options, logMessage); - } + DoFetch(repository.Handle, null, url, options, logMessage, refspecs); } /// <summary> @@ -402,12 +419,12 @@ namespace LibGit2Sharp { var callbacks = new RemoteCallbacks(pushOptions); GitRemoteCallbacks gitCallbacks = callbacks.GenerateCallbacks(); - Proxy.git_remote_set_callbacks(remoteHandle, ref gitCallbacks); Proxy.git_remote_push(remoteHandle, pushRefSpecs, new GitPushOptions() { - PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism + PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism, + RemoteCallbacks = gitCallbacks, }); } } diff --git a/LibGit2Sharp/ObjectDatabase.cs b/LibGit2Sharp/ObjectDatabase.cs index 73bd5e9b..a7996561 100644 --- a/LibGit2Sharp/ObjectDatabase.cs +++ b/LibGit2Sharp/ObjectDatabase.cs @@ -131,10 +131,10 @@ namespace LibGit2Sharp private class Processor { private readonly Stream stream; - private readonly int? numberOfBytesToConsume; + private readonly long? numberOfBytesToConsume; private int totalNumberOfReadBytes; - public Processor(Stream stream, int? numberOfBytesToConsume) + public Processor(Stream stream, long? numberOfBytesToConsume) { this.stream = stream; this.numberOfBytesToConsume = numberOfBytesToConsume; @@ -148,11 +148,11 @@ namespace LibGit2Sharp if (numberOfBytesToConsume.HasValue) { - int totalRemainingBytesToRead = numberOfBytesToConsume.Value - totalNumberOfReadBytes; + long totalRemainingBytesToRead = numberOfBytesToConsume.Value - totalNumberOfReadBytes; if (totalRemainingBytesToRead < max_length) { - bytesToRead = totalRemainingBytesToRead; + bytesToRead = totalRemainingBytesToRead > int.MaxValue ? int.MaxValue : (int)totalRemainingBytesToRead; } } @@ -208,12 +208,12 @@ namespace LibGit2Sharp /// <param name="hintpath">The hintpath is used to determine what git filters should be applied to the object before it can be placed to the object database.</param> /// <param name="numberOfBytesToConsume">The number of bytes to consume from the stream.</param> /// <returns>The created <see cref="Blob"/>.</returns> - public virtual Blob CreateBlob(Stream stream, string hintpath, int numberOfBytesToConsume) + public virtual Blob CreateBlob(Stream stream, string hintpath, long numberOfBytesToConsume) { - return CreateBlob(stream, hintpath, (int?)numberOfBytesToConsume); + return CreateBlob(stream, hintpath, (long?)numberOfBytesToConsume); } - internal Blob CreateBlob(Stream stream, string hintpath, int? numberOfBytesToConsume) + private Blob CreateBlob(Stream stream, string hintpath, long? numberOfBytesToConsume) { Ensure.ArgumentNotNull(stream, "stream"); @@ -240,7 +240,7 @@ namespace LibGit2Sharp /// <param name="stream">The stream from which will be read the content of the blob to be created.</param> /// <param name="numberOfBytesToConsume">Number of bytes to consume from the stream.</param> /// <returns>The created <see cref="Blob"/>.</returns> - public virtual Blob CreateBlob(Stream stream, int numberOfBytesToConsume) + public virtual Blob CreateBlob(Stream stream, long numberOfBytesToConsume) { Ensure.ArgumentNotNull(stream, "stream"); @@ -249,15 +249,15 @@ namespace LibGit2Sharp throw new ArgumentException("The stream cannot be read from.", "stream"); } - using (var odbStream = Proxy.git_odb_open_wstream(handle, (UIntPtr)numberOfBytesToConsume, GitObjectType.Blob)) + using (var odbStream = Proxy.git_odb_open_wstream(handle, numberOfBytesToConsume, GitObjectType.Blob)) { var buffer = new byte[4*1024]; - int totalRead = 0; + long totalRead = 0; while (totalRead < numberOfBytesToConsume) { - var left = numberOfBytesToConsume - totalRead; - var toRead = left < buffer.Length ? left : buffer.Length; + long left = numberOfBytesToConsume - totalRead; + int toRead = left < buffer.Length ? (int)left : buffer.Length; var read = stream.Read(buffer, 0, toRead); if (read == 0) diff --git a/LibGit2Sharp/OdbBackend.cs b/LibGit2Sharp/OdbBackend.cs index 149b996c..8ecd3f73 100644 --- a/LibGit2Sharp/OdbBackend.cs +++ b/LibGit2Sharp/OdbBackend.cs @@ -440,13 +440,11 @@ namespace LibGit2Sharp private static int WriteStream( out IntPtr stream_out, IntPtr backend, - UIntPtr len, + long len, GitObjectType type) { stream_out = IntPtr.Zero; - long length = ConverToLong(len); - OdbBackend odbBackend = MarshalOdbBackend(backend); if (odbBackend == null) { @@ -458,7 +456,7 @@ namespace LibGit2Sharp try { OdbBackendStream stream; - int toReturn = odbBackend.WriteStream(length, objectType, out stream); + int toReturn = odbBackend.WriteStream(len, objectType, out stream); if (toReturn == 0) { diff --git a/LibGit2Sharp/RemoteCollection.cs b/LibGit2Sharp/RemoteCollection.cs index d504ca3c..a85cb6ad 100644 --- a/LibGit2Sharp/RemoteCollection.cs +++ b/LibGit2Sharp/RemoteCollection.cs @@ -57,12 +57,11 @@ namespace LibGit2Sharp /// <returns>The updated remote.</returns> public virtual Remote Update(Remote remote, params Action<RemoteUpdater>[] actions) { - using (var updater = new RemoteUpdater(this.repository, remote)) + var updater = new RemoteUpdater(repository, remote); + + foreach (Action<RemoteUpdater> action in actions) { - foreach (Action<RemoteUpdater> action in actions) - { - action(updater); - } + action(updater); } return this[remote.Name]; diff --git a/LibGit2Sharp/RemoteUpdater.cs b/LibGit2Sharp/RemoteUpdater.cs index 1c419727..07c823bc 100644 --- a/LibGit2Sharp/RemoteUpdater.cs +++ b/LibGit2Sharp/RemoteUpdater.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using LibGit2Sharp.Core; using LibGit2Sharp.Core.Handles; @@ -9,11 +10,12 @@ namespace LibGit2Sharp /// <summary> /// Exposes properties of a remote that can be updated. /// </summary> - public class RemoteUpdater : IDisposable + public class RemoteUpdater { private readonly UpdatingCollection<string> fetchRefSpecs; private readonly UpdatingCollection<string> pushRefSpecs; - private readonly RemoteSafeHandle remoteHandle; + private readonly Repository repo; + private readonly Remote remote; /// <summary> /// Needed for mocking purposes. @@ -26,32 +28,47 @@ namespace LibGit2Sharp Ensure.ArgumentNotNull(repo, "repo"); Ensure.ArgumentNotNull(remote, "remote"); + this.repo = repo; + this.remote = remote; + fetchRefSpecs = new UpdatingCollection<string>(GetFetchRefSpecs, SetFetchRefSpecs); pushRefSpecs = new UpdatingCollection<string>(GetPushRefSpecs, SetPushRefSpecs); - - remoteHandle = Proxy.git_remote_lookup(repo.Handle, remote.Name, true); } private IEnumerable<string> GetFetchRefSpecs() { - return Proxy.git_remote_get_fetch_refspecs(remoteHandle); + using (RemoteSafeHandle remoteHandle = Proxy.git_remote_lookup(repo.Handle, remote.Name, true)) + { + return Proxy.git_remote_get_fetch_refspecs(remoteHandle); + } } private void SetFetchRefSpecs(IEnumerable<string> value) { - Proxy.git_remote_set_fetch_refspecs(remoteHandle, value); - Proxy.git_remote_save(remoteHandle); + repo.Config.UnsetMultivar(string.Format("remote.{0}.fetch", remote.Name), ConfigurationLevel.Local); + + foreach (var url in value) + { + Proxy.git_remote_add_fetch(repo.Handle, remote.Name, url); + } } private IEnumerable<string> GetPushRefSpecs() { - return Proxy.git_remote_get_push_refspecs(remoteHandle); + using (RemoteSafeHandle remoteHandle = Proxy.git_remote_lookup(repo.Handle, remote.Name, true)) + { + return Proxy.git_remote_get_push_refspecs(remoteHandle); + } } private void SetPushRefSpecs(IEnumerable<string> value) { - Proxy.git_remote_set_push_refspecs(remoteHandle, value); - Proxy.git_remote_save(remoteHandle); + repo.Config.UnsetMultivar(string.Format("remote.{0}.push", remote.Name), ConfigurationLevel.Local); + + foreach (var url in value) + { + Proxy.git_remote_add_push(repo.Handle, remote.Name, url); + } } /// <summary> @@ -61,8 +78,7 @@ namespace LibGit2Sharp { set { - Proxy.git_remote_set_autotag(remoteHandle, value); - Proxy.git_remote_save(remoteHandle); + Proxy.git_remote_set_autotag(repo.Handle, remote.Name, value); } } @@ -73,11 +89,10 @@ namespace LibGit2Sharp { set { - Proxy.git_remote_set_url(remoteHandle, value); - Proxy.git_remote_save(remoteHandle); + Proxy.git_remote_set_url(repo.Handle, remote.Name, value); } } - + /// <summary> /// Sets the push url defined for this <see cref="Remote"/> /// </summary> @@ -85,8 +100,7 @@ namespace LibGit2Sharp { set { - Proxy.git_remote_set_pushurl(remoteHandle, value); - Proxy.git_remote_save(remoteHandle); + Proxy.git_remote_set_pushurl(repo.Handle, remote.Name, value); } } @@ -188,13 +202,5 @@ namespace LibGit2Sharp setter(list.Value); } } - - /// <summary> - /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. - /// </summary> - public void Dispose() - { - remoteHandle.Dispose(); - } } } diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs index 189a3cf3..79c9077b 100644 --- a/LibGit2Sharp/Repository.cs +++ b/LibGit2Sharp/Repository.cs @@ -628,7 +628,7 @@ namespace LibGit2Sharp Version = 1, Bare = options.IsBare ? 1 : 0, CheckoutOpts = gitCheckoutOptions, - RemoteCallbacks = gitRemoteCallbacks, + FetchOpts = new GitFetchOptions { RemoteCallbacks = gitRemoteCallbacks }, }; string clonedRepoPath; diff --git a/LibGit2Sharp/SmartSubtransportRegistration.cs b/LibGit2Sharp/SmartSubtransportRegistration.cs index df7c1cb4..8247b023 100644 --- a/LibGit2Sharp/SmartSubtransportRegistration.cs +++ b/LibGit2Sharp/SmartSubtransportRegistration.cs @@ -80,7 +80,8 @@ namespace LibGit2Sharp private static int Subtransport( out IntPtr subtransport, - IntPtr transport) + IntPtr transport, + IntPtr payload) { subtransport = IntPtr.Zero; diff --git a/LibGit2Sharp/SubmoduleCollection.cs b/LibGit2Sharp/SubmoduleCollection.cs index 33abfbf8..14ff416a 100644 --- a/LibGit2Sharp/SubmoduleCollection.cs +++ b/LibGit2Sharp/SubmoduleCollection.cs @@ -107,7 +107,7 @@ namespace LibGit2Sharp { Version = 1, CheckoutOptions = gitCheckoutOptions, - RemoteCallbacks = gitRemoteCallbacks, + FetchOptions = new GitFetchOptions { RemoteCallbacks = gitRemoteCallbacks }, CloneCheckoutStrategy = CheckoutStrategy.GIT_CHECKOUT_SAFE }; diff --git a/LibGit2Sharp/TagFetchMode.cs b/LibGit2Sharp/TagFetchMode.cs index 8e8efc79..993833f4 100644 --- a/LibGit2Sharp/TagFetchMode.cs +++ b/LibGit2Sharp/TagFetchMode.cs @@ -7,10 +7,16 @@ public enum TagFetchMode { /// <summary> - /// Default behavior. Will automatically retrieve tags that + /// Use the setting from the configuration + /// or, when there isn't any, fallback to default behavior. + /// </summary> + FromConfigurationOrDefault = 0, // GIT_REMOTE_DOWNLOAD_TAGS_FALLBACK + + /// <summary> + /// Will automatically retrieve tags that /// point to objects retrieved during this fetch. /// </summary> - Auto = 0, // GIT_REMOTE_DOWNLOAD_TAGS_AUTO + Auto, // GIT_REMOTE_DOWNLOAD_TAGS_AUTO /// <summary> /// No tag will be retrieved. diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt deleted file mode 100644 index 1f04184d..00000000 --- a/LibGit2Sharp/libgit2_hash.txt +++ /dev/null @@ -1 +0,0 @@ -9bbc8f350b80a5a6e94651ec667cf9e5d545b317 diff --git a/LibGit2Sharp/packages.config b/LibGit2Sharp/packages.config new file mode 100644 index 00000000..6565d177 --- /dev/null +++ b/LibGit2Sharp/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="LibGit2Sharp.NativeBinaries" version="1.0.51" targetFramework="net40" allowedVersions="[1.0.51]" /> +</packages>
\ No newline at end of file diff --git a/UpdateLibgit2ToSha.ps1 b/UpdateLibgit2ToSha.ps1 deleted file mode 100644 index 4a90841e..00000000 --- a/UpdateLibgit2ToSha.ps1 +++ /dev/null @@ -1,212 +0,0 @@ -<# -.SYNOPSIS - Builds a version of libgit2 and copies it to Lib/NativeBinaries. -.PARAMETER sha - Desired libgit2 version. This is run through `git rev-parse`, so branch names are okay too. -.PARAMETER vs - Version of Visual Studio project files to generate. Cmake supports "10" (default), "11" and "12". -.PARAMETER libgit2Name - The base name (i.e without the file extension) of the libgit2 DLL to generate. Default is to use git2-$suffix, where $suffix is the first 7 characters of the SHA1 of the corresponding libgi2 commit as the suffix. -.PARAMETER test - If set, run the libgit2 tests on the desired version. -.PARAMETER debug - If set, build the "Debug" configuration of libgit2, rather than "RelWithDebInfo" (default). -#> - -Param( - [string]$sha = 'HEAD', - [string]$vs = '10', - [string]$libgit2Name = '', - [switch]$test, - [switch]$debug -) - -Set-StrictMode -Version Latest - -$self = Split-Path -Leaf $MyInvocation.MyCommand.Path -$libgit2sharpDirectory = Split-Path $MyInvocation.MyCommand.Path -$libgit2Directory = Join-Path $libgit2sharpDirectory "libgit2" -$x86Directory = Join-Path $libgit2sharpDirectory "Lib\NativeBinaries\x86" -$x64Directory = Join-Path $libgit2sharpDirectory "Lib\NativeBinaries\amd64" - -$build_clar = 'OFF' -if ($test.IsPresent) { $build_clar = 'ON' } -$configuration = "RelWithDebInfo" -if ($debug.IsPresent) { $configuration = "Debug" } - -function Run-Command([scriptblock]$Command, [switch]$Fatal, [switch]$Quiet) { - $output = "" - if ($Quiet) { - $output = & $Command 2>&1 - } else { - & $Command - } - - if (!$Fatal) { - return - } - - $exitCode = 0 - if ($LastExitCode -ne 0) { - $exitCode = $LastExitCode - } elseif (!$?) { - $exitCode = 1 - } else { - return - } - - $error = "``$Command`` failed" - if ($output) { - Write-Host -ForegroundColor yellow $output - $error += ". See output above." - } - Throw $error -} - -function Find-CMake { - # Look for cmake.exe in $Env:PATH. - $cmake = @(Get-Command cmake.exe)[0] 2>$null - if ($cmake) { - $cmake = $cmake.Definition - } else { - # Look for the highest-versioned cmake.exe in its default location. - $cmake = @(Resolve-Path (Join-Path ${Env:ProgramFiles(x86)} "CMake *\bin\cmake.exe")) - if ($cmake) { - $cmake = $cmake[-1].Path - } - } - if (!$cmake) { - throw "Error: Can't find cmake.exe" - } - $cmake -} - -function Find-Git { - $git = @(Get-Command git)[0] 2>$null - if ($git) { - $git = $git.Definition - Write-Host -ForegroundColor Gray "Using git: $git" - & $git --version | write-host -ForegroundColor Gray - return $git - } - throw "Error: Can't find git" -} - -Push-Location $libgit2Directory - -function Ensure-Property($expected, $propertyValue, $propertyName, $path) { - if ($propertyValue -eq $expected) { - return - } - - throw "Error: Invalid '$propertyName' property in generated '$path' (Expected: $expected - Actual: $propertyValue)" -} - -function Assert-Consistent-Naming($expected, $path) { - $dll = get-item $path - - Ensure-Property $expected $dll.Name "Name" $dll.Fullname - Ensure-Property $expected $dll.VersionInfo.InternalName "VersionInfo.InternalName" $dll.Fullname - Ensure-Property $expected $dll.VersionInfo.OriginalFilename "VersionInfo.OriginalFilename" $dll.Fullname -} - -& { - trap { - Pop-Location - break - } - - $cmake = Find-CMake - $ctest = Join-Path (Split-Path -Parent $cmake) "ctest.exe" - $git = Find-Git - - Write-Output "Fetching..." - Run-Command -Quiet { & $git fetch } - - Write-Output "Verifying $sha..." - $sha = & $git rev-parse $sha - if ($LASTEXITCODE -ne 0) { - write-host -foregroundcolor red "Error: invalid SHA. USAGE: $self <SHA>" - popd - break - } - - if(![string]::IsNullOrEmpty($libgit2Name)) { - $binaryFilename = $libgit2Name - } else { - $binaryFilename = "git2-" + $sha.Substring(0,7) - } - - Write-Output "Checking out $sha..." - Run-Command -Quiet -Fatal { & $git checkout $sha } - - Write-Output "Building 32-bit..." - Run-Command -Quiet { & remove-item build -recurse -force } - Run-Command -Quiet { & mkdir build } - cd build - Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON .. } - Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration } - if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } - cd $configuration - Assert-Consistent-Naming "$binaryFilename.dll" "*.dll" - Run-Command -Quiet { & rm *.exp } - Run-Command -Quiet { & rm $x86Directory\* } - Run-Command -Quiet -Fatal { & copy -fo * $x86Directory } - - Write-Output "Building 64-bit..." - cd .. - Run-Command -Quiet { & mkdir build64 } - cd build64 - Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON ../.. } - Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration } - if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } - cd $configuration - Assert-Consistent-Naming "$binaryFilename.dll" "*.dll" - Run-Command -Quiet { & rm *.exp } - Run-Command -Quiet { & rm $x64Directory\* } - Run-Command -Quiet -Fatal { & copy -fo * $x64Directory } - - pop-location - - $dllNameClass = @" -namespace LibGit2Sharp.Core -{ - internal static class NativeDllName - { - public const string Name = "$binaryFilename"; - } -} -"@ - - sc -Encoding ASCII (Join-Path $libgit2sharpDirectory "Libgit2sharp\Core\NativeDllName.cs") $dllNameClass - sc -Encoding ASCII (Join-Path $libgit2sharpDirectory "Libgit2sharp\libgit2_hash.txt") $sha - - $buildProperties = @" -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Condition=" '`$(OS)' == 'Windows_NT' "> - <None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\$binaryFilename.dll"> - <Link>NativeBinaries\amd64\$binaryFilename.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\$binaryFilename.pdb"> - <Link>NativeBinaries\amd64\$binaryFilename.pdb</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\$binaryFilename.dll"> - <Link>NativeBinaries\x86\$binaryFilename.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\$binaryFilename.pdb"> - <Link>NativeBinaries\x86\$binaryFilename.pdb</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - </ItemGroup> -</Project> -"@ - - sc -Encoding UTF8 (Join-Path $libgit2sharpDirectory "nuget.package\build\LibGit2Sharp.props") $buildProperties - - Write-Output "Done!" -} -exit diff --git a/appveyor.yml b/appveyor.yml index c67ccc7e..64263909 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,7 +63,7 @@ test_script: on_success: - ps: | - & "$env:APPVEYOR_BUILD_FOLDER\nuget.package\BuildNugetPackage.ps1" -commitSha "$env:APPVEYOR_REPO_COMMIT" -postBuild { sourcelink index -pr LibGit2Sharp.csproj -pp Configuration Release -nf Core\UniqueIdentifier.cs -nf Properties\AssemblyInfo.cs -r .. -u 'https://raw.githubusercontent.com/libgit2/libgit2sharp/{0}/%var2%' } + & "$env:APPVEYOR_BUILD_FOLDER\nuget.package\BuildNugetPackage.ps1" -commitSha "$env:APPVEYOR_REPO_COMMIT" -postBuild { sourcelink index -pr LibGit2Sharp.csproj -pp Configuration Release -nf Core\NativeDllName.cs -nf Core\UniqueIdentifier.cs -nf Properties\AssemblyInfo.cs -r .. -u 'https://raw.githubusercontent.com/libgit2/libgit2sharp/{0}/%var2%' } Add-Type -Path "$env:APPVEYOR_BUILD_FOLDER\LibGit2Sharp\bin\Release\LibGit2Sharp.dll" Write-Host "LibGit2Sharp version = $([LibGit2Sharp.GlobalSettings]::Version)" -ForegroundColor "Magenta" If ($Env:SHOULD_PUBLISH_NUGET_ARTIFACT -eq $True) diff --git a/build.libgit2sharp.sh b/build.libgit2sharp.sh index f9527cbb..acf425a2 100755 --- a/build.libgit2sharp.sh +++ b/build.libgit2sharp.sh @@ -1,33 +1,13 @@ #!/bin/bash set -e -LIBGIT2SHA=`cat ./LibGit2Sharp/libgit2_hash.txt` -SHORTSHA=${LIBGIT2SHA:0:7} EXTRADEFINE="$1" -rm -rf libgit2/build -mkdir libgit2/build -pushd libgit2/build -export _BINPATH=`pwd` - -cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ - -DBUILD_CLAR:BOOL=OFF \ - -DUSE_SSH=OFF \ - -DENABLE_TRACE=ON \ - -DLIBGIT2_FILENAME=git2-$SHORTSHA \ - -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \ - .. -cmake --build . - -export LD_LIBRARY_PATH=$_BINPATH:$LD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=$_BINPATH:$DYLD_LIBRARY_PATH - -popd - -export MONO_OPTIONS=--debug - -echo $DYLD_LIBRARY_PATH -echo $LD_LIBRARY_PATH +# Setting LD_LIBRARY_PATH to the current working directory is needed to run +# the tests successfully in linux. Without this, mono can't find libgit when +# the libgit2sharp assembly has been shadow copied. OS X includes the current +# working directory in its library search path, so it works without this value. +export LD_LIBRARY_PATH=. # Required for NuGet package restore to run. mozroots --import --sync diff --git a/libgit2 b/libgit2 deleted file mode 160000 -Subproject 9bbc8f350b80a5a6e94651ec667cf9e5d545b31 diff --git a/nuget.package/LibGit2Sharp.nuspec b/nuget.package/LibGit2Sharp.nuspec index 3b997418..c8381e2c 100644 --- a/nuget.package/LibGit2Sharp.nuspec +++ b/nuget.package/LibGit2Sharp.nuspec @@ -12,18 +12,11 @@ <releaseNotes>https://github.com/libgit2/libgit2sharp/blob/master/CHANGES.md#libgit2sharp-changes</releaseNotes> <iconUrl>https://github.com/libgit2/libgit2sharp/raw/master/square-logo.png</iconUrl> <tags>libgit2 git wrapper bindings API dvcs vcs</tags> - <references> - <reference file="LibGit2Sharp.dll" /> - </references> </metadata> <files> - <file src="..\Lib\NativeBinaries\**\*.dll" target="lib\net40\NativeBinaries" /> - <file src="..\Lib\NativeBinaries\**\*.pdb" target="lib\net40\NativeBinaries" /> <file src="..\README.md" target="App_Readme\LibGit2Sharp.README.md" /> <file src="..\LICENSE.md" target="App_Readme\LibGit2Sharp.LICENSE.md" /> <file src="..\CHANGES.md" target="App_Readme\LibGit2Sharp.CHANGES.md" /> - <file src="..\nuget.package\build\*.*" target="build\net40" /> - <file src="..\Lib\NativeBinaries\libgit2.license.txt" target="App_Readme" /> <file src="bin\$configuration$\$id$.pdb" target="lib\net40" /> </files> </package> diff --git a/nuget.package/build/LibGit2Sharp.props b/nuget.package/build/LibGit2Sharp.props deleted file mode 100644 index b12792b7..00000000 --- a/nuget.package/build/LibGit2Sharp.props +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Condition=" '$(OS)' == 'Windows_NT' "> - <None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-9bbc8f3.dll"> - <Link>NativeBinaries\amd64\git2-9bbc8f3.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-9bbc8f3.pdb"> - <Link>NativeBinaries\amd64\git2-9bbc8f3.pdb</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-9bbc8f3.dll"> - <Link>NativeBinaries\x86\git2-9bbc8f3.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-9bbc8f3.pdb"> - <Link>NativeBinaries\x86\git2-9bbc8f3.pdb</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - </ItemGroup> -</Project> |