← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-17 13:53:36 UTC
  • mfrom: (1939 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1940.
  • Revision ID: john@arbash-meinel.com-20060817135336-100de82962355d3b
[merge] bzr.dev 1939

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
66
66
import re
67
67
import sys
68
68
import time
69
 
import warnings
70
69
 
71
70
from cStringIO import StringIO
72
71
 
83
82
from bzrlib.trace import mutter, note, warning
84
83
from bzrlib.xml5 import serializer_v5
85
84
from bzrlib.inventory import Inventory, ROOT_ID, InventoryEntry
 
85
from bzrlib import symbol_versioning
86
86
from bzrlib.symbol_versioning import (deprecated_passed,
87
87
        deprecated_function,
88
88
        zero_seven,
221
221
        mutter('preparing to commit')
222
222
 
223
223
        if deprecated_passed(branch):
224
 
            warnings.warn("Commit.commit (branch, ...): The branch parameter is "
 
224
            symbol_versioning.warn("Commit.commit (branch, ...): The branch parameter is "
225
225
                 "deprecated as of bzr 0.8. Please use working_tree= instead.",
226
226
                 DeprecationWarning, stacklevel=2)
227
227
            self.branch = branch
505
505
        mutter("Selecting files for commit with filter %s", self.specific_files)
506
506
        entries = self.work_inv.iter_entries()
507
507
        if not self.builder.record_root_entry:
508
 
            warnings.warn('CommitBuilders should support recording the root'
509
 
                ' entry as of bzr 0.10.', DeprecationWarning, stacklevel=1)
 
508
            symbol_versioning.warn('CommitBuilders should support recording'
 
509
                ' the root entry as of bzr 0.10.', DeprecationWarning, 
 
510
                stacklevel=1)
510
511
            self.builder.new_inventory.add(self.basis_inv.root.copy())
511
512
            entries.next()
512
513
            self._emit_progress_update()