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

commands: pass in *githistory.RewriteOptions to migrate()

Browse Source
This commit is contained in:
Taylor Blau 2017-06-21 10:54:55 -06:00
parent 0dde5c84c4
commit 7f22ed9ec2
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
commands/command_migrate.go
View File

@ -23,10 +23,10 @@ var (
// migrate takes the given command and arguments, *odb.ObjectDatabase, as well
// as a BlobRewriteFn to apply, and performs a migration.
func migrate(args []string, r *githistory.Rewriter, fn githistory.BlobRewriteFn) {
func migrate(args []string, r *githistory.Rewriter, opts *githistory.RewriteOptions) {
requireInRepo()
opts, err := rewriteOptions(args, fn)
opts, err := rewriteOptions(args, opts)
if err != nil {
ExitWithError(err)
}
@ -49,18 +49,18 @@ func getObjectDatabase() (*odb.ObjectDatabase, error) {
// rewriteOptions returns *githistory.RewriteOptions able to be passed to a
// *githistory.Rewriter that reflect the current arguments and flags passed to
// an invocation of git-lfs-migrate(1).?
// an invocation of git-lfs-migrate(1).
//
// Repository references are included and excluded based on the following rules:
// It is merged with the given "opts". In other words, an identical "opts" is
// returned, where the Include and Exclude fields have been filled based on the
// following rules:
//
// The included and excluded references are determined based on the output of
// includeExcludeRefs (see below for documentation and detail).
//
// The given "fn" githistory.BlobRewriteFn is passed as the BlobFn.
//
// If any of the above could not be determined without error, that error will be
// returned immediately.
func rewriteOptions(args []string, fn githistory.BlobRewriteFn) (*githistory.RewriteOptions, error) {
func rewriteOptions(args []string, opts *githistory.RewriteOptions) (*githistory.RewriteOptions, error) {
include, exclude, err := includeExcludeRefs(args)
if err != nil {
return nil, err
@ -70,7 +70,10 @@ func rewriteOptions(args []string, fn githistory.BlobRewriteFn) (*githistory.Rew
Include: include,
Exclude: exclude,
BlobFn: fn,
UpdateRefs: opts.UpdateRefs,
BlobFn: opts.BlobFn,
TreeCallbackFn: opts.TreeCallbackFn,
}, nil
}

39
commands/command_migrate_info.go
View File

@ -9,6 +9,7 @@ import (
"strings"
"github.com/git-lfs/git-lfs/errors"
"github.com/git-lfs/git-lfs/git/githistory"
"github.com/git-lfs/git-lfs/git/odb"
"github.com/git-lfs/git-lfs/tools"
"github.com/git-lfs/git-lfs/tools/humanize"
@ -62,27 +63,29 @@ func migrateInfoCommand(cmd *cobra.Command, args []string) {
migrateInfoAbove = above
migrate(args, rewriter, func(path string, b *odb.Blob) (*odb.Blob, error) {
ext := fmt.Sprintf("*%s", filepath.Ext(path))
migrate(args, rewriter, &githistory.RewriteOptions{
BlobFn: func(path string, b *odb.Blob) (*odb.Blob, error) {
ext := fmt.Sprintf("*%s", filepath.Ext(path))
if len(ext) > 1 {
entry := exts[ext]
if entry == nil {
entry = &MigrateInfoEntry{Qualifier: ext}
if len(ext) > 1 {
entry := exts[ext]
if entry == nil {
entry = &MigrateInfoEntry{Qualifier: ext}
}
entry.Total++
entry.BytesTotal += b.Size
if b.Size > int64(migrateInfoAbove) {
entry.TotalAbove++
entry.BytesAbove += b.Size
}
exts[ext] = entry
}
entry.Total++
entry.BytesTotal += b.Size
if b.Size > int64(migrateInfoAbove) {
entry.TotalAbove++
entry.BytesAbove += b.Size
}
exts[ext] = entry
}
return b, nil
return b, nil
},
})
entries := EntriesBySize(MapToEntries(exts))