← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Robert Collins
  • Date: 2006-01-05 22:30:59 UTC
  • mto: (1534.1.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1536.
  • Revision ID: robertc@robertcollins.net-20060105223059-a8b64f7b47cf12fb
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion
   for functions that need unicode strings. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
190
190
        If set, use an external GNU diff and pass these options.
191
191
    """
192
192
 
193
 
    old_tree.lock_read()
194
 
    try:
195
 
        new_tree.lock_read()
196
 
        try:
197
 
            return _show_diff_trees(old_tree, new_tree, to_file,
198
 
                                    specific_files, external_diff_options)
199
 
        finally:
200
 
            new_tree.unlock()
201
 
    finally:
202
 
        old_tree.unlock()
203
 
 
204
 
 
205
 
def _show_diff_trees(old_tree, new_tree, to_file,
206
 
                     specific_files, external_diff_options):
207
 
 
208
193
    # TODO: Options to control putting on a prefix or suffix, perhaps as a format string
209
194
    old_label = ''
210
195
    new_label = ''