/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 tools/capture_tree.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/capture_tree.py
 
1
#! /usr/bin/env python
 
2
 
 
3
# Copyright (C) 2005 Canonical Ltd
 
4
 
 
5
"""Print to stdout a description of the current directory, 
 
6
formatted as a Python data structure.
 
7
 
 
8
This can be useful in tests that need to recreate directory
 
9
contents."""
 
10
 
 
11
import sys
 
12
import os
 
13
 
 
14
from bzrlib.trace import enable_default_logging
 
15
enable_default_logging()
 
16
from bzrlib.selftest.treeshape import capture_tree_contents
 
17
 
 
18
def main(argv):
 
19
    # a lame reimplementation of pformat that splits multi-line
 
20
    # strings into concatenated string literals.
 
21
    print '['
 
22
    for tt in capture_tree_contents('.'):
 
23
        assert isinstance(tt, tuple)
 
24
        print '    (', repr(tt[0]) + ',',
 
25
        if len(tt) == 1:
 
26
            print '),'
 
27
        else:
 
28
            assert len(tt) == 2
 
29
            val = tt[1]
 
30
            print
 
31
            if val == '':
 
32
                print "        ''"
 
33
            else:
 
34
                for valline in val.splitlines(True):
 
35
                    print '       ', repr(valline)
 
36
            print '    ),'
 
37
    print ']'
 
38
 
 
39
if __name__ == '__main__':
 
40
    sys.exit(main(sys.argv))