/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Robert Collins
  • Date: 2009-03-27 04:10:25 UTC
  • mfrom: (4208 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4216.
  • Revision ID: robertc@robertcollins.net-20090327041025-rgutx4q03xo4pq6l
Resolve NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
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
 
1713
1713
        return self.inventory[file_id].text_size
1714
1714
 
1715
1715
    def get_file_text(self, file_id, path=None):
1716
 
        return list(self.iter_files_bytes([(file_id, None)]))[0][1]
 
1716
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
 
1717
        return ''.join(content)
1717
1718
 
1718
1719
    def get_reference_revision(self, file_id, path=None):
1719
1720
        return self.inventory[file_id].reference_revision