← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-07-06 03:15:29 UTC
  • mfrom: (1711.2.78 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060706031529-e189d8c3f42076be
(jam) allow plugins to include benchmarks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
1
 
# Copyright (C) 2004, 2005 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2004, 2005 by Canonical Ltd
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
88
88
                    reprocess=False):
89
89
        """Return merge in cvs-like form.
90
90
        """
91
 
        newline = '\n'
92
 
        if len(self.a) > 0:
93
 
            if self.a[0].endswith('\r\n'):
94
 
                newline = '\r\n'
95
 
            elif self.a[0].endswith('\r'):
96
 
                newline = '\r'
97
91
        if base_marker and reprocess:
98
92
            raise CantReprocessAndShowBase()
99
93
        if name_a:
117
111
                for i in range(t[1], t[2]):
118
112
                    yield self.b[i]
119
113
            elif what == 'conflict':
120
 
                yield start_marker + newline
 
114
                yield start_marker + '\n'
121
115
                for i in range(t[3], t[4]):
122
116
                    yield self.a[i]
123
117
                if base_marker is not None:
124
 
                    yield base_marker + newline
 
118
                    yield base_marker + '\n'
125
119
                    for i in range(t[1], t[2]):
126
120
                        yield self.base[i]
127
 
                yield mid_marker + newline
 
121
                yield mid_marker + '\n'
128
122
                for i in range(t[5], t[6]):
129
123
                    yield self.b[i]
130
 
                yield end_marker + newline
 
124
                yield end_marker + '\n'
131
125
            else:
132
126
                raise ValueError(what)
133
127