/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 bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2005-06-17 07:28:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050617072853-a815535b877b1ac7
- weed out all remaining calls to bailout() and remove the function

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
16
16
 
17
17
 
18
18
 
19
 
# FIXME: "bzr commit doc/format" commits doc/format.txt!
20
 
 
21
19
def commit(branch, message,
22
20
           timestamp=None,
23
21
           timezone=None,
24
22
           committer=None,
25
23
           verbose=True,
26
24
           specific_files=None,
27
 
           rev_id=None,
28
 
           allow_pointless=True):
 
25
           rev_id=None):
29
26
    """Commit working copy as a new revision.
30
27
 
31
28
    The basic approach is to add all the file texts into the
42
39
    be robust against files disappearing, moving, etc.  So the
43
40
    whole thing is a bit hard.
44
41
 
45
 
    This raises PointlessCommit if there are no changes, no new merges,
46
 
    and allow_pointless  is false.
47
 
 
48
42
    timestamp -- if not None, seconds-since-epoch for a
49
43
         postdated/predated commit.
50
44
 
61
55
 
62
56
    import time, tempfile
63
57
 
64
 
    from bzrlib.osutils import local_time_offset, username
65
 
    from bzrlib.branch import gen_file_id
66
 
    from bzrlib.errors import BzrError, PointlessCommit
67
 
    from bzrlib.revision import Revision, RevisionReference
68
 
    from bzrlib.trace import mutter, note
69
 
    from bzrlib.xml import pack_xml
 
58
    from osutils import local_time_offset, username
 
59
    
 
60
    from branch import gen_file_id
 
61
    from errors import BzrError
 
62
    from revision import Revision
 
63
    from trace import mutter, note
70
64
 
71
65
    branch.lock_write()
72
66
 
87
81
        if verbose:
88
82
            note('looking for changes...')
89
83
 
90
 
        pending_merges = branch.pending_merges()
91
 
 
92
 
        missing_ids, new_inv, any_changes = \
93
 
                     _gather_commit(branch,
94
 
                                    work_tree,
95
 
                                    work_inv,
96
 
                                    basis_inv,
97
 
                                    specific_files,
98
 
                                    verbose)
99
 
 
100
 
        if not (any_changes or allow_pointless or pending_merges):
101
 
            raise PointlessCommit()
 
84
        missing_ids, new_inv = _gather_commit(branch,
 
85
                                              work_tree,
 
86
                                              work_inv,
 
87
                                              basis_inv,
 
88
                                              specific_files,
 
89
                                              verbose)
102
90
 
103
91
        for file_id in missing_ids:
104
92
            # Any files that have been deleted are now removed from the
121
109
        inv_id = rev_id
122
110
 
123
111
        inv_tmp = tempfile.TemporaryFile()
124
 
        pack_xml(new_inv, inv_tmp)
 
112
        new_inv.write_xml(inv_tmp)
125
113
        inv_tmp.seek(0)
126
114
        branch.inventory_store.add(inv_tmp, inv_id)
127
115
        mutter('new inventory_id is {%s}' % inv_id)
131
119
        # ever actually does anything special
132
120
        inv_sha1 = branch.get_inventory_sha1(inv_id)
133
121
 
 
122
        precursor = branch.last_patch()
 
123
        if precursor:
 
124
            precursor_sha1 = branch.get_revision_sha1(precursor)
 
125
        else:
 
126
            precursor_sha1 = None
 
127
 
134
128
        branch._write_inventory(work_inv)
135
129
 
136
130
        if timestamp == None:
146
140
        rev = Revision(timestamp=timestamp,
147
141
                       timezone=timezone,
148
142
                       committer=committer,
 
143
                       precursor = precursor,
 
144
                       precursor_sha1 = precursor_sha1,
149
145
                       message = message,
150
146
                       inventory_id=inv_id,
151
147
                       inventory_sha1=inv_sha1,
152
148
                       revision_id=rev_id)
153
149
 
154
 
        rev.parents = []
155
 
        precursor_id = branch.last_patch()
156
 
        if precursor_id:
157
 
            precursor_sha1 = branch.get_revision_sha1(precursor_id)
158
 
            rev.parents.append(RevisionReference(precursor_id, precursor_sha1))
159
 
        for merge_rev in pending_merges:
160
 
            rev.parents.append(RevisionReference(merge_rev))            
161
 
 
162
150
        rev_tmp = tempfile.TemporaryFile()
163
 
        pack_xml(rev, rev_tmp)
 
151
        rev.write_xml(rev_tmp)
164
152
        rev_tmp.seek(0)
165
153
        branch.revision_store.add(rev_tmp, rev_id)
166
154
        mutter("new revision_id is {%s}" % rev_id)
177
165
 
178
166
        branch.append_revision(rev_id)
179
167
 
180
 
        branch.set_pending_merges([])
181
 
 
182
168
        if verbose:
183
169
            note("commited r%d" % branch.revno())
184
170
    finally:
200
186
                   verbose):
201
187
    """Build inventory preparatory to commit.
202
188
 
203
 
    Returns missing_ids, new_inv, any_changes.
204
 
 
205
189
    This adds any changed files into the text store, and sets their
206
190
    test-id, sha and size in the returned inventory appropriately.
207
191
 
211
195
        working inventory.
212
196
    """
213
197
    from bzrlib.inventory import Inventory
214
 
    from bzrlib.osutils import isdir, isfile, sha_string, quotefn, \
 
198
    from osutils import isdir, isfile, sha_string, quotefn, \
215
199
         local_time_offset, username, kind_marker, is_inside_any
216
200
    
217
 
    from bzrlib.branch import gen_file_id
218
 
    from bzrlib.errors import BzrError
219
 
    from bzrlib.revision import Revision
 
201
    from branch import gen_file_id
 
202
    from errors import BzrError
 
203
    from revision import Revision
220
204
    from bzrlib.trace import mutter, note
221
205
 
222
 
    any_changes = False
223
 
    inv = Inventory(work_inv.root.file_id)
 
206
    inv = Inventory()
224
207
    missing_ids = []
225
208
    
226
209
    for path, entry in work_inv.iter_entries():
232
215
        mutter('commit prep file %s, id %r ' % (p, file_id))
233
216
 
234
217
        if specific_files and not is_inside_any(specific_files, path):
235
 
            mutter('  skipping file excluded from commit')
236
218
            if basis_inv.has_id(file_id):
237
219
                # carry over with previous state
238
220
                inv.add(basis_inv[file_id].copy())
244
226
        if not work_tree.has_id(file_id):
245
227
            if verbose:
246
228
                print('deleted %s%s' % (path, kind_marker(entry.kind)))
247
 
                any_changes = True
248
229
            mutter("    file is missing, removing from inventory")
249
230
            missing_ids.append(file_id)
250
231
            continue
296
277
            marked = path + kind_marker(entry.kind)
297
278
            if not old_ie:
298
279
                print 'added', marked
299
 
                any_changes = True
300
280
            elif old_ie == entry:
301
281
                pass                    # unchanged
302
282
            elif (old_ie.name == entry.name
303
283
                  and old_ie.parent_id == entry.parent_id):
304
284
                print 'modified', marked
305
 
                any_changes = True
306
285
            else:
307
286
                print 'renamed', marked
308
 
                any_changes = True
309
287
                        
310
 
    return missing_ids, inv, any_changes
 
288
    return missing_ids, inv
311
289
 
312
290