← 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: 2006-06-22 18:24:25 UTC
  • mfrom: (1803 +trunk)
  • mto: (1793.3.6 bundle-fixes)
  • mto: This revision was merged to the branch mainline in revision 1806.
  • Revision ID: john@arbash-meinel.com-20060622182425-6f45cb7acd587216
[merge] bzr.dev 1804 and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
18
18
 
19
19
from bzrlib.delta import compare_trees
20
20
from bzrlib.diff import _raise_if_nonexistent
21
 
from bzrlib.errors import NoSuchRevision
 
21
import bzrlib.errors as errors
22
22
from bzrlib.log import line_log
23
23
from bzrlib.osutils import is_inside_any
24
 
from bzrlib.symbol_versioning import *
 
24
from bzrlib.symbol_versioning import (deprecated_function,
 
25
        zero_eight,
 
26
        )
25
27
 
26
28
# TODO: when showing single-line logs, truncate to the width of the terminal
27
29
# if known, but only if really going to the terminal (not into a file)
117
119
            try:
118
120
                rev_id = revision[0].in_history(wt.branch).rev_id
119
121
                old = wt.branch.repository.revision_tree(rev_id)
120
 
            except NoSuchRevision, e:
121
 
                raise BzrCommandError(str(e))
 
122
            except errors.NoSuchRevision, e:
 
123
                raise errors.BzrCommandError(str(e))
122
124
            if (len(revision) > 1) and (revision[1].spec is not None):
123
125
                try:
124
126
                    rev_id = revision[1].in_history(wt.branch).rev_id
125
127
                    new = wt.branch.repository.revision_tree(rev_id)
126
128
                    new_is_working_tree = False
127
 
                except NoSuchRevision, e:
128
 
                    raise BzrCommandError(str(e))
 
129
                except errors.NoSuchRevision, e:
 
130
                    raise errors.BzrCommandError(str(e))
129
131
            else:
130
132
                new = wt
131
133
        _raise_if_nonexistent(specific_files, old, new)
175
177
                mm_revision = branch.repository.get_revision(mmerge)
176
178
                print >> to_file, '   ', line_log(mm_revision, 75)
177
179
                ignore.add(mmerge)
178
 
        except NoSuchRevision:
179
 
            print >> to_file, ' ', merge 
 
180
        except errors.NoSuchRevision:
 
181
            print >> to_file, ' ', merge
180
182
        
181
183
def list_paths(header, paths, specific_files, to_file):
182
184
    done_header = False