Test revert to 48a7dcf

Signed-off-by: Elijah Newren <[email protected]>

Documentation/git-filter-repo.txt

@@ -572,9 +572,11 @@ history rewrite are roughly as follows:
      hosting provider about how to remove any server-side references
      to the old commits (example:
      https://docs.gitlab.com/ee/user/project/repository/reducing_the_repo_size_using_git.html[GitLab's
-     excellent docs on reducing repository size], or
-     https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository#fully-removing-the-data-from-github[the
-     first and second steps under "Fully removing the data from GitHub"]).
+     excellent docs on reducing repository size], or just the warning
+     box that references "GitHub support" from
+     https://docs.github.com/en/github/authenticating-to-github/removing-sensitive-data-from-a-repository[GitHub's
+     otherwise dangerously out-of-date docs on removing sensitive
+     data]).
 
 6. (Optional) Some additional considerations
 

Makefile

@@ -130,14 +130,15 @@ github_release: update_docs
 
 pypi_release: # Has an implicit dependency on github_release because...
 	# Upload to PyPI, automatically picking tag created by github_release
-	python3 -m venv venv
-	venv/bin/pip install --upgrade pip
-	venv/bin/pip install build twine
-	venv/bin/pyproject-build
+	cd release && python3 -m venv venv
+	cd release && venv/bin/pip3 install --upgrade setuptools pip
+	cd release && venv/bin/pip3 install twine wheel
+	cd release && venv/bin/python3 setup.py sdist bdist_wheel
 	# Note: hope you remember password for pypi, but username is 'newren'
-	venv/bin/twine upload dist/*
+	cd release && venv/bin/twine upload dist/*
 	# Remove temporary file(s)
-	rm -rf dist/ venv/ git_filter_repo.egg-info/
+	cd release && rm -f README.md git-filter-repo git_filter_repo.py
+	cd release && rm -rf .eggs/ build/ venv/ git_filter_repo.egg-info/
 
 # NOTE TO FUTURE SELF: If you accidentally push a bad release, you can remove
 # all but the git-filter-repo-$VERSION.tar.xz asset with

contrib/filter-repo-demos/clean-ignore

@@ -55,11 +55,8 @@ class CheckIgnores:
         if not source and not linenum and not pattern:
           self.okay.add(name)
         else:
-          if pattern[0:1] == b"!":
-            self.okay.add(name)
-          else:
-            self.ignored.add(name)
-            ignored.add(name)
+          self.ignored.add(name)
+          ignored.add(name)
 
     return ignored
 

contrib/filter-repo-demos/lint-history

@@ -31,7 +31,7 @@ near the top of git-filter-repo.
 # about filenames, then this program could be replaced by a "one-liner"; e.g.
 #    git filter-repo --force --blob-callback '
 #      if not b"\0" in blob.data[0:8192]:
-#        filename = ".git/info/tmpfile"
+#        filename = '.git/info/tmpfile'
 #        with open(filename, "wb") as f:
 #          f.write(blob.data)
 #        subprocess.check_call(["lint_program", "--some", "arg", filename])

git-filter-repo

@@ -51,13 +51,6 @@ __all__ = ["Blob", "Reset", "FileChange", "Commit", "Tag", "Progress",
            "string_to_date", "date_to_string",
            "record_id_rename", "GitUtils", "FilteringOptions", "RepoFilter"]
 
-# The globals to make visible to callbacks. They will see all our imports for
-# free, as well as our public API.
-public_globals = ["__builtins__", "argparse", "collections", "fnmatch",
-                  "gettext", "io", "os", "platform", "re", "shutil",
-                  "subprocess", "sys", "time", "textwrap", "tzinfo",
-                  "timedelta", "datetime"] + __all__
-
 deleted_hash = b'0'*40
 write_marks = True
 date_format_permissive = True
@@ -2851,11 +2844,9 @@ class RepoFilter(object):
 
   def _handle_arg_callbacks(self):
     def make_callback(argname, str):
-      callback_globals = {g: globals()[g] for g in public_globals}
-      callback_locals = {}
       exec('def callback({}, _do_not_use_this_var = None):\n'.format(argname)+
-           '  '+'\n  '.join(str.splitlines()), callback_globals, callback_locals)
-      return callback_locals['callback']
+           '  '+'\n  '.join(str.splitlines()), globals())
+      return callback #namespace['callback']
     def handle(type):
       callback_field = '_{}_callback'.format(type)
       code_string = getattr(self._args, type+'_callback')

release/setup.cfg

@@ -0,0 +1,32 @@
+[metadata]
+name = git-filter-repo
+url = https://github.com/newren/git-filter-repo
+project_urls =
+    Source = https://github.com/newren/git-filter-repo
+    Issues = https://github.com/newren/git-filter-repo/issues/
+description = Quickly rewrite git repository history
+long_description = file: README.md
+long_description_content_type = text/markdown
+classifiers =
+    Development Status :: 4 - Beta
+    Operating System :: OS Independent
+    Programming Language :: Python
+    License :: OSI Approved :: MIT License
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
+platforms = any
+license = MIT
+
+[options]
+scripts = git-filter-repo
+py_modules = git_filter_repo
+python_requires = >= 3.5
+setup_requires = setuptools_scm
+
+[bdist_wheel]
+universal = 1

release/setup.py

@@ -0,0 +1,21 @@
+from setuptools import setup
+import os
+
+
+def link_parent(src, target=None):
+    if target is None:
+        target = src
+    try:
+        os.symlink(os.path.join("..", src), target)
+    except FileExistsError:
+        pass
+
+
+for f in ['git-filter-repo', 'README.md']:
+    link_parent(f)
+
+link_parent('git-filter-repo', 'git_filter_repo.py')
+
+
+setup(use_scm_version=dict(root="..", relative_to=__file__),
+      entry_points={'console_scripts': ['git-filter-repo = git_filter_repo:main']})

t/run_coverage

@@ -26,7 +26,7 @@ exitcode=$?
 set -e
 
 cd $tmpdir
-coverage3 combine -q
+coverage3 combine
 coverage3 html -d $orig_dir/report
 coverage3 report -m
 cd $orig_dir