/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: Vincent Ladeuil
  • Date: 2007-11-30 09:51:22 UTC
  • mto: (3059.2.1 173010)
  • mto: This revision was merged to the branch mainline in revision 3060.
  • Revision ID: v.ladeuil+lp@free.fr-20071130095122-6xz845lluzjp7tvs
Add -Dhttp support.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPConnection.__init__): Report the host we are about to connect
to if -Dhttp is used.
(AbstractHTTPHandler.do_open): Report requests and
responses (including headers) if -Dhttp is used.

* bzrlib/transport/http/_urllib.py: Fix some imports.
(HttpTransport_urllib._perform): Delete one mutter call since
-Dhttp provides better information.

* bzrlib/transport/http/_pycurl.py:
Fix some imports.
(PyCurlTransport._set_curl_options): Activate verbose output if
-Dhttp is used. Unfortunately this goes straight to stderr instead
of .bzr.log (libcurl provides an option but pycurl does not
implement it), but since we are debugging, I think it's
acceptable.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._coalesce_readv): Add a comment about the
servers that return the whole file ignoring the Ranges header.

* bzrlib/help_topics.py:
(_global_options): Add http.

* bzrlib/debug.py: 
Add 'http'.

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)