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

  • Committer: Aaron Bentley
  • Date: 2006-09-09 18:52:57 UTC
  • mfrom: (1996 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1997.
  • Revision ID: aaron.bentley@utoronto.ca-20060909185257-ce0ee03ee5125ff1
Merge bzr.dev

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)