← 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-15 07:34:23 UTC
  • mfrom: (4503.2.6 bool-config-option)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073423-ri6ms86pfwxfoop8
Support boolean variables in configuration files and UI queries

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1096
1096
        (tree, br_from,
1097
1097
         _unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1098
1098
        if strict is None:
1099
 
            strict = br_from.get_config().get_user_option('push_strict')
1100
 
            if strict is not None:
1101
 
                # FIXME: This should be better supported by config
1102
 
                # -- vila 20090611
1103
 
                bools = dict(yes=True, no=False, on=True, off=False,
1104
 
                             true=True, false=False)
1105
 
                try:
1106
 
                    strict = bools[strict.lower()]
1107
 
                except KeyError:
1108
 
                    strict = None
 
1099
            strict = br_from.get_config().get_user_option_as_bool('push_strict')
 
1100
        if strict is None: strict = True # default value
1109
1101
        # Get the tip's revision_id
1110
1102
        revision = _get_one_revision('push', revision)
1111
1103
        if revision is not None:
1112
1104
            revision_id = revision.in_history(br_from).rev_id
1113
1105
        else:
1114
1106
            revision_id = None
1115
 
        if (tree is not None and revision_id is None
1116
 
            and (strict is None or strict)): # Default to True:
 
1107
        if strict and tree is not None and revision_id is None:
1117
1108
            if (tree.has_changes(tree.basis_tree())
1118
 
                 or len(tree.get_parent_ids()) > 1):
 
1109
                or len(tree.get_parent_ids()) > 1):
1119
1110
                raise errors.UncommittedChanges(
1120
1111
                    tree, more='Use --no-strict to force the push.')
1121
1112
            if tree.last_revision() != tree.branch.last_revision():