~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/multiparent.py

  • Committer: Blake Winton
  • Date: 2007-10-16 16:02:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2921.
  • Revision ID: bwinton@latte.ca-20071016160201-os2bci2ujf7in7an
Change 'print >> f,'s to 'f.write('s.

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
            size=False, build=False):
57
57
        file_weave = get_file_weave(file)
58
58
        url = file_weave.transport.abspath(file_weave.filename)
59
 
        print >> sys.stderr, 'Importing: %s' % \
60
 
            urlutils.local_path_from_url(url)
 
59
        sys.stderr.write('Importing: %s\n' % \
 
60
            urlutils.local_path_from_url(url))
61
61
        if sync_snapshots:
62
 
            print >> sys.stderr, 'Snapshots follow input'
 
62
            sys.stderr.write('Snapshots follow input\n')
63
63
        else:
64
 
            print >> sys.stderr, 'Snapshot interval: %d' % snapshot_interval
 
64
            sys.stderr.write('Snapshot interval: %d\n' % snapshot_interval)
65
65
        if not memory:
66
66
            if outfile is None:
67
67
                filename = 'pknit'
80
80
            to_sync = set()
81
81
        else:
82
82
            to_sync = vf.select_snapshots(file_weave)
83
 
        print >> sys.stderr, "%d fulltext(s)" % len(old_snapshots)
84
 
        print >> sys.stderr, "%d planned snapshots" % len(to_sync)
 
83
        sys.stderr.write("%d fulltext(s)\n" % len(old_snapshots))
 
84
        sys.stderr.write("%d planned snapshots\n" % len(to_sync))
85
85
 
86
86
        try:
87
87
            vf.import_versionedfile(file_weave, to_sync, single_parent=single,
100
100
            vf.destroy()
101
101
            raise
102
102
        try:
103
 
            print >> sys.stderr, "%d actual snapshots" % len(vf._snapshots)
 
103
            sys.stderr.write("%d actual snapshots\n" % len(vf._snapshots))
104
104
            if not cache:
105
105
                vf.clear_cache()
106
106
            if memory:
146
146
            vf = MultiVersionedFile(filename)
147
147
            vf.load()
148
148
            vf.get_line_list(revisions)
149
 
        print >> sys.stderr, time.clock() - start
 
149
        sys.stderr.write(time.clock() - start)
 
150
        sys.stderr.write('\n')
150
151
        if lsprof_timed:
151
152
            from bzrlib.lsprof import profile
152
153
            vf.clear_cache()
157
158
        for revisions in revisions_list:
158
159
            file_weave = get_file_weave(vfile)
159
160
            file_weave.get_line_list(revisions)
160
 
        print >> sys.stderr, time.clock() - start
 
161
        sys.stderr.write(time.clock() - start)
 
162
        sys.stderr.write('\n')
161
163
 
162
164
 
163
165
def get_file_weave(filename=None, wt=None):