← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

 * bzr add now lists how many files were ignored per glob.  add --verbose
   lists the specific files.  (Aaron Bentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
74
74
    last_path = None
75
75
    revno = 1
76
76
    for revision_id in branch.revision_history():
77
 
        this_inv = branch.repository.get_revision_inventory(revision_id)
 
77
        this_inv = branch.get_revision_inventory(revision_id)
78
78
        if file_id in this_inv:
79
79
            this_ie = this_inv[file_id]
80
80
            this_path = this_inv.id2path(file_id)
223
223
            # although we calculated it, throw it away without display
224
224
            delta = None
225
225
 
226
 
        rev = branch.repository.get_revision(rev_id)
 
226
        rev = branch.get_revision(rev_id)
227
227
 
228
228
        if searchRE:
229
229
            if not searchRE.search(rev.message):
235
235
                excludes = set()
236
236
            else:
237
237
                # revno is 1 based, so -2 to get back 1 less.
238
 
                repository = branch.repository
239
 
                excludes = repository.get_ancestry(revision_history[revno - 2])
240
 
                excludes = set(excludes)
 
238
                excludes = set(branch.get_ancestry(revision_history[revno - 2]))
241
239
            pending = list(rev.parent_ids)
242
240
            while pending:
243
241
                rev_id = pending.pop()
246
244
                # prevent showing merged revs twice if they multi-path.
247
245
                excludes.add(rev_id)
248
246
                try:
249
 
                    rev = branch.repository.get_revision(rev_id)
 
247
                    rev = branch.get_revision(rev_id)
250
248
                except errors.NoSuchRevision:
251
249
                    continue
252
250
                pending.extend(rev.parent_ids)
450
448
    lf = LineLogFormatter(None)
451
449
    return lf.log_string(rev, max_chars)
452
450
 
453
 
FORMATTERS = {
454
 
              'long': LongLogFormatter,
 
451
FORMATTERS = {'long': LongLogFormatter,
455
452
              'short': ShortLogFormatter,
456
453
              'line': LineLogFormatter,
457
454
              }
458
455
 
459
 
def register_formatter(name, formatter):
460
 
    FORMATTERS[name] = formatter
461
456
 
462
457
def log_formatter(name, *args, **kwargs):
463
458
    """Construct a formatter from arguments.
468
463
    from bzrlib.errors import BzrCommandError
469
464
    try:
470
465
        return FORMATTERS[name](*args, **kwargs)
471
 
    except KeyError:
 
466
    except IndexError:
472
467
        raise BzrCommandError("unknown log formatter: %r" % name)
473
468
 
474
469
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
515
510
        to_file.write('*'*60)
516
511
        to_file.write('\nRemoved Revisions:\n')
517
512
        for i in range(base_idx, len(old_rh)):
518
 
            rev = branch.repository.get_revision(old_rh[i])
 
513
            rev = branch.get_revision(old_rh[i])
519
514
            lf.show(i+1, rev, None)
520
515
        to_file.write('*'*60)
521
516
        to_file.write('\n\n')