Commit Graph

15 Commits

Author SHA1 Message Date
Elijah Newren
b1606ba8ac Merge branch 'mr/fix-filter-lamely-name-error' into main
Signed-off-by: Elijah Newren <newren@gmail.com>
2020-10-07 10:52:54 -07:00
Marius Renner
70f83c2526 filter-lamely: fix NameError because of forgotten fr module prefix
In repositories with annotated tags filter-lamely crashes with the
message: "NameError: name 'Reset' is not defined".

This is because of a missing "fr" module prefix in the code, which this
commit adds.

Signed-off-by: Marius Renner <marius@mariusrenner.de>
2020-10-06 16:27:39 +02:00
Elijah Newren
debe52000d contrib: rename no-op-example to barebones-example
"no-op" might suggest that it doesn't do anything, when in reality it
does exactly what filter-repo does.  Rename it to barebones-example.

Signed-off-by: Elijah Newren <newren@gmail.com>
2020-06-23 19:59:39 -07:00
Elijah Newren
b8ebda97dd contrib: avoid applying --replace-text to binary files in bfg-ish
Signed-off-by: Elijah Newren <newren@gmail.com>
2020-06-08 19:51:21 -07:00
Elijah Newren
23bec32283 contrib, docs: make discovery of code formatting and linting easier
The desire to format or lint code throughout history has arisen several
times.  It's more natural to do this in filter-branch since it somewhat
forces people to run external commands, but we have an example contrib
demo that shows how to run an external command on each file in history
that I created even before any of these requests came in and yet I still
periodically get requests about it.

Make lint-history ever-so-slightly easier to apply to a subset of
filenames, and include its usage as an extra cheat sheet comparison for
filter-branch-vs-filter-repo commands.

Signed-off-by: Elijah Newren <newren@gmail.com>
2020-06-06 11:54:28 -07:00
Elijah Newren
bd2c9c4d4d contrib: new simple no-op-example
The purpose of this example is to solely show what to import and run to
recover filter-repo's behavior as-is.  It doesn't modify any behavior,
but instead exists as an example so people can easily find a good
starting point for making their own modifications.

Signed-off-by: Elijah Newren <newren@gmail.com>
2020-06-06 11:19:35 -07:00
Marius Renner
3427ee171b contrib: fix special character handling in filter-lamely
filter-lamely does not handle filenames with special characters (such as
äöü or even \n and \t) properly when using a tree filter or index
filter. It either does not quote the input to git correctly or parses
git output incorrectly, causing affected filenames to be mangled with
extraneous double quotes in the history or even crashing the program.

Make filter-lamely correctly handle such filenames by using
NUL-delimited input and output modes for the affected git commands.

Signed-off-by: Marius Renner <marius@mariusrenner.de>
2020-04-03 09:42:57 +02:00
Elijah Newren
46549e7d3f lint-history: point people to issue with more linting examples
Signed-off-by: Elijah Newren <newren@gmail.com>
2020-02-18 21:59:28 -08:00
Elijah Newren
9d3d99593c lint-history: avoid dying when we get file deletions
When a file is deleted, there is nothing to lint, so we can just keep
the deletion as-is.

Reported-by: Thorben Kröger <dev@thorben.net>
Signed-off-by: Elijah Newren <newren@gmail.com>
2020-02-06 13:02:12 -08:00
Elijah Newren
dab9386c47 contrib: update bfg-ish and filter-lamely with windows workaround
In commit f2729153 (filter-repo: workaround Windows' insistence that cwd
not be a bytestring, 2019-10-19), filter-repo was made to use a special
SubprocessWrapper class instead of the normal subprocess calls, due to
what appears to be in bugs in the python implementation on Windows not
working with arguments being bytestrings.  Add the same workarounds to
bfg-ish and filter-lamely.

Signed-off-by: Elijah Newren <newren@gmail.com>
2019-12-26 15:54:47 -08:00
Elijah Newren
0590c4193d contrib: clarify a few points of usage
Make it clearer that absolute paths should not be used for pathnames
within a git repository.  Also, fix the comment about how the
insert-beginning script could be implemented as a one-liner; the
example commented-out code should have used bytestrings.

Signed-off-by: Elijah Newren <newren@gmail.com>
2019-11-25 08:42:29 -08:00
Elijah Newren
320c85f941 filter-repo: improve support for partial history rewrites
Partial history rewrites were possible before with the (previously
hidden) --refs flag, but the defaults were wrong.  That could be worked
around with the --source or --target flags, but that disabled --no-data
for fast-export and thus slowed things down, and also would require
overridding --replace-refs.  And the defaults for --source and --target
may diverge further from what is wanted/needed for partial history
rewrites in the future.

So, add --partial as a first-class supported option with scary
documentation about how it permits mixing new and old history.  Make
--refs imply that flag.  Make the behavioral similarities (in regards to
which steps are skipped) between --source, --target, and --partial more
clear.  Add relevant documentation to round it out.

Signed-off-by: Elijah Newren <newren@gmail.com>
2019-10-17 18:55:09 -07:00
Elijah Newren
622afca813 contrib: new filter-repo demo named bfg-ish
This implements most of BFG Repo Cleaner, with several additional
features and bugfixes included.

Signed-off-by: Elijah Newren <newren@gmail.com>
2019-08-20 23:58:47 -07:00
Elijah Newren
df575fb181 contrib: new filter-repo demo named filter-lamely (or filter-branch-ish)
This is a re-implementation of git-filter-branch that is nearly
perfectly bug compatible (it can replace git-filter-branch and still
pass the git testsuite).  It deviates in one minor way that should not
matter to real world usecases, but allows it to run a few times faster
than filter-branch.

Signed-off-by: Elijah Newren <newren@gmail.com>
2019-08-20 23:58:47 -07:00
Elijah Newren
6d231c0a94 contrib: simple examples of tools based on filter-repo
Signed-off-by: Elijah Newren <newren@gmail.com>
2019-08-13 14:25:29 -07:00