/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/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2006-06-08 14:17:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1753.
  • Revision ID: jelmer@samba.org-20060608141729-9c1e343ea30820ce
Fix some minor issues pointed out by j-a-m.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
72
72
from cStringIO import StringIO
73
73
 
74
74
from bzrlib.atomicfile import AtomicFile
75
 
from bzrlib.osutils import (kind_marker, is_inside_any, 
76
 
                            quotefn, is_inside_or_parent_of_any,
77
 
                            sha_file, isdir, isfile, split_lines)
78
75
import bzrlib.config
79
76
import bzrlib.errors as errors
80
77
from bzrlib.errors import (BzrError, PointlessCommit,
82
79
                           ConflictsInTree,
83
80
                           StrictCommitFailed
84
81
                           )
 
82
from bzrlib.osutils import (kind_marker, isdir,isfile, is_inside_any, 
 
83
                            is_inside_or_parent_of_any,
 
84
                            quotefn, sha_file, split_lines)
85
85
from bzrlib.testament import Testament
86
86
from bzrlib.trace import mutter, note, warning
87
87
from bzrlib.xml5 import serializer_v5
239
239
        self.local = local
240
240
        self.master_branch = None
241
241
        self.master_locked = False
 
242
        self.rev_id = None
242
243
        self.specific_files = specific_files
243
244
        self.allow_pointless = allow_pointless
244
245
 
285
286
            # note that this estimate is too long when we do a partial tree
286
287
            # commit which excludes some new files from being considered.
287
288
            # The estimate is corrected when we populate the new inv.
288
 
            self.pb_total = len(self.basis_inv) + len(self.work_inv) + 3 - 1
 
289
            self.pb_total = len(self.work_inv) + 5
289
290
            self.pb_count = 0
290
291
 
291
292
            self._gather_parents()
311
312
            self.builder.finish_inventory()
312
313
            self._emit_progress_update()
313
314
            self.rev_id = self.builder.commit(self.message)
 
315
            self._emit_progress_update()
314
316
            # revision data is in the local branch now.
315
317
            
316
318
            # upload revision data to the master.
511
513
        # iter_entries does not visit the ROOT_ID node so we need to call
512
514
        # self._emit_progress_update once by hand.
513
515
        self._emit_progress_update()
514
 
        self._emit_progress_update()
515
516
        for path, new_ie in self.work_inv.iter_entries():
516
517
            self._emit_progress_update()
517
 
            self._emit_progress_update()
518
518
            file_id = new_ie.file_id
519
519
            mutter('check %s {%s}', path, file_id)
520
520
            if (not self.specific_files or