~bzr-pqm/bzr/bzr.dev

485 by Martin Pool
- move commit code into its own module
1
# Copyright (C) 2005 Canonical Ltd
1248 by Martin Pool
- new weave based cleanup [broken]
2
#
485 by Martin Pool
- move commit code into its own module
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.
1248 by Martin Pool
- new weave based cleanup [broken]
7
#
485 by Martin Pool
- move commit code into its own module
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.
1248 by Martin Pool
- new weave based cleanup [broken]
12
#
485 by Martin Pool
- move commit code into its own module
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
1248 by Martin Pool
- new weave based cleanup [broken]
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.
21
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?)
27
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.
34
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.
43
44
# TODO: Update hashcache before and after - or does the WorkingTree
45
# look after that?
1245 by Martin Pool
doc
46
1339 by Martin Pool
- doc
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.
1335 by Martin Pool
doc
50
1341 by Martin Pool
- doc
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
53
# distinct parent.
54
1343 by Martin Pool
- fix up test for merge of trees
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.
58
1185.16.66 by mbp at sourcefrog
- todo
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.
62
63
# TODO: If commit fails, leave the message in a file somewhere.
64
1194 by Martin Pool
- [BROKEN] more progress of commit into weaves
65
1189 by Martin Pool
- BROKEN: partial support for commit into weave
66
import os
1390 by Robert Collins
pair programming worx... merge integration and weave
67
import re
1189 by Martin Pool
- BROKEN: partial support for commit into weave
68
import sys
1188 by Martin Pool
- clean up imports in commit code
69
import time
1248 by Martin Pool
- new weave based cleanup [broken]
70
import pdb
1194 by Martin Pool
- [BROKEN] more progress of commit into weaves
71
1188 by Martin Pool
- clean up imports in commit code
72
from binascii import hexlify
1194 by Martin Pool
- [BROKEN] more progress of commit into weaves
73
from cStringIO import StringIO
1188 by Martin Pool
- clean up imports in commit code
74
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
75
from bzrlib.osutils import (local_time_offset,
76
                            rand_bytes, compact_date,
1188 by Martin Pool
- clean up imports in commit code
77
                            kind_marker, is_inside_any, quotefn,
1248 by Martin Pool
- new weave based cleanup [broken]
78
                            sha_string, sha_strings, sha_file, isdir, isfile,
79
                            split_lines)
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
80
from bzrlib.branch import gen_file_id
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
81
import bzrlib.config
1264 by Martin Pool
- Raise a better error from commit when a parent is absent
82
from bzrlib.errors import (BzrError, PointlessCommit,
83
                           HistoryMissing,
1185.16.65 by mbp at sourcefrog
- new commit --strict option
84
                           ConflictsInTree,
85
                           StrictCommitFailed
1264 by Martin Pool
- Raise a better error from commit when a parent is absent
86
                           )
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
87
import bzrlib.gpg as gpg
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
88
from bzrlib.revision import Revision
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
89
from bzrlib.testament import Testament
1264 by Martin Pool
- Raise a better error from commit when a parent is absent
90
from bzrlib.trace import mutter, note, warning
1189 by Martin Pool
- BROKEN: partial support for commit into weave
91
from bzrlib.xml5 import serializer_v5
1416 by Robert Collins
when committing a specific file, include all its parents
92
from bzrlib.inventory import Inventory, ROOT_ID
1189 by Martin Pool
- BROKEN: partial support for commit into weave
93
from bzrlib.weave import Weave
94
from bzrlib.weavefile import read_weave, write_weave_v5
95
from bzrlib.atomicfile import AtomicFile
96
97
1205 by Martin Pool
- add bzrlib.commit.commit compatability interface
98
def commit(*args, **kwargs):
99
    """Commit a new revision to a branch.
100
101
    Function-style interface for convenience of old callers.
102
103
    New code should use the Commit class instead.
104
    """
1276 by Martin Pool
- make Branch.commit accept (and ignore) verbose argument
105
    ## XXX: Remove this in favor of Branch.commit?
