← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2006-11-02 10:20:19 UTC
  • mfrom: (2114 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2119.
  • Revision ID: mbp@sourcefrog.net-20061102102019-9a5a02f485dff6f6
merge bzr.dev and reconcile several changes, also some test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
23
23
from bzrlib.symbol_versioning import (deprecated_function,
24
24
        zero_eight,
25
25
        )
 
26
from bzrlib.trace import warning
26
27
 
27
28
# TODO: when showing single-line logs, truncate to the width of the terminal
28
29
# if known, but only if really going to the terminal (not into a file)
112
113
    try:
113
114
        new_is_working_tree = True
114
115
        if revision is None:
 
116
            if wt.last_revision() != wt.branch.last_revision():
 
117
                warning("working tree is out of date, run 'bzr update'")
115
118
            new = wt
116
119
            old = new.basis_tree()
117
120
        elif len(revision) > 0: