[PATCH 2 of 2] mq: flag as deprecated

[Martin Geisler]

Pierre-Yves David <pierre-yves.david at ens-lyon.org> writes:

> On 06/07/2014 05:44 PM, Augie Fackler wrote:
>>
>> On Jun 7, 2014, at 8:18 PM, Angel Ezquerra <angel.ezquerra at gmail.com> wrote:
>>
>>> I would prefer if there were a switch that let you get a more
>>> qrefresh like behavior when doing commit --amend or perhaps that let
>>> you directly pass a list of files to remove from the commit.
>>
>> Yeah, I've wanted something like that in commit, but I'm not good at
>> smart ideas.
>
> Reminder: There is 3 states:
>
> a. `p1(.)` content
> b. `.` content
> c. working directory content
>
> - `qrefresh` let you choose between `a` and `c` only (much
>   frustration)

I think your assertion that this caused "much frustration" is incorrect.
I don't recall seeing people complain about it, but I do remember seeing
people complain about the different behavior in 'hg commit --amend'.

We've gone over this before :) Almost a year ago:

  http://markmail.org/message/oce4axafrmovsqgu

There, I tried to argue that the 'hg commit --amend -X foo' case is
confusing. I call it confusing since I don't know how to see what the
commit will contain before I made it. It's easy to predict what the
effect of 'hg qrefresh -X foo' is since foo is removed completely.

> - `amend` let you choose between b and c,

The accumulating-only behavior of amend is less than ideal to me since I
I'm often in the case where I want to choose between 'a' and 'c'.

> - `uncommit` let you choose between a and b,
>
> We can probably add a ``--uncommit PATTERN`` flag to ``hg amend``.
> This would lets one any of `a`, `b` or `c` with a single command

That sounds useful. I'm actually surprised that you want to keep the 'hg
amend' command around -- I had somehow assumed that it was a temporary
command and that 'hg commit --amend' would be the normal way to amend
commits. Is the purpose of a dedicated amend command to let people
uncommit files or are there other uses for it?

-- 
Martin Geisler

http://google.com/+MartinGeisler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20140610/69d6b619/attachment.pgp>