subrepo: change default path in hgrc of subrepo after cloning

Previous behavior was to put in the cloned subrepos the path found in the original main repo.
However it isn't valid for relative path and it seems more logical to reference instead the subrepos
working copy path of the original main repo.

mercurial/subrepo.py

@@ -1,360 +1,361
 # subrepo.py - sub-repository handling for Mercurial
 #
 # Copyright 2009-2010 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import errno, os, re, xml.dom.minidom, shutil
 from i18n import _
 import config, util, node, error
 hg = None
 
 nullstate = ('', '', 'empty')
 
 def state(ctx):
     p = config.config()
     def read(f, sections=None, remap=None):
         if f in ctx:
             p.parse(f, ctx[f].data(), sections, remap, read)
         else:
             raise util.Abort(_("subrepo spec file %s not found") % f)
 
     if '.hgsub' in ctx:
         read('.hgsub')
 
     rev = {}
     if '.hgsubstate' in ctx:
         try:
             for l in ctx['.hgsubstate'].data().splitlines():
                 revision, path = l.split(" ", 1)
                 rev[path] = revision
         except IOError, err:
             if err.errno != errno.ENOENT:
                 raise
 
     state = {}
     for path, src in p[''].items():
         kind = 'hg'
         if src.startswith('['):
             if ']' not in src:
                 raise util.Abort(_('missing ] in subrepo source'))
             kind, src = src.split(']', 1)
             kind = kind[1:]
         state[path] = (src, rev.get(path, ''), kind)
 
     return state
 
 def writestate(repo, state):
     repo.wwrite('.hgsubstate',
                 ''.join(['%s %s\n' % (state[s][1], s)
                          for s in sorted(state)]), '')
 
 def submerge(repo, wctx, mctx, actx):
     # working context, merging context, ancestor context
     if mctx == actx: # backwards?
         actx = wctx.p1()
     s1 = wctx.substate
     s2 = mctx.substate
     sa = actx.substate
     sm = {}
 
     repo.ui.debug("subrepo merge %s %s %s\n" % (wctx, mctx, actx))
 
     def debug(s, msg, r=""):
         if r:
             r = "%s:%s:%s" % r
         repo.ui.debug("  subrepo %s: %s %s\n" % (s, msg, r))
 
     for s, l in s1.items():
         if wctx != actx and wctx.sub(s).dirty():
             l = (l[0], l[1] + "+")
         a = sa.get(s, nullstate)
         if s in s2:
             r = s2[s]
             if l == r or r == a: # no change or local is newer
                 sm[s] = l
                 continue
             elif l == a: # other side changed
                 debug(s, "other changed, get", r)
                 wctx.sub(s).get(r)
                 sm[s] = r
             elif l[0] != r[0]: # sources differ
                 if repo.ui.promptchoice(
                     _(' subrepository sources for %s differ\n'
                       'use (l)ocal source (%s) or (r)emote source (%s)?')
                       % (s, l[0], r[0]),
                       (_('&Local'), _('&Remote')), 0):
                     debug(s, "prompt changed, get", r)
                     wctx.sub(s).get(r)
                     sm[s] = r
             elif l[1] == a[1]: # local side is unchanged
                 debug(s, "other side changed, get", r)
                 wctx.sub(s).get(r)
                 sm[s] = r
             else:
                 debug(s, "both sides changed, merge with", r)
                 wctx.sub(s).merge(r)
                 sm[s] = l
         elif l == a: # remote removed, local unchanged
             debug(s, "remote removed, remove")
             wctx.sub(s).remove()
         else:
             if repo.ui.promptchoice(
                 _(' local changed subrepository %s which remote removed\n'
                   'use (c)hanged version or (d)elete?') % s,
                 (_('&Changed'), _('&Delete')), 0):
                 debug(s, "prompt remove")
                 wctx.sub(s).remove()
 
     for s, r in s2.items():
         if s in s1:
             continue
         elif s not in sa:
             debug(s, "remote added, get", r)
             mctx.sub(s).get(r)
             sm[s] = r
         elif r != sa[s]:
             if repo.ui.promptchoice(
                 _(' remote changed subrepository %s which local removed\n'
                   'use (c)hanged version or (d)elete?') % s,
                 (_('&Changed'), _('&Delete')), 0) == 0:
                 debug(s, "prompt recreate", r)
                 wctx.sub(s).get(r)
                 sm[s] = r
 
     # record merged .hgsubstate
     writestate(repo, sm)
 
 def _abssource(repo, push=False):
     if hasattr(repo, '_subparent'):
         source = repo._subsource
         if source.startswith('/') or '://' in source:
             return source
         parent = _abssource(repo._subparent)
         if '://' in parent:
             if parent[-1] == '/':
                 parent = parent[:-1]
             return parent + '/' + source
         return os.path.join(parent, repo._subsource)
     if push and repo.ui.config('paths', 'default-push'):
         return repo.ui.config('paths', 'default-push', repo.root)
     return repo.ui.config('paths', 'default', repo.root)
 
 def subrepo(ctx, path):
     # subrepo inherently violates our import layering rules
     # because it wants to make repo objects from deep inside the stack
     # so we manually delay the circular imports to not break
     # scripts that don't use our demand-loading
     global hg
     import hg as h
     hg = h
 
     util.path_auditor(ctx._repo.root)(path)
     state = ctx.substate.get(path, nullstate)
     if state[2] not in types:
         raise util.Abort(_('unknown subrepo type %s') % state[2])
     return types[state[2]](ctx, path, state[:2])
 
 # subrepo classes need to implement the following methods:
 # __init__(self, ctx, path, state)
 # dirty(self): returns true if the dirstate of the subrepo
 #   does not match current stored state
 # commit(self, text, user, date): commit the current changes
 #   to the subrepo with the given log message. Use given
 #   user and date if possible. Return the new state of the subrepo.
 # remove(self): remove the subrepo (should verify the dirstate
 #   is not dirty first)
 # get(self, state): run whatever commands are needed to put the
 #   subrepo into this state
 # merge(self, state): merge currently-saved state with the new state.
 # push(self, force): perform whatever action is analagous to 'hg push'
 #   This may be a no-op on some systems.
 
 class hgsubrepo(object):
     def __init__(self, ctx, path, state):
         self._path = path
         self._state = state
         r = ctx._repo
         root = r.wjoin(path)
         if os.path.exists(os.path.join(root, '.hg')):
             self._repo = hg.repository(r.ui, root)
         else:
             util.makedirs(root)
             self._repo = hg.repository(r.ui, root, create=True)
             f = file(os.path.join(root, '.hg', 'hgrc'), 'w')
