robustcheckout: tweak warning message; r?glob
Clarify that it is the working directory that we're deleting (as
opposed to the shared store).
MozReview-Commit-ID: 5d3FjoxFXAT
--- a/hgext/robustcheckout/__init__.py
+++ b/hgext/robustcheckout/__init__.py
@@ -205,21 +205,21 @@ def _docheckout(ui, url, dest, upstream,
# Verify the shared path exists and is using modern pooled storage.
if destvfs.exists('.hg/sharedpath'):
storepath = destvfs.read('.hg/sharedpath').strip()
ui.write('(existing repository shared store: %s)\n' % storepath)
if not os.path.exists(storepath):
- ui.warn('(shared store does not exist; deleting)\n')
+ ui.warn('(shared store does not exist; deleting destination)\n')
destvfs.rmtree(forcibly=True)
elif not re.search('[a-f0-9]{40}/\.hg$', storepath.replace('\\', '/')):
ui.warn('(shared store does not belong to pooled storage; '
- 'deleting to improve efficiency)\n')
+ 'deleting destination to improve efficiency)\n')
destvfs.rmtree(forcibly=True)
# FUTURE when we require generaldelta, this is where we can check
# for that.
def deletesharedstore():
storepath = destvfs.read('.hg/sharedpath').strip()
if storepath.endswith('.hg'):
--- a/hgext/robustcheckout/tests/test-corrupt-repo.t
+++ b/hgext/robustcheckout/tests/test-corrupt-repo.t
@@ -27,17 +27,17 @@ Corrupt the manifest
searching for changes
adding changesets
adding manifests
transaction abort!
rollback completed
(repo corruption: index 00manifest.i is corrupted; deleting shared store)
ensuring http://localhost:$HGPORT/repo0@aada1b3e573f is available at dest
(existing repository shared store: $TESTTMP/share/b8b78f0253d822e33ba652fd3d80a5c0837cfdf3/.hg)
- (shared store does not exist; deleting)
+ (shared store does not exist; deleting destination)
(sharing from new pooled repository b8b78f0253d822e33ba652fd3d80a5c0837cfdf3)
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
searching for changes
no changes found
@@ -57,17 +57,17 @@ Now check corruption is handled during c
searching for changes
adding changesets
adding manifests
transaction abort!
rollback completed
(repo corruption: index 00manifest.i is corrupted; deleting shared store)
ensuring http://localhost:$HGPORT/repo0@aada1b3e573f is available at dest1
(existing repository shared store: $TESTTMP/share/b8b78f0253d822e33ba652fd3d80a5c0837cfdf3/.hg)
- (shared store does not exist; deleting)
+ (shared store does not exist; deleting destination)
(sharing from new pooled repository b8b78f0253d822e33ba652fd3d80a5c0837cfdf3)
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
searching for changes
no changes found
--- a/hgext/robustcheckout/tests/test-dest-shared-state.t
+++ b/hgext/robustcheckout/tests/test-dest-shared-state.t
@@ -28,17 +28,17 @@ If shared path points nowhere, repo is "
$ cat > missingsharepath/.hg/sharedpath << EOF
> does_not_exist
> EOF
$ touch missingsharepath/file0
$ hg robustcheckout http://localhost:$HGPORT/repo0 missingsharepath --revision aada1b3e573f
ensuring http://localhost:$HGPORT/repo0@aada1b3e573f is available at missingsharepath
(existing repository shared store: does_not_exist)
- (shared store does not exist; deleting)
+ (shared store does not exist; deleting destination)
(sharing from existing pooled repository b8b78f0253d822e33ba652fd3d80a5c0837cfdf3)
searching for changes
no changes found
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to aada1b3e573f7272bb2ef93b34acbf0f77c69d44
$ ls missingsharepath
foo
@@ -54,17 +54,17 @@ we require pooled storage
$ cat > nopoolshare/.hg/sharedpath << EOF
> $TESTTMP/fakeshare/.hg
> EOF
$ touch nopoolshare/file0
$ hg robustcheckout http://localhost:$HGPORT/repo0 nopoolshare --revision aada1b3e573f
ensuring http://localhost:$HGPORT/repo0@aada1b3e573f is available at nopoolshare
(existing repository shared store: $TESTTMP/fakeshare/.hg)
- (shared store does not belong to pooled storage; deleting to improve efficiency)
+ (shared store does not belong to pooled storage; deleting destination to improve efficiency)
(sharing from existing pooled repository b8b78f0253d822e33ba652fd3d80a5c0837cfdf3)
searching for changes
no changes found
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to aada1b3e573f7272bb2ef93b34acbf0f77c69d44
$ ls nopoolshare
foo