1205 by Martin Pool
- add bzrlib.commit.commit compatability interface
106
    Commit().commit(*args, **kwargs)
107
108
1189 by Martin Pool
- BROKEN: partial support for commit into weave
109
class NullCommitReporter(object):
110
    """I report on progress of a commit."""
1185.12.8 by Aaron Bentley
Fixed commit so all output comes though CommitReporter
111
112
    def snapshot_change(self, change, path):
113
        pass
114
115
    def completed(self, revno, rev_id):
116
        pass
117
118
    def deleted(self, file_id):
119
        pass
120
121
    def escaped(self, escape_count, message):
122
        pass
123
124
    def missing(self, path):
125
        pass
1189 by Martin Pool
- BROKEN: partial support for commit into weave
126
127
class ReportCommitToLog(NullCommitReporter):
1185.12.8 by Aaron Bentley
Fixed commit so all output comes though CommitReporter
128
129
    def snapshot_change(self, change, path):
130
        note("%s %s", change, path)
131
132
    def completed(self, revno, rev_id):
133
        note('committed r%d {%s}', revno, rev_id)
134
    
135
    def deleted(self, file_id):
136
        note('deleted %s', file_id)
137
138
    def escaped(self, escape_count, message):
139
        note("replaced %d control characters in message", escape_count)
140
141
    def missing(self, path):
142
        note('missing %s', path)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
143
144
class Commit(object):
145
    """Task of committing a new revision.
146
147
    This is a MethodObject: it accumulates state as the commit is
148
    prepared, and then it is discarded.  It doesn't represent
149
    historical revisions, just the act of recording a new one.
150
151
            missing_ids
152
            Modified to hold a list of files that have been deleted from
153
            the working directory; these should be removed from the
154
            working inventory.
485 by Martin Pool
- move commit code into its own module
155
    """
1189 by Martin Pool
- BROKEN: partial support for commit into weave
156
    def __init__(self,
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
157
                 reporter=None,
158
                 config=None):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
159
        if reporter is not None:
160
            self.reporter = reporter
161
        else:
162
            self.reporter = NullCommitReporter()
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
163
        if config is not None:
164
            self.config = config
165
        else:
166
            self.config = None
1189 by Martin Pool
- BROKEN: partial support for commit into weave
167
        
168
    def commit(self,
169
               branch, message,
170
               timestamp=None,
171
               timezone=None,
172
               committer=None,
173
               specific_files=None,
174
               rev_id=None,
1276 by Martin Pool
- make Branch.commit accept (and ignore) verbose argument
175
               allow_pointless=True,
1185.16.65 by mbp at sourcefrog
- new commit --strict option
176
               strict=False,
1185.16.35 by Martin Pool
- stub for revision properties
177
               verbose=False,
178
               revprops=None):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
179
        """Commit working copy as a new revision.
180
181
        timestamp -- if not None, seconds-since-epoch for a
182
             postdated/predated commit.
183
1253 by Martin Pool
- test that pointless commits are trapped
184
        specific_files -- If true, commit only those files.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
185
1253 by Martin Pool
- test that pointless commits are trapped
186
        rev_id -- If set, use this as the new revision id.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
187
            Useful for test or import commands that need to tightly
188
            control what revisions are assigned.  If you duplicate
189
            a revision id that exists elsewhere it is your own fault.
190
            If null (default), a time/random revision id is generated.
1253 by Martin Pool
- test that pointless commits are trapped
191
192
        allow_pointless -- If true (default), commit even if nothing
193
            has changed and no merges are recorded.
1185.16.35 by Martin Pool
- stub for revision properties
194
1185.16.65 by mbp at sourcefrog
- new commit --strict option
195
        strict -- If true, don't allow a commit if the working tree
196
            contains unknown files.
197
1185.16.35 by Martin Pool
- stub for revision properties
198
        revprops -- Properties for new revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
199
        """
1285 by Martin Pool
- fix bug in committing files that are renamed but not modified
200
        mutter('preparing to commit')
1189 by Martin Pool
- BROKEN: partial support for commit into weave
201
202
        self.branch = branch