-            f.write('[paths]\ndefault = %s\n' % state[0])
+            f.write('[paths]\ndefault = %s\n' % os.path.join(
+                _abssource(ctx._repo), path))
             f.close()
         self._repo._subparent = r
         self._repo._subsource = state[0]
 
     def dirty(self):
         r = self._state[1]
         if r == '':
             return True
         w = self._repo[None]
         if w.p1() != self._repo[r]: # version checked out changed
             return True
         return w.dirty() # working directory changed
 
     def commit(self, text, user, date):
         self._repo.ui.debug("committing subrepo %s\n" % self._path)
         n = self._repo.commit(text, user, date)
         if not n:
             return self._repo['.'].hex() # different version checked out
         return node.hex(n)
 
     def remove(self):
         # we can't fully delete the repository as it may contain
         # local-only history
         self._repo.ui.note(_('removing subrepo %s\n') % self._path)
         hg.clean(self._repo, node.nullid, False)
 
     def _get(self, state):
         source, revision, kind = state
         try:
             self._repo.lookup(revision)
         except error.RepoError:
             self._repo._subsource = source
             self._repo.ui.status(_('pulling subrepo %s\n') % self._path)
             srcurl = _abssource(self._repo)
             other = hg.repository(self._repo.ui, srcurl)
             self._repo.pull(other)
 
     def get(self, state):
         self._get(state)
         source, revision, kind = state
         self._repo.ui.debug("getting subrepo %s\n" % self._path)
         hg.clean(self._repo, revision, False)
 
     def merge(self, state):
         self._get(state)
         cur = self._repo['.']
         dst = self._repo[state[1]]
         anc = dst.ancestor(cur)
         if anc == cur:
             self._repo.ui.debug("updating subrepo %s\n" % self._path)
             hg.update(self._repo, state[1])
         elif anc == dst:
             self._repo.ui.debug("skipping subrepo %s\n" % self._path)
         else:
             self._repo.ui.debug("merging subrepo %s\n" % self._path)
             hg.merge(self._repo, state[1], remind=False)
 
     def push(self, force):
         # push subrepos depth-first for coherent ordering
         c = self._repo['']
         subs = c.substate # only repos that are committed
         for s in sorted(subs):
             c.sub(s).push(force)
 
         self._repo.ui.status(_('pushing subrepo %s\n') % self._path)
         dsturl = _abssource(self._repo, True)
         other = hg.repository(self._repo.ui, dsturl)
         self._repo.push(other, force)
 
 class svnsubrepo(object):
     def __init__(self, ctx, path, state):
         self._path = path
         self._state = state
         self._ctx = ctx
         self._ui = ctx._repo.ui
 
     def _svncommand(self, commands):
         cmd = ['svn'] + commands + [self._path]
         cmd = [util.shellquote(arg) for arg in cmd]
         cmd = util.quotecommand(' '.join(cmd))
         env = dict(os.environ)
         # Avoid localized output, preserve current locale for everything else.
         env['LC_MESSAGES'] = 'C'
         write, read, err = util.popen3(cmd, env=env, newlines=True)
         retdata = read.read()
         err = err.read().strip()
         if err:
             raise util.Abort(err)
         return retdata
 
     def _wcrev(self):
         output = self._svncommand(['info', '--xml'])
         doc = xml.dom.minidom.parseString(output)
         entries = doc.getElementsByTagName('entry')
         if not entries:
             return 0
         return int(entries[0].getAttribute('revision') or 0)
 
     def _wcchanged(self):
         """Return (changes, extchanges) where changes is True
         if the working directory was changed, and extchanges is
         True if any of these changes concern an external entry.
         """
         output = self._svncommand(['status', '--xml'])
         externals, changes = [], []
         doc = xml.dom.minidom.parseString(output)
         for e in doc.getElementsByTagName('entry'):
             s = e.getElementsByTagName('wc-status')
             if not s:
                 continue
             item = s[0].getAttribute('item')
             props = s[0].getAttribute('props')
             path = e.getAttribute('path')
             if item == 'external':
                 externals.append(path)
             if (item not in ('', 'normal', 'unversioned', 'external')
                 or props not in ('', 'none')):
                 changes.append(path)
         for path in changes:
             for ext in externals:
                 if path == ext or path.startswith(ext + os.sep):
                     return True, True
         return bool(changes), False
 
     def dirty(self):
         if self._wcrev() == self._state[1] and not self._wcchanged()[0]:
             return False
         return True
 
     def commit(self, text, user, date):
         # user and date are out of our hands since svn is centralized
         changed, extchanged = self._wcchanged()
         if not changed:
             return self._wcrev()
         if extchanged:
             # Do not try to commit externals
             raise util.Abort(_('cannot commit svn externals'))
         commitinfo = self._svncommand(['commit', '-m', text])
         self._ui.status(commitinfo)
         newrev = re.search('Committed revision ([\d]+).', commitinfo)
         if not newrev:
             raise util.Abort(commitinfo.splitlines()[-1])
         newrev = newrev.groups()[0]
         self._ui.status(self._svncommand(['update', '-r', newrev]))
         return newrev
 
     def remove(self):
         if self.dirty():
             self._ui.warn(_('not removing repo %s because '
                             'it has changes.\n' % self._path))
             return
         self._ui.note('removing subrepo %s\n' % self._path)
         shutil.rmtree(self._ctx.repo.join(self._path))
 
     def get(self, state):
         status = self._svncommand(['checkout', state[0], '--revision', state[1]])
         if not re.search('Checked out revision [\d]+.', status):
             raise util.Abort(status.splitlines()[-1])
         self._ui.status(status)
 
     def merge(self, state):
         old = int(self._state[1])
         new = int(state[1])
         if new > old:
             self.get(state)
 
     def push(self, force):
         # nothing for svn
         pass
 
 types = {
     'hg': hgsubrepo,
     'svn': svnsubrepo,
     }

