Permalink
Browse files

Bug 699407: Make sure path is set when we're unbundling. r=Callek

  • Loading branch information...
1 parent 0eb852d commit feb9bf879b4eea6e0b7f63fbed332bbff633a868 @catlee catlee committed Nov 9, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −0 lib/python/mozilla_buildtools/test/test_util_hg.py
  2. +1 −2 lib/python/util/hg.py
@@ -505,6 +505,7 @@ def new_unbundle(*args, **kwargs):
clone(self.repodir, self.wc, bundles=[bundle])
self.assertEquals(self.revisions, getRevisions(self.wc))
self.assertEquals(called, [True])
+ self.assertEquals(path(self.wc), self.repodir)
finally:
hg.unbundle = orig_unbundle
View
@@ -131,6 +131,7 @@ def clone(repo, dest, branch=None, revision=None, update_dest=True,
log.info("Trying to use bundle %s", bundle)
try:
unbundle(bundle, dest)
+ adjust_paths(dest, default=repo)
# Now pull / update
return pull(repo, dest, update_dest=update_dest, mirrors=mirrors)
except:
@@ -327,8 +328,6 @@ def mercurial(repo, dest, branch=None, revision=None, update_dest=True,
# Make sure that our default path is correct
if hgpath != _make_absolute(repo):
log.info("hg path isn't correct (%s should be %s); clobbering", hgpath, _make_absolute(repo))
- # we need to clobber both the shared checkout and the dest,
- # since hgrc needs to be in both places
remove_path(dest)
# If the working directory already exists and isn't using share we update

0 comments on commit feb9bf8

Please sign in to comment.