1248 by Martin Pool
- new weave based cleanup [broken]
203
        self.weave_store = branch.weave_store
1189 by Martin Pool
- BROKEN: partial support for commit into weave
204
        self.rev_id = rev_id
205
        self.specific_files = specific_files
1194 by Martin Pool
- [BROKEN] more progress of commit into weaves
206
        self.allow_pointless = allow_pointless
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
207
        self.revprops = {'branch-nick': branch.nick}
208
        if revprops:
209
            self.revprops.update(revprops)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
210
1185.22.4 by Michael Ellerman
Strict commit was a little .. ah .. too strict, oops :}
211
        if strict:
212
            # raise an exception as soon as we find a single unknown.
213
            for unknown in branch.unknowns():
214
                raise StrictCommitFailed()
1185.16.65 by mbp at sourcefrog
- new commit --strict option
215
1189 by Martin Pool
- BROKEN: partial support for commit into weave
216
        if timestamp is None:
217
            self.timestamp = time.time()
218
        else:
219
            self.timestamp = long(timestamp)
220
            
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
221
        if self.config is None:
222
            self.config = bzrlib.config.BranchConfig(self.branch)
223
1248 by Martin Pool
- new weave based cleanup [broken]
224
        if rev_id is None:
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
225
            self.rev_id = _gen_revision_id(self.config, self.timestamp)
1248 by Martin Pool
- new weave based cleanup [broken]
226
        else:
227
            self.rev_id = rev_id
228
1189 by Martin Pool
- BROKEN: partial support for commit into weave
229
        if committer is None:
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
230
            self.committer = self.config.username()
1189 by Martin Pool
- BROKEN: partial support for commit into weave
231
        else:
232
            assert isinstance(committer, basestring), type(committer)
233
            self.committer = committer
234
235
        if timezone is None:
236
            self.timezone = local_time_offset()
237
        else:
238
            self.timezone = int(timezone)
239
240
        assert isinstance(message, basestring), type(message)
241
        self.message = message
1390 by Robert Collins
pair programming worx... merge integration and weave
242
        self._escape_commit_message()
1189 by Martin Pool
- BROKEN: partial support for commit into weave
243
1245 by Martin Pool
doc
244
        self.branch.lock_write()
1189 by Martin Pool
- BROKEN: partial support for commit into weave
245
        try:
246
            self.work_tree = self.branch.working_tree()
247
            self.work_inv = self.work_tree.inventory
248
            self.basis_tree = self.branch.basis_tree()
249
            self.basis_inv = self.basis_tree.inventory
250
1223 by Martin Pool
- store inventories in weave
251
            self._gather_parents()
1344 by Martin Pool
- disallow selected-file commit of merges
252
            if len(self.parents) > 1 and self.specific_files:
253
                raise NotImplementedError('selected-file commit of merges is not supported yet')
1284 by Martin Pool
- in commit, avoid reading basis inventory twice
254
            self._check_parents_present()
255
            
1251 by Martin Pool
- fix up commit in directory with some deleted files
256
            self._remove_deleted()
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
257
            self._populate_new_inv()
258
            self._store_snapshot()
1248 by Martin Pool
- new weave based cleanup [broken]
259
            self._report_deletes()
1245 by Martin Pool
doc
260
1248 by Martin Pool
- new weave based cleanup [broken]
261
            if not (self.allow_pointless
1279 by Martin Pool
- pointless commit of r1 no longer allowed
262
                    or len(self.parents) > 1
1249 by Martin Pool
- improvements to weave commit [broken]
263
                    or self.new_inv != self.basis_inv):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
264
                raise PointlessCommit()
265
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
266
            if len(list(self.work_tree.iter_conflicts()))>0:
267
                raise ConflictsInTree
268
1189 by Martin Pool
- BROKEN: partial support for commit into weave
269
            self._record_inventory()
270
            self._make_revision()
