← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2006-06-20 04:45:30 UTC
  • mto: This revision was merged to the branch mainline in revision 1798.
  • Revision ID: mbp@sourcefrog.net-20060620044530-6e8a6f4b6f3bc525
Cleanup of imports; undeprecate all_revision_ids()

Thanks to John for review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
22
22
import os
23
23
import sys
24
24
 
 
25
import bzrlib
25
26
from bzrlib.branch import Branch, BranchReferenceFormat
26
 
from bzrlib import (branch, bzrdir, errors, osutils, ui, config, user_encoding,
 
27
from bzrlib import (branch, bzrdir, errors, osutils, ui, config,
27
28
    repository, log)
28
29
from bzrlib.bundle.read_bundle import BundleReader
29
30
from bzrlib.bundle.apply_bundle import merge_bundle
1403
1404
    """List unknown files."""
1404
1405
    @display_command
1405
1406
    def run(self):
1406
 
        from osutils import quotefn
1407
1407
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1408
 
            self.outf.write(quotefn(f) + '\n')
 
1408
            self.outf.write(osutils.quotefn(f) + '\n')
1409
1409
 
1410
1410
 
1411
1411
class cmd_ignore(Command):
1656
1656
            raise BzrCommandError("please specify either --message or --file")
1657
1657
        
1658
1658
        if file:
1659
 
            message = codecs.open(file, 'rt', user_encoding).read()
 
1659
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1660
1660
 
1661
1661
        if message == "":
1662
1662
            raise BzrCommandError("empty commit message specified")