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

annotate mercurial/merge.py @ 5390:36c46e20976a

merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.

author	Patrick Mezard <pmezard@gmail.com>
date	Wed, 03 Oct 2007 23:09:36 +0200
parents	17ed9b9a0d03
children	77cafe8f89e0

rev	line source
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # merge.py - directory-level update/merge handling for Mercurial
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	5 # This software may be used and distributed according to the terms
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	7
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	8 from node import *
3893 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3886 diff changeset	9 from i18n import _
5149 ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	10 import errno, util, os, tempfile, context, heapq
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	11
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	12 def filemerge(repo, fw, fd, fo, wctx, mctx):
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	13 """perform a 3-way merge in the working directory
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	14
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	15 fw = original filename in the working directory
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	16 fd = destination filename in the working directory
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	17 fo = filename in other parent
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	18 wctx, mctx = working and merge changecontexts
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	19 """
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	20
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	21 def temp(prefix, ctx):
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	22 pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	23 (fd, name) = tempfile.mkstemp(prefix=pre)
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 3893 diff changeset	24 data = repo.wwritedata(ctx.path(), ctx.data())
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	25 f = os.fdopen(fd, "wb")
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 3893 diff changeset	26 f.write(data)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	27 f.close()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	28 return name
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	29
3305 e7abcf3a7c5f filemerge: use contexts rather than my and other Matt Mackall <mpm@selenic.com> parents: 3303 diff changeset	30 fcm = wctx.filectx(fw)
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	31 fcmdata = wctx.filectx(fd).data()
3305 e7abcf3a7c5f filemerge: use contexts rather than my and other Matt Mackall <mpm@selenic.com> parents: 3303 diff changeset	32 fco = mctx.filectx(fo)
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	33
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	34 if not fco.cmp(fcmdata): # files identical?
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	35 return None
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	36
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	37 fca = fcm.ancestor(fco)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	38 if not fca:
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3442 diff changeset	39 fca = repo.filectx(fw, fileid=nullrev)
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	40 a = repo.wjoin(fd)
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	41 b = temp("base", fca)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	42 c = temp("other", fco)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	43
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	44 if fw != fo:
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	45 repo.ui.status(_("merging %s and %s\n") % (fw, fo))
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	46 else:
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	47 repo.ui.status(_("merging %s\n") % fw)
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	48
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	49 repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcm, fco, fca))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	50
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	51 cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	52 or "hgmerge")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	53 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	54 environ={'HG_FILE': fd,
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	55 'HG_MY_NODE': str(wctx.parents()[0]),
5390 36c46e20976a merge: provide _ISLINK environment vars to merge helper Patrick Mezard <pmezard@gmail.com>* parents: 5371 diff changeset	56 'HG_OTHER_NODE': str(mctx),
36c46e20976a merge: provide _ISLINK environment vars to merge helper Patrick Mezard <pmezard@gmail.com>* parents: 5371 diff changeset	57 'HG_MY_ISLINK': fcm.islink(),
36c46e20976a merge: provide _ISLINK environment vars to merge helper Patrick Mezard <pmezard@gmail.com>* parents: 5371 diff changeset	58 'HG_OTHER_ISLINK': fco.islink(),
36c46e20976a merge: provide _ISLINK environment vars to merge helper Patrick Mezard <pmezard@gmail.com>* parents: 5371 diff changeset	59 'HG_BASE_ISLINK': fca.islink(),})
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	60 if r:
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	61 repo.ui.warn(_("merging %s failed!\n") % fd)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	62
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	63 os.unlink(b)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	64 os.unlink(c)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	65 return r
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	66
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	67 def checkunknown(wctx, mctx):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	68 "check for collisions between unknown files and files in mctx"
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	69 man = mctx.manifest()
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	70 for f in wctx.unknown():
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	71 if f in man:
c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	72 if mctx.filectx(f).cmp(wctx.filectx(f).data()):
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4603 diff changeset	73 raise util.Abort(_("untracked local file '%s' differs"
3620 3109f012c305 Clarify untracked file merge message Matt Mackall <mpm@selenic.com> parents: 3593 diff changeset	74 " from remote version") % f)
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	75
3786 6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	76 def checkcollision(mctx):
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	77 "check for case folding collisions in the destination context"
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	78 folded = {}
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	79 for fn in mctx.manifest():
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	80 fold = fn.lower()
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	81 if fold in folded:
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	82 raise util.Abort(_("case-folding collision between %s and %s")
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	83 % (fn, folded[fold]))
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	84 folded[fold] = fn
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	85
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	86 def forgetremoved(wctx, mctx):
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	87 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	88 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	89
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	90 If we're jumping between revisions (as opposed to merging), and if
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	91 neither the working directory nor the target rev has the file,
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	92 then we need to remove it from the dirstate, to prevent the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	93 dirstate from listing the file when it is no longer in the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	94 manifest.
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	95 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	96
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	97 action = []
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	98 man = mctx.manifest()
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	99 for f in wctx.deleted() + wctx.removed():
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	100 if f not in man:
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	101 action.append((f, "f"))
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	102
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	103 return action
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	104
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	105 def findcopies(repo, m1, m2, ma, limit):
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	106 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	107 Find moves and copies between m1 and m2 back to limit linkrev
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	108 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	109
4401 84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	110 def nonoverlap(d1, d2, d3):
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	111 "Return list of elements in d1 not in d2 or d3"
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	112 l = [d for d in d1 if d not in d3 and d not in d2]
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	113 l.sort()
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	114 return l
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	115
4398 9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	116 def dirname(f):
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	117 s = f.rfind("/")
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	118 if s == -1:
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	119 return ""
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	120 return f[:s]
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	121
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	122 def dirs(files):
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	123 d = {}
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	124 for f in files:
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	125 f = dirname(f)
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	126 while f not in d:
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	127 d[f] = True
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	128 f = dirname(f)
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	129 return d
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	130
4416 bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	131 wctx = repo.workingctx()
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	132
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	133 def makectx(f, n):
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	134 if len(n) == 20:
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	135 return repo.filectx(f, fileid=n)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	136 return wctx.filectx(f)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	137 ctx = util.cachefunc(makectx)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	138
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	139 def findold(fctx):
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	140 "find files that path was copied from, back to linkrev limit"
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	141 old = {}
4354 8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	142 seen = {}
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	143 orig = fctx.path()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	144 visit = [fctx]
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	145 while visit:
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	146 fc = visit.pop()
4354 8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	147 s = str(fc)
8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	148 if s in seen:
8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	149 continue
8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	150 seen[s] = 1
3881 c0a12e6441a5 Fix copy detection corner case Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	151 if fc.path() != orig and fc.path() not in old:
c0a12e6441a5 Fix copy detection corner case Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	152 old[fc.path()] = 1
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	153 if fc.rev() < limit:
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	154 continue
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	155 visit += fc.parents()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	156
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	157 old = old.keys()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	158 old.sort()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	159 return old
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	160
4401 84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	161 copy = {}
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	162 fullcopy = {}
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	163 diverge = {}
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	164
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	165 def checkcopies(c, man, aman):
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	166 '''check possible copies for filectx c'''
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	167 for of in findold(c):
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	168 fullcopy[c.path()] = of # remember for dir rename detection
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	169 if of not in man: # original file not in other manifest?
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	170 if of in ma:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	171 diverge.setdefault(of, []).append(c.path())
4311 4787e2b0dd03 merge: fix a bug where copies were ignored Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	172 continue
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	173 # if the original file is unchanged on the other branch,
931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	174 # no merge needed
931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	175 if man[of] == aman.get(of):
931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	176 continue
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	177 c2 = ctx(of, man[of])
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	178 ca = c.ancestor(c2)
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	179 if not ca: # unrelated?
4311 4787e2b0dd03 merge: fix a bug where copies were ignored Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	180 continue
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	181 # named changed on only one side?
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	182 if ca.path() == c.path() or ca.path() == c2.path():
4416 bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	183 if c == ca or c2 == ca: # no merge needed, ignore copy
4311 4787e2b0dd03 merge: fix a bug where copies were ignored Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	184 continue
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	185 copy[c.path()] = of
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	186
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	187 if not repo.ui.configbool("merge", "followcopies", True):
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	188 return {}, {}
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	189
3161 1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	190 # avoid silly behavior for update from empty dir
3731 b4af5f92e04b merge: move check for empty ancestor into findcopies Matt Mackall <mpm@selenic.com> parents: 3730 diff changeset	191 if not m1 or not m2 or not ma:
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	192 return {}, {}
3161 1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	193
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	194 repo.ui.debug(_(" searching for copies back to rev %d\n") % limit)
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	195
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	196 u1 = nonoverlap(m1, m2, ma)
8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	197 u2 = nonoverlap(m2, m1, ma)
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	198
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	199 if u1:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	200 repo.ui.debug(_(" unmatched files in local:\n %s\n")
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	201 % "\n ".join(u1))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	202 if u2:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	203 repo.ui.debug(_(" unmatched files in other:\n %s\n")
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	204 % "\n ".join(u2))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	205
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	206 for f in u1:
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	207 checkcopies(ctx(f, m1[f]), m2, ma)
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	208
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	209 for f in u2:
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	210 checkcopies(ctx(f, m2[f]), m1, ma)
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	211
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	212 d2 = {}
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	213 for of, fl in diverge.items():
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	214 for f in fl:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	215 fo = list(fl)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	216 fo.remove(f)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	217 d2[f] = (of, fo)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	218
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	219 if fullcopy:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	220 repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n"))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	221 for f in fullcopy:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	222 note = ""
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	223 if f in copy: note += "*"
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	224 if f in diverge: note += "!"
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	225 repo.ui.debug(_(" %s -> %s %s\n") % (f, fullcopy[f], note))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	226
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	227 if not fullcopy or not repo.ui.configbool("merge", "followdirs", True):
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	228 return copy, diverge
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	229
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	230 repo.ui.debug(_(" checking for directory renames\n"))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	231
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	232 # generate a directory move map
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	233 d1, d2 = dirs(m1), dirs(m2)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	234 invalid = {}
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	235 dirmove = {}
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	236
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	237 # examine each file copy for a potential directory move, which is
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	238 # when all the files in a directory are moved to a new directory
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	239 for dst, src in fullcopy.items():
4398 9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	240 dsrc, ddst = dirname(src), dirname(dst)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	241 if dsrc in invalid:
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	242 # already seen to be uninteresting
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	243 continue
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	244 elif dsrc in d1 and ddst in d1:
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	245 # directory wasn't entirely moved locally
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	246 invalid[dsrc] = True
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	247 elif dsrc in d2 and ddst in d2:
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	248 # directory wasn't entirely moved remotely
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	249 invalid[dsrc] = True
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	250 elif dsrc in dirmove and dirmove[dsrc] != ddst:
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	251 # files from the same directory moved to two different places
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	252 invalid[dsrc] = True
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	253 else:
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	254 # looks good so far
4117 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	255 dirmove[dsrc + "/"] = ddst + "/"
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	256
4399 3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	257 for i in invalid:
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	258 if i in dirmove:
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	259 del dirmove[i]
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	260
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	261 del d1, d2, invalid
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	262
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	263 if not dirmove:
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	264 return copy, diverge
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	265
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	266 for d in dirmove:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	267 repo.ui.debug(_(" dir %s -> %s\n") % (d, dirmove[d]))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	268
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	269 # check unaccounted nonoverlapping files against directory moves
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	270 for f in u1 + u2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	271 if f not in fullcopy:
4117 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	272 for d in dirmove:
c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	273 if f.startswith(d):
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	274 # new file added in a directory that was moved, move it
4117 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	275 copy[f] = dirmove[d] + f[len(d):]
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	276 repo.ui.debug(_(" file %s -> %s\n") % (f, copy[f]))
4117 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	277 break
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	278
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	279 return copy, diverge
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	280
5149 ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	281 def symmetricdifference(repo, rev1, rev2):
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	282 """symmetric difference of the sets of ancestors of rev1 and rev2
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	283
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	284 I.e. revisions that are ancestors of rev1 or rev2, but not both.
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	285 """
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	286 # basic idea:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	287 # - mark rev1 and rev2 with different colors
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	288 # - walk the graph in topological order with the help of a heap;
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	289 # for each revision r:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	290 # - if r has only one color, we want to return it
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	291 # - add colors[r] to its parents
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	292 #
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	293 # We keep track of the number of revisions in the heap that
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	294 # we may be interested in. We stop walking the graph as soon
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	295 # as this number reaches 0.
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	296 WHITE = 1
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	297 BLACK = 2
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	298 ALLCOLORS = WHITE \| BLACK
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	299 colors = {rev1: WHITE, rev2: BLACK}
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	300
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	301 cl = repo.changelog
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	302
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	303 visit = [-rev1, -rev2]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	304 heapq.heapify(visit)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	305 n_wanted = len(visit)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	306 ret = []
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	307
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	308 while n_wanted:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	309 r = -heapq.heappop(visit)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	310 wanted = colors[r] != ALLCOLORS
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	311 n_wanted -= wanted
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	312 if wanted:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	313 ret.append(r)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	314
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	315 for p in cl.parentrevs(r):
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	316 if p == nullrev:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	317 continue
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	318 if p not in colors:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	319 # first time we see p; add it to visit
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	320 n_wanted += wanted
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	321 colors[p] = colors[r]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	322 heapq.heappush(visit, -p)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	323 elif colors[p] != ALLCOLORS and colors[p] != colors[r]:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	324 # at first we thought we wanted p, but now
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	325 # we know we don't really want it
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	326 n_wanted -= 1
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	327 colors[p] \|= colors[r]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	328
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	329 del colors[r]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	330
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	331 return ret
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	332
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	333 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	334 """
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	335 Merge p1 and p2 with ancestor ma and generate merge action list
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	336
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	337 overwrite = whether we clobber working files
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	338 partial = function to filter file lists
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	339 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	340
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	341 repo.ui.note(_("resolving manifests\n"))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	342 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	343 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	344
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	345 m1 = p1.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	346 m2 = p2.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	347 ma = pa.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	348 backwards = (pa == p2)
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	349 action = []
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	350 copy = {}
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	351 diverge = {}
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	352
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	353 def fmerge(f, f2=None, fa=None):
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	354 """merge flags"""
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	355 if not f2:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	356 f2 = f
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	357 fa = f
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	358 a, b, c = ma.execf(fa), m1.execf(f), m2.execf(f2)
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	359 if ((a^b) \| (a^c)) ^ a:
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	360 return 'x'
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	361 a, b, c = ma.linkf(fa), m1.linkf(f), m2.linkf(f2)
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	362 if ((a^b) \| (a^c)) ^ a:
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	363 return 'l'
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	364 return ''
3119 5644a05a608c merge: simplify exec flag handling Matt Mackall <mpm@selenic.com> parents: 3118 diff changeset	365
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	366 def act(msg, m, f, *args):
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	367 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
3122 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	368 action.append((f, m) + args)
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	369
3731 b4af5f92e04b merge: move check for empty ancestor into findcopies Matt Mackall <mpm@selenic.com> parents: 3730 diff changeset	370 if not (backwards or overwrite):
5149 ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	371 rev1 = p1.rev()
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	372 if rev1 is None:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	373 # p1 is a workingctx
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	374 rev1 = p1.parents()[0].rev()
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	375 limit = min(symmetricdifference(repo, rev1, p2.rev()))
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	376 copy, diverge = findcopies(repo, m1, m2, ma, limit)
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	377
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	378 for of, fl in diverge.items():
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	379 act("divergent renames", "dr", of, fl)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	380
3730 d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	381 copied = dict.fromkeys(copy.values())
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	382
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	383 # Compare manifests
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	384 for f, n in m1.iteritems():
3254 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	385 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	386 continue
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	387 if f in m2:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	388 # are files different?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	389 if n != m2[f]:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	390 a = ma.get(f, nullid)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	391 # are both different from the ancestor?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	392 if not overwrite and n != a and m2[f] != a:
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	393 act("versions differ", "m", f, f, f, fmerge(f), False)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	394 # are we clobbering?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	395 # is remote's version newer?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	396 # or are we going back in time and clean?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	397 elif overwrite or m2[f] != a or (backwards and not n[20:]):
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	398 act("remote is newer", "g", f, m2.flags(f))
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	399 # local is newer, not overwrite, check mode bits
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	400 elif fmerge(f) != m1.flags(f):
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	401 act("update permissions", "e", f, m2.flags(f))
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	402 # contents same, check mode bits
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	403 elif m1.flags(f) != m2.flags(f):
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	404 if overwrite or fmerge(f) != m1.flags(f):
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	405 act("update permissions", "e", f, m2.flags(f))
3730 d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	406 elif f in copied:
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	407 continue
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	408 elif f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	409 f2 = copy[f]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	410 if f2 not in m2: # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	411 act("remote renamed directory to " + f2, "d",
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	412 f, None, f2, m1.flags(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	413 elif f2 in m1: # case 2 A,B/B/B
3730 d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	414 act("local copied to " + f2, "m",
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	415 f, f2, f, fmerge(f, f2, f2), False)
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	416 else: # case 4,21 A/B/B
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	417 act("local moved to " + f2, "m",
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	418 f, f2, f, fmerge(f, f2, f2), False)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	419 elif f in ma:
3118 7a635ef25132 merge: simplify tests for local changed/remote deleted Matt Mackall <mpm@selenic.com> parents: 3117 diff changeset	420 if n != ma[f] and not overwrite:
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	421 if repo.ui.prompt(
3118 7a635ef25132 merge: simplify tests for local changed/remote deleted Matt Mackall <mpm@selenic.com> parents: 3117 diff changeset	422 (_(" local changed %s which remote deleted\n") % f) +
3120 b1de36a4b4df merge: simplify prompt code Matt Mackall <mpm@selenic.com> parents: 3119 diff changeset	423 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	424 act("prompt delete", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	425 else:
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	426 act("other deleted", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	427 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	428 # file is created on branch or in working directory
3121 1c1e59aac82a merge: simplify local created logic Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	429 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	430 act("remote deleted", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	431
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	432 for f, n in m2.iteritems():
3254 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	433 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	434 continue
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	435 if f in m1:
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	436 continue
3729 581d20773326 merge: add copied hash to simplify copy logic Matt Mackall <mpm@selenic.com> parents: 3728 diff changeset	437 if f in copied:
581d20773326 merge: add copied hash to simplify copy logic Matt Mackall <mpm@selenic.com> parents: 3728 diff changeset	438 continue
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	439 if f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	440 f2 = copy[f]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	441 if f2 not in m1: # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	442 act("local renamed directory to " + f2, "d",
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	443 None, f, f2, m2.flags(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	444 elif f2 in m2: # rename case 1, A/A,B/A
3730 d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	445 act("remote copied to " + f, "m",
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	446 f2, f, f, fmerge(f2, f, f2), False)
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	447 else: # case 3,20 A/B/A
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	448 act("remote moved to " + f, "m",
d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	449 f2, f, f, fmerge(f2, f, f2), True)
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	450 elif f in ma:
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	451 if overwrite or backwards:
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	452 act("recreating", "g", f, m2.flags(f))
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	453 elif n != ma[f]:
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	454 if repo.ui.prompt(
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	455 (_("remote changed %s which local deleted\n") % f) +
3120 b1de36a4b4df merge: simplify prompt code Matt Mackall <mpm@selenic.com> parents: 3119 diff changeset	456 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	457 act("prompt recreating", "g", f, m2.flags(f))
3116 bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	458 else:
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	459 act("remote created", "g", f, m2.flags(f))
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	460
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	461 return action
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	462
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	463 def applyupdates(repo, action, wctx, mctx):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	464 "apply the merge action list to the working directory"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	465
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	466 updated, merged, removed, unresolved = 0, 0, 0, 0
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	467 action.sort()
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	468 # prescan for copy/renames
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	469 for a in action:
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	470 f, m = a[:2]
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	471 if m == 'm': # merge
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	472 f2, fd, flags, move = a[2:]
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	473 if f != fd:
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	474 repo.ui.debug(_("copying %s to %s\n") % (f, fd))
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	475 repo.wwrite(fd, repo.wread(f), flags)
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	476
5141 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5060 diff changeset	477 audit_path = util.path_auditor(repo.root)
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5060 diff changeset	478
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	479 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	480 f, m = a[:2]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	481 if f and f[0] == "/":
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	482 continue
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	483 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	484 repo.ui.note(_("removing %s\n") % f)
5141 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5060 diff changeset	485 audit_path(f)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	486 try:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	487 util.unlink(repo.wjoin(f))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	488 except OSError, inst:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	489 if inst.errno != errno.ENOENT:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	490 repo.ui.warn(_("update failed to remove %s: %s!\n") %
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	491 (f, inst.strerror))
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3620 diff changeset	492 removed += 1
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	493 elif m == "m": # merge
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	494 f2, fd, flags, move = a[2:]
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	495 r = filemerge(repo, f, fd, f2, wctx, mctx)
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	496 if r > 0:
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	497 unresolved += 1
3315 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	498 else:
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	499 if r is None:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	500 updated += 1
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	501 else:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	502 merged += 1
5059 8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636 Matt Mackall <mpm@selenic.com> parents: 5045 diff changeset	503 util.set_exec(repo.wjoin(fd), "x" in flags)
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636 Matt Mackall <mpm@selenic.com> parents: 5045 diff changeset	504 if f != fd and move and util.lexists(repo.wjoin(f)):
5045 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	505 repo.ui.debug(_("removing %s\n") % f)
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4999 diff changeset	506 os.unlink(repo.wjoin(f))
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	507 elif m == "g": # get
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	508 flags = a[2]
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	509 repo.ui.note(_("getting %s\n") % f)
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	510 t = mctx.filectx(f).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	511 repo.wwrite(f, t, flags)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	512 updated += 1
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	513 elif m == "d": # directory rename
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	514 f2, fd, flags = a[2:]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	515 if f:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	516 repo.ui.note(_("moving %s to %s\n") % (f, fd))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	517 t = wctx.filectx(f).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	518 repo.wwrite(fd, t, flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	519 util.unlink(repo.wjoin(f))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	520 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	521 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	522 t = mctx.filectx(f2).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	523 repo.wwrite(fd, t, flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	524 updated += 1
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	525 elif m == "dr": # divergent renames
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	526 fl = a[2]
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	527 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	528 for nf in fl:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	529 repo.ui.warn(" %s\n" % nf)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	530 elif m == "e": # exec
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	531 flags = a[2]
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	532 util.set_exec(repo.wjoin(f), flags)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	533
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	534 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	535
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	536 def recordupdates(repo, action, branchmerge):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	537 "record merge actions to the dirstate"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	538
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	539 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	540 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	541 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	542 if branchmerge:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	543 repo.dirstate.remove(f)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	544 else:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	545 repo.dirstate.forget(f)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	546 elif m == "f": # forget
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	547 repo.dirstate.forget(f)
4999 60c54154ec4c merge: don't forget to update the dirstate for exec bit changes Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	548 elif m in "ge": # get or exec change
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	549 if branchmerge:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	550 repo.dirstate.normaldirty(f)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	551 else:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	552 repo.dirstate.normal(f)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	553 elif m == "m": # merge
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	554 f2, fd, flag, move = a[2:]
3257 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	555 if branchmerge:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	556 # We've done a branch merge, mark this file as merged
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	557 # so that we properly record the merger later
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	558 repo.dirstate.merge(fd)
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	559 if f != f2: # copy/rename
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	560 if move:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	561 repo.dirstate.remove(f)
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	562 if f != fd:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	563 repo.dirstate.copy(f, fd)
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	564 else:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	565 repo.dirstate.copy(f2, fd)
3257 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	566 else:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	567 # We've update-merged a locally modified file, so
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	568 # we set the dirstate to emulate a normal checkout
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	569 # of that file some time in the past. Thus our
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	570 # merge will appear as a normal local file
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	571 # modification.
5210 90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5150 diff changeset	572 repo.dirstate.normallookup(fd)
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	573 if move:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	574 repo.dirstate.forget(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	575 elif m == "d": # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	576 f2, fd, flag = a[2:]
4820 9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4815 diff changeset	577 if not f2 and f not in repo.dirstate:
9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4815 diff changeset	578 # untracked file moved
9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4815 diff changeset	579 continue
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	580 if branchmerge:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	581 repo.dirstate.add(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	582 if f:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	583 repo.dirstate.remove(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	584 repo.dirstate.copy(f, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	585 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	586 repo.dirstate.copy(f2, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	587 else:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	588 repo.dirstate.normal(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	589 if f:
4948 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4890 diff changeset	590 repo.dirstate.forget(f)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	591
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	592 def update(repo, node, branchmerge, force, partial):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	593 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	594 Perform a merge between the working directory and the given node
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	595
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	596 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	597 force = whether to force branch merging or file overwriting
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	598 partial = a function to filter file lists (dirstate not updated)
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	599 """
2829 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	600
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	601 wlock = repo.wlock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	602 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	603 wc = repo.workingctx()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	604 if node is None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	605 # tip of current branch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	606 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	607 node = repo.branchtags()[wc.branch()]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	608 except KeyError:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	609 raise util.Abort(_("branch %s not found") % wc.branch())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	610 overwrite = force and not branchmerge
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	611 forcemerge = force and branchmerge
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	612 pl = wc.parents()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	613 p1, p2 = pl[0], repo.changectx(node)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	614 pa = p1.ancestor(p2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	615 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	616 fastforward = False
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	617
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	618 ### check phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	619 if not overwrite and len(pl) > 1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	620 raise util.Abort(_("outstanding uncommitted merges"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	621 if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	622 if branchmerge:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	623 if p1.branch() != p2.branch() and pa != p2:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	624 fastforward = True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	625 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	626 raise util.Abort(_("there is nothing to merge, just use "
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	627 "'hg update' or look at 'hg heads'"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	628 elif not (overwrite or branchmerge):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	629 raise util.Abort(_("update spans branches, use 'hg merge' "
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	630 "or 'hg update -C' to lose changes"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	631 if branchmerge and not forcemerge:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	632 if wc.files():
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	633 raise util.Abort(_("outstanding uncommitted changes"))
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	634
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	635 ### calculate phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	636 action = []
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	637 if not force:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	638 checkunknown(wc, p2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	639 if not util.checkfolding(repo.path):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	640 checkcollision(p2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	641 if not branchmerge:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	642 action += forgetremoved(wc, p2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	643 action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	644
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	645 ### apply phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	646 if not branchmerge: # just jump to the new rev
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	647 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	648 if not partial:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	649 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	650
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	651 stats = applyupdates(repo, action, wc, p2)
2919 8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2918 diff changeset	652
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	653 if not partial:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	654 recordupdates(repo, action, branchmerge)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	655 repo.dirstate.setparents(fp1, fp2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	656 if not branchmerge and not fastforward:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	657 repo.dirstate.setbranch(p2.branch())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	658 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	659
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	660 return stats
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	661 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	662 del wlock

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/merge.py @ 5390:36c46e20976a