← 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: 2011-01-20 23:07:25 UTC
  • mfrom: (5626 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5630.
  • Revision ID: mbp@canonical.com-20110120230725-12l7ltnko5x3fgnz
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
328
328
        if revision_id is None and revision is None:
329
329
            raise errors.BzrCommandError('You must supply either'
330
330
                                         ' --revision or a revision_id')
331
 
        b = WorkingTree.open_containing(directory)[0].branch
 
331
 
 
332
        b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
332
333
 
333
334
        revisions = b.repository.revisions
334
335
        if revisions is None:
1961
1962
            type=unicode,
1962
1963
            ),
1963
1964
        RegistryOption('format',
 
1965
            short_name='F',
1964
1966
            help='Diff format to use.',
1965
1967
            lazy_registry=('bzrlib.diff', 'format_registry'),
1966
 
            value_switches=False, title='Diff format'),
 
1968
            title='Diff format'),
1967
1969
        ]
1968
1970
    aliases = ['di', 'dif']
1969
1971
    encoding_type = 'exact'
3425
3427
                self.outf.write(c.username() + '\n')
3426
3428
            return
3427
3429
 
 
3430
        if email:
 
3431
            raise errors.BzrCommandError("--email can only be used to display existing "
 
3432
                                         "identity")
 
3433
 
3428
3434
        # display a warning if an email address isn't included in the given name.
3429
3435
        try:
3430
3436
            _mod_config.extract_email_address(name)