← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Robert Collins
  • Date: 2005-10-27 19:45:18 UTC
  • mfrom: (1185.16.130)
  • Revision ID: robertc@robertcollins.net-20051027194518-58afabc9ab280bb0
Merge from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
20
20
import bzrlib.commands
21
21
from bzrlib.trace import warning, mutter
22
22
from bzrlib.revisionspec import RevisionSpec
 
23
from bzrlib.errors import BzrCommandError
23
24
 
24
25
 
25
26
def _parse_revision_str(revstr):
162
163
    Option.OPTIONS[name] = Option(name, **kwargs)
163
164
 
164
165
_global_option('all')
165
 
_global_option('clobber')
 
166
_global_option('overwrite', help='Ignore differences between branches and '
 
167
               'overwrite unconditionally')
166
168
_global_option('basis', type=str)
167
169
_global_option('diff-options', type=str)
168
170
_global_option('help',
193
195
_global_option('merge-type', type=_parse_merge_type)
194
196
_global_option('pattern', type=str)
195
197
_global_option('quiet')
196
 
_global_option('remember')
 
198
_global_option('remember', help='Remember the specified location as a'
 
199
               ' default.')
197
200
 
198
201
 
199
202
def _global_short(short_name, long_name):