/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 breezy/version_info_formats/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/version_info_formats/__init__.py
47
47
    """A class which lets you build up information about a revision."""
48
48
 
49
49
    def __init__(self, branch, working_tree=None,
50
 
                check_for_clean=False,
51
 
                include_revision_history=False,
52
 
                include_file_revisions=False,
53
 
                template=None,
54
 
                revision_id=None):
 
50
                 check_for_clean=False,
 
51
                 include_revision_history=False,
 
52
                 include_file_revisions=False,
 
53
                 template=None,
 
54
                 revision_id=None):
55
55
        """Build up information about the given branch.
56
56
        If working_tree is given, it can be checked for changes.
57
57
 
83
83
            self._tree = working_tree
84
84
            self._working_tree = working_tree
85
85
        else:
86
 
            self._tree = self._branch.repository.revision_tree(self._revision_id)
 
86
            self._tree = self._branch.repository.revision_tree(
 
87
                self._revision_id)
87
88
            # the working tree is not relevant if an explicit revision was specified
88
89
            self._working_tree = None
89
90
 
99
100
            #       a higher level, but this will do for now.
100
101
            self._working_tree.lock_read()
101
102
        else:
102
 
            basis_tree = self._branch.repository.revision_tree(self._revision_id)
 
103
            basis_tree = self._branch.repository.revision_tree(
 
104
                self._revision_id)
103
105
 
104
106
        basis_tree.lock_read()
105
107
        try:
131
133
            for (old_path, new_path, file_id,
132
134
                 kind, text_mod, meta_mod) in delta.renamed:
133
135
                self._clean = False
134
 
                self._file_revisions[new_path] = u'renamed from %s' % (old_path,)
 
136
                self._file_revisions[new_path] = u'renamed from %s' % (
 
137
                    old_path,)
135
138
            for path, file_id, kind, text_mod, meta_mod in delta.modified:
136
139
                self._clean = False
137
140
                self._file_revisions[path] = 'modified'
149
152
 
150
153
        last_rev = self._get_revision_id()
151
154
 
152
 
        repository =  self._branch.repository
 
155
        repository = self._branch.repository
153
156
        with repository.lock_read():
154
157
            graph = repository.get_graph()
155
158
            revhistory = list(graph.iter_lefthand_ancestry(