57
53
If null (default), a time/random revision id is generated.
60
import time, tempfile, re
62
from bzrlib.osutils import local_time_offset, username
63
from bzrlib.branch import gen_file_id
64
from bzrlib.errors import BzrError, PointlessCommit
65
from bzrlib.revision import Revision, RevisionReference
66
from bzrlib.trace import mutter, note
67
from bzrlib.xml import serializer_v4
72
# First walk over the working inventory; and both update that
73
# and also build a new revision inventory. The revision
74
# inventory needs to hold the text-id, sha1 and size of the
75
# actual file versions committed in the revision. (These are
76
# not present in the working inventory.) We also need to
77
# detect missing/deleted files, and remove them from the
80
work_tree = branch.working_tree()
81
work_inv = work_tree.inventory
82
basis = branch.basis_tree()
83
basis_inv = basis.inventory
86
# note('looking for changes...')
87
# print 'looking for changes...'
88
# disabled; should be done at a higher level
91
pending_merges = branch.pending_merges()
93
missing_ids, new_inv, any_changes = \
94
_gather_commit(branch,
101
if not (any_changes or allow_pointless or pending_merges):
102
raise PointlessCommit()
104
for file_id in missing_ids:
105
# Any files that have been deleted are now removed from the
106
# working inventory. Files that were not selected for commit
107
# are left as they were in the working inventory and ommitted
108
# from the revision inventory.
110
# have to do this later so we don't mess up the iterator.
111
# since parents may be removed before their children we
114
# FIXME: There's probably a better way to do this; perhaps
115
# the workingtree should know how to filter itbranch.
116
if work_inv.has_id(file_id):
117
del work_inv[file_id]
120
rev_id = _gen_revision_id(branch, time.time())
123
inv_tmp = tempfile.TemporaryFile()
125
serializer_v4.write_inventory(new_inv, inv_tmp)
127
branch.inventory_store.add(inv_tmp, inv_id)
128
mutter('new inventory_id is {%s}' % inv_id)
130
# We could also just sha hash the inv_tmp file
131
# however, in the case that branch.inventory_store.add()
132
# ever actually does anything special
133
inv_sha1 = branch.get_inventory_sha1(inv_id)
135
branch._write_inventory(work_inv)
137
if timestamp == None:
138
timestamp = time.time()
140
if committer == None:
141
committer = username(branch)
144
timezone = local_time_offset()
146
mutter("building commit log message")
147
# Python strings can include characters that can't be
148
# represented in well-formed XML; escape characters that
149
# aren't listed in the XML specification
150
# (http://www.w3.org/TR/REC-xml/#NT-Char).
151
if isinstance(message, unicode):
152
char_pattern = u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]'
154
# Use a regular 'str' as pattern to avoid having re.subn
155
# return 'unicode' results.
156
char_pattern = '[^x09\x0A\x0D\x20-\xFF]'
157
message, escape_count = re.subn(
159
lambda match: match.group(0).encode('unicode_escape'),
162
note("replaced %d control characters in message", escape_count)
163
rev = Revision(timestamp=timestamp,
168
inventory_sha1=inv_sha1,
172
precursor_id = branch.last_patch()
174
precursor_sha1 = branch.get_revision_sha1(precursor_id)
175
rev.parents.append(RevisionReference(precursor_id, precursor_sha1))
176
for merge_rev in pending_merges:
177
rev.parents.append(RevisionReference(merge_rev))
179
rev_tmp = tempfile.TemporaryFile()
180
serializer_v4.write_revision(rev, rev_tmp)
182
branch.revision_store.add(rev_tmp, rev_id)
183
mutter("new revision_id is {%s}" % rev_id)
185
## XXX: Everything up to here can simply be orphaned if we abort
186
## the commit; it will leave junk files behind but that doesn't
189
## TODO: Read back the just-generated changeset, and make sure it
190
## applies and recreates the right state.
192
## TODO: Also calculate and store the inventory SHA1
193
mutter("committing patch r%d" % (branch.revno() + 1))
195
branch.append_revision(rev_id)
197
branch.set_pending_merges([])
200
# disabled; should go through logging
201
# note("commited r%d" % branch.revno())
202
# print ("commited r%d" % branch.revno())
209
def _gen_revision_id(branch, when):
210
"""Return new revision-id."""
211
from binascii import hexlify
212
from bzrlib.osutils import rand_bytes, compact_date, user_email
214
s = '%s-%s-' % (user_email(branch), compact_date(when))
215
s += hexlify(rand_bytes(8))
219
def _gather_commit(branch, work_tree, work_inv, basis_inv, specific_files,
221
"""Build inventory preparatory to commit.
223
Returns missing_ids, new_inv, any_changes.
225
This adds any changed files into the text store, and sets their
226
test-id, sha and size in the returned inventory appropriately.
229
Modified to hold a list of files that have been deleted from
230
the working directory; these should be removed from the
233
from bzrlib.inventory import Inventory
234
from bzrlib.osutils import isdir, isfile, sha_string, quotefn, \
56
import os, time, tempfile
58
from inventory import Inventory
59
from osutils import isdir, isfile, sha_string, quotefn, \
235
60
local_time_offset, username, kind_marker, is_inside_any
237
from bzrlib.branch import gen_file_id
238
from bzrlib.errors import BzrError
239
from bzrlib.revision import Revision
240
from bzrlib.trace import mutter, note
243
inv = Inventory(work_inv.root.file_id)
62
from branch import gen_file_id
63
from errors import BzrError
64
from revision import Revision
65
from trace import mutter, note
67
branch._need_writelock()
69
# First walk over the working inventory; and both update that
70
# and also build a new revision inventory. The revision
71
# inventory needs to hold the text-id, sha1 and size of the
72
# actual file versions committed in the revision. (These are
73
# not present in the working inventory.) We also need to
74
# detect missing/deleted files, and remove them from the
77
work_tree = branch.working_tree()
78
work_inv = work_tree.inventory
80
basis = branch.basis_tree()
81
basis_inv = basis.inventory
85
note('looking for changes...')
246
87
for path, entry in work_inv.iter_entries():
247
88
## TODO: Check that the file kind has not changed from the previous
248
89
## revision of this file (if any).
250
93
p = branch.abspath(path)
251
94
file_id = entry.file_id
252
95
mutter('commit prep file %s, id %r ' % (p, file_id))
254
97
if specific_files and not is_inside_any(specific_files, path):
255
mutter(' skipping file excluded from commit')
256
98
if basis_inv.has_id(file_id):
257
99
# carry over with previous state
258
100
inv.add(basis_inv[file_id].copy())
311
148
entry.text_id = gen_file_id(entry.name)
312
149
branch.text_store.add(content, entry.text_id)
313
150
mutter(' stored with text_id {%s}' % entry.text_id)
316
marked = path + kind_marker(entry.kind)
318
print 'added', marked
320
elif old_ie == entry:
322
elif (old_ie.name == entry.name
323
and old_ie.parent_id == entry.parent_id):
324
print 'modified', marked
327
print 'renamed', marked
329
elif old_ie != entry:
332
return missing_ids, inv, any_changes
153
print('added %s' % path)
154
elif (old_ie.name == entry.name
155
and old_ie.parent_id == entry.parent_id):
156
print('modified %s' % path)
158
print('renamed %s' % path)
161
for file_id in missing_ids:
162
# Any files that have been deleted are now removed from the
163
# working inventory. Files that were not selected for commit
164
# are left as they were in the working inventory and ommitted
165
# from the revision inventory.
167
# have to do this later so we don't mess up the iterator.
168
# since parents may be removed before their children we
171
# FIXME: There's probably a better way to do this; perhaps
172
# the workingtree should know how to filter itbranch.
173
if work_inv.has_id(file_id):
174
del work_inv[file_id]
178
rev_id = _gen_revision_id(time.time())
181
inv_tmp = tempfile.TemporaryFile()
182
inv.write_xml(inv_tmp)
184
branch.inventory_store.add(inv_tmp, inv_id)
185
mutter('new inventory_id is {%s}' % inv_id)
187
branch._write_inventory(work_inv)
189
if timestamp == None:
190
timestamp = time.time()
192
if committer == None:
193
committer = username()
196
timezone = local_time_offset()
198
mutter("building commit log message")
199
rev = Revision(timestamp=timestamp,
202
precursor = branch.last_patch(),
207
rev_tmp = tempfile.TemporaryFile()
208
rev.write_xml(rev_tmp)
210
branch.revision_store.add(rev_tmp, rev_id)
211
mutter("new revision_id is {%s}" % rev_id)
213
## XXX: Everything up to here can simply be orphaned if we abort
214
## the commit; it will leave junk files behind but that doesn't
217
## TODO: Read back the just-generated changeset, and make sure it
218
## applies and recreates the right state.
220
## TODO: Also calculate and store the inventory SHA1
221
mutter("committing patch r%d" % (branch.revno() + 1))
223
branch.append_revision(rev_id)
226
note("commited r%d" % branch.revno())
230
def _gen_revision_id(when):
231
"""Return new revision-id."""
232
from binascii import hexlify
233
from osutils import rand_bytes, compact_date, user_email
235
s = '%s-%s-' % (user_email(), compact_date(when))
236
s += hexlify(rand_bytes(8))
added
removed
bzrlib/commit.py
