← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-28 09:40:23 UTC
  • mfrom: (5155.1.5 320119-exclude-ancestry)
  • Revision ID: pqm@pqm.ubuntu.com-20100428094023-7504mlou1qk28r9n
(vila) Add --exclude-common-ancestry log option (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1132
1132
        else:
1133
1133
            revision_id = None
1134
1134
        if tree is not None and revision_id is None:
1135
 
            tree.check_changed_or_out_of_date(
1136
 
                strict, 'push_strict',
1137
 
                more_error='Use --no-strict to force the push.',
1138
 
                more_warning='Uncommitted changes will not be pushed.')
 
1135
            tree.warn_if_changed_or_out_of_date(
 
1136
                strict, 'push_strict', 'Use --no-strict to force the push.')
1139
1137
        # Get the stacked_on branch, if any
1140
1138
        if stacked_on is not None:
1141
1139
            stacked_on = urlutils.normalize_url(stacked_on)
3073
3071
                         "the master branch until a normal commit "
3074
3072
                         "is performed."
3075
3073
                    ),
3076
 
             Option('show-diff', short_name='p',
 
3074
             Option('show-diff',
3077
3075
                    help='When no message is supplied, show the diff along'
3078
3076
                    ' with the status summary in the message editor.'),
3079
3077
             ]
4681
4679
 
4682
4680
class cmd_bind(Command):
4683
4681
    __doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
 
    If no branch is supplied, rebind to the last bound location.
4685
4682
 
4686
4683
    Once converted into a checkout, commits must succeed on the master branch
4687
4684
    before they will be applied to the local branch.