1
# Copyright (C) 2005 Canonical Ltd
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.
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.
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
18
# XXX: Can we do any better about making interrupted commits change
19
# nothing? Perhaps the best approach is to integrate commit of
20
# AtomicFiles with releasing the lock on the Branch.
22
# TODO: Separate 'prepare' phase where we find a list of potentially
23
# committed files. We then can then pause the commit to prompt for a
24
# commit message, knowing the summary will be the same as what's
25
# actually used for the commit. (But perhaps simpler to simply get
26
# the tree status, then use that for a selective commit?)
28
# The newly committed revision is going to have a shape corresponding
29
# to that of the working inventory. Files that are not in the
30
# working tree and that were in the predecessor are reported as
31
# removed --- this can include files that were either removed from the
32
# inventory or deleted in the working tree. If they were only
33
# deleted from disk, they are removed from the working inventory.
35
# We then consider the remaining entries, which will be in the new
36
# version. Directory entries are simply copied across. File entries
37
# must be checked to see if a new version of the file should be
38
# recorded. For each parent revision inventory, we check to see what
39
# version of the file was present. If the file was present in at
40
# least one tree, and if it was the same version in all the trees,
41
# then we can just refer to that version. Otherwise, a new version
42
# representing the merger of the file versions must be added.
44
# TODO: Update hashcache before and after - or does the WorkingTree
47
# TODO: Rather than mashing together the ancestry and storing it back,
48
# perhaps the weave should have single method which does it all in one
49
# go, avoiding a lot of redundant work.
51
# TODO: Perhaps give a warning if one of the revisions marked as
52
# merged is already in the ancestry, and then don't record it as a
55
# TODO: If the file is newly merged but unchanged from the version it
56
# merges from, then it should still be reported as newly added
57
# relative to the basis revision.
59
# TODO: Do checks that the tree can be committed *before* running the
60
# editor; this should include checks for a pointless commit and for
61
# unknown or missing files.
63
# TODO: If commit fails, leave the message in a file somewhere.
72
from binascii import hexlify
73
from cStringIO import StringIO
75
from bzrlib.atomicfile import AtomicFile
76
from bzrlib.osutils import (local_time_offset,
77
rand_bytes, compact_date,
78
kind_marker, is_inside_any, quotefn,
79
sha_string, sha_strings, sha_file, isdir, isfile,
82
from bzrlib.errors import (BzrError, PointlessCommit,
87
import bzrlib.gpg as gpg
88
from bzrlib.revision import Revision
89
from bzrlib.testament import Testament
90
from bzrlib.trace import mutter, note, warning
91
from bzrlib.xml5 import serializer_v5
92
from bzrlib.inventory import Inventory, ROOT_ID
93
from bzrlib.symbol_versioning import *
94
from bzrlib.weave import Weave
95
from bzrlib.weavefile import read_weave, write_weave_v5
96
from bzrlib.workingtree import WorkingTree
99
@deprecated_function(zero_seven)
100
def commit(*args, **kwargs):
101
"""Commit a new revision to a branch.
103
Function-style interface for convenience of old callers.
105
New code should use the Commit class instead.
107
## XXX: Remove this in favor of Branch.commit?
108
Commit().commit(*args, **kwargs)
111
class NullCommitReporter(object):
112
"""I report on progress of a commit."""
114
def snapshot_change(self, change, path):
117
def completed(self, revno, rev_id):
120
def deleted(self, file_id):
123
def escaped(self, escape_count, message):
126
def missing(self, path):
130
class ReportCommitToLog(NullCommitReporter):
132
def snapshot_change(self, change, path):
133
note("%s %s", change, path)
135
def completed(self, revno, rev_id):
136
note('committed r%d {%s}', revno, rev_id)
138
def deleted(self, file_id):
139
note('deleted %s', file_id)
141
def escaped(self, escape_count, message):
142
note("replaced %d control characters in message", escape_count)
144
def missing(self, path):
145
note('missing %s', path)
148
class Commit(object):
149
"""Task of committing a new revision.
151
This is a MethodObject: it accumulates state as the commit is
152
prepared, and then it is discarded. It doesn't represent
153
historical revisions, just the act of recording a new one.
156
Modified to hold a list of files that have been deleted from
157
the working directory; these should be removed from the
163
if reporter is not None:
164
self.reporter = reporter
166
self.reporter = NullCommitReporter()
167
if config is not None:
173
branch=deprecated_nonce, message=None,
179
allow_pointless=True,
184
"""Commit working copy as a new revision.
186
branch -- the deprecated branch to commit to. New callers should pass in
189
message -- the commit message, a mandatory parameter
191
timestamp -- if not None, seconds-since-epoch for a
192
postdated/predated commit.
194
specific_files -- If true, commit only those files.
196
rev_id -- If set, use this as the new revision id.
197
Useful for test or import commands that need to tightly
198
control what revisions are assigned. If you duplicate
199
a revision id that exists elsewhere it is your own fault.
200
If null (default), a time/random revision id is generated.
202
allow_pointless -- If true (default), commit even if nothing
203
has changed and no merges are recorded.
205
strict -- If true, don't allow a commit if the working tree
206
contains unknown files.
208
revprops -- Properties for new revision
210
mutter('preparing to commit')
212
if deprecated_passed(branch):
213
warn("Commit.commit (branch, ...): The branch parameter is "
214
"deprecated as of bzr 0.8. Please use working_tree= instead.",
215
DeprecationWarning, stacklevel=2)
217
self.work_tree = WorkingTree(branch.base, branch)
218
elif working_tree is None:
219
raise BzrError("One of branch and working_tree must be passed into commit().")
221
self.work_tree = working_tree
222
self.branch = self.work_tree.branch
224
raise BzrError("The message keyword parameter is required for commit().")
226
self.weave_store = self.branch.weave_store
228
self.specific_files = specific_files
229
self.allow_pointless = allow_pointless
230
self.revprops = {'branch-nick': self.branch.nick}
232
self.revprops.update(revprops)
235
# raise an exception as soon as we find a single unknown.
236
for unknown in self.work_tree.unknowns():
237
raise StrictCommitFailed()
239
if timestamp is None:
240
self.timestamp = time.time()
242
self.timestamp = long(timestamp)
244
if self.config is None:
245
self.config = bzrlib.config.BranchConfig(self.branch)
248
self.rev_id = _gen_revision_id(self.config, self.timestamp)
252
if committer is None:
253
self.committer = self.config.username()
255
assert isinstance(committer, basestring), type(committer)
256
self.committer = committer
259
self.timezone = local_time_offset()
261
self.timezone = int(timezone)
263
if isinstance(message, str):
264
message = message.decode(bzrlib.user_encoding)
265
assert isinstance(message, unicode), type(message)
266
self.message = message
267
self._escape_commit_message()
269
self.branch.lock_write()
271
self.work_inv = self.work_tree.inventory
272
self.basis_tree = self.branch.basis_tree()
273
self.basis_inv = self.basis_tree.inventory
275
self._gather_parents()
276
if len(self.parents) > 1 and self.specific_files:
277
raise NotImplementedError('selected-file commit of merges is not supported yet')
278
self._check_parents_present()
280
self._remove_deleted()
281
self._populate_new_inv()
282
self._store_snapshot()
283
self._report_deletes()
285
if not (self.allow_pointless
286
or len(self.parents) > 1
287
or self.new_inv != self.basis_inv):
288
raise PointlessCommit()
290
if len(list(self.work_tree.iter_conflicts()))>0:
291
raise ConflictsInTree
293
self._record_inventory()
294
self._make_revision()
295
self.work_tree.set_pending_merges([])
296
self.branch.append_revision(self.rev_id)
297
if len(self.parents):
298
precursor = self.parents[0]
301
self.work_tree.set_last_revision(self.rev_id, precursor)
302
self.reporter.completed(self.branch.revno()+1, self.rev_id)
303
if self.config.post_commit() is not None:
304
hooks = self.config.post_commit().split(' ')
305
# this would be nicer with twisted.python.reflect.namedAny
307
result = eval(hook + '(branch, rev_id)',
308
{'branch':self.branch,
310
'rev_id':self.rev_id})
314
def _record_inventory(self):
315
"""Store the inventory for the new revision."""
316
inv_text = serializer_v5.write_inventory_to_string(self.new_inv)
317
self.inv_sha1 = sha_string(inv_text)
318
s = self.branch.control_weaves
319
s.add_text('inventory', self.rev_id,
320
split_lines(inv_text), self.present_parents,
321
self.branch.get_transaction())
323
def _escape_commit_message(self):
324
"""Replace xml-incompatible control characters."""
325
# Python strings can include characters that can't be
326
# represented in well-formed XML; escape characters that
327
# aren't listed in the XML specification
328
# (http://www.w3.org/TR/REC-xml/#NT-Char).
329
self.message, escape_count = re.subn(
330
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
331
lambda match: match.group(0).encode('unicode_escape'),
334
self.reporter.escaped(escape_count, self.message)
336
def _gather_parents(self):
337
"""Record the parents of a merge for merge detection."""
338
pending_merges = self.work_tree.pending_merges()
340
self.parent_invs = []
341
self.present_parents = []
342
precursor_id = self.branch.last_revision()
344
self.parents.append(precursor_id)
345
self.parents += pending_merges
346
for revision in self.parents:
347
if self.branch.has_revision(revision):
348
self.parent_invs.append(self.branch.get_inventory(revision))
349
self.present_parents.append(revision)
351
def _check_parents_present(self):
352
for parent_id in self.parents:
353
mutter('commit parent revision {%s}', parent_id)
354
if not self.branch.has_revision(parent_id):
355
if parent_id == self.branch.last_revision():
356
warning("parent is missing %r", parent_id)
357
raise HistoryMissing(self.branch, 'revision', parent_id)
359
mutter("commit will ghost revision %r", parent_id)
361
def _make_revision(self):
362
"""Record a new revision object for this commit."""
363
self.rev = Revision(timestamp=self.timestamp,
364
timezone=self.timezone,
365
committer=self.committer,
366
message=self.message,
367
inventory_sha1=self.inv_sha1,
368
revision_id=self.rev_id,
369
properties=self.revprops)
370
self.rev.parent_ids = self.parents
372
serializer_v5.write_revision(self.rev, rev_tmp)
374
if self.config.signature_needed():
375
plaintext = Testament(self.rev, self.new_inv).as_short_text()
376
self.branch.store_revision_signature(gpg.GPGStrategy(self.config),
377
plaintext, self.rev_id)
378
self.branch.revision_store.add(rev_tmp, self.rev_id)
379
mutter('new revision_id is {%s}', self.rev_id)
381
def _remove_deleted(self):
382
"""Remove deleted files from the working inventories.
384
This is done prior to taking the working inventory as the
385
basis for the new committed inventory.
387
This returns true if any files
388
*that existed in the basis inventory* were deleted.
389
Files that were added and deleted
390
in the working copy don't matter.
392
specific = self.specific_files
394
for path, ie in self.work_inv.iter_entries():
395
if specific and not is_inside_any(specific, path):
397
if not self.work_tree.has_filename(path):
398
self.reporter.missing(path)
399
deleted_ids.append((path, ie.file_id))
401
deleted_ids.sort(reverse=True)
402
for path, file_id in deleted_ids:
403
del self.work_inv[file_id]
404
self.work_tree._write_inventory(self.work_inv)
406
def _store_snapshot(self):
407
"""Pass over inventory and record a snapshot.
409
Entries get a new revision when they are modified in
410
any way, which includes a merge with a new set of
411
parents that have the same entry.
413
# XXX: Need to think more here about when the user has
414
# made a specific decision on a particular value -- c.f.
416
for path, ie in self.new_inv.iter_entries():
417
previous_entries = ie.find_previous_heads(
419
self.weave_store.get_weave_prelude_or_empty(ie.file_id,
420
self.branch.get_transaction()))
421
if ie.revision is None:
422
change = ie.snapshot(self.rev_id, path, previous_entries,
423
self.work_tree, self.weave_store,
424
self.branch.get_transaction())
427
self.reporter.snapshot_change(change, path)
429
def _populate_new_inv(self):
430
"""Build revision inventory.
432
This creates a new empty inventory. Depending on
433
which files are selected for commit, and what is present in the
434
current tree, the new inventory is populated. inventory entries
435
which are candidates for modification have their revision set to
436
None; inventory entries that are carried over untouched have their
437
revision set to their prior value.
439
mutter("Selecting files for commit with filter %s", self.specific_files)
440
self.new_inv = Inventory()
441
for path, new_ie in self.work_inv.iter_entries():
442
file_id = new_ie.file_id
443
mutter('check %s {%s}', path, new_ie.file_id)
444
if self.specific_files:
445
if not is_inside_any(self.specific_files, path):
446
mutter('%s not selected for commit', path)
447
self._carry_entry(file_id)
450
# this is selected, ensure its parents are too.
451
parent_id = new_ie.parent_id
452
while parent_id != ROOT_ID:
453
if not self.new_inv.has_id(parent_id):
454
ie = self._select_entry(self.work_inv[parent_id])
455
mutter('%s selected for commit because of %s',
456
self.new_inv.id2path(parent_id), path)
458
ie = self.new_inv[parent_id]
459
if ie.revision is not None:
461
mutter('%s selected for commit because of %s',
462
self.new_inv.id2path(parent_id), path)
463
parent_id = ie.parent_id
464
mutter('%s selected for commit', path)
465
self._select_entry(new_ie)
467
def _select_entry(self, new_ie):
468
"""Make new_ie be considered for committing."""
474
def _carry_entry(self, file_id):
475
"""Carry the file unchanged from the basis revision."""
476
if self.basis_inv.has_id(file_id):
477
self.new_inv.add(self.basis_inv[file_id].copy())
479
def _report_deletes(self):
480
for file_id in self.basis_inv:
481
if file_id not in self.new_inv:
482
self.reporter.deleted(self.basis_inv.id2path(file_id))
484
def _gen_revision_id(config, when):
485
"""Return new revision-id."""
486
s = '%s-%s-' % (config.user_email(), compact_date(when))
487
s += hexlify(rand_bytes(8))
added
removed
bzrlib/commit.py
