jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Run go fmt 

As it seems to be something that many people can't get over, reformat
all the files; as we're breaking things, whoever depended on 'next' will
have to take many changes into account anyway, so let's include this to
reduce the noise of incoming patches.
This commit is contained in:
Carlos Martín Nieto 2015-08-31 20:22:17 +02:00
parent 876ddd17eb
commit d5890f58e8
7 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
checkout.go
View File

@ -44,7 +44,7 @@ type CheckoutOpts struct {
FileMode os.FileMode // Default is 0644 or 0755 as dictated by blob FileMode os.FileMode // Default is 0644 or 0755 as dictated by blob
FileOpenFlags int // Default is O_CREAT | O_TRUNC | O_WRONLY FileOpenFlags int // Default is O_CREAT | O_TRUNC | O_WRONLY
TargetDirectory string // Alternative checkout path to workdir TargetDirectory string // Alternative checkout path to workdir
Paths []string Paths []string
} }
func checkoutOptionsFromC(c *C.git_checkout_options) CheckoutOpts { func checkoutOptionsFromC(c *C.git_checkout_options) CheckoutOpts {
@ -156,4 +156,4 @@ func (v *Repository) CheckoutTree(tree *Tree, opts *CheckoutOpts) error {
} }
return nil return nil
} }

6
index.go
View File

