[PATCH] histedit: print action before running it
timeless
timeless at gmail.com
Wed Dec 23 19:09:26 CST 2015
Mateusz Kwapich wrote:
> histedit: print action before running it
Augie Fackler wrote:
> So, until I saw the patches from timeless for progress, I thought this
> was a good idea. Now I'm less sure. Can you two chat here and figure
> out which you think is better?
Gregory Szorc wrote:
> What I find confusing is that I have no clue where I am in the histedit. I
> know I need to preserve a specific line for each conflict. But since I don't
> have access to the commit message, I have no idea which line that should be.
> I'm forced to run an additional `hg diff` to see what else changed. Contrast
> with `hg rebase`, which now displays which commits it is operating on. When
> there is a conflict, I can easily see the commit is got stuck on.
> I like the direction of this patch. But I'd also like it to print the commit
> message. Or at least we should print the commit message in the conflict
> abort case.
[2,of,7] histedit: InterventionRequired list action is a start, it
should give you the action and node which lead you to your working
directory.
rebase uses this:
desc = '%d:%s "%s"' % (ctx.rev(), ctx,
ctx.description().split('\n', 1)[0])
It'd be pretty easy to adjust InterventionRequired to do something similar.
But, is relying on people using `hg log -r ...` good enough?
More information about the Mercurial-devel
mailing list