1194 by Martin Pool
- [BROKEN] more progress of commit into weaves
271
            self.branch.append_revision(self.rev_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
272
            self.branch.set_pending_merges([])
1472 by Robert Collins
post commit hook, first pass implementation
273
            self.reporter.completed(self.branch.revno()+1, self.rev_id)
274
            if self.config.post_commit() is not None:
275
                hooks = self.config.post_commit().split(' ')
276
                # this would be nicer with twisted.python.reflect.namedAny
277
                for hook in hooks:
278
                    result = eval(hook + '(branch, rev_id)',
279
                                  {'branch':self.branch,
280
                                   'bzrlib':bzrlib,
281
                                   'rev_id':self.rev_id})
1189 by Martin Pool
- BROKEN: partial support for commit into weave
282
        finally:
283
            self.branch.unlock()
284
285
    def _record_inventory(self):
1223 by Martin Pool
- store inventories in weave
286
        """Store the inventory for the new revision."""
1248 by Martin Pool
- new weave based cleanup [broken]
287
        inv_text = serializer_v5.write_inventory_to_string(self.new_inv)
288
        self.inv_sha1 = sha_string(inv_text)
1390 by Robert Collins
pair programming worx... merge integration and weave
289
        s = self.branch.control_weaves
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
290
        s.add_text('inventory', self.rev_id,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
291
                   split_lines(inv_text), self.present_parents,
292
                   self.branch.get_transaction())
1223 by Martin Pool
- store inventories in weave
293
1390 by Robert Collins
pair programming worx... merge integration and weave
294
    def _escape_commit_message(self):
295
        """Replace xml-incompatible control characters."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
296
        # Python strings can include characters that can't be
297
        # represented in well-formed XML; escape characters that
298
        # aren't listed in the XML specification
299
        # (http://www.w3.org/TR/REC-xml/#NT-Char).
1390 by Robert Collins
pair programming worx... merge integration and weave
300
        if isinstance(self.message, unicode):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
301
            char_pattern = u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]'
302
        else:
303
            # Use a regular 'str' as pattern to avoid having re.subn
304
            # return 'unicode' results.
305
            char_pattern = '[^x09\x0A\x0D\x20-\xFF]'
1390 by Robert Collins
pair programming worx... merge integration and weave
306
        self.message, escape_count = re.subn(
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
307
            char_pattern,
308
            lambda match: match.group(0).encode('unicode_escape'),
1390 by Robert Collins
pair programming worx... merge integration and weave
309
            self.message)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
310
        if escape_count:
1185.12.8 by Aaron Bentley
Fixed commit so all output comes though CommitReporter
311
            self.reporter.escaped(escape_count, self.message)
1223 by Martin Pool
- store inventories in weave
312
313
    def _gather_parents(self):
1092.2.25 by Robert Collins
support ghosts in commits
314
        """Record the parents of a merge for merge detection."""
1223 by Martin Pool
- store inventories in weave
315
        pending_merges = self.branch.pending_merges()
316
        self.parents = []
1408 by Robert Collins
we do not need revision_trees in commit, parent inventories are sufficient
317
        self.parent_invs = []
1092.2.25 by Robert Collins
support ghosts in commits
318
        self.present_parents = []
1241 by Martin Pool
- rename last_patch to last_revision
319
        precursor_id = self.branch.last_revision()
1223 by Martin Pool
- store inventories in weave
320
        if precursor_id:
321
            self.parents.append(precursor_id)
322
        self.parents += pending_merges
1092.2.25 by Robert Collins
support ghosts in commits
323
        for revision in self.parents:
324
            if self.branch.has_revision(revision):
1408 by Robert Collins
we do not need revision_trees in commit, parent inventories are sufficient
325
                self.parent_invs.append(self.branch.get_inventory(revision))
1092.2.25 by Robert Collins
support ghosts in commits
326
                self.present_parents.append(revision)
1284 by Martin Pool
- in commit, avoid reading basis inventory twice
327
328
    def _check_parents_present(self):
1264 by Martin Pool
- Raise a better error from commit when a parent is absent
329
        for parent_id in self.parents:
1270 by Martin Pool
- fix recording of merged ancestry lines
330
            mutter('commit parent revision {%s}', parent_id)
1264 by Martin Pool
- Raise a better error from commit when a parent is absent
331
            if not self.branch.has_revision(parent_id):
1092.2.25 by Robert Collins
support ghosts in commits
332
                if parent_id == self.branch.last_revision():
1185.12.9 by Aaron Bentley
Removed crude language
333
                    warning("parent is missing %r", parent_id)
1092.2.25 by Robert Collins
support ghosts in commits
334
                    raise HistoryMissing(self.branch, 'revision', parent_id)
335
                else:
336
                    mutter("commit will ghost revision %r", parent_id)
1284 by Martin Pool
- in commit, avoid reading basis inventory twice
337
            
1189 by Martin Pool
- BROKEN: partial support for commit into weave
338
    def _make_revision(self):
339
        """Record a new revision object for this commit."""
340
        self.rev = Revision(timestamp=self.timestamp,
341
                            timezone=self.timezone,
342
                            committer=self.committer,
343
                            message=self.message,
344
                            inventory_sha1=self.inv_sha1,
1185.16.35 by Martin Pool
- stub for revision properties
345
                            revision_id=self.rev_id,
346
                            properties=self.revprops)
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
347
        self.rev.parent_ids = self.parents
1248 by Martin Pool
- new weave based cleanup [broken]
348
        rev_tmp = StringIO()
1189 by Martin Pool
- BROKEN: partial support for commit into weave
349
        serializer_v5.write_revision(self.rev, rev_tmp)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
350
        rev_tmp.seek(0)
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
351
        if self.config.signature_needed():
352
            plaintext = Testament(self.rev, self.new_inv).as_short_text()
353
            self.branch.store_revision_signature(gpg.GPGStrategy(self.config),
354
                                                 plaintext, self.rev_id)
1393.2.3 by John Arbash Meinel
Fixing typos, updating stores, getting tests to pass.
355
        self.branch.revision_store.add(rev_tmp, self.rev_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
356
        mutter('new revision_id is {%s}', self.rev_id)
357
358
    def _remove_deleted(self):
1248 by Martin Pool
- new weave based cleanup [broken]
359
        """Remove deleted files from the working inventories.
360
361
        This is done prior to taking the working inventory as the
362
        basis for the new committed inventory.
363
364
        This returns true if any files
365
        *that existed in the basis inventory* were deleted.
366
        Files that were added and deleted
367
        in the working copy don't matter.
368
        """
1254 by Martin Pool
- fix handling of selective commit with deleted files
369
        specific = self.specific_files
370
        deleted_ids = []
371
        for path, ie in self.work_inv.iter_entries():
372
            if specific and not is_inside_any(specific, path):
373
                continue
374
            if not self.work_tree.has_filename(path):
1185.12.8 by Aaron Bentley
Fixed commit so all output comes though CommitReporter
375
                self.reporter.missing(path)
1185.12.5 by Aaron Bentley
Fixed ordering issue in Commit._remove_deleted
376
                deleted_ids.append((path, ie.file_id))
1254 by Martin Pool
- fix handling of selective commit with deleted files
377
        if deleted_ids:
1185.12.5 by Aaron Bentley
Fixed ordering issue in Commit._remove_deleted
378
            deleted_ids.sort(reverse=True)
379
            for path, file_id in deleted_ids:
1248 by Martin Pool
- new weave based cleanup [broken]
380
                del self.work_inv[file_id]
1249 by Martin Pool
- improvements to weave commit [broken]
381
            self.branch._write_inventory(self.work_inv)
1248 by Martin Pool
- new weave based cleanup [broken]
382
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
383
    def _store_snapshot(self):
384
        """Pass over inventory and record a snapshot.
1303 by Martin Pool
- commit updates entry_version
385
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
386
        Entries get a new revision when they are modified in 
387
        any way, which includes a merge with a new set of
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
388
        parents that have the same entry. 
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
389
        """
1303 by Martin Pool
- commit updates entry_version
390
        # XXX: Need to think more here about when the user has
391
        # made a specific decision on a particular value -- c.f.
392
        # mark-merge.  
393
        for path, ie in self.new_inv.iter_entries():
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
394
            previous_entries = ie.find_previous_heads(
395
                self.parent_invs, 
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
396
                self.weave_store.get_weave_or_empty(ie.file_id,
397
                    self.branch.get_transaction()))
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
398
            if ie.revision is None:
399
                change = ie.snapshot(self.rev_id, path, previous_entries,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
400
                                     self.work_tree, self.weave_store,
401
                                     self.branch.get_transaction())
1092.2.23 by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py
402
            else:
403
                change = "unchanged"
1185.12.8 by Aaron Bentley
Fixed commit so all output comes though CommitReporter
404
            self.reporter.snapshot_change(change, path)
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
405
406
    def _populate_new_inv(self):
407
        """Build revision inventory.
408
409
        This creates a new empty inventory. Depending on
410
        which files are selected for commit, and what is present in the
411
        current tree, the new inventory is populated. inventory entries 
412
        which are candidates for modification have their revision set to
413
        None; inventory entries that are carried over untouched have their
414
        revision set to their prior value.
1301 by Martin Pool
- more docs in commit code
415
        """
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
416
        mutter("Selecting files for commit with filter %s", self.specific_files)
417
        self.new_inv = Inventory()
1249 by Martin Pool
- improvements to weave commit [broken]
418
        for path, new_ie in self.work_inv.iter_entries():
419
            file_id = new_ie.file_id
420
            mutter('check %s {%s}', path, new_ie.file_id)
1248 by Martin Pool
- new weave based cleanup [broken]
421
            if self.specific_files:
422
                if not is_inside_any(self.specific_files, path):
1249 by Martin Pool
- improvements to weave commit [broken]
423
                    mutter('%s not selected for commit', path)
1416 by Robert Collins
when committing a specific file, include all its parents
424
                    self._carry_entry(file_id)
1249 by Martin Pool
- improvements to weave commit [broken]
425
                    continue
1416 by Robert Collins
when committing a specific file, include all its parents
426
                else:
427
                    # this is selected, ensure its parents are too.
428
                    parent_id = new_ie.parent_id
429
                    while parent_id != ROOT_ID:
430
                        if not self.new_inv.has_id(parent_id):
431
                            ie = self._select_entry(self.work_inv[parent_id])
432
                            mutter('%s selected for commit because of %s',
433
                                   self.new_inv.id2path(parent_id), path)
434
435
                        ie = self.new_inv[parent_id]
436
                        if ie.revision is not None:
437
                            ie.revision = None
438
                            mutter('%s selected for commit because of %s',
439
                                   self.new_inv.id2path(parent_id), path)
440
                        parent_id = ie.parent_id
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
441
            mutter('%s selected for commit', path)
1416 by Robert Collins
when committing a specific file, include all its parents
442
            self._select_entry(new_ie)
443
444
    def _select_entry(self, new_ie):
445
        """Make new_ie be considered for committing."""
446
        ie = new_ie.copy()
447
        ie.revision = None
448
        self.new_inv.add(ie)
449
        return ie
450
451
    def _carry_entry(self, file_id):
1285 by Martin Pool
- fix bug in committing files that are renamed but not modified
452
        """Carry the file unchanged from the basis revision."""
1249 by Martin Pool
- improvements to weave commit [broken]
453
        if self.basis_inv.has_id(file_id):
454
            self.new_inv.add(self.basis_inv[file_id].copy())
1248 by Martin Pool
- new weave based cleanup [broken]
455
456
    def _report_deletes(self):
457
        for file_id in self.basis_inv:
458
            if file_id not in self.new_inv:
1185.12.8 by Aaron Bentley
Fixed commit so all output comes though CommitReporter
459
                self.reporter.deleted(self.basis_inv.id2path(file_id))
1248 by Martin Pool
- new weave based cleanup [broken]
460
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
461
def _gen_revision_id(config, when):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
462
    """Return new revision-id."""
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
463
    s = '%s-%s-' % (config.user_email(), compact_date(when))
1189 by Martin Pool
- BROKEN: partial support for commit into weave
464
    s += hexlify(rand_bytes(8))
465
    return s