@ -51,8 +51,8 @@ func newIndexEntryFromC(entry *C.git_index_entry) *IndexEntry {
return nil return nil
} }
return &IndexEntry{ return &IndexEntry{
IndexTime { int32(entry.ctime.seconds), uint32(entry.ctime.nanoseconds) }, IndexTime{int32(entry.ctime.seconds), uint32(entry.ctime.nanoseconds)},
IndexTime { int32(entry.mtime.seconds), uint32(entry.mtime.nanoseconds) }, IndexTime{int32(entry.mtime.seconds), uint32(entry.mtime.nanoseconds)},
Filemode(entry.mode), Filemode(entry.mode),
uint32(entry.uid), uint32(entry.uid),
uint32(entry.gid), uint32(entry.gid),
@ -280,7 +280,7 @@ func (v *Index) ReadTree(tree *Tree) error {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_index_read_tree(v.ptr, tree.cast_ptr); ret := C.git_index_read_tree(v.ptr, tree.cast_ptr)
if ret < 0 { if ret < 0 {
return MakeGitError(ret) return MakeGitError(ret)
} }

12
merge.go
View File

@ -85,8 +85,8 @@ const (
) )
type MergeOptions struct { type MergeOptions struct {
Version uint Version uint
TreeFlags MergeTreeFlag TreeFlags MergeTreeFlag
RenameThreshold uint RenameThreshold uint
TargetLimit uint TargetLimit uint
@ -98,7 +98,7 @@ type MergeOptions struct {
func mergeOptionsFromC(opts *C.git_merge_options) MergeOptions { func mergeOptionsFromC(opts *C.git_merge_options) MergeOptions {
return MergeOptions{ return MergeOptions{
Version: uint(opts.version), Version: uint(opts.version),
TreeFlags: MergeTreeFlag(opts.tree_flags), TreeFlags: MergeTreeFlag(opts.tree_flags),
RenameThreshold: uint(opts.rename_threshold), RenameThreshold: uint(opts.rename_threshold),
TargetLimit: uint(opts.target_limit), TargetLimit: uint(opts.target_limit),
FileFavor: MergeFileFavor(opts.file_favor), FileFavor: MergeFileFavor(opts.file_favor),
@ -259,10 +259,10 @@ func (r *Repository) MergeBases(one, two *Oid) ([]*Oid, error) {
} }
oids := make([]*Oid, coids.count) oids := make([]*Oid, coids.count)
hdr := reflect.SliceHeader { hdr := reflect.SliceHeader{
Data: uintptr(unsafe.Pointer(coids.ids)), Data: uintptr(unsafe.Pointer(coids.ids)),
Len: int(coids.count), Len: int(coids.count),
Cap: int(coids.count), Cap: int(coids.count),
} }
goSlice := *(*[]C.git_oid)(unsafe.Pointer(&hdr)) goSlice := *(*[]C.git_oid)(unsafe.Pointer(&hdr))

4
odb.go
View File

@ -8,10 +8,10 @@ extern void _go_git_odb_backend_free(git_odb_backend *backend);
*/ */
import "C" import "C"
import ( import (
"fmt"
"reflect" "reflect"
"runtime" "runtime"
"unsafe" "unsafe"
"fmt"
) )
type Odb struct { type Odb struct {
@ -130,7 +130,7 @@ func (v *Odb) ForEach(callback OdbForEachCallback) error {
defer pointerHandles.Untrack(handle) defer pointerHandles.Untrack(handle)
ret := C._go_git_odb_foreach(v.ptr, handle) ret := C._go_git_odb_foreach(v.ptr, handle)
fmt.Println("ret %v", ret); fmt.Println("ret %v", ret)
if ret == C.GIT_EUSER { if ret == C.GIT_EUSER {
return data.err return data.err
} else if ret < 0 { } else if ret < 0 {

26
remote.go
View File

@ -72,12 +72,12 @@ type RemoteCallbacks struct {
type FetchPrune uint type FetchPrune uint
const ( const (
// Use the setting from the configuration // Use the setting from the configuration
FetchPruneUnspecified FetchPrune = C.GIT_FETCH_PRUNE_UNSPECIFIED FetchPruneUnspecified FetchPrune = C.GIT_FETCH_PRUNE_UNSPECIFIED
// Force pruning on // Force pruning on
FetchPruneOn FetchPrune = C.GIT_FETCH_PRUNE FetchPruneOn FetchPrune = C.GIT_FETCH_PRUNE
// Force pruning off // Force pruning off
FetchNoPrune FetchPrune = C.GIT_FETCH_NO_PRUNE FetchNoPrune FetchPrune = C.GIT_FETCH_NO_PRUNE
) )
type DownloadTags uint type DownloadTags uint
@ -88,20 +88,20 @@ const (
DownloadTagsUnspecified DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED DownloadTagsUnspecified DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED
// Ask the server for tags pointing to objects we're already // Ask the server for tags pointing to objects we're already
// downloading. // downloading.
DownloadTagsAuto DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_AUTO DownloadTagsAuto DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_AUTO
// Don't ask for any tags beyond the refspecs. // Don't ask for any tags beyond the refspecs.
DownloadTagsNone DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_NONE DownloadTagsNone DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_NONE
// Ask for the all the tags. // Ask for the all the tags.
DownloadTagsAll DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_ALL DownloadTagsAll DownloadTags = C.GIT_REMOTE_DOWNLOAD_TAGS_ALL
) )
type FetchOptions struct { type FetchOptions struct {
// Callbacks to use for this fetch operation // Callbacks to use for this fetch operation
RemoteCallbacks RemoteCallbacks RemoteCallbacks RemoteCallbacks
// Whether to perform a prune after the fetch // Whether to perform a prune after the fetch
Prune FetchPrune Prune FetchPrune
// Whether to write the results to FETCH_HEAD. Defaults to // Whether to write the results to FETCH_HEAD. Defaults to
// on. Leave this default in order to behave like git. // on. Leave this default in order to behave like git.
UpdateFetchhead bool UpdateFetchhead bool
@ -111,7 +111,7 @@ type FetchOptions struct {
// downloading all of them. // downloading all of them.
// //
// The default is to auto-follow tags. // The default is to auto-follow tags.
DownloadTags DownloadTags DownloadTags DownloadTags
} }
type Remote struct { type Remote struct {
@ -588,7 +588,7 @@ func (o *Remote) RefspecCount() uint {
func populateFetchOptions(options *C.git_fetch_options, opts *FetchOptions) { func populateFetchOptions(options *C.git_fetch_options, opts *FetchOptions) {
C.git_fetch_init_options(options, C.GIT_FETCH_OPTIONS_VERSION) C.git_fetch_init_options(options, C.GIT_FETCH_OPTIONS_VERSION)
if opts == nil { if opts == nil {
return; return
} }
populateRemoteCallbacks(&options.callbacks, &opts.RemoteCallbacks) populateRemoteCallbacks(&options.callbacks, &opts.RemoteCallbacks)
options.prune = C.git_fetch_prune_t(opts.Prune) options.prune = C.git_fetch_prune_t(opts.Prune)
@ -611,7 +611,7 @@ func populatePushOptions(options *C.git_push_options, opts *PushOptions) {
// to use for this fetch, use an empty list to use the refspecs from // to use for this fetch, use an empty list to use the refspecs from
// the configuration; msg specifies what to use for the reflog // the configuration; msg specifies what to use for the reflog
// entries. Leave "" to use defaults. // entries. Leave "" to use defaults.
func (o *Remote) Fetch(refspecs []string, opts *FetchOptions, msg string) error { func (o *Remote) Fetch(refspecs []string, opts *FetchOptions, msg string) error {
var cmsg *C.char = nil var cmsg *C.char = nil
if msg != "" { if msg != "" {
cmsg = C.CString(msg) cmsg = C.CString(msg)
@ -624,7 +624,7 @@ func (o *Remote) Fetch(refspecs []string, opts *FetchOptions, msg string) error
defer freeStrarray(&crefspecs) defer freeStrarray(&crefspecs)
var coptions C.git_fetch_options var coptions C.git_fetch_options
populateFetchOptions(&coptions, opts); populateFetchOptions(&coptions, opts)
defer untrackCalbacksPayload(&coptions.callbacks) defer untrackCalbacksPayload(&coptions.callbacks)
runtime.LockOSThread() runtime.LockOSThread()
@ -646,7 +646,7 @@ func (o *Remote) ConnectPush(callbacks *RemoteCallbacks) error {
} }
func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks) error { func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks) error {
var ccallbacks C.git_remote_callbacks; var ccallbacks C.git_remote_callbacks
populateRemoteCallbacks(&ccallbacks, callbacks) populateRemoteCallbacks(&ccallbacks, callbacks)
runtime.LockOSThread() runtime.LockOSThread()
@ -729,7 +729,7 @@ func (o *Remote) PruneRefs() bool {
} }
func (o *Remote) Prune(callbacks *RemoteCallbacks) error { func (o *Remote) Prune(callbacks *RemoteCallbacks) error {
var ccallbacks C.git_remote_callbacks; var ccallbacks C.git_remote_callbacks
populateRemoteCallbacks(&ccallbacks, callbacks) populateRemoteCallbacks(&ccallbacks, callbacks)
runtime.LockOSThread() runtime.LockOSThread()

2
remote_test.go
View File

@ -39,7 +39,7 @@ func TestCertificateCheck(t *testing.T) {
remote, err := repo.Remotes.Create("origin", "https://github.com/libgit2/TestGitRepository") remote, err := repo.Remotes.Create("origin", "https://github.com/libgit2/TestGitRepository")
checkFatal(t, err) checkFatal(t, err)
options := FetchOptions { options := FetchOptions{
RemoteCallbacks: RemoteCallbacks{ RemoteCallbacks: RemoteCallbacks{
CertificateCheckCallback: func(cert *Certificate, valid bool, hostname string) ErrorCode { CertificateCheckCallback: func(cert *Certificate, valid bool, hostname string) ErrorCode {
return assertHostname(cert, valid, hostname, t) return assertHostname(cert, valid, hostname, t)

10
repository.go
View File

@ -12,11 +12,11 @@ import (
// Repository // Repository
type Repository struct { type Repository struct {
ptr *C.git_repository ptr *C.git_repository
// Remotes represents the collection of remotes and can be // Remotes represents the collection of remotes and can be
// used to add, remove and configure remotes for this // used to add, remove and configure remotes for this
// repository. // repository.
Remotes RemoteCollection Remotes RemoteCollection
// Submodules represents the collection of submodules and can // Submodules represents the collection of submodules and can
// be used to add, remove and configure submodules in this // be used to add, remove and configure submodules in this
// repostiory. // repostiory.
@ -26,7 +26,7 @@ type Repository struct {
References ReferenceCollection References ReferenceCollection
// Notes represents the collection of notes and can be used to // Notes represents the collection of notes and can be used to
// read, write and delete notes from this repository. // read, write and delete notes from this repository.
Notes NoteCollection Notes NoteCollection
// Tags represents the collection of tags and can be used to create, // Tags represents the collection of tags and can be used to create,
// list and iterate tags in this repository. // list and iterate tags in this repository.
Tags TagsCollection Tags TagsCollection
@ -35,10 +35,10 @@ type Repository struct {
func newRepositoryFromC(ptr *C.git_repository) *Repository { func newRepositoryFromC(ptr *C.git_repository) *Repository {
repo := &Repository{ptr: ptr} repo := &Repository{ptr: ptr}
repo.Remotes.repo = repo repo.Remotes.repo = repo
repo.Submodules.repo = repo repo.Submodules.repo = repo
repo.References.repo = repo repo.References.repo = repo
repo.Notes.repo = repo repo.Notes.repo = repo
repo.Tags.repo = repo repo.Tags.repo = repo
runtime.SetFinalizer(repo, (*Repository).Free) runtime.SetFinalizer(repo, (*Repository).Free)