Rev 3645: (Jelmer) Remove deprecated Branch.abspath and unimplemented in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3645
revision-id: pqm at pqm.ubuntu.com-20080823174134-lx67nymraun1onby
parent: pqm at pqm.ubuntu.com-20080822042630-on3dxyek4ezk0miu
parent: jelmer at samba.org-20080823152030-zz5d4mcu1rlp1q51
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-08-23 18:41:34 +0100
message:
  (Jelmer) Remove deprecated Branch.abspath and unimplemented
  	Branch.rename_one and Branch.move.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
    ------------------------------------------------------------
    revno: 3644.1.1
    revision-id: jelmer at samba.org-20080823152030-zz5d4mcu1rlp1q51
    parent: pqm at pqm.ubuntu.com-20080822042630-on3dxyek4ezk0miu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Sat 2008-08-23 17:20:30 +0200
    message:
      Remove deprecated Branch.abspath and unimplemented Branch.rename_one and Branch.move.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
=== modified file 'NEWS'
--- a/NEWS	2008-08-22 04:26:30 +0000
+++ b/NEWS	2008-08-23 15:20:30 +0000
@@ -58,6 +58,9 @@
       the target tree. Previously it returned True unconditionally.
       (Robert Collins)
 
+    * The deprecated ``Branch.abspath`` and unimplemented 
+      ``Branch.rename_one`` and ``Branch.move`` were removed. (Jelmer Vernooij)
+
   TESTING:
 
     * ``addCleanup`` now takes ``*arguments`` and ``**keyword_arguments``

=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2008-07-25 15:19:45 +0000
+++ b/bzrlib/branch.py	2008-08-23 15:20:30 +0000
@@ -231,15 +231,6 @@
         """
         self.control_files.dont_leave_in_place()
 
-    @deprecated_method(deprecated_in((0, 16, 0)))
-    def abspath(self, name):
-        """Return absolute filename for something in the branch
-        
-        XXX: Robert Collins 20051017 what is this used for? why is it a branch
-        method and not a tree method.
-        """
-        raise NotImplementedError(self.abspath)
-
     def bind(self, other):
         """Bind the local branch the other branch.
 
@@ -576,29 +567,6 @@
         """Return `Tree` object for last revision."""
         return self.repository.revision_tree(self.last_revision())
 
-    def rename_one(self, from_rel, to_rel):
-        """Rename one file.
-
-        This can change the directory or the filename or both.
-        """
-        raise NotImplementedError(self.rename_one)
-
-    def move(self, from_paths, to_name):
-        """Rename files.
-
-        to_name must exist as a versioned directory.
-
-        If to_name exists and is a directory, the files are moved into
-        it, keeping their old names.  If it is a directory, 
-
-        Note that to_name is only the last component of the new name;
-        this doesn't change the directory.
-
-        This returns a list of (from_path, to_path) pairs for each
-        entry that is moved.
-        """
-        raise NotImplementedError(self.move)
-
     def get_parent(self):
         """Return the parent location of the branch.
 
@@ -1520,11 +1488,6 @@
 
     base = property(_get_base, doc="The URL for the root of this branch.")
 
-    @deprecated_method(deprecated_in((0, 16, 0)))
-    def abspath(self, name):
-        """See Branch.abspath."""
-        return self._transport.abspath(name)
-
     def is_locked(self):
         return self.control_files.is_locked()