Hi,
On Thu, 3 Jul 2008, Stephan Beyer wrote:
> On Thu, Jul 03, 2008 at 12:03:49PM +0100, Johannes Schindelin wrote:
>
> > On Wed, 2 Jul 2008, Junio C Hamano wrote:
> > > Stephan Beyer <s-beyer@xxxxxxx> writes:
> > >
> > > > git sequencer is planned as a backend for user scripts that
> > > > execute a sequence of git instructions and perhaps need manual
> > > > intervention, for example git-rebase or git-am.
> > >
> > > ...
> > > > +output () {
> > > > + case "$VERBOSE" in
> > > > + 0)
> > > > + "$@" >/dev/null
> > > > + ;;
> > > > + 1)
> > > > + output=$("$@" 2>&1 )
> > > > + status=$?
> > > > + test $status -ne 0 && printf '%s\n' "$output"
> > > > + return $status
> > > > + ;;
> > > > + 2)
> > > > + "$@"
> > > > + ;;
> > > > + esac
> > > > +}
> > >
> > > Perhaps misnamed? This feels more like "do" or "perform" or "run".
> >
> > My fault. I like "perform".
>
> Right, the "output" name puts a wrong behavior in mind. "perform" (or
> "do" or "run") won't exactly say that this function "adjusts" the output
> somehow, but I'm nonetheless fine with taking "perform".
Actually, it does not even "adjust" the output. It just performs the
action, and _if_ there was an error and "verbose" was set to 1, it shows
the output. If "verbose" was set to 2, it always shows the output.
Otherwise, the output is suppressed.
So, the use of the function really is in the output, but that is either
shown or not shown, never modified.
> Btw, another root commit problem is btw that it's not possible to
> cherry-pick root commits.
That is a problem to be fixed in cherry-pick, not in sequencer. Care to
take care of that?
> Johannes Schindelin wrote:
> > > > +# Usage: pick_one (cherry-pick|revert) [-*|--edit] sha1
> > > > +pick_one () {
> > > > + what="$1"
> > > > + # we just assume that this is either cherry-pick or revert
> > > > + shift
> > > > +
> > > > + # check for fast-forward if no options are given
> > > > + if expr "x$1" : 'x[^-]' >/dev/null
> > > > + then
> > > > + test "$(git rev-parse --verify "$1^")" = \
> > > > + "$(git rev-parse --verify HEAD)" &&
> > > > + output git reset --hard "$1" &&
> > > > + return
> > > > + fi
> > > > + test "$1" != '--edit' -a "$what" = 'revert' &&
> > > > + what='revert --no-edit'
> > >
> > > This looks somewhat wrong.
> > >
> > > When the history looks like ---A---B and we are at A, cherry-picking B can
> > > be optimized to just advancing to B, but that optimization has a slight
> > > difference (or two) in the semantics.
> > >
> > > (1) The committer information would not record the user and time of the
> > > sequencer operation, which actually may be a good thing.
> >
> > This is debatable. But I think you are correct, for all the same reasons
> > why a merge can result in a fast-forward.
>
> Dscho, you mean me by referring to 'you' here, right?
Nope.
> Otherwise I'm a bit confused: "For the same reasons why a merge can
> result in a fast-forward we should not do fast forward here" ;-)
What I meant: there is no use here to redo it. It has already be done,
and redoing just pretends that the girl calling sequencer tried to pretend
that she did it.
If the merge has been done already, it should not be redone.
Only if the user _explicitely_ specified a merge strategy, there _might_
be a reason to redo the merge, but I still doubt it.
> > > (2) When $what is revert, this codepath shouldn't be exercised,
> > > should it?
> >
> > Yes.
>
> I haven't done a check intentionally, but there was a stupid thinko.
> So you're right.
>
> But: this will only be a bug if the commit that _comes next in the
> original history_ is to be reverted.
Does not matter. It's a bug.
A bug is almost always in the details, a corner-case, but it almost always
needs fixing nevertheless.
> Nonetheless, purely tested:
"Nevertheless", maybe? "untested", maybe?
> Johannes Schindelin wrote:
> > I'd not check in sequencer for the strategy. Especially given that we
> > want to support user-written strategies in the future.
>
> I don't know how this is planned to look like, but perhaps
> --list-strategies may make sense here, too.
No. You just do not check for strategies. Period. git-merge does that,
and you can easily abort a rebase if you explicitely asked for an invalid
strategy.
BTW your coalescing multiple replies into one mail was a major pain in the
donkey. Should you do that again, I will not even bother reading that
mail.
Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
