mercurial-crew-with-dirclash: mercurial/commands.py comparison

clone: fall back to pull if we can't lock the source repo

comparison

equal deleted inserted replaced

-:9d10f89b75a5
+:937ee88da3ef
 if not os.path.exists(source):
 source = ui.expandpath(source)
 abspath = source
 other = hg.repository(ui, source)
+copy = False
 if other.dev() != -1:
 abspath = os.path.abspath(source)
+copy = True
-# we use a lock here because if we race with commit, we can
-# end up with extra data in the cloned revlogs that's not
+if copy:
-# pointed to by changesets, thus causing verify to fail
+try:
-l1 = lock.lock(os.path.join(source, ".hg", "lock"))
+# we use a lock here because if we race with commit, we
+# can end up with extra data in the cloned revlogs that's
-# and here to avoid premature writing to the target
+# not pointed to by changesets, thus causing verify to
+# fail
+l1 = lock.lock(os.path.join(source, ".hg", "lock"))
+except OSError:
+copy = False
+if copy:
+# we lock here to avoid premature writing to the target
 os.mkdir(os.path.join(dest, ".hg"))
 l2 = lock.lock(os.path.join(dest, ".hg", "lock"))
 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
 for f in files.split():

Mercurial > hg > mercurial-crew-with-dirclash