Thread (6 messages) flat view 6 messages, 3 authors, 2016-06-15

Re: [PATCH/RFC 01/10] Teach rebase interactive the mark command

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:44:28

Jrg Sommer [off-list ref] wrote:
Shawn O. Pearce schrieb am Sat 12. Apr, 23:56 (-0400):
quoted
Why not use the mark syntax that fast-import uses?
I didn't know it.
quoted
In fast-import we use ":n" anytime we need to refer to a mark, e.g.
":1" or ":5".
Currently, I don't restrict the mark to be a number. It can anything that
is a valid ref. Should I restrict it?
In fast-import a mark can *only* be a number.  It cannot be a ref
string or anything complex like that.  This reduces the memory load
of fast-import, but does cause a burden on the import frontend.
 
And how do you handle the :/ syntax? “reset :/Bla” is than not valid.
Mmm, I'll add an exception for :/.
I think the ':/' syntax came along after fast-import had already started
to use ':' as the mark syntax.  I forgot to object to this bastard form
of looking up a commit when it was introduced by Dscho and now we have
a SHA-1 expression syntax that fast-import will confuse with a mark.  I
originally had chosen to start a mark off with ':' because it is not an
allowed character in a ref, due to its use to split src:dst in a fetch
or push refspec.
 
Except of this, I prefer to use the colon to be much closer to the syntax
of fast-import.
Me too, but it looks like in a human edited "TODO" script we may want
to be more friendly and allow named marks.  Though I'm not sure that is
really all that useful.  If you are merging something because it used to
be merged before the rebase I doubt we'd generate a meaningful mark name
when the TODO script is initially formatted.

-- 
Shawn.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help