~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Martin Pool
  • Date: 2005-09-13 05:22:41 UTC
  • Revision ID: mbp@sourcefrog.net-20050913052241-52dbd8e8ced620f6
- better BZR_DEBUG trace output

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
 
18
import tempfile, os, errno
 
19
                
18
20
import bzrlib.errors
19
21
import bzrlib.progress
 
22
from bzrlib.xml import serializer_v4
20
23
 
21
24
 
22
25
def upgrade(branch):
39
42
 
40
43
    branch.lock_write()
41
44
 
42
 
    pb = bzrlib.ui.progress_bar()
 
45
    pb = bzrlib.ui.ui_factory.progress_bar()
43
46
 
44
47
    try:
45
48
        last_rev_id = None
68
71
            updated = False
69
72
 
70
73
            if rev.inventory_sha1 is None:
71
 
                rev.inventory_sha1 = branch.get_inventory_sha1(rev.inventory_id)
 
74
                rev.inventory_sha1 = branch.get_inventory_sha1(rev_id)
72
75
                updated = True
73
76
                mutter("  set inventory_sha1 on {%s}" % rev_id)
74
77
 
96
99
                # revision entry. I'm not supremely happy about it, but
97
100
                # there should be *some* way of making old entries have
98
101
                # the full meta information.
99
 
                import tempfile, os, errno
100
 
                from bzrlib.xml import pack_xml
101
 
                
102
102
                rev_tmp = tempfile.TemporaryFile()
103
 
                pack_xml(rev, rev_tmp)
 
103
                serializer_v4.write_revision(rev, rev_tmp)
104
104
                rev_tmp.seek(0)
105
105
 
106
106
                tmpfd, tmp_path = tempfile.mkstemp(prefix=rev_id, suffix='.gz',