mercurial-crew-with-dirclash: mercurial/patch.py annotate

annotate mercurial/patch.py @ 4125:ef7c39ae5d4c

Suppress <stdout> before hg export -v (regression from previous patch).

author	Brendan Cully <brendan@kublai.com>
date	Fri, 02 Mar 2007 14:03:30 -0800
parents	ef4c1cd6f4e4
children	b5d1eaade333

rev	line source
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	1 # patch.py - patch file parsing routines
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	2 #
2864 71e78f2ca5ae merge git patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2862 diff changeset	3 # Copyright 2006 Brendan Cully <brendan@kublai.com>
71e78f2ca5ae merge git patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2862 diff changeset	4 #
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	5 # This software may be used and distributed according to the terms
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	7
3893 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3886 diff changeset	8 from i18n import _
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	9 from node import *
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	10 import base85, cmdutil, mdiff, util, context, revlog
3963 ba45041827a2 remove various unused import Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3902 diff changeset	11 import cStringIO, email.Parser, os, popen2, re, sha
3886 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3717 diff changeset	12 import sys, tempfile, zlib
2865 2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	13
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	14 # helper functions
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	15
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	16 def copyfile(src, dst, basedir=None):
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	17 if not basedir:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	18 basedir = os.getcwd()
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	19
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	20 abssrc, absdst = [os.path.join(basedir, n) for n in (src, dst)]
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	21 if os.path.exists(absdst):
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	22 raise util.Abort(_("cannot create %s: destination already exists") %
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	23 dst)
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	24
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	25 targetdir = os.path.dirname(absdst)
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	26 if not os.path.isdir(targetdir):
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	27 os.makedirs(targetdir)
3632 4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3588 diff changeset	28
4cfb72bcb978 util: add copyfile function Matt Mackall <mpm@selenic.com> parents: 3588 diff changeset	29 util.copyfile(abssrc, absdst)
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	30
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	31 # public functions
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	32
2865 2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	33 def extract(ui, fileobj):
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	34 '''extract patch from data read from fileobj.
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	35
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	36 patch can be normal patch or contained in email message.
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	37
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	38 return tuple (filename, message, user, date). any item in returned
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	39 tuple can be None. if filename is None, fileobj did not contain
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	40 patch. caller must unlink filename when done.'''
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	41
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	42 # attempt to detect the start of a patch
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	43 # (this heuristic is borrowed from quilt)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	44 diffre = re.compile(r'^(?:Index:[ \t]\|diff[ \t]\|RCS file: \|' +
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	45 'retrieving revision [0-9]+(\.[0-9]+)*$\|' +
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	46 '(---\|\\\*)[ \t])', re.MULTILINE)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	47
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	48 fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	49 tmpfp = os.fdopen(fd, 'w')
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	50 try:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	51 hgpatch = False
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	52
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	53 msg = email.Parser.Parser().parse(fileobj)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	54
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	55 message = msg['Subject']
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	56 user = msg['From']
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	57 # should try to parse msg['Date']
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	58 date = None
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	59
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	60 if message:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	61 message = message.replace('\n\t', ' ')
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	62 ui.debug('Subject: %s\n' % message)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	63 if user:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	64 ui.debug('From: %s\n' % user)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	65 diffs_seen = 0
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	66 ok_types = ('text/plain', 'text/x-diff', 'text/x-patch')
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	67
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	68 for part in msg.walk():
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	69 content_type = part.get_content_type()
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	70 ui.debug('Content-Type: %s\n' % content_type)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	71 if content_type not in ok_types:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	72 continue
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	73 payload = part.get_payload(decode=True)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	74 m = diffre.search(payload)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	75 if m:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	76 ui.debug(_('found patch at byte %d\n') % m.start(0))
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	77 diffs_seen += 1
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	78 cfp = cStringIO.StringIO()
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	79 if message:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	80 cfp.write(message)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	81 cfp.write('\n')
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	82 for line in payload[:m.start(0)].splitlines():
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	83 if line.startswith('# HG changeset patch'):
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	84 ui.debug(_('patch generated by hg export\n'))
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	85 hgpatch = True
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	86 # drop earlier commit message content
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	87 cfp.seek(0)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	88 cfp.truncate()
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	89 elif hgpatch:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	90 if line.startswith('# User '):
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	91 user = line[7:]
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	92 ui.debug('From: %s\n' % user)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	93 elif line.startswith("# Date "):
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	94 date = line[7:]
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	95 if not line.startswith('# '):
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	96 cfp.write(line)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	97 cfp.write('\n')
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	98 message = cfp.getvalue()
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	99 if tmpfp:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	100 tmpfp.write(payload)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	101 if not payload.endswith('\n'):
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	102 tmpfp.write('\n')
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	103 elif not diffs_seen and message and content_type == 'text/plain':
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	104 message += '\n' + payload
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	105 except:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	106 tmpfp.close()
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	107 os.unlink(tmpname)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	108 raise
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	109
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	110 tmpfp.close()
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	111 if not diffs_seen:
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	112 os.unlink(tmpname)
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	113 return None, message, user, date
2893e51407a4 commands.import: refactor patch parsing into patch.extract. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2864 diff changeset	114 return tmpname, message, user, date
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	115
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	116 GP_PATCH = 1 << 0 # we have to run patch
ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	117 GP_FILTER = 1 << 1 # there's some copy/rename operation
ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	118 GP_BINARY = 1 << 2 # there's a binary patch
ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	119
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	120 def readgitpatch(patchname):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	121 """extract git-style metadata about patches from <patchname>"""
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	122 class gitpatch:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	123 "op is one of ADD, DELETE, RENAME, MODIFY or COPY"
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	124 def __init__(self, path):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	125 self.path = path
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	126 self.oldpath = None
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	127 self.mode = None
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	128 self.op = 'MODIFY'
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	129 self.copymod = False
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	130 self.lineno = 0
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	131 self.binary = False
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3192 diff changeset	132
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	133 # Filter patch for git information
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	134 gitre = re.compile('diff --git a/(.) b/(.)')
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	135 pf = file(patchname)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	136 gp = None
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	137 gitpatches = []
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	138 # Can have a git patch with only metadata, causing patch to complain
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	139 dopatch = 0
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	140
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	141 lineno = 0
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	142 for line in pf:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	143 lineno += 1
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	144 if line.startswith('diff --git'):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	145 m = gitre.match(line)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	146 if m:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	147 if gp:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	148 gitpatches.append(gp)
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3632 diff changeset	149 src, dst = m.group(1, 2)
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	150 gp = gitpatch(dst)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	151 gp.lineno = lineno
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	152 elif gp:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	153 if line.startswith('--- '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	154 if gp.op in ('COPY', 'RENAME'):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	155 gp.copymod = True
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	156 dopatch \|= GP_FILTER
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	157 gitpatches.append(gp)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	158 gp = None
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	159 dopatch \|= GP_PATCH
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	160 continue
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	161 if line.startswith('rename from '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	162 gp.op = 'RENAME'
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	163 gp.oldpath = line[12:].rstrip()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	164 elif line.startswith('rename to '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	165 gp.path = line[10:].rstrip()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	166 elif line.startswith('copy from '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	167 gp.op = 'COPY'
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	168 gp.oldpath = line[10:].rstrip()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	169 elif line.startswith('copy to '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	170 gp.path = line[8:].rstrip()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	171 elif line.startswith('deleted file'):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	172 gp.op = 'DELETE'
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	173 elif line.startswith('new file mode '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	174 gp.op = 'ADD'
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	175 gp.mode = int(line.rstrip()[-3:], 8)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	176 elif line.startswith('new mode '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	177 gp.mode = int(line.rstrip()[-3:], 8)
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	178 elif line.startswith('GIT binary patch'):
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	179 dopatch \|= GP_BINARY
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	180 gp.binary = True
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	181 if gp:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	182 gitpatches.append(gp)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	183
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	184 if not gitpatches:
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	185 dopatch = GP_PATCH
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	186
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	187 return (dopatch, gitpatches)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	188
3052 efd26ceedafb Fix git patch application when cwd != repo.root Brendan Cully <brendan@kublai.com> parents: 2952 diff changeset	189 def dogitpatch(patchname, gitpatches, cwd=None):
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	190 """Preprocess git patch so that vanilla patch can handle it"""
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	191 def extractbin(fp):
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	192 i = [0] # yuck
9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	193 def readline():
9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	194 i[0] += 1
9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	195 return fp.readline().rstrip()
9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	196 line = readline()
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	197 while line and not line.startswith('literal '):
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	198 line = readline()
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	199 if not line:
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	200 return None, i[0]
3372 fd43ff3b4442 Use line length field when extracting git binary patches Brendan Cully <brendan@kublai.com> parents: 3367 diff changeset	201 size = int(line[8:])
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	202 dec = []
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	203 line = readline()
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	204 while line:
3372 fd43ff3b4442 Use line length field when extracting git binary patches Brendan Cully <brendan@kublai.com> parents: 3367 diff changeset	205 l = line[0]
fd43ff3b4442 Use line length field when extracting git binary patches Brendan Cully <brendan@kublai.com> parents: 3367 diff changeset	206 if l <= 'Z' and l >= 'A':
fd43ff3b4442 Use line length field when extracting git binary patches Brendan Cully <brendan@kublai.com> parents: 3367 diff changeset	207 l = ord(l) - ord('A') + 1
fd43ff3b4442 Use line length field when extracting git binary patches Brendan Cully <brendan@kublai.com> parents: 3367 diff changeset	208 else:
fd43ff3b4442 Use line length field when extracting git binary patches Brendan Cully <brendan@kublai.com> parents: 3367 diff changeset	209 l = ord(l) - ord('a') + 27
fd43ff3b4442 Use line length field when extracting git binary patches Brendan Cully <brendan@kublai.com> parents: 3367 diff changeset	210 dec.append(base85.b85decode(line[1:])[:l])
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	211 line = readline()
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	212 text = zlib.decompress(''.join(dec))
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	213 if len(text) != size:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	214 raise util.Abort(_('binary patch is %d bytes, not %d') %
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	215 (len(text), size))
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	216 return text, i[0]
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	217
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	218 pf = file(patchname)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	219 pfline = 1
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	220
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	221 fd, patchname = tempfile.mkstemp(prefix='hg-patch-')
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	222 tmpfp = os.fdopen(fd, 'w')
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	223
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	224 try:
3468 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3460 diff changeset	225 for i in xrange(len(gitpatches)):
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	226 p = gitpatches[i]
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	227 if not p.copymod and not p.binary:
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	228 continue
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	229
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	230 # rewrite patch hunk
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	231 while pfline < p.lineno:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	232 tmpfp.write(pf.readline())
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	233 pfline += 1
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	234
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	235 if p.binary:
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	236 text, delta = extractbin(pf)
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	237 if not text:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	238 raise util.Abort(_('binary patch extraction failed'))
3717 9e248cfd8b94 handle files with more than one git binary patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3716 diff changeset	239 pfline += delta
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	240 if not cwd:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	241 cwd = os.getcwd()
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	242 absdst = os.path.join(cwd, p.path)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	243 basedir = os.path.dirname(absdst)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	244 if not os.path.isdir(basedir):
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	245 os.makedirs(basedir)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	246 out = file(absdst, 'wb')
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	247 out.write(text)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	248 out.close()
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	249 elif p.copymod:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	250 copyfile(p.oldpath, p.path, basedir=cwd)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	251 tmpfp.write('diff --git a/%s b/%s\n' % (p.path, p.path))
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	252 line = pf.readline()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	253 pfline += 1
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	254 while not line.startswith('--- a/'):
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	255 tmpfp.write(line)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	256 line = pf.readline()
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	257 pfline += 1
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	258 tmpfp.write('--- a/%s\n' % p.path)
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	259
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	260 line = pf.readline()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	261 while line:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	262 tmpfp.write(line)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	263 line = pf.readline()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	264 except:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	265 tmpfp.close()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	266 os.unlink(patchname)
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	267 raise
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	268
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	269 tmpfp.close()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	270 return patchname
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	271
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3386 diff changeset	272 def patch(patchname, ui, strip=1, cwd=None, files={}):
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	273 """apply the patch <patchname> to the working directory.
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	274 a list of patched files is returned"""
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	275
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	276 # helper function
d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	277 def __patch(patchname):
d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	278 """patch and updates the files and fuzz variables"""
d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	279 fuzz = False
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	280
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	281 patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''),
d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	282 'patch')
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	283 args = []
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	284 if cwd:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	285 args.append('-d %s' % util.shellquote(cwd))
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	286 fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	287 util.shellquote(patchname)))
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	288
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	289 for line in fp:
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	290 line = line.rstrip()
2907 b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	291 ui.note(line + '\n')
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	292 if line.startswith('patching file '):
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	293 pf = util.parse_patch_output(line)
2907 b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	294 printed_file = False
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	295 files.setdefault(pf, (None, None))
2907 b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	296 elif line.find('with fuzz') >= 0:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	297 fuzz = True
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	298 if not printed_file:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	299 ui.warn(pf + '\n')
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	300 printed_file = True
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	301 ui.warn(line + '\n')
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	302 elif line.find('saving rejects to file') >= 0:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	303 ui.warn(line + '\n')
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	304 elif line.find('FAILED') >= 0:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	305 if not printed_file:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	306 ui.warn(pf + '\n')
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	307 printed_file = True
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2892 diff changeset	308 ui.warn(line + '\n')
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	309 code = fp.close()
0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	310 if code:
2867 9a2a481ec3ea util: qualify name properly. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2865 diff changeset	311 raise util.Abort(_("patch command failed: %s") %
9a2a481ec3ea util: qualify name properly. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2865 diff changeset	312 util.explain_exit(code)[0])
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3386 diff changeset	313 return fuzz
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	314
d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	315 (dopatch, gitpatches) = readgitpatch(patchname)
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3386 diff changeset	316 for gp in gitpatches:
2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3386 diff changeset	317 files[gp.path] = (gp.op, gp)
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	318
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3386 diff changeset	319 fuzz = False
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	320 if dopatch:
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	321 filterpatch = dopatch & (GP_FILTER \| GP_BINARY)
ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	322 if filterpatch:
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	323 patchname = dogitpatch(patchname, gitpatches, cwd=cwd)
d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	324 try:
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	325 if dopatch & GP_PATCH:
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3386 diff changeset	326 fuzz = __patch(patchname)
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	327 finally:
3716 ab5600428b08 handle files with both git binary patches and copy/rename ops Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3702 diff changeset	328 if filterpatch:
3054 d16b93f4a6ca unlink temporary patch files even when an exception is raised Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3053 diff changeset	329 os.unlink(patchname)
2860 0f08f2c042ec Move patch-related code into its own module. Brendan Cully <brendan@kublai.com> parents: diff changeset	330
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3386 diff changeset	331 return fuzz
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	332
3540 da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	333 def diffopts(ui, opts={}, untrusted=False):
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	334 def get(key, name=None):
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	335 return (opts.get(key) or
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	336 ui.configbool('diff', name or key, None, untrusted=untrusted))
2908 3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2880 diff changeset	337 return mdiff.diffopts(
3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2880 diff changeset	338 text=opts.get('text'),
3540 da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	339 git=get('git'),
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	340 nodates=get('nodates'),
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	341 showfunc=get('show_function', 'showfunc'),
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	342 ignorews=get('ignore_all_space', 'ignorews'),
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	343 ignorewsamount=get('ignore_space_change', 'ignorewsamount'),
da3ee7ca620f add untrusted argument to patch.diffopts Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	344 ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines'))
2908 3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2880 diff changeset	345
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	346 def updatedir(ui, repo, patches, wlock=None):
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	347 '''Update dirstate after patch application according to metadata'''
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	348 if not patches:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	349 return
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	350 copies = []
3701 05c8704a3743 handle git patches that rename a file to more than one destination Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3696 diff changeset	351 removes = {}
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	352 cfiles = patches.keys()
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	353 cwd = repo.getcwd()
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	354 if cwd:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	355 cfiles = [util.pathto(cwd, f) for f in patches.keys()]
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	356 for f in patches:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	357 ctype, gp = patches[f]
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	358 if ctype == 'RENAME':
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	359 copies.append((gp.oldpath, gp.path, gp.copymod))
3701 05c8704a3743 handle git patches that rename a file to more than one destination Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3696 diff changeset	360 removes[gp.oldpath] = 1
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	361 elif ctype == 'COPY':
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	362 copies.append((gp.oldpath, gp.path, gp.copymod))
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	363 elif ctype == 'DELETE':
3701 05c8704a3743 handle git patches that rename a file to more than one destination Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3696 diff changeset	364 removes[gp.path] = 1
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	365 for src, dst, after in copies:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	366 if not after:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	367 copyfile(src, dst, repo.root)
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	368 repo.copy(src, dst, wlock=wlock)
3701 05c8704a3743 handle git patches that rename a file to more than one destination Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3696 diff changeset	369 removes = removes.keys()
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	370 if removes:
3701 05c8704a3743 handle git patches that rename a file to more than one destination Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3696 diff changeset	371 removes.sort()
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	372 repo.remove(removes, True, wlock=wlock)
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	373 for f in patches:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	374 ctype, gp = patches[f]
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	375 if gp and gp.mode:
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	376 x = gp.mode & 0100 != 0
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	377 dst = os.path.join(repo.root, gp.path)
3588 45574a225632 git patch: create empty added files Brendan Cully <brendan@kublai.com> parents: 3540 diff changeset	378 # patch won't create empty files
45574a225632 git patch: create empty added files Brendan Cully <brendan@kublai.com> parents: 3540 diff changeset	379 if ctype == 'ADD' and not os.path.exists(dst):
4006 67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 3996 diff changeset	380 repo.wwrite(gp.path, '', x and 'x' or '')
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 3996 diff changeset	381 else:
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 3996 diff changeset	382 util.set_exec(dst, x)
2933 439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	383 cmdutil.addremove(repo, cfiles, wlock=wlock)
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	384 files = patches.keys()
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	385 files.extend([r for r in removes if r not in files])
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	386 files.sort()
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	387
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	388 return files
439fd013360d Move import's working dir update code into patch.updatedir Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	389
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	390 def b85diff(fp, to, tn):
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	391 '''print base85-encoded binary diff'''
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	392 def gitindex(text):
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	393 if not text:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	394 return '0' * 40
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	395 l = len(text)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	396 s = sha.new('blob %d\0' % l)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	397 s.update(text)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	398 return s.hexdigest()
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	399
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	400 def fmtline(line):
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	401 l = len(line)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	402 if l <= 26:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	403 l = chr(ord('A') + l - 1)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	404 else:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	405 l = chr(l - 26 + ord('a') - 1)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	406 return '%c%s\n' % (l, base85.b85encode(line, True))
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	407
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	408 def chunk(text, csize=52):
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	409 l = len(text)
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	410 i = 0
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	411 while i < l:
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	412 yield text[i:i+csize]
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	413 i += csize
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	414
4104 ed46895aa38c git binary patches: use hashes to detect identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4092 diff changeset	415 tohash = gitindex(to)
ed46895aa38c git binary patches: use hashes to detect identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4092 diff changeset	416 tnhash = gitindex(tn)
ed46895aa38c git binary patches: use hashes to detect identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4092 diff changeset	417 if tohash == tnhash:
4105 797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	418 return ""
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	419
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	420 # TODO: deltas
4105 797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	421 ret = ['index %s..%s\nGIT binary patch\nliteral %s\n' %
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	422 (tohash, tnhash, len(tn))]
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	423 for l in chunk(zlib.compress(tn)):
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	424 ret.append(fmtline(l))
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	425 ret.append('\n')
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	426 return ''.join(ret)
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	427
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	428 def diff(repo, node1=None, node2=None, files=None, match=util.always,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	429 fp=None, changes=None, opts=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	430 '''print diff of changes to files between two nodes, or node and
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	431 working directory.
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	432
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	433 if node1 is None, use first dirstate parent instead.
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	434 if node2 is None, compare node1 with working directory.'''
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	435
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	436 if opts is None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	437 opts = mdiff.defaultopts
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	438 if fp is None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	439 fp = repo.ui
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	440
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	441 if not node1:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	442 node1 = repo.dirstate.parents()[0]
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2933 diff changeset	443
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	444 ccache = {}
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	445 def getctx(r):
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	446 if r not in ccache:
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	447 ccache[r] = context.changectx(repo, r)
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	448 return ccache[r]
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	449
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	450 flcache = {}
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	451 def getfilectx(f, ctx):
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	452 flctx = ctx.filectx(f, filelog=flcache.get(f))
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	453 if f not in flcache:
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	454 flcache[f] = flctx._filelog
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	455 return flctx
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2933 diff changeset	456
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	457 # reading the data for node1 early allows it to play nicely
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	458 # with repo.status and the revlog cache.
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	459 ctx1 = context.changectx(repo, node1)
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	460 # force manifest reading
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	461 man1 = ctx1.manifest()
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	462 date1 = util.datestr(ctx1.date())
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	463
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	464 if not changes:
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	465 changes = repo.status(node1, node2, files, match=match)[:5]
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	466 modified, added, removed, deleted, unknown = changes
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	467 if files:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	468 def filterfiles(filters):
2880 eab07a7b7491 fix patch.patch.filterfiles. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	469 l = [x for x in filters if x in files]
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	470
2880 eab07a7b7491 fix patch.patch.filterfiles. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	471 for t in files:
eab07a7b7491 fix patch.patch.filterfiles. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	472 if not t.endswith("/"):
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	473 t += "/"
2880 eab07a7b7491 fix patch.patch.filterfiles. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	474 l += [x for x in filters if x.startswith(t)]
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	475 return l
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	476
2880 eab07a7b7491 fix patch.patch.filterfiles. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	477 modified, added, removed = map(filterfiles, (modified, added, removed))
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	478
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	479 if not modified and not added and not removed:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	480 return
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	481
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	482 if node2:
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	483 ctx2 = context.changectx(repo, node2)
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	484 else:
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	485 ctx2 = context.workingctx(repo)
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	486 man2 = ctx2.manifest()
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	487
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	488 # returns False if there was no rename between ctx1 and ctx2
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	489 # returns None if the file was created between ctx1 and ctx2
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	490 # returns the (file, node) present in ctx1 that was renamed to f in ctx2
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	491 def renamed(f):
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	492 startrev = ctx1.rev()
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	493 c = ctx2
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	494 crev = c.rev()
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	495 if crev is None:
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	496 crev = repo.changelog.count()
3694 c0b1a0c72c7d renamedbetween: only return (file, node) pairs that exist in the original rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3693 diff changeset	497 orig = f
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	498 while crev > startrev:
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	499 if f in c.files():
3693 454b3a8cdf28 diff: improve detection of renames when diffing across many revisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	500 try:
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	501 src = getfilectx(f, c).renamed()
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	502 except revlog.LookupError:
3693 454b3a8cdf28 diff: improve detection of renames when diffing across many revisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	503 return None
454b3a8cdf28 diff: improve detection of renames when diffing across many revisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	504 if src:
454b3a8cdf28 diff: improve detection of renames when diffing across many revisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3673 diff changeset	505 f = src[0]
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	506 crev = c.parents()[0].rev()
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	507 # try to reuse
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	508 c = getctx(crev)
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	509 if f not in man1:
3694 c0b1a0c72c7d renamedbetween: only return (file, node) pairs that exist in the original rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3693 diff changeset	510 return None
3696 562a65635bcb diff: better detection of renames when comparing with the working dir. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3695 diff changeset	511 if f == orig:
562a65635bcb diff: better detection of renames when comparing with the working dir. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3695 diff changeset	512 return False
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	513 return f
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	514
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	515 if repo.ui.quiet:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	516 r = None
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	517 else:
3386 2065789f6a3e use short hashes with diff -v Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3376 diff changeset	518 hexfunc = repo.ui.debugflag and hex or short
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	519 r = [hexfunc(node) for node in [node1, node2] if node]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	520
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	521 if opts.git:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	522 copied = {}
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	523 for f in added:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	524 src = renamed(f)
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	525 if src:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	526 copied[f] = src
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	527 srcs = [x[1] for x in copied.items()]
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	528
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	529 all = modified + added + removed
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	530 all.sort()
3702 70c3ee224c08 Don't generate git patches that rename a file to multiple destinations Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3701 diff changeset	531 gone = {}
3996 c190df14338c exec: add execfunc to simplify exec flag support on non-exec filesystems Matt Mackall <mpm@selenic.com> parents: 3970 diff changeset	532
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	533 for f in all:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	534 to = None
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	535 tn = None
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	536 dodiff = True
3327 319358e6bd96 Don't generate git diff header for empty diffs Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	537 header = []
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	538 if f in man1:
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	539 to = getfilectx(f, ctx1).data()
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	540 if f not in removed:
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	541 tn = getfilectx(f, ctx2).data()
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	542 if opts.git:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	543 def gitmode(x):
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	544 return x and '100755' or '100644'
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	545 def addmodehdr(header, omode, nmode):
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	546 if omode != nmode:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	547 header.append('old mode %s\n' % omode)
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	548 header.append('new mode %s\n' % nmode)
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	549
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	550 a, b = f, f
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	551 if f in added:
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	552 mode = gitmode(man2.execf(f))
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	553 if f in copied:
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	554 a = copied[f]
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	555 omode = gitmode(man1.execf(a))
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	556 addmodehdr(header, omode, mode)
3702 70c3ee224c08 Don't generate git patches that rename a file to multiple destinations Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3701 diff changeset	557 if a in removed and a not in gone:
70c3ee224c08 Don't generate git patches that rename a file to multiple destinations Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3701 diff changeset	558 op = 'rename'
70c3ee224c08 Don't generate git patches that rename a file to multiple destinations Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3701 diff changeset	559 gone[a] = 1
70c3ee224c08 Don't generate git patches that rename a file to multiple destinations Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3701 diff changeset	560 else:
70c3ee224c08 Don't generate git patches that rename a file to multiple destinations Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3701 diff changeset	561 op = 'copy'
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	562 header.append('%s from %s\n' % (op, a))
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	563 header.append('%s to %s\n' % (op, f))
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	564 to = getfilectx(a, ctx1).data()
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	565 else:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	566 header.append('new file mode %s\n' % mode)
4092 4ced663bebf0 git patches: handle renames of binary files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3900 diff changeset	567 if util.binary(tn):
4ced663bebf0 git patches: handle renames of binary files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3900 diff changeset	568 dodiff = 'binary'
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	569 elif f in removed:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	570 if f in srcs:
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	571 dodiff = False
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	572 else:
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	573 mode = gitmode(man1.execf(f))
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	574 header.append('deleted file mode %s\n' % mode)
8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	575 else:
3967 dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	576 omode = gitmode(man1.execf(f))
dccb83241dd0 patch: use contexts for diff Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	577 nmode = gitmode(man2.execf(f))
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	578 addmodehdr(header, omode, nmode)
3367 7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	579 if util.binary(to) or util.binary(tn):
7f486971d263 Add git-1.4 binary patch support Brendan Cully <brendan@kublai.com> parents: 3327 diff changeset	580 dodiff = 'binary'
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	581 r = None
3327 319358e6bd96 Don't generate git diff header for empty diffs Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	582 header.insert(0, 'diff --git a/%s b/%s\n' % (a, b))
4105 797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	583 if dodiff:
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	584 if dodiff == 'binary':
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	585 text = b85diff(fp, to, tn)
797dbdd4d7e1 git binary patches: don't print the header for identical files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4104 diff changeset	586 else:
4107 226df1808f16 merge with crew-stable Thomas Arendsen Hein <thomas@intevation.de> parents: 4096 4105 diff changeset	587 text = mdiff.unidiff(to, date1,
226df1808f16 merge with crew-stable Thomas Arendsen Hein <thomas@intevation.de> parents: 4096 4105 diff changeset	588 # ctx2 date may be dynamic
226df1808f16 merge with crew-stable Thomas Arendsen Hein <thomas@intevation.de> parents: 4096 4105 diff changeset	589 tn, util.datestr(ctx2.date()),
226df1808f16 merge with crew-stable Thomas Arendsen Hein <thomas@intevation.de> parents: 4096 4105 diff changeset	590 f, r, opts=opts)
3327 319358e6bd96 Don't generate git diff header for empty diffs Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	591 if text or len(header) > 1:
2892 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2880 diff changeset	592 fp.write(''.join(header))
3327 319358e6bd96 Don't generate git diff header for empty diffs Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	593 fp.write(text)
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	594
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	595 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	596 opts=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	597 '''export changesets as hg patches.'''
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	598
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	599 total = len(revs)
3900 2b3175acb653 Don't use node length for calculating revision number length. Thomas Arendsen Hein <thomas@intevation.de> parents: 3899 diff changeset	600 revwidth = max([len(str(rev)) for rev in revs])
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	601
3970 fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	602 def single(rev, seqno, fp):
fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	603 ctx = repo.changectx(rev)
fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	604 node = ctx.node()
fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	605 parents = [p.node() for p in ctx.parents() if p]
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	606 if switch_parent:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	607 parents.reverse()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	608 prev = (parents and parents[0]) or nullid
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	609
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	610 if not fp:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	611 fp = cmdutil.make_file(repo, template, node, total=total,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	612 seqno=seqno, revwidth=revwidth)
4125 ef7c39ae5d4c Suppress <stdout> before hg export -v (regression from previous patch). Brendan Cully <brendan@kublai.com> parents: 4124 diff changeset	613 if fp != sys.stdout and hasattr(fp, 'name'):
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	614 repo.ui.note("%s\n" % fp.name)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	615
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	616 fp.write("# HG changeset patch\n")
3970 fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	617 fp.write("# User %s\n" % ctx.user())
fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	618 fp.write("# Date %d %d\n" % ctx.date())
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	619 fp.write("# Node ID %s\n" % hex(node))
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	620 fp.write("# Parent %s\n" % hex(prev))
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	621 if len(parents) > 1:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	622 fp.write("# Parent %s\n" % hex(parents[1]))
3970 fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	623 fp.write(ctx.description().rstrip())
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	624 fp.write("\n\n")
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	625
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	626 diff(repo, prev, node, fp=fp, opts=opts)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	627 if fp not in (sys.stdout, repo.ui):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	628 fp.close()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2867 diff changeset	629
3900 2b3175acb653 Don't use node length for calculating revision number length. Thomas Arendsen Hein <thomas@intevation.de> parents: 3899 diff changeset	630 for seqno, rev in enumerate(revs):
3970 fff8a5345eb0 commands.py: use contexts in export Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3967 diff changeset	631 single(rev, seqno+1, fp)
3093 f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	632
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	633 def diffstat(patchlines):
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	634 fd, name = tempfile.mkstemp(prefix="hg-patchbomb-", suffix=".txt")
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	635 try:
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	636 p = popen2.Popen3('diffstat -p1 -w79 2>/dev/null > ' + name)
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	637 try:
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	638 for line in patchlines: print >> p.tochild, line
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	639 p.tochild.close()
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	640 if p.wait(): return
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	641 fp = os.fdopen(fd, 'r')
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	642 stat = []
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	643 for line in fp: stat.append(line.lstrip())
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	644 last = stat.pop()
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	645 stat.insert(0, last)
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	646 stat = ''.join(stat)
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	647 if stat.startswith('0 files'): raise ValueError
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	648 return stat
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	649 except: raise
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	650 finally:
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	651 try: os.unlink(name)
f422c8265ae5 Add support for diffstat in commit emails, and move diffstat from Matt Doar <matt@xensource.com> parents: 3063 diff changeset	652 except: pass

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/patch.py @ 4125:ef7c39ae5d4c