From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Tom Clarkson via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Avery Pennarun <apenwarr@gmail.com>,
Ed Maste <emaste@freebsd.org>, Tom Clarkson <tom@tqclarkson.com>,
Tom Clarkson <tom@tqclarkson.com>
Subject: Re: [PATCH v2 5/7] subtree: add git subtree use and ignore commands
Date: Wed, 7 Oct 2020 18:29:44 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2010071812400.50@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <2d103292cecfef3b29d221b3d8f05adb0add4475.1602021913.git.gitgitgadget@gmail.com>
Hi Tom,
On Tue, 6 Oct 2020, Tom Clarkson via GitGitGadget wrote:
> @@ -796,20 +810,60 @@ cmd_add_commit () {
> }
>
> cmd_map () {
> - oldrev="$1"
> - newrev="$2"
>
> - if test -z "$oldrev"
> + if test -z "$1"
I'd like to keep the nice name. Maybe if it is `local`, there is no longer
a need to replace `$oldrev` by `$1`?
> then
> die "You must provide a revision to map"
> fi
>
> + oldrev=$(git rev-parse --revs-only "$1") || exit $?
> + newrev=
> +
> + if test -n "$2"
> + then
> + newrev=$(git rev-parse --revs-only "$2") || exit $?
> + fi
> +
Would it not make more sense to validate the parameters before calling
`cmd_map`?
In any case, this strikes me like a subject for another commit.
Thanks,
Dscho
P.S.: I'll have to stop reviewing here for the moment, not sure whether
I'll come back to it later today or maybe tomorrow.
> cache_setup || exit $?
> cache_set "$oldrev" "$newrev"
>
> say "Mapped $oldrev => $newrev"
> }
>
> +cmd_ignore () {
> + revs=$(git rev-parse $default --revs-only "$@") || exit $?
> + ensure_single_rev $revs
> +
> + say "Ignoring $revs"
> +
> + cache_setup || exit $?
> +
> + git rev-list $revs |
> + while read rev
> + do
> + cache_set "$rev" ""
> + done
> +
> + echo "$revs" >>"$cachedir/processed"
> +}
> +
> +cmd_use () {
> + revs=$(git rev-parse $default --revs-only "$@") || exit $?
> + ensure_single_rev $revs
> +
> + say "Using existing subtree $revs"
> +
> + cache_setup || exit $?
> +
> + git rev-list $revs |
> + while read rev
> + do
> + cache_set "$rev" "$rev"
> + done
> +
> + echo "$revs" >>"$cachedir/processed"
> +}
> +
> cmd_split () {
> debug "Splitting $dir..."
> cache_setup || exit $?
> @@ -827,7 +881,7 @@ cmd_split () {
> done
> fi
>
> - unrevs="$(find_existing_splits "$dir" "$revs")"
> + unrevs="$(find_existing_splits "$dir" "$revs") $(exclude_processed_refs)"
>
> mainline="$(find_mainline_ref "$dir" "$revs")"
> if test -n "$mainline"
> --
> gitgitgadget
>
>
next prev parent reply other threads:[~2020-10-07 16:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 5:49 [PATCH 0/7] subtree: Fix handling of complex history Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 1/7] subtree: handle multiple parents passed to cache_miss Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 2/7] subtree: exclude commits predating add from recursive processing Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 3/7] subtree: persist cache between split runs Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 4/7] subtree: add git subtree map command Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 5/7] subtree: add git subtree use and ignore commands Tom Clarkson via GitGitGadget
2020-05-11 5:50 ` [PATCH 6/7] subtree: more robustly distinguish subtree and mainline commits Tom Clarkson via GitGitGadget
2020-05-11 5:50 ` [PATCH 7/7] subtree: document new subtree commands Tom Clarkson via GitGitGadget
2020-10-04 17:52 ` [PATCH 0/7] subtree: Fix handling of complex history Ed Maste
2020-10-04 19:27 ` Johannes Schindelin
2020-10-05 16:47 ` Junio C Hamano
2020-10-05 21:37 ` Ed Maste
2020-10-07 16:31 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 " Tom Clarkson via GitGitGadget
2020-10-06 22:05 ` [PATCH v2 1/7] subtree: handle multiple parents passed to cache_miss Tom Clarkson via GitGitGadget
2020-10-07 13:12 ` Ed Maste
2020-10-06 22:05 ` [PATCH v2 2/7] subtree: exclude commits predating add from recursive processing Tom Clarkson via GitGitGadget
2020-10-07 15:36 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 3/7] subtree: persist cache between split runs Tom Clarkson via GitGitGadget
2020-10-07 16:06 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 4/7] subtree: add git subtree map command Tom Clarkson via GitGitGadget
2020-10-06 22:05 ` [PATCH v2 5/7] subtree: add git subtree use and ignore commands Tom Clarkson via GitGitGadget
2020-10-07 16:29 ` Johannes Schindelin [this message]
2020-10-06 22:05 ` [PATCH v2 6/7] subtree: more robustly distinguish subtree and mainline commits Tom Clarkson via GitGitGadget
2020-10-07 19:42 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 7/7] subtree: document new subtree commands Tom Clarkson via GitGitGadget
2020-10-07 19:43 ` Johannes Schindelin
2020-10-07 19:46 ` [PATCH v2 0/7] subtree: Fix handling of complex history Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2010071812400.50@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=apenwarr@gmail.com \
--cc=emaste@freebsd.org \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=tom@tqclarkson.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.