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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
911
911
    def run(self, filename):
912
912
        tree, relpath = WorkingTree.open_containing(filename)
913
913
        i = tree.inventory.path2id(relpath)
914
 
        if i == None:
 
914
        if i is None:
915
915
            raise BzrError("%r is not a versioned file" % filename)
916
916
        else:
917
917
            self.outf.write(i + '\n')
932
932
        tree, relpath = WorkingTree.open_containing(filename)
933
933
        inv = tree.inventory
934
934
        fid = inv.path2id(relpath)
935
 
        if fid == None:
 
935
        if fid is None:
936
936
            raise BzrError("%r is not a versioned file" % filename)
937
937
        for fip in inv.get_idpath(fid):
938
938
            self.outf.write(fip + '\n')
996
996
            last_revision = wt.last_revision()
997
997
 
998
998
        revision_ids = b.repository.get_ancestry(last_revision)
999
 
        assert revision_ids[0] == None
 
999
        assert revision_ids[0] is None
1000
1000
        revision_ids.pop(0)
1001
1001
        for revision_id in revision_ids:
1002
1002
            self.outf.write(revision_id + '\n')
1377
1377
        if rev1 > rev2:
1378
1378
            (rev2, rev1) = (rev1, rev2)
1379
1379
 
1380
 
        if (log_format == None):
 
1380
        if (log_format is None):
1381
1381
            default = b.get_config().log_format()
1382
1382
            log_format = get_log_format(long=long, short=short, line=line, 
1383
1383
                                        default=default)
2427
2427
            remote_branch.lock_read()
2428
2428
            try:
2429
2429
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2430
 
                if (log_format == None):
 
2430
                if (log_format is None):
2431
2431
                    default = local_branch.get_config().log_format()
2432
2432
                    log_format = get_log_format(long=long, short=short, 
2433
2433
                                                line=line, default=default)
2481
2481
        import bzrlib.plugin
2482
2482
        from inspect import getdoc
2483
2483
        for name, plugin in bzrlib.plugin.all_plugins().items():
2484
 
            if hasattr(plugin, '__path__'):
 
2484
            if getattr(plugin, '__path__', None) is not None:
2485
2485
                print plugin.__path__[0]
2486
 
            elif hasattr(plugin, '__file__'):
 
2486
            elif getattr(plugin, '__file__', None) is not None:
2487
2487
                print plugin.__file__
2488
2488
            else:
2489
 
                print `plugin`
 
2489
                print repr(plugin)
2490
2490
                
2491
2491
            d = getdoc(plugin)
2492
2492
            if d: