[PATCH 2 of 2] histedit: dropmissing hint

Mateusz Kwapich mitrandir at fb.com
Mon Mar 14 21:22:14 EDT 2016


Your version provides a good explanation but I’d prefer something less verbose with
ALL CAPS keyword so it’s easy to notice and read.

Also we don’t have repo object passed to that function so we can’t really check
if obsolescence is on. Do you think we should pass it?

What do you think about something like that:

+        if obsolete.isenabled(repo, obsolete.createmarkersopt):
+   dropverb = _('EXCLUDED')
+        else:
+   dropverb = _('DELETED')
+
+        hints.extend(("""'dropmissing' is enabled:
+If you delete a changeset from the list it will be %s from rewritten history!
+""" % dropverb).split('\n'))





On 3/14/16, 1:07 AM, "timeless.bmo1 at gmail.com on behalf of timeless" <timeless.bmo1 at gmail.com on behalf of timeless at gmail.com> 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...
>
>> + * 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.


More information about the Mercurial-devel mailing list