Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

storage/filesystem: avoid norwfs build flag #864

Merged
merged 1 commit into from
Jul 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion storage/filesystem/dotgit/dotgit.go
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ func (d *DotGit) openAndLockPackedRefs(doCreate bool) (
// File mode is retrieved from a constant defined in the target specific
// files (dotgit_rewrite_packed_refs_*). Some modes are not available
// in all filesystems.
openFlags := openAndLockPackedRefsMode
openFlags := d.openAndLockPackedRefsMode()
if doCreate {
openFlags |= os.O_CREATE
}
Expand Down
81 changes: 81 additions & 0 deletions storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package dotgit

import (
"io"
"os"
"runtime"

"gopkg.in/src-d/go-billy.v4"
"gopkg.in/src-d/go-git.v4/utils/ioutil"
)

func (d *DotGit) openAndLockPackedRefsMode() int {
if billy.CapabilityCheck(d.fs, billy.ReadAndWriteCapability) {
return os.O_RDWR
}

return os.O_RDONLY
}

func (d *DotGit) rewritePackedRefsWhileLocked(
tmp billy.File, pr billy.File) error {
// Try plain rename. If we aren't using the bare Windows filesystem as the
// storage layer, we might be able to get away with a rename over a locked
// file.
err := d.fs.Rename(tmp.Name(), pr.Name())
if err == nil {
return nil
}

// If we are in a filesystem that does not support rename (e.g. sivafs)
// a full copy is done.
if err == billy.ErrNotSupported {
return d.copyNewFile(tmp, pr)
}

if runtime.GOOS != "windows" {
return err
}

// Otherwise, Windows doesn't let us rename over a locked file, so
// we have to do a straight copy. Unfortunately this could result
// in a partially-written file if the process fails before the
// copy completes.
return d.copyToExistingFile(tmp, pr)
}

func (d *DotGit) copyToExistingFile(tmp, pr billy.File) error {
_, err := pr.Seek(0, io.SeekStart)
if err != nil {
return err
}
err = pr.Truncate(0)
if err != nil {
return err
}
_, err = tmp.Seek(0, io.SeekStart)
if err != nil {
return err
}
_, err = io.Copy(pr, tmp)

return err
}

func (d *DotGit) copyNewFile(tmp billy.File, pr billy.File) (err error) {
prWrite, err := d.fs.Create(pr.Name())
if err != nil {
return err
}

defer ioutil.CheckClose(prWrite, &err)

_, err = tmp.Seek(0, io.SeekStart)
if err != nil {
return err
}

_, err = io.Copy(prWrite, tmp)

return err
}
17 changes: 0 additions & 17 deletions storage/filesystem/dotgit/dotgit_rewrite_packed_refs_nix.go

This file was deleted.

34 changes: 0 additions & 34 deletions storage/filesystem/dotgit/dotgit_rewrite_packed_refs_norwfs.go

This file was deleted.

42 changes: 0 additions & 42 deletions storage/filesystem/dotgit/dotgit_rewrite_packed_refs_windows.go

This file was deleted.