tests/test-subrepo

@@ -1,164 +1,186
 #!/bin/sh
 
 rm -rf sub
 mkdir sub
 cd sub
 hg init t
 cd t
 
 echo % first revision, no sub
 echo a > a
 hg ci -Am0
 
 echo % add first sub
 echo s = s > .hgsub
 hg add .hgsub
 hg init s
 echo a > s/a
 hg -R s ci -Ams0
 hg ci -m1
 
 echo % add sub sub
 echo ss = ss > s/.hgsub
 hg init s/ss
 echo a > s/ss/a
 hg -R s add s/.hgsub
 hg -R s/ss add s/ss/a
 hg ci -m2
 
 echo % bump sub rev
 echo b > s/a
 hg -R s ci -ms1
 hg ci -m3
 
 echo % leave sub dirty
 echo c > s/a
 hg ci -m4
 hg tip -R s
 
 echo % check caching
 hg co 0
 hg debugsub
 echo % restore
 hg co
 hg debugsub
 
 echo % new branch for merge tests
 hg co 1
 echo t = t >> .hgsub
 hg init t
 echo t > t/t
 hg -R t add t
 echo % 5
 hg ci -m5 # add sub
 echo t2 > t/t
 echo % 6
 hg st -R s
 hg ci -m6 # change sub
 hg debugsub
 echo t3 > t/t
 echo % 7
 hg ci -m7 # change sub again for conflict test
 hg rm .hgsub
 echo % 8
 hg ci -m8 # remove sub
 
 echo % merge tests
 hg co -C 3
 hg merge 5 # test adding
 hg debugsub
 hg ci -m9
 hg merge 6 --debug # test change
 hg debugsub
 echo conflict > t/t
 hg ci -m10
 HGMERGE=internal:merge hg merge --debug 7 # test conflict
 echo % should conflict
 cat t/t
 
 echo % clone
 cd ..
 hg clone t tc
 cd tc
 hg debugsub
 
 echo % push
 echo bah > t/t
 hg ci -m11
 hg push | sed 's/ .*sub/ ...sub/g'
 
 echo % push -f
 echo bah > s/a
 hg ci -m12
 hg push | sed 's/ .*sub/ ...sub/g'
 hg push -f | sed 's/ .*sub/ ...sub/g'
 
 echo % update
 cd ../t
 hg up -C # discard our earlier merge
 echo blah > t/t
 hg ci -m13
 
 echo % pull
 cd ../tc
 hg pull | sed 's/ .*sub/ ...sub/g'
 hg up # should pull t
 cat t/t
 
 echo % bogus subrepo path aborts
 echo 'bogus=[boguspath' >> .hgsub
 hg ci -m 'bogus subrepo path'
 
 echo % issue 1986
 cd ..
 rm -rf sub
 hg init main
 cd main
 
 hg init s           # subrepo layout
 cd s                #
 echo a > a          #   o   5 br
 hg ci -Am1          #  /|
 hg branch br        # o |   4 default
 echo a >> a         # | |
 hg ci -m1           # | o   3 br
 hg up default       # |/|
 echo b > b          # o |   2 default
 hg ci -Am1          # | |
 hg up br            # | o   1 br
 hg merge tip        # |/
 hg ci -m1           # o     0 default
 hg up 2
 echo c > c
 hg ci -Am1
 hg up 3
 hg merge 4
 hg ci -m1
 
 cd ..                         # main repo layout:
 echo 's = s' > .hgsub         #
 hg -R s up 2                  #   * <-- try to merge default into br again
 hg ci -Am1                    # .`|
 hg branch br                  # . o   5 br      --> substate = 5
 echo b > b                    # . |
 hg -R s up 3                  # o |   4 default --> substate = 4
 hg ci -Am1                    # | |
 hg up default                 # | o   3 br      --> substate = 2
 echo c > c                    # |/|
 hg ci -Am1                    # o |   2 default --> substate = 2
 hg up 1                       # | |     
 hg merge 2                    # | o   1 br      --> substate = 3
 hg ci -m1                     # |/    
 hg up 2                       # o     0 default --> substate = 2
 hg -R s up 4
 echo d > d
 hg ci -Am1
 hg up 3
 hg -R s up 5
 echo e > e
 hg ci -Am1
 
 hg up 5
 hg merge 4    # try to merge default into br again
