← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1462
1462
            _mod_revision.ensure_null(tree.last_revision()))
1463
1463
        note('Updated to revision %s of branch %s' %
1464
1464
             ('.'.join(map(str, revno)), branch_location))
1465
 
        if tree.get_parent_ids()[1:] != existing_pending_merges:
 
1465
        parent_ids = tree.get_parent_ids()
 
1466
        if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1466
1467
            note('Your local commits will now show as pending merges with '
1467
1468
                 "'bzr status', and can be committed with 'bzr commit'.")
1468
1469
        if conflicts != 0:
1955
1956
    @display_command
1956
1957
    def run(self, revision=None, file_list=None, diff_options=None,
1957
1958
            prefix=None, old=None, new=None, using=None, format=None):
1958
 
        from bzrlib.diff import (get_trees_and_branches_to_diff,
 
1959
        from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1959
1960
            show_diff_trees)
1960
1961
 
1961
1962
        if (prefix is None) or (prefix == '0'):
1982
1983
 
1983
1984
        (old_tree, new_tree,
1984
1985
         old_branch, new_branch,
1985
 
         specific_files, extra_trees) = get_trees_and_branches_to_diff(
1986
 
            file_list, revision, old, new, apply_view=True)
 
1986
         specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
 
1987
            file_list, revision, old, new, self.add_cleanup, apply_view=True)
1987
1988
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1988
1989
                               specific_files=specific_files,
1989
1990
                               external_diff_options=diff_options,