← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Parth Malwankar
  • Date: 2010-05-03 08:13:32 UTC
  • mfrom: (5199 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5210.
  • Revision ID: parth.malwankar@gmail.com-20100503081332-sccscii0dqslaqu3
merged in changes from trunk and resolved conflict in NEWS.

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,
24
23
    tsort,
25
24
    revision as _mod_revision,
26
25
    )
27
26
import bzrlib.errors as errors
28
 
from bzrlib.osutils import is_inside_any
29
 
from bzrlib.symbol_versioning import (deprecated_function,
30
 
        )
31
27
from bzrlib.trace import mutter, warning
32
28
 
33
29
# TODO: when showing single-line logs, truncate to the width of the terminal