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

  • Committer: Vincent Ladeuil
  • Date: 2007-07-03 09:28:59 UTC
  • mto: (2584.1.1 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 2585.
  • Revision ID: v.ladeuil+lp@free.fr-20070703092859-yl7j53209tfmhf7u
Take Martin and Robert comments into account.

* bzrlib/strace.py:
(strace): is now a wrapper that calls strace_detailed.
(strace_detailed): like strace before but with an option to
disable following forked children without polluting the kwargs
param.

* bzrlib/tests/test_strace.py:
(TestStrace.test_strace_callable_is_called,
TestStrace.test_strace_callable_result,
TestStrace.test_strace_result_has_raw_log): use strace_detailed
while disabling following forked children, the syntax is a bit
uglier but non-test users should never use anyway..

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