+cd ..
+
+echo % test repository cloning
+mkdir mercurial mercurial2
+hg init nested_absolute
+echo test > nested_absolute/foo
+hg -R nested_absolute add
+hg -R nested_absolute ci -mtest
+cd mercurial
+hg init nested_relative
+echo test2 > nested_relative/foo2
+hg -R nested_relative add
+hg -R nested_relative ci -mtest2
+hg init main
+echo nested_relative = ../nested_relative > main/.hgsub
+echo nested_absolute = $PWD/nested_absolute >> main/.hgsub
+hg -R main add
+hg -R main ci -m "add subrepos"
+cd ..
+hg clone mercurial/main mercurial2/main
+cat mercurial2/main/nested_absolute/.hg/hgrc mercurial2/main/nested_relative/.hg/hgrc | sed "s:${PWD}:/tmp:"
+rm -rf mercurial mercurial2
 
 exit 0

tests/test-subrepo.out

@@ -1,245 +1,257
 % first revision, no sub
 adding a
 % add first sub
 adding a
 committing subrepository s
 % add sub sub
 committing subrepository s
 committing subrepository ss
 % bump sub rev
 committing subrepository s
 % leave sub dirty
 committing subrepository s
 changeset:   3:1c833a7a9e3a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     4
 
 % check caching
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 % restore
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 path s
  source   s
  revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
 % new branch for merge tests
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding t/t
 % 5
 committing subrepository t
 created new head
 % 6
 committing subrepository t
 path s
  source   s
  revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
 path t
  source   t
  revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
 % 7
 committing subrepository t
 % 8
 % merge tests
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
 created new head
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
  .hgsubstate: versions differ -> m
 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
   subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
 getting subrepo t
 resolving manifests
  overwrite True partial False
  ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
  t: remote is newer -> g
 getting t
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
 committing subrepository t
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
  .hgsubstate: versions differ -> m
 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
   subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
 merging subrepo t
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
  t: versions differ -> m
 preserving t for resolve of t
 picked tool 'internal:merge' for t (binary False symlink False)
 merging t
 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
 warning: conflicts during merge.
 merging t failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should conflict
 <<<<<<< local
 conflict
 =======
 t3
 >>>>>>> other
 % clone
 updating to branch default
 pulling subrepo s
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 3 files
 pulling subrepo ss
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 pulling subrepo t
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files (+1 heads)
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
 % push
 committing subrepository t
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 no changes found
 pushing ...subrepo t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % push -f
 committing subrepository s
 abort: push creates new remote heads!
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 (did you forget to merge? use push -f to force)
 pushing ...subrepo t
 searching for changes
 no changes found
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 pushing ...subrepo t
 searching for changes
 no changes found
 searching for changes
 no changes found
 % update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 committing subrepository t
 % pull
 pulling ...sub/t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 pulling subrepo t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 blah
 % bogus subrepo path aborts
 abort: missing ] in subrepo source
 % issue 1986
 adding a
 marked working directory as branch br
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding c
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding .hgsub
 committing subrepository s
 marked working directory as branch br
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b
 committing subrepository s
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding c
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding d
 committing subrepository s
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding e
 committing subrepository s
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+% test repository cloning
+adding nested_absolute/foo
+adding nested_relative/foo2
+adding main/.hgsub
+committing subrepository nested_relative
+committing subrepository nested_absolute
+updating to branch default
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+[paths]
+default = /tmp/mercurial/main/nested_absolute
+[paths]
+default = /tmp/mercurial/main/nested_relative