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

equal deleted inserted replaced

-:b4eaa68dea1b
+:dccb83241dd0
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 from i18n import _
 from node import *
-import base85, cmdutil, mdiff, util
+import base85, cmdutil, mdiff, util, context, revlog
 import cStringIO, email.Parser, os, popen2, re, sha
 import sys, tempfile, zlib
 # helper functions
 fp = repo.ui
 if not node1:
 node1 = repo.dirstate.parents()[0]
-clcache = {}
+ccache = {}
-def getchangelog(n):
+def getctx(r):
-if n not in clcache:
+if r not in ccache:
-clcache[n] = repo.changelog.read(n)
+ccache[r] = context.changectx(repo, r)
-return clcache[n]
+return ccache[r]
-mcache = {}
-def getmanifest(n):
+flcache = {}
-if n not in mcache:
+def getfilectx(f, ctx):
-mcache[n] = repo.manifest.read(n)
+flctx = ctx.filectx(f, filelog=flcache.get(f))
-return mcache[n]
+if f not in flcache:
-fcache = {}
+flcache[f] = flctx._filelog
-def getfile(f):
+return flctx
-if f not in fcache:
-fcache[f] = repo.file(f)
-return fcache[f]
 # reading the data for node1 early allows it to play nicely
 # with repo.status and the revlog cache.
-change = getchangelog(node1)
+ctx1 = context.changectx(repo, node1)
-mmap = getmanifest(change[0])
+# force manifest reading
-date1 = util.datestr(change[2])
+man1 = ctx1.manifest()
+date1 = util.datestr(ctx1.date())
 if not changes:
 changes = repo.status(node1, node2, files, match=match)[:5]
 modified, added, removed, deleted, unknown = changes
 if files:
 modified, added, removed = map(filterfiles, (modified, added, removed))
 if not modified and not added and not removed:
 return
-# returns False if there was no rename between n1 and n2
+if node2:
-# returns None if the file was created between n1 and n2
+ctx2 = context.changectx(repo, node2)
-# returns the (file, node) present in n1 that was renamed to f in n2
+else:
-def renamedbetween(f, n1, n2):
+ctx2 = context.workingctx(repo)
-r1, r2 = map(repo.changelog.rev, (n1, n2))
+man2 = ctx2.manifest()
+# returns False if there was no rename between ctx1 and ctx2
+# returns None if the file was created between ctx1 and ctx2
+# returns the (file, node) present in ctx1 that was renamed to f in ctx2
+def renamed(f):
+startrev = ctx1.rev()
+c = ctx2
+crev = c.rev()
+if crev is None:
+crev = repo.changelog.count()
 orig = f
-src = None
+while crev > startrev:
-while r2 > r1:
+if f in c.files():
-cl = getchangelog(n2)
-if f in cl[3]:
-m = getmanifest(cl[0])
 try:
-src = getfile(f).renamed(m[f])
+src = getfilectx(f, c).renamed()
-except KeyError:
+except revlog.LookupError:
 return None
 if src:
 f = src[0]
-n2 = repo.changelog.parents(n2)[0]
+crev = c.parents()[0].rev()
-r2 = repo.changelog.rev(n2)
+# try to reuse
-cl = getchangelog(n1)
+c = getctx(crev)
-m = getmanifest(cl[0])
+if f not in man1:
-if f not in m:
 return None
 if f == orig:
 return False
-return f, m[f]
+return f
-if node2:
-change = getchangelog(node2)
-mmap2 = getmanifest(change[0])
-_date2 = util.datestr(change[2])
-def date2(f):
-return _date2
-def read(f):
-return getfile(f).read(mmap2[f])
-def renamed(f):
-return renamedbetween(f, node1, node2)
-else:
-tz = util.makedate()[1]
-_date2 = util.datestr()
-def date2(f):
-try:
-return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz))
-except OSError, err:
-if err.errno != errno.ENOENT: raise
-return _date2
-def read(f):
-return repo.wread(f)
-def renamed(f):
-src = repo.dirstate.copied(f)
-parent = repo.dirstate.parents()[0]
-if src:
-f = src
-of = renamedbetween(f, node1, parent)
-if of or of is None:
-return of
-elif src:
-cl = getchangelog(parent)[0]
-return (src, getmanifest(cl)[src])
-else:
-return None
 if repo.ui.quiet:
 r = None
 else:
 hexfunc = repo.ui.debugflag and hex or short
 copied = {}
 for f in added:
 src = renamed(f)
 if src:
 copied[f] = src
-srcs = [x[1][0] for x in copied.items()]
+srcs = [x[1] for x in copied.items()]
 all = modified + added + removed
 all.sort()
 gone = {}
 for f in all:
 to = None
 tn = None
 dodiff = True
 header = []
-if f in mmap:
+if f in man1:
-to = getfile(f).read(mmap[f])
+to = getfilectx(f, ctx1).data()
 if f not in removed:
-tn = read(f)
+tn = getfilectx(f, ctx2).data()
 if opts.git:
 def gitmode(x):
 return x and '100755' or '100644'
 def addmodehdr(header, omode, nmode):
 if omode != nmode:
 header.append('old mode %s\n' % omode)
 header.append('new mode %s\n' % nmode)
 a, b = f, f
 if f in added:
-if node2:
+mode = gitmode(man2.execf(f))
-mode = gitmode(mmap2.execf(f))
-else:
-mode = gitmode(util.is_exec(repo.wjoin(f), None))
 if f in copied:
-a, arev = copied[f]
+a = copied[f]
-omode = gitmode(mmap.execf(a))
+omode = gitmode(man1.execf(a))
 addmodehdr(header, omode, mode)
 if a in removed and a not in gone:
 op = 'rename'
 gone[a] = 1
 else:
 op = 'copy'
 header.append('%s from %s\n' % (op, a))
 header.append('%s to %s\n' % (op, f))
-to = getfile(a).read(arev)
+to = getfilectx(a, ctx1).data()
 else:
 header.append('new file mode %s\n' % mode)
 if util.binary(tn):
 dodiff = 'binary'
 elif f in removed:
 if f in srcs:
 dodiff = False
 else:
-mode = gitmode(mmap.execf(f))
+mode = gitmode(man1.execf(f))
 header.append('deleted file mode %s\n' % mode)
 else:
-omode = gitmode(mmap.execf(f))
+omode = gitmode(man1.execf(f))
-if node2:
+nmode = gitmode(man2.execf(f))
-nmode = gitmode(mmap2.execf(f))
-else:
-nmode = gitmode(util.is_exec(repo.wjoin(f), mmap.execf(f)))
 addmodehdr(header, omode, nmode)
 if util.binary(to) or util.binary(tn):
 dodiff = 'binary'
 r = None
 header.insert(0, 'diff --git a/%s b/%s\n' % (a, b))
 if dodiff == 'binary':
 fp.write(''.join(header))
 b85diff(fp, to, tn)
 elif dodiff:
-text = mdiff.unidiff(to, date1, tn, date2(f), f, r, opts=opts)
+text = mdiff.unidiff(to, date1,
+# ctx2 date may be dynamic
+tn, util.datestr(ctx2.date()),
+f, r, opts=opts)
 if text or len(header) > 1:
 fp.write(''.join(header))
 fp.write(text)
 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,

changeset 3967	dccb83241dd0
parent 3963	ba45041827a2
child 3970	fff8a5345eb0