← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

  • Committer: Patch Queue Manager
  • Date: 2013-05-23 10:35:23 UTC
  • mfrom: (6574.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20130523103523-2wt6jmauja1n1vdt
(jameinel) Merge bzr/2.5 into trunk. (John A Meinel)

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