← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-07-29 13:29:17 UTC
  • Revision ID: mbp@sourcefrog.net-20050729132917-f4c36e163315d157
- remove unnecessary internal imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
18
18
import sys, os
19
19
 
20
20
import bzrlib
 
21
 
21
22
from bzrlib.trace import mutter, note
22
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, splitpath, \
23
24
     sha_file, appendpath, file_kind
24
25
from bzrlib.errors import BzrError
25
 
 
 
26
from bzrlib.textui import show_status
 
27
        
26
28
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
27
29
## TODO: Maybe include checks for common corruption of newlines, etc?
28
30
 
422
424
              add all non-ignored children.  Perhaps do that in a
423
425
              higher-level method.
424
426
        """
425
 
        from bzrlib.textui import show_status
426
427
        # TODO: Re-adding a file that is removed in the working copy
427
428
        # should probably put it back with the previous ID.
428
429
        if isinstance(files, basestring):
501
502
        is the opposite of add.  Removing it is consistent with most
502
503
        other tools.  Maybe an option.
503
504
        """
504
 
        from bzrlib.textui import show_status
505
505
        ## TODO: Normalize names
506
506
        ## TODO: Remove nested loops; better scalability
507
507
        if isinstance(files, basestring):