← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-23 06:50:13 UTC
  • mfrom: (2027.4.6 inventory-takes-file-3631)
  • Revision ID: pqm@pqm.ubuntu.com-20060923065013-b8483dd421706cbe
(jam) allow 'bzr inventory filename' (bug #3631)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
31
31
def plural(n, base='', pl=None):
32
32
    if n == 1:
33
33
        return base
34
 
    elif pl != None:
 
34
    elif pl is not None:
35
35
        return pl
36
36
    else:
37
37
        return 's'
173
173
    work_inv = working.inventory
174
174
    delta = working.changes_from(basis, want_unchanged=True)
175
175
    history = branch.revision_history()
176
 
    tree_last_id = working.last_revision()
 
176
    try:
 
177
        tree_last_id = working.get_parent_ids()[0]
 
178
    except IndexError:
 
179
        tree_last_id = None
177
180
 
178
181
    if len(history) and tree_last_id != history[-1]:
179
182
        tree_last_revno = branch.revision_id_to_revno(tree_last_id)