/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2009-04-27 03:47:55 UTC
  • mfrom: (4303 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4304.
  • Revision ID: robertc@robertcollins.net-20090427034755-hzs5tk304glypj9j
Fixup NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2105
2105
            Option('show-diff',
2106
2106
                   short_name='p',
2107
2107
                   help='Show changes made in each revision as a patch.'),
 
2108
            Option('include-merges',
 
2109
                   help='Show merged revisions like --levels 0 does.'),
2108
2110
            ]
2109
2111
    encoding_type = 'replace'
2110
2112
 
2119
2121
            levels=None,
2120
2122
            message=None,
2121
2123
            limit=None,
2122
 
            show_diff=False):
 
2124
            show_diff=False,
 
2125
            include_merges=False):
2123
2126
        from bzrlib.log import (
2124
2127
            Logger,
2125
2128
            make_log_request_dict,
2126
2129
            _get_info_for_log_files,
2127
2130
            )
2128
2131
        direction = (forward and 'forward') or 'reverse'
 
2132
        if include_merges:
 
2133
            if levels is None:
 
2134
                levels = 0
 
2135
            else:
 
2136
                raise errors.BzrCommandError(
 
2137
                    '--levels and --include-merges are mutually exclusive')
2129
2138
 
2130
2139
        if change is not None:
2131
2140
            if len(change) > 1:
2188
2197
            lf = log_format(show_ids=show_ids, to_file=self.outf,
2189
2198
                            show_timezone=timezone,
2190
2199
                            delta_format=get_verbosity_level(),
2191
 
                            levels=levels)
 
2200
                            levels=levels,
 
2201
                            show_advice=levels is None)
2192
2202
 
2193
2203
            # Choose the algorithm for doing the logging. It's annoying
2194
2204
            # having multiple code paths like this but necessary until