/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 serialize_transform.py

  • Committer: Aaron Bentley
  • Date: 2008-10-11 15:04:38 UTC
  • mfrom: (0.12.47 shelf-manager)
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081011150438-zp58xowmn3mw3104
Merge shelf-manager into shelf-ui

Show diffs side-by-side

added added

removed removed

Lines of Context:
serialize_transform.py
1
1
import os
2
2
 
3
 
from bzrlib import multiparent
 
3
from bzrlib import errors, multiparent, osutils
4
4
from bzrlib.util import bencode
5
5
 
6
6
 
7
7
def get_parents_texts(tt, trans_id):
8
 
    return tuple(''.join(p) for p in get_parents_lines(tt, trans_id))
9
 
 
10
 
 
11
 
def get_parents_lines(tt, trans_id):
12
8
    file_id = tt.tree_file_id(trans_id)
13
 
    if file_id is None:
 
9
    try:
 
10
        if file_id is None or tt._tree.kind(file_id) != 'file':
 
11
            return ()
 
12
    except errors.NoSuchFile:
14
13
        return ()
15
 
    else:
16
 
        return (tt._tree.get_file(file_id).readlines(),)
 
14
    return tt._tree.get_file_text(file_id)
 
15
 
 
16
 
 
17
def get_parents_lines(tt, trans_id):
 
18
    return tuple(osutils.split_lines(p) for p
 
19
                 in get_parents_texts(tt, trans_id))
17
20
 
18
21
 
19
22
def serialize(tt, serializer):
38
41
        if kind == 'file':
39
42
            cur_file = open(tt._limbo_name(trans_id), 'rb')
40
43
            try:
41
 
                lines = cur_file.readlines()
 
44
                lines = osutils.split_lines(cur_file.read())
42
45
            finally:
43
46
                cur_file.close()
44
47
            parents = get_parents_lines(tt, trans_id)