~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2009-03-28 14:24:46 UTC
  • mfrom: (4211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4212.
  • Revision ID: jelmer@samba.org-20090328142446-vqi0ksswdurga631
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""WorkingTree4 format and implementation.
18
18
 
1715
1715
        return self.inventory[file_id].text_size
1716
1716
 
1717
1717
    def get_file_text(self, file_id, path=None):
1718
 
        return list(self.iter_files_bytes([(file_id, None)]))[0][1]
 
1718
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
 
1719
        return ''.join(content)
1719
1720
 
1720
1721
    def get_reference_revision(self, file_id, path=None):
1721
1722
        return self.inventory[file_id].reference_revision