/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: John Arbash Meinel
  • Date: 2008-12-16 14:58:29 UTC
  • mfrom: (3903 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3913.
  • Revision ID: john@arbash-meinel.com-20081216145829-fqis79ouytgbcj4t
Merge in bzr.dev, pull out some of the retry on copy_revision_texts code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
181
181
        from bzrlib import commit
182
182
        if revprops is None:
183
183
            revprops = {}
 
184
        possible_master_transports=[]
184
185
        if not 'branch-nick' in revprops:
185
 
            revprops['branch-nick'] = self.branch.nick
 
186
            revprops['branch-nick'] = self.branch._get_nick(
 
187
                kwargs.get('local', False),
 
188
                possible_master_transports)
186
189
        author = kwargs.pop('author', None)
187
190
        if author is not None:
188
191
            if 'author' in revprops:
194
197
        for hook in MutableTree.hooks['start_commit']:
195
198
            hook(self)
196
199
        committed_id = commit.Commit().commit(working_tree=self,
197
 
            revprops=revprops, *args, **kwargs)
 
200
            revprops=revprops,
 
201
            possible_master_transports=possible_master_transports,
 
202
            *args, **kwargs)
198
203
        return committed_id
199
204
 
200
205
    def _gather_kinds(self, files, kinds):