← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textinv.py

  • Committer: John Arbash Meinel
  • Date: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textinv.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
from __future__ import absolute_import
17
18
 
18
19
from bzrlib.errors import BzrError
19
 
from bzrlib.inventory import InventoryEntry, Inventory
 
20
from bzrlib.inventory import Inventory
20
21
 
21
22
 
22
23
START_MARK = "# bzr inventory format 3\n"
25
26
 
26
27
def escape(s):
27
28
    """Very simple URL-like escaping.
28
 
    
 
29
 
29
30
    (Why not just use backslashes?  Because then we couldn't parse
30
31
    lines just by splitting on spaces.)"""
31
32
    return (s.replace('\\', r'\x5c')
36
37
 
37
38
 
38
39
def unescape(s):
39
 
    assert s.find(' ') == -1
 
40
    if s.find(' ') != -1:
 
41
        raise AssertionError()
40
42
    s = (s.replace(r'\x20', ' ')
41
43
         .replace(r'\x09', '\t')
42
44
         .replace(r'\x0a', '\n')
45
47
    # TODO: What if there's anything else?
46
48
 
47
49
    return s
48
 
    
49
 
                     
 
50
 
 
51
 
50
52
 
51
53
 
52
54
def write_text_inventory(inv, outf):
55
57
    for path, ie in inv.iter_entries():
56
58
        if inv.is_root(ie.file_id):
57
59
            continue
58
 
        
 
60
 
59
61
        outf.write(ie.file_id + ' ')
60
62
        outf.write(escape(ie.name) + ' ')
61
63
        outf.write(ie.kind + ' ')
62
64
        outf.write(ie.parent_id + ' ')
63
 
        
 
65
 
64
66
        if ie.kind == 'file':
65
67
            outf.write(ie.text_id)
66
68
            outf.write(' ' + ie.text_sha1)
73
75
    """Return an inventory read in from tf"""
74
76
    if tf.readline() != START_MARK:
75
77
        raise BzrError("missing start mark")
76
 
    
 
78
 
77
79
    inv = Inventory()
78
80
 
79
81
    for l in tf:
85
87
              'kind': fields[2],
86
88
              'parent_id': fields[3]}
87
89
        ##inv.add(ie)
88
 
        
 
90
 
89
91
    if l != END_MARK:
90
92
        raise BzrError("missing end mark")
91
93
    return inv