/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/diff.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-11 02:34:42 UTC
  • mfrom: (6681.2.10 more-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170611023442-p3vm7secrkqn6ckx
Some more bzrdir vs controldir fixes.

Merged from https://code.launchpad.net/~jelmer/brz/more-controldir/+merge/325453

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
195
195
    # make sure our own output is properly ordered before the diff
196
196
    to_file.flush()
197
197
 
198
 
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
199
 
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
 
198
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='brz-diff-old-')
 
199
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='brz-diff-new-')
200
200
    oldtmpf = os.fdopen(oldtmp_fd, 'wb')
201
201
    newtmpf = os.fdopen(newtmp_fd, 'wb')
202
202
 
710
710
                 path_encoding='utf-8'):
711
711
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
712
712
        self.command_template = command_template
713
 
        self._root = osutils.mkdtemp(prefix='bzr-diff-')
 
713
        self._root = osutils.mkdtemp(prefix='brz-diff-')
714
714
 
715
715
    @classmethod
716
716
    def from_string(klass, command_string, old_tree, new_tree, to_file,