[PATCH] subrepo: allow remapping subpaths using the "final" path

[Martin Geisler]

Matt Mackall <mpm at selenic.com> writes:

> On Thu, 2011-08-11 at 09:33 +0200, Martin Geisler wrote:
>> Matt Mackall <mpm at selenic.com> writes:
>> 
>> > On Wed, 2011-08-10 at 16:59 +0200, Martin Geisler wrote:
>> >> # HG changeset patch
>> >> # User Martin Geisler <mg at aragost.com>
>> >> # Date 1312988370 -7200
>> >> # Node ID 4cfdb06e702888cbd4cbe97cf0aec0cb01368456
>> >> # Parent  0cb27eda3a1e0ea47a9a0bd5d44f5d21ec4509e1
>> >> subrepo: allow remapping subpaths using the "final" path
>> >> 
>> >> The way subpath remapping happens now, the right-hand side of a
>> >> .hgsub entry is used, as is, to match the left-hand side of a
>> >> subpaths entry. The new idea is to expand the .hgsub entry by
>> >> prefixing the parent repo path *before* the match occurs - i.e. to
>> >> operate on the final path including the parent. For example,
>> >> 
>> >>   .hgsub entry:     src/foo = src/foo
>> >>   parent repo path: http://example.net/parent
>> >>   expansion:        http://example.net/parent/src/foo
>> >
>> > Ok, so before we'd try remapping src/foo, now with this option
>> > enabled, we'll try remapping the whole URL.
>> 
>> Yes, that is correct.
>> 
>> The advantage is that a rewriting rule like 'http:// = ssh://' now
>> also affects a trivial subrepo path like the above since we rewrite
>> the expansion instead of just 'src/foo'.
>> 
>> > Seems to me that it should be sufficiently safe to try both and
>> > avoid a confusing new option.
>> 
>> I'm not sure what "trying both" means here?
>
> base = "src/foo"
> parent = "http://example.net/parent"
> full = join(parent, base)
> final = remap(full)
> if final == full: # no remapping, try old-style remapping
>   final = join(parent, remap(base))

Okay, thanks, that will definitely catch some backwards incompatible
changes.

I've tried to make the remapping use the final path always today, but it
leads to test failures like this one:

  --- /home/mg/src/mercurial-crew/tests/test-subrepo.t
  +++ /home/mg/src/mercurial-crew/tests/test-subrepo.t.err
  @@ -620,8 +620,8 @@
     adding manifests
     adding file changes
     added 1 changesets with 2 changes to 2 files
  -  cloning subrepo sub/repo from issue1852a/sub/repo
  -  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  +  abort: repository issue1852a/issue1852a/sub/repo not found!
  +  [255]

   Try to push from the other side

The problem is the parent path is added an extra time with _abssource in
hgsubrepo._get. Not calling _abssource help here, but there are other
similar problems and I've not figured out how to solve them all yet.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/