lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commands: accept ...*lfs.WrappedPointer instead of []*lfs.WrappedPointer

Browse Source
This commit is contained in:
Taylor Blau 2016-12-29 14:36:28 -07:00
parent c405f2f67a
commit b89c89d65e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/command_pre_push.go
View File

@ -82,7 +82,7 @@ func prePushCommand(cmd *cobra.Command, args []string) {
Print("Error scanning for Git LFS files in %q", left) Print("Error scanning for Git LFS files in %q", left)
ExitWithError(err) ExitWithError(err)
} }
uploadPointers(ctx, pointers) uploadPointers(ctx, pointers...)
} }
ctx.Await() ctx.Await()

4
commands/command_push.go
View File

@ -40,7 +40,7 @@ func uploadsBetweenRefAndRemote(ctx *uploadContext, refnames []string) {
Print("Error scanning for Git LFS files in the %q ref", ref.Name) Print("Error scanning for Git LFS files in the %q ref", ref.Name)
ExitWithError(err) ExitWithError(err)
} }
uploadPointers(ctx, pointers) uploadPointers(ctx, pointers...)
} }
ctx.Await() ctx.Await()
@ -78,7 +78,7 @@ func uploadsWithObjectIDs(ctx *uploadContext, oids []string) {
for idx, oid := range oids { for idx, oid := range oids {
pointers[idx] = &lfs.WrappedPointer{Pointer: &lfs.Pointer{Oid: oid}} pointers[idx] = &lfs.WrappedPointer{Pointer: &lfs.Pointer{Oid: oid}}
} }
uploadPointers(ctx, pointers) uploadPointers(ctx, pointers...)
ctx.Await() ctx.Await()
} }

6
commands/uploader.go
View File

@ -50,7 +50,7 @@ func (c *uploadContext) HasUploaded(oid string) bool {
return c.uploadedOids.Contains(oid) return c.uploadedOids.Contains(oid)
} }
func (c *uploadContext) prepareUpload(unfiltered []*lfs.WrappedPointer) (*tq.TransferQueue, []*lfs.WrappedPointer) { func (c *uploadContext) prepareUpload(unfiltered ...*lfs.WrappedPointer) (*tq.TransferQueue, []*lfs.WrappedPointer) {
numUnfiltered := len(unfiltered) numUnfiltered := len(unfiltered)
uploadables := make([]*lfs.WrappedPointer, 0, numUnfiltered) uploadables := make([]*lfs.WrappedPointer, 0, numUnfiltered)
missingLocalObjects := make([]*lfs.WrappedPointer, 0, numUnfiltered) missingLocalObjects := make([]*lfs.WrappedPointer, 0, numUnfiltered)
@ -137,7 +137,7 @@ func (c *uploadContext) checkMissing(missing []*lfs.WrappedPointer, missingSize
<-done <-done
} }
func uploadPointers(c *uploadContext, unfiltered []*lfs.WrappedPointer) { func uploadPointers(c *uploadContext, unfiltered ...*lfs.WrappedPointer) {
if c.DryRun { if c.DryRun {
for _, p := range unfiltered { for _, p := range unfiltered {
if c.HasUploaded(p.Oid) { if c.HasUploaded(p.Oid) {
@ -151,7 +151,7 @@ func uploadPointers(c *uploadContext, unfiltered []*lfs.WrappedPointer) {
return return
} }
q, pointers := c.prepareUpload(unfiltered) q, pointers := c.prepareUpload(unfiltered...)
for _, p := range pointers { for _, p := range pointers {
t, err := uploadTransfer(p.Oid, p.Name) t, err := uploadTransfer(p.Oid, p.Name)
if err != nil { if err != nil {