← Back to branch summary

~bzr/bzr-rewrite/translations

« back to all changes in this revision

Viewing changes to upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2010-08-24 21:35:59 UTC
  • mfrom: (221.2.1 skip-ghost-tags)
  • Revision ID: jelmer@samba.org-20100824213559-y25p5wifpb6x9nd1
Cope with tags referencing ghost revisions in rebase-foreign.

Show diffs side-by-side

added added

removed removed

Lines of Context:
upgrade.py
68
68
        for i, (name, revid) in enumerate(tags_dict.iteritems()):
69
69
            pb.update("upgrading tags", i, len(tags_dict))
70
70
            if not revid in renames:
71
 
                renames.update(upgrade_repository(repository, 
72
 
                      generate_rebase_map, determine_new_revid,
73
 
                      revision_id=revid, allow_changes=allow_changes,
74
 
                      verbose=verbose))
 
71
                try:
 
72
                    repository.lock_read()
 
73
                    revid_exists = repository.has_revision(revid)
 
74
                finally:
 
75
                    repository.unlock()
 
76
                if revid_exists:
 
77
                    renames.update(upgrade_repository(repository, 
 
78
                          generate_rebase_map, determine_new_revid,
 
79
                          revision_id=revid, allow_changes=allow_changes,
 
80
                          verbose=verbose))
75
81
            if (revid in renames and 
76
82
                (branch_ancestry is None or not revid in branch_ancestry)):
77
83
                tags.set_tag(name, renames[revid])