[PATCH] revert: allow configuring the .orig file location

Augie Fackler raf at durin42.com
Wed Aug 12 15:18:41 CDT 2015


On Wed, Aug 12, 2015 at 1:19 PM, Durham Goode <durham at fb.com> wrote:
>
>
> On 8/12/15 10:11 AM, Augie Fackler wrote:
>>
>> On Wed, Aug 12, 2015 at 1:00 PM, Durham Goode <durham at fb.com> wrote:
>>>>
>>>> As a fraction of users, how bad is this? If it's 1% of your userbase
>>>> or some other low level, I'm inclined to tell them to suck it up, as
>>>> every feature introduces some extra maintenance complexity. Have you
>>>> pointed them to 'hg revert --no-backup'?
>>>
>>> It's not a large percentage, but then again, the majority of users don't
>>> give any feedback at all.  When they ask "why can't we just put the orig
>>> files somewhere else", me answering "suck it up" or "because it adds
>>> complexity" is kind of an embarrassing response for me for a relatively
>>> simple issue.
>>
>> You're asking for a feature that to my knowledge NO version control
>> system has ever offered. It's also tiptoeing up to the line that will
>> probably make mpm nervous about scripts breaking (though I'm
>> personally less worried about that...). I get that it's relatively
>> simple, but a lot of "relatively simple" things in a complex codepath
>> (revert counts as one of those just from the reviews I've done for
>> marmoute!) add up to a nightmare for long-term maintainers.
>
> I don't actually know how other version control systems handle this, so I
> can't really comment on that.

It's been pointed out to me that git doesn't store .orig files at all
(yikes). Between that and the comparison between these .orig files and
emacs foo~ droppings, I've been pretty well convinced that this
functionality makes sense (rather than being dangerous.)

That said, this patch appears to only touch the tip of the iceberg:

hg locate 'set:added() or modified() or clean()'  | xargs egrep
--include='*.py'  -- '\.orig['\"\'\]

so it might be helpful to have the config name not mention revert? I
think? Hopefully Matt has some idea on what color we can paint that
part of the bike shed.


More information about the Mercurial-devel mailing list