[PATCH stable?] import: respect diff.noprefix config (issue4639)

Siddharth Agarwal sid at less-broken.com
Fri Jan 22 17:22:03 CST 2016


On 1/22/16 15:21, Matt Mackall wrote:
> On Fri, 2016-01-22 at 10:43 -0800, Siddharth Agarwal wrote:
>> On 1/22/16 06:51, Ryan McElroy wrote:
>>> # HG changeset patch
>>> # User Ryan McElroy <rmcelroy at fb.com>
>>> # Date 1453473839 28800
>>> #      Fri Jan 22 06:43:59 2016 -0800
>>> # Branch stable
>>> # Node ID 40555a31b98b027c91b1ccf61477151b3307deb2
>>> # Parent  158bdc8965720ca4061f8f8d806563cfc7cdb62e
>>> import: respect diff.noprefix config (issue4639)
>>>
>>> Previously export-import round-trips would not work if diff.nopreofix was
>>> truthy, because import did not pay attention to that setting. Now we inspect
>>> that setting unless an explicit strip level is specified.
>> I don't think this is the right solution here -- much of the time hg
>> import is used on a repository that's different from the one where hg
>> export was used. Could we figure out from the patch whether to use -p0
>> or -p1?
> In fact I asked Sid to do the above when he added noprefix, so I still favor
> this method. Detecting the lack of a/b prefixes is only a little tricky (you
> have to consider the case of the repo which actually has "a" or "b" as directory
> names).

Oh, you did? Wow, I completely forgot.

> But I don't think this is freeze-appropriate.
>
> -- 
> Mathematics is the supreme nostalgia of our time.
>



More information about the Mercurial-devel mailing list