/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 bzrlib/patiencediff.py

  • Committer: Martin Pool
  • Date: 2007-10-03 08:06:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071003080644-oivy0gkg98sex0ed
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).

Add new LockFailed, which doesn't imply that we failed to get it because of
contention.  Raise this if we fail to create the pending or lock directories
because of Transport errors.

UnlockableTransport is not an internal error.

ReadOnlyLockError has a message which didn't match its name or usage; it's now
deprecated and callers are updated to use LockFailed which is more appropriate.

Add zero_ninetytwo deprecation symbol.

Unify assertMatchesRe with TestCase.assertContainsRe.

When the constructor is deprecated, just say that the class is deprecated, not
the __init__ method - this works better with applyDeprecated in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patiencediff.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
 
19
19
from bzrlib.lazy_import import lazy_import
76
76
        import difflib
77
77
        sequencematcher = difflib.SequenceMatcher
78
78
 
79
 
    if fromfiledate:
80
 
        fromfiledate = '\t' + str(fromfiledate)
81
 
    if tofiledate:
82
 
        tofiledate = '\t' + str(tofiledate)
83
 
 
84
79
    started = False
85
80
    for group in sequencematcher(None,a,b).get_grouped_opcodes(n):
86
81
        if not started:
87
 
            yield '--- %s%s%s' % (fromfile, fromfiledate, lineterm)
88
 
            yield '+++ %s%s%s' % (tofile, tofiledate, lineterm)
 
82
            yield '--- %s %s%s' % (fromfile, fromfiledate, lineterm)
 
83
            yield '+++ %s %s%s' % (tofile, tofiledate, lineterm)
89
84
            started = True
90
85
        i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
91
86
        yield "@@ -%d,%d +%d,%d @@%s" % (i1+1, i2-i1, j1+1, j2-j1, lineterm)