~bzr-pqm/bzr/bzr.dev

184 by mbp at sourcefrog
pychecker fixups
1
# (C) 2005 Canonical
1 by mbp at sourcefrog
import from baz patch-364
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
18
8 by mbp at sourcefrog
store committer's timezone in revision and show
19
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
20
class RevisionReference(object):
696 by Martin Pool
- Refactor revision deserialization code
21
    """
22
    Reference to a stored revision.
23
24
    Includes the revision_id and revision_sha1.
25
    """
26
    revision_id = None
27
    revision_sha1 = None
816 by Martin Pool
- don't write precursor field in new revision xml
28
    def __init__(self, revision_id, revision_sha1=None):
696 by Martin Pool
- Refactor revision deserialization code
29
        if revision_id == None \
30
           or isinstance(revision_id, basestring):
31
            self.revision_id = revision_id
32
        else:
33
            raise ValueError('bad revision_id %r' % revision_id)
34
35
        if revision_sha1 != None:
36
            if isinstance(revision_sha1, basestring) \
37
               and len(revision_sha1) == 40:
38
                self.revision_sha1 = revision_sha1
39
            else:
40
                raise ValueError('bad revision_sha1 %r' % revision_sha1)
41
                
42
43
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
44
class Revision(object):
1 by mbp at sourcefrog
import from baz patch-364
45
    """Single revision on a branch.
46
47
    Revisions may know their revision_hash, but only once they've been
48
    written out.  This is not stored because you cannot write the hash
49
    into the file it describes.
50
697 by Martin Pool
- write out parent list for new revisions
51
    After bzr 0.0.5 revisions are allowed to have multiple parents.
696 by Martin Pool
- Refactor revision deserialization code
52
53
    parents
700 by Martin Pool
doc
54
        List of parent revisions, each is a RevisionReference.
1 by mbp at sourcefrog
import from baz patch-364
55
    """
696 by Martin Pool
- Refactor revision deserialization code
56
    inventory_id = None
57
    inventory_sha1 = None
58
    revision_id = None
59
    timestamp = None
60
    message = None
61
    timezone = None
62
    committer = None
63
    
1 by mbp at sourcefrog
import from baz patch-364
64
    def __init__(self, **args):
65
        self.__dict__.update(args)
696 by Martin Pool
- Refactor revision deserialization code
66
        self.parents = []
67
1 by mbp at sourcefrog
import from baz patch-364
68
69
    def __repr__(self):
184 by mbp at sourcefrog
pychecker fixups
70
        return "<Revision id %s>" % self.revision_id
1 by mbp at sourcefrog
import from baz patch-364
71
72
        
73
    def to_element(self):
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
74
        from bzrlib.xml import Element, SubElement
75
        
11 by mbp at sourcefrog
- change revision XML to <revision>
76
        root = Element('revision',
1 by mbp at sourcefrog
import from baz patch-364
77
                       committer = self.committer,
8 by mbp at sourcefrog
store committer's timezone in revision and show
78
                       timestamp = '%.9f' % self.timestamp,
1 by mbp at sourcefrog
import from baz patch-364
79
                       revision_id = self.revision_id,
8 by mbp at sourcefrog
store committer's timezone in revision and show
80
                       inventory_id = self.inventory_id,
672 by Martin Pool
- revision records include the hash of their inventory and
81
                       inventory_sha1 = self.inventory_sha1,
673 by Martin Pool
- cope when writing out revisions with no timezone recorded
82
                       )
83
        if self.timezone:
84
            root.set('timezone', str(self.timezone))
1 by mbp at sourcefrog
import from baz patch-364
85
        root.text = '\n'
86
        
87
        msg = SubElement(root, 'message')
88
        msg.text = self.message
89
        msg.tail = '\n'
90
697 by Martin Pool
- write out parent list for new revisions
91
        if self.parents:
92
            pelts = SubElement(root, 'parents')
