From b6d9893648829edbc063e8bcbffd25ad7be7bd37 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 2 Nov 2012 23:22:46 -0400
Subject: rename pbs-absrepo-convert's tree-filters

---
 pbs-absrepo-convert                |  4 ++--
 pbs-absrepo-convert--filterlist    |  7 +++++++
 pbs-absrepo-convert--filterpackage | 34 ++++++++++++++++++++++++++++++++++
 pbs-absrepo-convert--list          |  7 -------
 pbs-absrepo-convert--treefilter    | 34 ----------------------------------
 5 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100755 pbs-absrepo-convert--filterlist
 create mode 100755 pbs-absrepo-convert--filterpackage
 delete mode 100755 pbs-absrepo-convert--list
 delete mode 100755 pbs-absrepo-convert--treefilter

diff --git a/pbs-absrepo-convert b/pbs-absrepo-convert
index 0b34980..7b0bdaf 100755
--- a/pbs-absrepo-convert
+++ b/pbs-absrepo-convert
@@ -50,7 +50,7 @@ collect-data() {
 	msg "$(gettext "Collecting package data...")"
 	[[ $# = 0 ]] || { usage; return 1; }
 	collect-data-gc &
-	git filter-branch --tree-filter pbs-absrepo-convert--list master
+	git filter-branch --tree-filter pbs-absrepo-convert--filterlist master
 	# notify collect-data-gc that filter-branch is done
 	touch "${TMPDIR}/collect-data-filter-branch.done"
 	# wait for collect-data-gc to finish
@@ -138,7 +138,7 @@ convert-arch() {
 	git checkout orig
 	git checkout -b "$arch"
 	git filter-branch -f --tree-filter \
-		"pbs-absrepo-convert--treefilter $arch" "$arch"
+		"pbs-absrepo-convert--filterpackage $arch" "$arch"
 }
 
 ##
diff --git a/pbs-absrepo-convert--filterlist b/pbs-absrepo-convert--filterlist
new file mode 100755
index 0000000..645c351
--- /dev/null
+++ b/pbs-absrepo-convert--filterlist
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+printf '%s\n' * > "${TMPDIR}/packages.tmp.${GIT_COMMIT}"
+find */repos/* -type d -printf '%f\n' >> "${TMPDIR}/repo-arch.tmp.${GIT_COMMIT}"
+
+mv "${TMPDIR}/packages.tmp.${GIT_COMMIT}" "${TMPDIR}/packages.new.${GIT_COMMIT}"
+mv "${TMPDIR}/repo-arch.tmp.${GIT_COMMIT}" "${TMPDIR}/repo-arch.new.${GIT_COMMIT}"
diff --git a/pbs-absrepo-convert--filterpackage b/pbs-absrepo-convert--filterpackage
new file mode 100755
index 0000000..24ba8b0
--- /dev/null
+++ b/pbs-absrepo-convert--filterpackage
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+arch=$1
+
+# generate map of all packages to their treehash
+tree="$(mktemp)"
+if [[ $arch = master ]]; then
+	git ls-tree -d "$GIT_COMMIT" */trunk > "$tree"
+else
+	git ls-tree -d "$GIT_COMMIT" */repos/*-"$arch" */repos/*-any > "$tree"
+fi
+
+# generate map of all packages to their repo
+repos="$(mktemp)"
+find */repos/* -type d -printf '%h/%h\n' | sed -r 's@^([^/]*)/repos/(.*)-[^-]*$@\1 \2@'|sort -u > "$repos"
+
+# clean the working directory
+rm -rf *
+
+# add the packages back in as remotes
+cat "$tree" | while read mode type treehash path; do
+	package="${path%%/*}"
+	repo="$(sed -n "s/^${package} //p" "$repos")"
+	commithash="$(sed -n "s/^${treehash} //p" "${TMPDIR}/packages-${package}.commits")"
+
+	mkdir -p "$repo"
+	git submodule add ./ "${repo}/${package}"
+	(
+		cd "${repo}/${package}"
+		git checkout "${commithash}"
+	)
+done
+
+# clean up
+rm -f "$repos" "$tree"
diff --git a/pbs-absrepo-convert--list b/pbs-absrepo-convert--list
deleted file mode 100755
index 645c351..0000000
--- a/pbs-absrepo-convert--list
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-printf '%s\n' * > "${TMPDIR}/packages.tmp.${GIT_COMMIT}"
-find */repos/* -type d -printf '%f\n' >> "${TMPDIR}/repo-arch.tmp.${GIT_COMMIT}"
-
-mv "${TMPDIR}/packages.tmp.${GIT_COMMIT}" "${TMPDIR}/packages.new.${GIT_COMMIT}"
-mv "${TMPDIR}/repo-arch.tmp.${GIT_COMMIT}" "${TMPDIR}/repo-arch.new.${GIT_COMMIT}"
diff --git a/pbs-absrepo-convert--treefilter b/pbs-absrepo-convert--treefilter
deleted file mode 100755
index 24ba8b0..0000000
--- a/pbs-absrepo-convert--treefilter
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash -e
-arch=$1
-
-# generate map of all packages to their treehash
-tree="$(mktemp)"
-if [[ $arch = master ]]; then
-	git ls-tree -d "$GIT_COMMIT" */trunk > "$tree"
-else
-	git ls-tree -d "$GIT_COMMIT" */repos/*-"$arch" */repos/*-any > "$tree"
-fi
-
-# generate map of all packages to their repo
-repos="$(mktemp)"
-find */repos/* -type d -printf '%h/%h\n' | sed -r 's@^([^/]*)/repos/(.*)-[^-]*$@\1 \2@'|sort -u > "$repos"
-
-# clean the working directory
-rm -rf *
-
-# add the packages back in as remotes
-cat "$tree" | while read mode type treehash path; do
-	package="${path%%/*}"
-	repo="$(sed -n "s/^${package} //p" "$repos")"
-	commithash="$(sed -n "s/^${treehash} //p" "${TMPDIR}/packages-${package}.commits")"
-
-	mkdir -p "$repo"
-	git submodule add ./ "${repo}/${package}"
-	(
-		cd "${repo}/${package}"
-		git checkout "${commithash}"
-	)
-done
-
-# clean up
-rm -f "$repos" "$tree"
-- 
cgit v1.1-4-g5e80