While I'm in here, this value is always the same, push it down

This commit is contained in:
rubyist 2015-07-30 10:43:50 -04:00
parent b87386d705
commit 46249c9dd4
6 changed files with 10 additions and 10 deletions

@ -73,7 +73,7 @@ func fetchAndReportToChan(pointers []*lfs.WrappedPointer, out chan<- *lfs.Wrappe
for _, p := range pointers { for _, p := range pointers {
totalSize += p.Size totalSize += p.Size
} }
q := lfs.NewDownloadQueue(lfs.Config.ConcurrentTransfers(), len(pointers), totalSize, false) q := lfs.NewDownloadQueue(len(pointers), totalSize, false)
for _, p := range pointers { for _, p := range pointers {
// Only add to download queue if local file is not the right size already // Only add to download queue if local file is not the right size already

@ -76,7 +76,7 @@ func prePushCommand(cmd *cobra.Command, args []string) {
totalSize += p.Size totalSize += p.Size
} }
uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(pointers), totalSize, prePushDryRun) uploadQueue := lfs.NewUploadQueue(len(pointers), totalSize, prePushDryRun)
for _, pointer := range pointers { for _, pointer := range pointers {
if prePushDryRun { if prePushDryRun {

@ -37,7 +37,7 @@ func uploadsBetweenRefs(left string, right string) *lfs.TransferQueue {
totalSize += p.Size totalSize += p.Size
} }
uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(pointers), totalSize, pushDryRun) uploadQueue := lfs.NewUploadQueue(len(pointers), totalSize, pushDryRun)
for i, pointer := range pointers { for i, pointer := range pointers {
if pushDryRun { if pushDryRun {
Print("push %s", pointer.Name) Print("push %s", pointer.Name)
@ -82,7 +82,7 @@ func uploadsWithObjectIDs(oids []string) *lfs.TransferQueue {
uploads = append(uploads, u) uploads = append(uploads, u)
} }
uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(oids), totalSize, pushDryRun) uploadQueue := lfs.NewUploadQueue(len(oids), totalSize, pushDryRun)
for _, u := range uploads { for _, u := range uploads {
uploadQueue.Add(u) uploadQueue.Add(u)

@ -42,8 +42,8 @@ func (d *Downloadable) SetObject(o *objectResource) {
} }
// NewDownloadQueue builds a DownloadQueue, allowing `workers` concurrent downloads. // NewDownloadQueue builds a DownloadQueue, allowing `workers` concurrent downloads.
func NewDownloadQueue(workers, files int, size int64, dryRun bool) *TransferQueue { func NewDownloadQueue(files int, size int64, dryRun bool) *TransferQueue {
q := newTransferQueue(workers, files, size, dryRun) q := newTransferQueue(files, size, dryRun)
q.transferKind = "download" q.transferKind = "download"
return q return q
} }

@ -38,13 +38,13 @@ type TransferQueue struct {
} }
// newTransferQueue builds a TransferQueue, allowing `workers` concurrent transfers. // newTransferQueue builds a TransferQueue, allowing `workers` concurrent transfers.
func newTransferQueue(workers, files int, size int64, dryRun bool) *TransferQueue { func newTransferQueue(files int, size int64, dryRun bool) *TransferQueue {
q := &TransferQueue{ q := &TransferQueue{
meter: NewProgressMeter(files, size, dryRun), meter: NewProgressMeter(files, size, dryRun),
apic: make(chan Transferable, batchSize), apic: make(chan Transferable, batchSize),
transferc: make(chan Transferable, batchSize), transferc: make(chan Transferable, batchSize),
errorc: make(chan *WrappedError), errorc: make(chan *WrappedError),
workers: workers, workers: Config.ConcurrentTransfers(),
transferables: make(map[string]Transferable), transferables: make(map[string]Transferable),
} }

@ -71,8 +71,8 @@ func (u *Uploadable) SetObject(o *objectResource) {
} }
// NewUploadQueue builds an UploadQueue, allowing `workers` concurrent uploads. // NewUploadQueue builds an UploadQueue, allowing `workers` concurrent uploads.
func NewUploadQueue(workers, files int, size int64, dryRun bool) *TransferQueue { func NewUploadQueue(files int, size int64, dryRun bool) *TransferQueue {
q := newTransferQueue(workers, files, size, dryRun) q := newTransferQueue(files, size, dryRun)
q.transferKind = "upload" q.transferKind = "upload"
return q return q
} }