← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Vincent Ladeuil
  • Date: 2010-07-15 13:41:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5347.
  • Revision ID: v.ladeuil+lp@free.fr-20100715134131-i2q34l1er6pt17op
Cleanup import in bzrlib.version_info_formats (no deprecations left there).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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,
55
56
    trace,
56
57
    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
75
76
 
76
77
 
77
78
class NullCommitReporter(object):
228
229
               message_callback=None,
229
230
               recursive='down',
230
231
               exclude=None,
231
 
               possible_master_transports=None,
232
 
               lossy=False):
 
232
               possible_master_transports=None):
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.
267
265
        """
268
266
        operation = OperationWithCleanups(self._commit)
269
267
        self.revprops = revprops or {}
285
283
               message_callback=message_callback,
286
284
               recursive=recursive,
287
285
               exclude=exclude,
288
 
               possible_master_transports=possible_master_transports,
289
 
               lossy=lossy)
 
286
               possible_master_transports=possible_master_transports)
290
287
 
291
288
    def _commit(self, operation, message, timestamp, timezone, committer,
292
289
            specific_files, rev_id, allow_pointless, strict, verbose,
293
290
            working_tree, local, reporter, message_callback, recursive,
294
 
            exclude, possible_master_transports, lossy):
 
291
            exclude, possible_master_transports):
295
292
        mutter('preparing to commit')
296
293
 
297
294
        if working_tree is None:
329
326
                minimum_path_selection(specific_files))
330
327
        else:
331
328
            self.specific_files = None
332
 
 
 
329
            
333
330
        self.allow_pointless = allow_pointless
334
331
        self.message_callback = message_callback
335
332
        self.timestamp = timestamp
349
346
            not self.branch.repository._format.supports_tree_reference and
350
347
            (self.branch.repository._format.fast_deltas or
351
348
             len(self.parents) < 2))
352
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
349
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
353
350
        operation.add_cleanup(self.pb.finished)
354
351
        self.basis_revid = self.work_tree.last_revision()
355
352
        self.basis_tree = self.work_tree.basis_tree()
383
380
        self.pb_stage_count = 0
384
381
        self.pb_stage_total = 5
385
382
        if self.bound_branch:
386
 
            # 2 extra stages: "Uploading data to master branch" and "Merging
387
 
            # tags to master branch"
388
 
            self.pb_stage_total += 2
 
383
            self.pb_stage_total += 1
389
384
        self.pb.show_pct = False
390
385
        self.pb.show_spinner = False
391
386
        self.pb.show_eta = False
403
398
 
404
399
        # Collect the changes
405
400
        self._set_progress_stage("Collecting changes", counter=True)
406
 
        self._lossy = lossy
407
401
        self.builder = self.branch.get_commit_builder(self.parents,
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)
 
402
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
413
403
 
414
404
        try:
415
405
            self.builder.will_record_deletes()
442
432
        except Exception, e:
443
433
            mutter("aborting commit write group because of exception:")
444
434
            trace.log_exception_quietly()
 
435
            note("aborting commit write group: %r" % (e,))
445
436
            self.builder.abort()
446
437
            raise
447
438
 
453
444
            self._set_progress_stage("Uploading data to master branch")
454
445
            # 'commit' to the master first so a timeout here causes the
455
446
            # local branch to be out of date
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)
 
447
            self.master_branch.import_last_revision_info(
 
448
                self.branch.repository, new_revno, self.rev_id)
460
449
 
461
450
        # and now do the commit locally.
462
451
        self.branch.set_last_revision_info(new_revno, self.rev_id)
463
452
 
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
 
 
473
453
        # Make the working tree be up to date with the branch. This
474
454
        # includes automatic changes scheduled to be made to the tree, such
475
455
        # as updating its basis and unversioning paths that were missing.
493
473
        # A merge with no effect on files
494
474
        if len(self.parents) > 1:
495
475
            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()
496
485
        if self.builder.any_changes():
497
486
            return
498
487
        raise PointlessCommit()
723
712
        if self.specific_files or self.exclude:
724
713
            specific_files = self.specific_files or []
725
714
            for path, old_ie in self.basis_inv.iter_entries():
726
 
                if self.builder.new_inventory.has_id(old_ie.file_id):
 
715
                if old_ie.file_id in self.builder.new_inventory:
727
716
                    # already added - skip.
728
717
                    continue
729
718
                if (is_inside_any(specific_files, path)