[PATCH evolve-ext] uncommit: abort if an explicitly given file cannot be uncommitted (BC)
Matt Harbison
mharbison72 at gmail.com
Tue Apr 9 21:31:23 EDT 2019
On Tue, 09 Apr 2019 20:26:21 -0400, Martin von Zweigbergk
<martinvonz at google.com> wrote:
> On Tue, Apr 9, 2019 at 7:44 AM Pierre-Yves David <
> pierre-yves.david at ens-lyon.org> wrote:
>
>> PAtch looks good overall, but has compatibility issue with older
>> version. Can you have a look at my comment below?
>>
>> On 4/3/19 4:45 AM, Matt Harbison wrote:
>> > # HG changeset patch
>> > # User Matt Harbison <matt_harbison at yahoo.com>
>> > # Date 1554259321 14400
>> > # Tue Apr 02 22:42:01 2019 -0400
>> > # Node ID 272e76e20c3c52fcae8a4c2003f73d8db77e566b
>> > # Parent e8515ee7a7cc0281d905f762e26e8956ccfd7f74
>> > uncommit: abort if an explicitly given file cannot be uncommitted (BC)
>> >
>> > This corresponds to f4147ca63d39 in the core uncommit extension.
>> >
>>
>> Evolve is compatible with version down to 4.4 and `getuipathfn` seems
>> newer than that. Can you send a V2 compatible with the older version ?
>>
>
> Pierre-Yves, it may not be clear to Matt what exactly he's supposed to do
> (it isn't to me anyway). Specifically, does `hg uncommit` try to use
> absolute or relative paths? I'm thinking it's probably not a big deal for
> now and an absolute path is okay? If that's the case, you could simply
> replace the "scmutil.getuipathfn(repo)(f)" by "f" in flight if that's
> okay
> with both of you.
I'm OK with either relative or absolute output for now (though I thought
most output other than status
was relative before your recent refactoring). Maybe we just need to
define a local `getuipathfn()` that either calls the scmutil function if
available, otherwise calls matcher.rel()? Diverging from the output of
the bundled extension doesn't seem like a good idea.
More information about the Mercurial-devel
mailing list