← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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
159
159
            self.config = None
160
160
        
161
161
    def commit(self,
162
 
               branch=DEPRECATED_PARAMETER, message=None,
 
162
               message=None,
163
163
               timestamp=None,
164
164
               timezone=None,
165
165
               committer=None,
177
177
               recursive='down'):
178
178
        """Commit working copy as a new revision.
179
179
 
180
 
        branch -- the deprecated branch to commit to. New callers should pass in 
181
 
                  working_tree instead
182
 
 
183
180
        message -- the commit message (it or message_callback is required)
184
181
 
185
182
        timestamp -- if not None, seconds-since-epoch for a
206
203
        """
207
204
        mutter('preparing to commit')
208
205
 
209
 
        if deprecated_passed(branch):
210
 
            symbol_versioning.warn("Commit.commit (branch, ...): The branch parameter is "
211
 
                 "deprecated as of bzr 0.8. Please use working_tree= instead.",
212
 
                 DeprecationWarning, stacklevel=2)
213
 
            self.branch = branch
214
 
            self.work_tree = self.branch.bzrdir.open_workingtree()
215
 
        elif working_tree is None:
216
 
            raise BzrError("One of branch and working_tree must be passed into commit().")
 
206
        if working_tree is None:
 
207
            raise BzrError("working_tree must be passed into commit().")
217
208
        else:
218
209
            self.work_tree = working_tree
219
210
            self.branch = self.work_tree.branch