← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

[merge] fix \t in commit messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
1
 
#!/usr/bin/env python
2
1
"""\
3
2
A plugin for displaying what revisions are in 'other' but not in local.
4
3
"""
5
4
 
6
 
import bzrlib
7
 
 
8
 
try:
9
 
    set
10
 
except NameError:
11
 
    from sets import Set as set
12
 
 
13
 
 
14
5
def show_missing(br_local, br_remote, verbose=False, quiet=False):
15
6
    """Show the revisions which exist in br_remote, that 
16
7
    do not exist in br_local.
69
60
    for revno, rev_id in missing_remote:
70
61
        rev = br_remote.get_revision(rev_id)
71
62
        if verbose:
72
 
            parent_rev_id = rev.parents[0].revision_id
 
63
            parent_rev_id = rev.parent_ids[0]
73
64
            if last_rev_id == parent_rev_id:
74
65
                parent_tree = last_tree
75
66
            else: