← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: John Arbash Meinel
  • Date: 2010-04-22 19:05:14 UTC
  • mfrom: (4634.139.10 2.0.6-peak-commit-mem)
  • mto: This revision was merged to the branch mainline in revision 5175.
  • Revision ID: john@arbash-meinel.com-20100422190514-udvjsm6n2a6sh0jv
Bring into bzr.dev, and update NEWS.

I can't land in 2.0 right now because PQM is broken.
But at least I can land in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
20
20
    delta as _mod_delta,
21
21
    log,
22
22
    osutils,
 
23
    tree,
23
24
    tsort,
24
25
    revision as _mod_revision,
25
26
    )
26
27
import bzrlib.errors as errors
 
28
from bzrlib.osutils import is_inside_any
 
29
from bzrlib.symbol_versioning import (deprecated_function,
 
30
        )
27
31
from bzrlib.trace import mutter, warning
28
32
 
29
33
# TODO: when showing single-line logs, truncate to the width of the terminal