Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hg.py @ 16018:ed9f40bc346f stable
phases: fix verify with secret csets
Verify uses repo.cancopy() to detect whether a repo is a plain old
local repo, so it was giving a confusing error message when secret
changesets were present.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 29 Jan 2012 13:36:10 -0600 |
| parents | 0b05e0bfdc1c |
| children | 6b16ded5c810 |
comparison
equal
deleted
inserted
replaced
| 16017:2605fc990725 | 16018:ed9f40bc346f |
|---|---|
| 287 | 287 |
| 288 if islocal(dest): | 288 if islocal(dest): |
| 289 dircleanup = DirCleanup(dest) | 289 dircleanup = DirCleanup(dest) |
| 290 | 290 |
| 291 copy = False | 291 copy = False |
| 292 if srcrepo.cancopy() and islocal(dest): | 292 if srcrepo.cancopy() and islocal(dest) and not srcrepo.revs("secret()"): |
| 293 copy = not pull and not rev | 293 copy = not pull and not rev |
| 294 | 294 |
| 295 if copy: | 295 if copy: |
| 296 try: | 296 try: |
| 297 # we use a lock here because if we race with commit, we | 297 # we use a lock here because if we race with commit, we |