← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-06 12:27:27 UTC
  • mfrom: (6449.6.7 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120206122727-bq0phmt80bmlvvx7
(jelmer) Use config stacks in a few more places. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
22
22
import time
23
23
 
24
24
from bzrlib import (
 
25
    config as _mod_config,
25
26
    errors,
26
27
    lazy_import,
27
28
    registry,
1405
1406
        delete_any(self._limbo_name(trans_id))
1406
1407
 
1407
1408
    def new_orphan(self, trans_id, parent_id):
1408
 
        # FIXME: There is no tree config, so we use the branch one (it's weird
1409
 
        # to define it this way as orphaning can only occur in a working tree,
1410
 
        # but that's all we have (for now). It will find the option in
1411
 
        # locations.conf or bazaar.conf though) -- vila 20100916
1412
 
        conf = self._tree.branch.get_config()
1413
 
        conf_var_name = 'bzr.transform.orphan_policy'
1414
 
        orphan_policy = conf.get_user_option(conf_var_name)
1415
 
        default_policy = orphaning_registry.default_key
1416
 
        if orphan_policy is None:
1417
 
            orphan_policy = default_policy
1418
 
        if orphan_policy not in orphaning_registry:
1419
 
            trace.warning('%s (from %s) is not a known policy, defaulting '
1420
 
                'to %s' % (orphan_policy, conf_var_name, default_policy))
1421
 
            orphan_policy = default_policy
1422
 
        handle_orphan = orphaning_registry.get(orphan_policy)
 
1409
        conf = self._tree.get_config_stack()
 
1410
        handle_orphan = conf.get('bzr.transform.orphan_policy')
1423
1411
        handle_orphan(self, trans_id, parent_id)
1424
1412
 
1425
1413
 
1488
1476
orphaning_registry._set_default_key('conflict')
1489
1477
 
1490
1478
 
 
1479
opt_transform_orphan = _mod_config.RegistryOption(
 
1480
    'bzr.transform.orphan_policy', orphaning_registry,
 
1481
    help='Policy for orphaned files during transform operations.',
 
1482
    invalid='warning')
 
1483
 
 
1484
 
1491
1485
class TreeTransform(DiskTreeTransform):
1492
1486
    """Represent a tree transformation.
1493
1487