← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Move all features to bzrlib.tests.features in 2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
52
52
from bzrlib import (
53
53
    debug,
54
54
    errors,
55
 
    revision,
56
55
    trace,
57
56
    tree,
 
57
    ui,
58
58
    )
59
59
from bzrlib.branch import Branch
60
60
from bzrlib.cleanup import OperationWithCleanups
72
72
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
73
73
from bzrlib import symbol_versioning
74
74
from bzrlib.urlutils import unescape_for_display
75
 
import bzrlib.ui
76
75
 
77
76
 
78
77
class NullCommitReporter(object):
229
228
               message_callback=None,
230
229
               recursive='down',
231
230
               exclude=None,
232
 
               possible_master_transports=None):
 
231
               possible_master_transports=None,
 
232
               lossy=False):
233
233
        """Commit working copy as a new revision.
234
234
 
235
235
        :param message: the commit message (it or message_callback is required)
262
262
        :param exclude: None or a list of relative paths to exclude from the
263
263
            commit. Pending changes to excluded files will be ignored by the
264
264
            commit.
 
265
        :param lossy: When committing to a foreign VCS, ignore any
 
266
            data that can not be natively represented.
265
267
        """
266
268
        operation = OperationWithCleanups(self._commit)
267
269
        self.revprops = revprops or {}
283
285
               message_callback=message_callback,
284
286
               recursive=recursive,
285
287
               exclude=exclude,
286
 
               possible_master_transports=possible_master_transports)
 
288
               possible_master_transports=possible_master_transports,
 
289
               lossy=lossy)
287
290
 
288
291
    def _commit(self, operation, message, timestamp, timezone, committer,
289
292
            specific_files, rev_id, allow_pointless, strict, verbose,
290
293
            working_tree, local, reporter, message_callback, recursive,
291
 
            exclude, possible_master_transports):
 
294
            exclude, possible_master_transports, lossy):
292
295
        mutter('preparing to commit')
293
296
 
294
297
        if working_tree is None:
326
329
                minimum_path_selection(specific_files))
327
330
        else:
328
331
            self.specific_files = None
329
 
            
 
332
 
330
333
        self.allow_pointless = allow_pointless
331
334
        self.message_callback = message_callback
332
335
        self.timestamp = timestamp
346
349
            not self.branch.repository._format.supports_tree_reference and
347
350
            (self.branch.repository._format.fast_deltas or
348
351
             len(self.parents) < 2))
349
 
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
352
        self.pb = ui.ui_factory.nested_progress_bar()
350
353
        operation.add_cleanup(self.pb.finished)
351
354
        self.basis_revid = self.work_tree.last_revision()
352
355
        self.basis_tree = self.work_tree.basis_tree()
380
383
        self.pb_stage_count = 0
381
384
        self.pb_stage_total = 5
382
385
        if self.bound_branch:
383
 
            self.pb_stage_total += 1
 
386
            # 2 extra stages: "Uploading data to master branch" and "Merging
 
387
            # tags to master branch"
 
388
            self.pb_stage_total += 2
384
389
        self.pb.show_pct = False
385
390
        self.pb.show_spinner = False
386
391
        self.pb.show_eta = False
398
403
 
399
404
        # Collect the changes
400
405
        self._set_progress_stage("Collecting changes", counter=True)
 
406
        self._lossy = lossy
401
407
        self.builder = self.branch.get_commit_builder(self.parents,
402
 
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
 
408
            self.config, timestamp, timezone, committer, self.revprops,
 
409
            rev_id, lossy=lossy)
 
410
        if not self.builder.supports_record_entry_contents and self.exclude:
 
411
            self.builder.abort()
 
412
            raise errors.ExcludesUnsupported(self.branch.repository)
403
413
 
404
414
        try:
405
415
            self.builder.will_record_deletes()
432
442
        except Exception, e:
433
443
            mutter("aborting commit write group because of exception:")
434
444
            trace.log_exception_quietly()
435
 
            note("aborting commit write group: %r" % (e,))
436
445
            self.builder.abort()
437
446
            raise
438
447
 
444
453
            self._set_progress_stage("Uploading data to master branch")
445
454
            # 'commit' to the master first so a timeout here causes the
446
455
            # local branch to be out of date
447
 
            self.master_branch.import_last_revision_info(
448
 
                self.branch.repository, new_revno, self.rev_id)
 
456
            (new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
 
457
                self.branch, new_revno, self.rev_id, lossy=lossy)
 
458
            if lossy:
 
459
                self.branch.fetch(self.master_branch, self.rev_id)
449
460
 
450
461
        # and now do the commit locally.
451
462
        self.branch.set_last_revision_info(new_revno, self.rev_id)
452
463
 
 
464
        # Merge local tags to remote
 
465
        if self.bound_branch:
 
466
            self._set_progress_stage("Merging tags to master branch")
 
467
            tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
 
468
            if tag_conflicts:
 
469
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
 
470
                note("Conflicting tags in bound branch:\n" +
 
471
                    "\n".join(warning_lines))
 
472
 
453
473
        # Make the working tree be up to date with the branch. This
454
474
        # includes automatic changes scheduled to be made to the tree, such
455
475
        # as updating its basis and unversioning paths that were missing.
473
493
        # A merge with no effect on files
474
494
        if len(self.parents) > 1:
475
495
            return
476
 
        # TODO: we could simplify this by using self.builder.basis_delta.
477
 
 
478
 
        # The initial commit adds a root directory, but this in itself is not
479
 
        # a worthwhile commit.
480
 
        if (self.basis_revid == revision.NULL_REVISION and
481
 
            ((self.builder.new_inventory is not None and
482
 
             len(self.builder.new_inventory) == 1) or
483
 
            len(self.builder._basis_delta) == 1)):
484
 
            raise PointlessCommit()
485
496
        if self.builder.any_changes():
486
497
            return
487
498
        raise PointlessCommit()
712
723
        if self.specific_files or self.exclude:
713
724
            specific_files = self.specific_files or []
714
725
            for path, old_ie in self.basis_inv.iter_entries():
715
 
                if old_ie.file_id in self.builder.new_inventory:
 
726
                if self.builder.new_inventory.has_id(old_ie.file_id):
716
727
                    # already added - skip.
717
728
                    continue
718
729
                if (is_inside_any(specific_files, path)