/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/diff.py

  • Committer: Martin Pool
  • Date: 2006-12-20 10:58:12 UTC
  • mto: This revision was merged to the branch mainline in revision 2207.
  • Revision ID: mbp@sourcefrog.net-20061220105812-7uob91i2tl5qfksd
Refactor cmd_diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
306
306
 
307
307
def diff_cmd_helper(tree, specific_files, external_diff_options, 
308
308
                    old_revision_spec=None, new_revision_spec=None,
 
309
                    revision_specs=None,
309
310
                    old_label='a/', new_label='b/'):
310
311
    """Helper for cmd_diff.
311
312
 
312
 
   tree 
 
313
    :param tree:
313
314
        A WorkingTree
314
315
 
315
 
    specific_files
 
316
    :param specific_files:
316
317
        The specific files to compare, or None
317
318
 
318
 
    external_diff_options
 
319
    :param external_diff_options:
319
320
        If non-None, run an external diff, and pass it these options
320
321
 
321
 
    old_revision_spec
 
322
    :param old_revision_spec:
322
323
        If None, use basis tree as old revision, otherwise use the tree for
323
324
        the specified revision. 
324
325
 
325
 
    new_revision_spec
 
326
    :param new_revision_spec:
326
327
        If None, use working tree as new revision, otherwise use the tree for
327
328
        the specified revision.
328
329
    
 
330
    :param revision_specs: 
 
331
        Zero, one or two RevisionSpecs from the command line, saying what revisions 
 
332
        to compare.  This can be passed as an alternative to the old_revision_spec 
 
333
        and new_revision_spec parameters.
 
334
 
329
335
    The more general form is show_diff_trees(), where the caller
330
336
    supplies any two trees.
331
337
    """
337
343
        revision_id = revision.rev_id
338
344
        branch = revision.branch
339
345
        return branch.repository.revision_tree(revision_id)
 
346
 
 
347
    if revision_specs is not None:
 
348
        assert (old_revision_spec is None
 
349
                and new_revision_spec is None)
 
350
        if len(revision_specs) > 0:
 
351
            old_revision_spec = revision_specs[0]
 
352
        if len(revision_specs) > 1:
 
353
            new_revision_spec = revision_specs[1]
 
354
 
340
355
    if old_revision_spec is None:
341
356
        old_tree = tree.basis_tree()
342
357
    else:
343
358
        old_tree = spec_tree(old_revision_spec)
344
359
 
345
 
    if new_revision_spec is None:
 
360
    if (new_revision_spec is None
 
361
        or new_revision_spec.spec is None):
346
362
        new_tree = tree
347
363
    else:
348
364
        new_tree = spec_tree(new_revision_spec)
 
365
 
349
366
    if new_tree is not tree:
350
367
        extra_trees = (tree,)
351
368
    else: