← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-02 09:03:14 UTC
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090702090314-xzzq2108489y6l4g
Use config.get_user_option_as_bool().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1097
1097
        (tree, br_from,
1098
1098
         _unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1099
1099
        if strict is None:
1100
 
            strict = br_from.get_config().get_user_option('push_strict')
1101
 
            if strict is not None:
1102
 
                # FIXME: This should be better supported by config
1103
 
                # -- vila 20090611
1104
 
                bools = dict(yes=True, no=False, on=True, off=False,
1105
 
                             true=True, false=False)
1106
 
                try:
1107
 
                    strict = bools[strict.lower()]
1108
 
                except KeyError:
1109
 
                    strict = None
 
1100
            strict = br_from.get_config().get_user_option_as_bool('push_strict')
1110
1101
        # Get the tip's revision_id
1111
1102
        revision = _get_one_revision('push', revision)
1112
1103
        if revision is not None: