← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2010-09-13 08:55:08 UTC
  • mfrom: (5417.1.5 scripts)
  • mto: This revision was merged to the branch mainline in revision 5426.
  • Revision ID: mbp@sourcefrog.net-20100913085508-oz74wnsz53hjd4yf
Merge additional fixes for blank lines in scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1354
1354
    If you want to discard your local changes, you can just do a
1355
1355
    'bzr revert' instead of 'bzr commit' after the update.
1356
1356
 
1357
 
    If you want to restore a file that has been removed locally, use
1358
 
    'bzr revert' instead of 'bzr update'.
1359
 
 
1360
1357
    If the tree's branch is bound to a master branch, it will also update
1361
1358
    the branch from the master.
1362
1359
    """
3484
3481
    If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3485
3482
    into a pdb postmortem session.
3486
3483
 
3487
 
    The --coverage=DIRNAME global option produces a report with covered code
3488
 
    indicated.
3489
 
 
3490
3484
    :Examples:
3491
3485
        Run only tests relating to 'ignore'::
3492
3486
 
4808
4802
                    'Uncommit these revisions',
4809
4803
                    'bzrlib.builtins.uncommit',
4810
4804
                    {}):
4811
 
                self.outf.write('Canceled\n')
 
4805
                self.outf.write('Canceled')
4812
4806
                return 0
4813
4807
 
4814
4808
        mutter('Uncommitting from {%s} to {%s}',
4841
4835
    takes_options = [
4842
4836
        Option('config',
4843
4837
               help='LOCATION is the directory where the config lock is.'),
4844
 
        Option('force',
4845
 
            help='Do not ask for confirmation before breaking the lock.'),
4846
4838
        ]
4847
4839
 
4848
 
    def run(self, location=None, config=False, force=False):
 
4840
    def run(self, location=None, config=False):
4849
4841
        if location is None:
4850
4842
            location = u'.'
4851
 
        if force:
4852
 
            ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4853
 
                None,
4854
 
                {'bzrlib.lockdir.break': True})
4855
4843
        if config:
4856
4844
            conf = _mod_config.LockableConfig(file_name=location)
4857
4845
            conf.break_lock()
4951
4939
    not part of it.  (Such trees can be produced by "bzr split", but also by
4952
4940
    running "bzr branch" with the target inside a tree.)
4953
4941
 
4954
 
    The result is a combined tree, with the subtree no longer an independent
 
4942
    The result is a combined tree, with the subtree no longer an independant
4955
4943
    part.  This is marked as a merge of the subtree into the containing tree,
4956
4944
    and all history is preserved.
4957
4945
    """