[PATCH 2 of 2] histedit: dropmissing hint

[Ryan McElroy]

On 3/14/2016 8:07 AM, timeless wrote:
> Mateusz Kwapich wrote:
>> + * If you remove a line here THAT COMMIT WILL BE DELETED
> "deleted" might not be correct, and I don't think this is the best way
> to say what we want.
> ("line here THAT COMMIT" is a bit of a mess)
>
> "Removing a changeset from the list of changes will result in it being
> excluded (deleted) from the rewritten history."
>
> Possibly w/ "deleted" depending on whether or not obsmarkers are being used...

I like timeless' version more than the original, but I think we should 
try to be more concise, otherwise people may not read it at all.

I definitely prefer the word "lost" or "excluded" to "deleted" here.


For reference, the original implementation that histedit is based off 
(git rebase -i) uses this language:

# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

histedit's UI is a lot more sparse, and it appears *ABOVE* the command 
list, whereas git's extra messages appear *BELOW* the command list.

# Edit history between 002e2dafc437 and 002e2dafc437
#
# Commits are listed from least to most recent
#

I'd suggest something like the following:

# Edit history between 002e2dafc437 and 002e2dafc437
#
# These lines can be re-ordered; they are executed from top to bottom. 
### Note this is taken straight from git.
#
# If you remove a line, THAT COMMIT WILL BE LOST. ### (add this line 
only if dropmissing = true)
#
# To abort this histedit, remove all commands. ### (compromise message)



>
>> + * However, if you remove everything, the histedit will be aborted.
> I don't think this is worth saying. Alternatively, we could suggest
> this advice even if !dropmissing. For now, i'd suggest omitting it.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE7TbmqBYd1txIQ&m=Noy_0LweviVkZpkW2m138GCoH3afyn650G3jwPVfu4w&s=q6n3Qy7QaJcbqb23XLj-qGC--B32YYd4PAbFj8TlF64&e=