704 by Martin Pool
- more whitespace in XML for Revision
93
            pelts.tail = pelts.text = '\n'
697 by Martin Pool
- write out parent list for new revisions
94
            for rr in self.parents:
95
                assert isinstance(rr, RevisionReference)
96
                p = SubElement(pelts, 'revision_ref')
704 by Martin Pool
- more whitespace in XML for Revision
97
                p.tail = '\n'
718 by Martin Pool
- add consistency checks when writing out revision
98
                assert rr.revision_id
697 by Martin Pool
- write out parent list for new revisions
99
                p.set('revision_id', rr.revision_id)
100
                if rr.revision_sha1:
101
                    p.set('revision_sha1', rr.revision_sha1)
102
1 by mbp at sourcefrog
import from baz patch-364
103
        return root
104
11 by mbp at sourcefrog
- change revision XML to <revision>
105
106
    def from_element(cls, elt):
696 by Martin Pool
- Refactor revision deserialization code
107
        return unpack_revision(elt)
1 by mbp at sourcefrog
import from baz patch-364
108
109
    from_element = classmethod(from_element)
110
696 by Martin Pool
- Refactor revision deserialization code
111
112
113
def unpack_revision(elt):
114
    """Convert XML element into Revision object."""
115
    # <changeset> is deprecated...
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
116
    from bzrlib.errors import BzrError
117
    
696 by Martin Pool
- Refactor revision deserialization code
118
    if elt.tag not in ('revision', 'changeset'):
119
        raise BzrError("unexpected tag in revision file: %r" % elt)
120
121
    rev = Revision(committer = elt.get('committer'),
122
                   timestamp = float(elt.get('timestamp')),
123
                   revision_id = elt.get('revision_id'),
124
                   inventory_id = elt.get('inventory_id'),
125
                   inventory_sha1 = elt.get('inventory_sha1')
126
                   )
127
128
    precursor = elt.get('precursor')
129
    precursor_sha1 = elt.get('precursor_sha1')
130
131
    pelts = elt.find('parents')
132
816 by Martin Pool
- don't write precursor field in new revision xml
133
    if pelts:
696 by Martin Pool
- Refactor revision deserialization code
134
        for p in pelts:
697 by Martin Pool
- write out parent list for new revisions
135
            assert p.tag == 'revision_ref', \
696 by Martin Pool
- Refactor revision deserialization code
136
                   "bad parent node tag %r" % p.tag
137
            rev_ref = RevisionReference(p.get('revision_id'),
138
                                        p.get('revision_sha1'))
139
            rev.parents.append(rev_ref)
140
816 by Martin Pool
- don't write precursor field in new revision xml
141
        if precursor:
142
            # must be consistent
143
            prec_parent = rev.parents[0].revision_id
144
            assert prec_parent == precursor
145
    elif precursor:
146
        # revisions written prior to 0.0.5 have a single precursor
147
        # give as an attribute
148
        rev_ref = RevisionReference(precursor, precursor_sha1)
149
        rev.parents.append(rev_ref)
150
696 by Martin Pool
- Refactor revision deserialization code
151
    v = elt.get('timezone')
152
    rev.timezone = v and int(v)
153
154
    rev.message = elt.findtext('message') # text of <message>
155
    return rev
810 by Martin Pool
- New validate_revision_id function
156
157
158
159
REVISION_ID_RE = None
160
161
def validate_revision_id(rid):
162
    """Check rid is syntactically valid for a revision id."""
163
    global REVISION_ID_RE
164
    if not REVISION_ID_RE:
165
        import re
814 by Martin Pool
- allow doubled-dashes in revision ids
166
        REVISION_ID_RE = re.compile('[\w.-]+@[\w.-]+--?\d+--?[0-9a-f]+\Z')
810 by Martin Pool
- New validate_revision_id function
167
168
    if not REVISION_ID_RE.match(rid):
169
        raise ValueError("malformed revision-id %r" % rid)
170