Mercurial > hg-stable

changeset 17194:32a6a33b9a35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
peer: remove cancopy from peer api; use directly on repo instead
author Sune Foldager <cryo@cyanite.org>
date Fri, 13 Jul 2012 21:52:37 +0200
parents 1d710fe5ee0e
children 48c232873a54
files mercurial/hg.py mercurial/localrepo.py mercurial/peer.py
diffstat 3 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Fri Jul 13 21:52:28 2012 +0200
+++ b/mercurial/hg.py	Fri Jul 13 21:52:37 2012 +0200
@@ -302,7 +302,8 @@
             dircleanup = DirCleanup(dest)
 
         copy = False
-        if srcpeer.cancopy() and islocal(dest) and not srcrepo.revs("secret()"):
+        if (srcrepo and srcrepo.cancopy() and islocal(dest)
+            and not srcrepo.revs("secret()")):
             copy = not pull and not rev
 
         if copy:
--- a/mercurial/localrepo.py	Fri Jul 13 21:52:28 2012 +0200
+++ b/mercurial/localrepo.py	Fri Jul 13 21:52:37 2012 +0200
@@ -46,9 +46,6 @@
     def local(self):
         return self._repo
 
-    def cancopy(self):
-        return self._repo.cancopy() # so bundlerepo can override
-
     def canpush(self):
         return True
 
--- a/mercurial/peer.py	Fri Jul 13 21:52:28 2012 +0200
+++ b/mercurial/peer.py	Fri Jul 13 21:52:37 2012 +0200
@@ -42,9 +42,6 @@
     def peer(self):
         return self
 
-    def cancopy(self):
-        return False
-
     def canpush(self):
         return True