/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/patch.py

  • Committer: Vincent Ladeuil
  • Date: 2007-05-06 06:59:57 UTC
  • mto: (2495.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 2496.
  • Revision ID: v.ladeuil+lp@free.fr-20070506065957-4jdlek9i5at2qb36
Fix bug #112719 by using the right range header.

* HTTPTestUtil.py:
(SingleOnlyRangeRequestHandler): Noisily refuses mutliple range
requests.

* test_http.py:
(TestSingleOnlyRangeRequestServer): Test the retry mechanism when
a server refuses to handle a mutiple range request without
silently replying with a single range or full file response.

* _pycurl.py:
(PyCurlTransport._get_ranged): The header have been built taken
into account the range hint, don't rebuilt it *ignoring* that
hint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
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
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import errno
48
48
    if status < 0:
49
49
        raise Exception("%s killed by signal %i" (args[0], -status))
50
50
    return stdout, stderr, status
51
 
 
 
51
    
52
52
 
53
53
def patch(patch_contents, filename, output_filename=None, reverse=False):
54
54
    """Apply a patch to a file, to produce another output file.  This is should
72
72
        args.extend(("-o", output_filename))
73
73
    args.append(filename)
74
74
    stdout, stderr, status = write_to_cmd(args, patch_contents)
75
 
    return status
 
75
    return status 
76
76
 
77
77
 
78
78
def diff3(out_file, mine_path, older_path, yours_path):