← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Arnaud Jeansen
  • Date: 2010-04-15 20:22:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5161.
  • Revision ID: arnaud.jeansen@gmail.com-20100415202204-862f6y0nh76dhpjp
Remove XXX as per Robert's comment in the merge proposal

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
49
49
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
50
50
# the rest of the code; add a deprecation of the old name.
51
51
 
 
52
import os
 
53
import re
 
54
import sys
 
55
import time
 
56
 
 
57
from cStringIO import StringIO
 
58
 
52
59
from bzrlib import (
53
60
    debug,
54
61
    errors,
55
62
    revision,
56
63
    trace,
57
64
    tree,
 
65
    xml_serializer,
58
66
    )
59
67
from bzrlib.branch import Branch
60
68
from bzrlib.cleanup import OperationWithCleanups
64
72
                           StrictCommitFailed
65
73
                           )
66
74
from bzrlib.osutils import (get_user_encoding,
67
 
                            is_inside_any,
 
75
                            kind_marker, isdir,isfile, is_inside_any,
 
76
                            is_inside_or_parent_of_any,
68
77
                            minimum_path_selection,
 
78
                            quotefn, sha_file, split_lines,
69
79
                            splitpath,
70
80
                            )
71
 
from bzrlib.trace import mutter, note, is_quiet
 
81
from bzrlib.testament import Testament
 
82
from bzrlib.trace import mutter, note, warning, is_quiet
72
83
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
73
84
from bzrlib import symbol_versioning
 
85
from bzrlib.symbol_versioning import (deprecated_passed,
 
86
        deprecated_function,
 
87
        DEPRECATED_PARAMETER)
 
88
from bzrlib.workingtree import WorkingTree
74
89
from bzrlib.urlutils import unescape_for_display
75
90
import bzrlib.ui
76
91
 
228
243
        """
229
244
        operation = OperationWithCleanups(self._commit)
230
245
        self.revprops = revprops or {}
231
 
        # XXX: Can be set on __init__ or passed in - this is a bit ugly.
232
 
        self.config = config or self.config
233
246
        return operation.run(
234
247
               message=message,
235
248
               timestamp=timestamp,
243
256
               working_tree=working_tree,
244
257
               local=local,
245
258
               reporter=reporter,
 
259
               config=config,
246
260
               message_callback=message_callback,
247
261
               recursive=recursive,
248
262
               exclude=exclude,
250
264
 
251
265
    def _commit(self, operation, message, timestamp, timezone, committer,
252
266
            specific_files, rev_id, allow_pointless, strict, verbose,
253
 
            working_tree, local, reporter, message_callback, recursive,
 
267
            working_tree, local, reporter, config, message_callback, recursive,
254
268
            exclude, possible_master_transports):
255
269
        mutter('preparing to commit')
256
270