Skip to content

Add rough cut of 'blobbase' #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add rough cut of 'blobbase' #712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions git-filter-repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,6 +2029,12 @@ EXAMPLES
contents.add_argument('--strip-blobs-with-ids', metavar='BLOB-ID-FILENAME',
help=_("Read git object ids from each line of the given file, and "
"strip all of them from history"))
contents.add_argument('--blobbase', metavar='BLOB-SHAS-AND-PATHS',
help=_("Process an annotated blob-shas-and-paths.txt file. 'blobbase' "
"because it uses a command system similar to git's interactive "
"rebase. Commands: k, keep <sha> = keep blob; s, strip <sha> = "
"strip blob. Keep is the default if no command has been "
"specified."))

refrename = parser.add_argument_group(title=_("Renaming of refs "
"(see also --refname-callback)"))
Expand Down Expand Up @@ -2444,6 +2450,16 @@ EXAMPLES
args.strip_blobs_with_ids = set(f.read().split())
else:
args.strip_blobs_with_ids = set()
# blobbase leverages args.strip_blobs_with_ids
if args.blobbase:
# Commands: k, keep = keep blob; s, strip = strip blob. No command means keep.
with open(args.blobbase, 'br') as f:
# Header lines start with "===" or "Format:"
# Blank lines are blank, comments start with "#"
# Not annotating a blob is interpreted as "keep", keep is keep
# All this has to do is find the strip lines which are distinct from the above lines
# git.git:sequencer.c:parse_insn_line() does not require the command to be in the first column
args.strip_blobs_with_ids.update(parts[1] for parts in (line.split() for line in f) if len(parts) >= 2 and parts[0].decode()[0:1] == 's')
if (args.partial or args.refs) and not args.replace_refs:
args.replace_refs = 'update-no-add'
args.repack = not (args.partial or args.refs or args.no_gc)
Expand Down Expand Up @@ -2874,6 +2890,7 @@ class RepoAnalyze(object):
# List of filenames and sizes in descending order
with open(os.path.join(reportdir, b"blob-shas-and-paths.txt"), 'bw') as f:
f.write(("=== %s ===\n" % _("Files by sha and associated pathnames in reverse size")).encode())
f.write(("=== %s ===\n" % _("To use blobbase, prefix lines with commands: k, keep = keep blob; s, strip = strip blob. No command means keep.")).encode())
f.write(_("Format: sha, unpacked size, packed size, filename(s) object stored as\n").encode())
for sha, size in sorted(stats['packed_size'].items(),
key=lambda x:(x[1],x[0]), reverse=True):
Expand Down