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

annotate mercurial/merge.py @ 4890:931f901ab811

merge: fix unnecessary rename merges on linear update (issue631) If one side's revision is identical to the ancestor, we skip the rest of the copy detection logic.

author	Matt Mackall <mpm@selenic.com>
date	Sun, 15 Jul 2007 14:43:38 -0500
parents	9797124581c9
children	6fd953d5faea 60c54154ec4c

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 _
4417 0912d8df5e19 Merge with stable Matt Mackall <mpm@selenic.com> parents: 4410 4416 diff changeset	10 import errno, util, os, tempfile, context
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	11
3315 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	12 def filemerge(repo, fw, 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
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	15 fw = filename in the working directory
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	16 fo = filename in other parent
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	17 wctx, mctx = working and merge changecontexts
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	18 """
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 def temp(prefix, ctx):
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	21 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	22 (fd, name) = tempfile.mkstemp(prefix=pre)
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 3893 diff changeset	23 data = repo.wwritedata(ctx.path(), ctx.data())
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	24 f = os.fdopen(fd, "wb")
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 3893 diff changeset	25 f.write(data)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	26 f.close()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	27 return name
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	28
3305 e7abcf3a7c5f filemerge: use contexts rather than my and other Matt Mackall <mpm@selenic.com> parents: 3303 diff changeset	29 fcm = wctx.filectx(fw)
e7abcf3a7c5f filemerge: use contexts rather than my and other Matt Mackall <mpm@selenic.com> parents: 3303 diff changeset	30 fco = mctx.filectx(fo)
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	31
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	32 if not fco.cmp(fcm.data()): # files identical?
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	33 return None
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	34
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	35 fca = fcm.ancestor(fco)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	36 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	37 fca = repo.filectx(fw, fileid=nullrev)
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	38 a = repo.wjoin(fw)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	39 b = temp("base", fca)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	40 c = temp("other", fco)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	41
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	42 if fw != fo:
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	43 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	44 else:
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	45 repo.ui.status(_("merging %s\n") % fw)
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	46
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	47 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	48
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	49 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	50 or "hgmerge")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	51 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	52 environ={'HG_FILE': fw,
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	53 'HG_MY_NODE': str(wctx.parents()[0]),
69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	54 'HG_OTHER_NODE': str(mctx)})
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	55 if r:
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	56 repo.ui.warn(_("merging %s failed!\n") % fw)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	57
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	58 os.unlink(b)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	59 os.unlink(c)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	60 return r
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	61
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	62 def checkunknown(wctx, mctx):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	63 "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	64 man = mctx.manifest()
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	65 for f in wctx.unknown():
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	66 if f in man:
c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	67 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	68 raise util.Abort(_("untracked local file '%s' differs"
3620 3109f012c305 Clarify untracked file merge message Matt Mackall <mpm@selenic.com> parents: 3593 diff changeset	69 " from remote version") % f)
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	70
3786 6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	71 def checkcollision(mctx):
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	72 "check for case folding collisions in the destination context"
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	73 folded = {}
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	74 for fn in mctx.manifest():
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	75 fold = fn.lower()
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	76 if fold in folded:
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	77 raise util.Abort(_("case-folding collision between %s and %s")
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	78 % (fn, folded[fold]))
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	79 folded[fold] = fn
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	80
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	81 def forgetremoved(wctx, mctx):
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	82 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	83 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	84
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	85 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	86 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	87 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	88 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	89 manifest.
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	90 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	91
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	92 action = []
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	93 man = mctx.manifest()
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	94 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	95 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	96 action.append((f, "f"))
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	97
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	98 return action
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	99
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	100 def findcopies(repo, m1, m2, ma, limit):
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	101 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	102 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	103 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	104
4401 84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	105 def nonoverlap(d1, d2, d3):
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	106 "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	107 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	108 l.sort()
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	109 return l
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	110
4398 9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	111 def dirname(f):
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	112 s = f.rfind("/")
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	113 if s == -1:
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	114 return ""
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	115 return f[:s]
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	116
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	117 def dirs(files):
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	118 d = {}
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	119 for f in files:
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	120 f = dirname(f)
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	121 while f not in d:
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	122 d[f] = True
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	123 f = dirname(f)
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	124 return d
9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	125
4416 bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	126 wctx = repo.workingctx()
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	127
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	128 def makectx(f, n):
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	129 if len(n) == 20:
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	130 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	131 return wctx.filectx(f)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	132 ctx = util.cachefunc(makectx)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4401 diff changeset	133
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	134 def findold(fctx):
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	135 "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	136 old = {}
4354 8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	137 seen = {}
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	138 orig = fctx.path()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	139 visit = [fctx]
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	140 while visit:
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	141 fc = visit.pop()
4354 8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	142 s = str(fc)
8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	143 if s in seen:
8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	144 continue
8aee687f0214 merge: fix quadratic behavior in find-copies Matt Mackall <mpm@selenic.com> parents: 4311 diff changeset	145 seen[s] = 1
3881 c0a12e6441a5 Fix copy detection corner case Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	146 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	147 old[fc.path()] = 1
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	148 if fc.rev() < limit:
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	149 continue
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	150 visit += fc.parents()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	151
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	152 old = old.keys()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	153 old.sort()
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	154 return old
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	155
4401 84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	156 copy = {}
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	157 fullcopy = {}
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	158 diverge = {}
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	159
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	160 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	161 '''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	162 for of in findold(c):
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	163 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	164 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	165 if of in ma:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	166 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	167 continue
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	168 # 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	169 # no merge needed
931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	170 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	171 continue
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	172 c2 = ctx(of, man[of])
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	173 ca = c.ancestor(c2)
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	174 if not ca: # unrelated?
4311 4787e2b0dd03 merge: fix a bug where copies were ignored Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	175 continue
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	176 # 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	177 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	178 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	179 continue
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	180 copy[c.path()] = of
ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	181
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	182 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	183 return {}, {}
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	184
3161 1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	185 # 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	186 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	187 return {}, {}
3161 1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	188
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	189 u1 = nonoverlap(m1, m2, ma)
8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	190 u2 = nonoverlap(m2, m1, ma)
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	191
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	192 for f in u1:
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	193 checkcopies(ctx(f, m1[f]), m2, ma)
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	194
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	195 for f in u2:
4890 931f901ab811 merge: fix unnecessary rename merges on linear update (issue631) Matt Mackall <mpm@selenic.com> parents: 4820 diff changeset	196 checkcopies(ctx(f, m2[f]), m1, ma)
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	197
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	198 d2 = {}
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	199 for of, fl in diverge.items():
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	200 for f in fl:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	201 fo = list(fl)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	202 fo.remove(f)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	203 d2[f] = (of, fo)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	204
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	205 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	206 return copy, diverge
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	207
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	208 # generate a directory move map
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	209 d1, d2 = dirs(m1), dirs(m2)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	210 invalid = {}
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	211 dirmove = {}
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	212
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	213 # 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	214 # 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	215 for dst, src in fullcopy.items():
4398 9fe267f77f56 merge: fix a bug detecting directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	216 dsrc, ddst = dirname(src), dirname(dst)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	217 if dsrc in invalid:
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	218 # already seen to be uninteresting
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	219 continue
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	220 elif dsrc in d1 and ddst in d1:
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	221 # directory wasn't entirely moved locally
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	222 invalid[dsrc] = True
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	223 elif dsrc in d2 and ddst in d2:
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	224 # directory wasn't entirely moved remotely
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	225 invalid[dsrc] = True
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	226 elif dsrc in dirmove and dirmove[dsrc] != ddst:
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	227 # 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	228 invalid[dsrc] = True
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	229 else:
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	230 # looks good so far
4117 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	231 dirmove[dsrc + "/"] = ddst + "/"
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	232
4399 3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	233 for i in invalid:
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	234 if i in dirmove:
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	235 del dirmove[i]
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4398 diff changeset	236
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	237 del d1, d2, invalid
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	238
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	239 if not dirmove:
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	240 return copy, diverge
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	241
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	242 # check unaccounted nonoverlapping files against directory moves
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	243 for f in u1 + u2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	244 if f not in fullcopy:
4117 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	245 for d in dirmove:
c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	246 if f.startswith(d):
4397 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4354 diff changeset	247 # 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	248 copy[f] = dirmove[d] + f[len(d):]
c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3881 diff changeset	249 break
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	250
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	251 return copy, diverge
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	252
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	253 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	254 """
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	255 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	256
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	257 overwrite = whether we clobber working files
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	258 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	259 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	260
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	261 repo.ui.note(_("resolving manifests\n"))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	262 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	263 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	264
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	265 m1 = p1.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	266 m2 = p2.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	267 ma = pa.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	268 backwards = (pa == p2)
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	269 action = []
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	270 copy = {}
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	271 diverge = {}
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	272
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	273 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	274 """merge flags"""
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	275 if not f2:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	276 f2 = f
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	277 fa = f
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	278 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	279 if ((a^b) \| (a^c)) ^ a:
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	280 return 'x'
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	281 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	282 if ((a^b) \| (a^c)) ^ a:
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	283 return 'l'
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	284 return ''
3119 5644a05a608c merge: simplify exec flag handling Matt Mackall <mpm@selenic.com> parents: 3118 diff changeset	285
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	286 def act(msg, m, f, *args):
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	287 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	288 action.append((f, m) + args)
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	289
3731 b4af5f92e04b merge: move check for empty ancestor into findcopies Matt Mackall <mpm@selenic.com> parents: 3730 diff changeset	290 if not (backwards or overwrite):
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	291 copy, diverge = findcopies(repo, m1, m2, ma, pa.rev())
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	292
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	293 for of, fl in diverge.items():
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	294 act("divergent renames", "dr", of, fl)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	295
3730 d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	296 copied = dict.fromkeys(copy.values())
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	297
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	298 # Compare manifests
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	299 for f, n in m1.iteritems():
3254 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	300 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	301 continue
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	302 if f in m2:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	303 # are files different?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	304 if n != m2[f]:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	305 a = ma.get(f, nullid)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	306 # are both different from the ancestor?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	307 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	308 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	309 # are we clobbering?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	310 # is remote's version newer?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	311 # 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	312 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	313 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	314 # 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	315 elif fmerge(f) != m1.flags(f):
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	316 act("update permissions", "e", f, m2.flags(f))
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	317 # contents same, check mode bits
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	318 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	319 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	320 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	321 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	322 continue
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	323 elif f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	324 f2 = copy[f]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	325 if f2 not in m2: # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	326 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	327 f, None, f2, m1.flags(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	328 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	329 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	330 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	331 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	332 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	333 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	334 elif f in ma:
3118 7a635ef25132 merge: simplify tests for local changed/remote deleted Matt Mackall <mpm@selenic.com> parents: 3117 diff changeset	335 if n != ma[f] and not overwrite:
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	336 if repo.ui.prompt(
3118 7a635ef25132 merge: simplify tests for local changed/remote deleted Matt Mackall <mpm@selenic.com> parents: 3117 diff changeset	337 (_(" local changed %s which remote deleted\n") % f) +
3120 b1de36a4b4df merge: simplify prompt code Matt Mackall <mpm@selenic.com> parents: 3119 diff changeset	338 _("(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	339 act("prompt delete", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	340 else:
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	341 act("other deleted", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	342 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	343 # 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	344 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	345 act("remote deleted", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	346
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	347 for f, n in m2.iteritems():
3254 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	348 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	349 continue
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	350 if f in m1:
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	351 continue
3729 581d20773326 merge: add copied hash to simplify copy logic Matt Mackall <mpm@selenic.com> parents: 3728 diff changeset	352 if f in copied:
581d20773326 merge: add copied hash to simplify copy logic Matt Mackall <mpm@selenic.com> parents: 3728 diff changeset	353 continue
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	354 if f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	355 f2 = copy[f]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	356 if f2 not in m1: # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	357 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	358 None, f, f2, m2.flags(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	359 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	360 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	361 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	362 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	363 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	364 f2, f, f, fmerge(f2, f, f2), True)
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	365 elif f in ma:
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	366 if overwrite or backwards:
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	367 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	368 elif n != ma[f]:
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	369 if repo.ui.prompt(
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	370 (_("remote changed %s which local deleted\n") % f) +
3120 b1de36a4b4df merge: simplify prompt code Matt Mackall <mpm@selenic.com> parents: 3119 diff changeset	371 _("(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	372 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	373 else:
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	374 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	375
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	376 return action
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	377
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	378 def applyupdates(repo, action, wctx, mctx):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	379 "apply the merge action list to the working directory"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	380
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	381 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	382 action.sort()
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	383 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	384 f, m = a[:2]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	385 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	386 continue
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	387 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	388 repo.ui.note(_("removing %s\n") % f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	389 util.audit_path(f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	390 try:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	391 util.unlink(repo.wjoin(f))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	392 except OSError, inst:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	393 if inst.errno != errno.ENOENT:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	394 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	395 (f, inst.strerror))
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3620 diff changeset	396 removed += 1
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	397 elif m == "m": # merge
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	398 f2, fd, flags, move = a[2:]
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	399 r = filemerge(repo, f, f2, wctx, mctx)
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	400 if r > 0:
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	401 unresolved += 1
3315 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	402 else:
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	403 if r is None:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	404 updated += 1
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	405 else:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	406 merged += 1
4681 dc5920ea12f8 merge: fix small bug with a failed merge across a rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4674 diff changeset	407 if f != fd:
dc5920ea12f8 merge: fix small bug with a failed merge across a rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4674 diff changeset	408 repo.ui.debug(_("copying %s to %s\n") % (f, fd))
dc5920ea12f8 merge: fix small bug with a failed merge across a rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4674 diff changeset	409 repo.wwrite(fd, repo.wread(f), flags)
dc5920ea12f8 merge: fix small bug with a failed merge across a rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4674 diff changeset	410 if move:
dc5920ea12f8 merge: fix small bug with a failed merge across a rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4674 diff changeset	411 repo.ui.debug(_("removing %s\n") % f)
dc5920ea12f8 merge: fix small bug with a failed merge across a rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4674 diff changeset	412 os.unlink(repo.wjoin(f))
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	413 util.set_exec(repo.wjoin(fd), "x" in flags)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	414 elif m == "g": # get
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	415 flags = a[2]
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	416 repo.ui.note(_("getting %s\n") % f)
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	417 t = mctx.filectx(f).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	418 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	419 updated += 1
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	420 elif m == "d": # directory rename
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	421 f2, fd, flags = a[2:]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	422 if f:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	423 repo.ui.note(_("moving %s to %s\n") % (f, fd))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	424 t = wctx.filectx(f).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	425 repo.wwrite(fd, t, flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	426 util.unlink(repo.wjoin(f))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	427 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	428 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	429 t = mctx.filectx(f2).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	430 repo.wwrite(fd, t, flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	431 updated += 1
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	432 elif m == "dr": # divergent renames
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	433 fl = a[2]
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	434 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	435 for nf in fl:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	436 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	437 elif m == "e": # exec
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	438 flags = a[2]
20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	439 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	440
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	441 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	442
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	443 def recordupdates(repo, action, branchmerge):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	444 "record merge actions to the dirstate"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	445
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	446 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	447 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	448 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	449 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	450 repo.dirstate.update([f], 'r')
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	451 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	452 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	453 elif m == "f": # forget
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	454 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	455 elif m == "g": # get
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	456 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	457 repo.dirstate.update([f], 'n', st_mtime=-1)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	458 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	459 repo.dirstate.update([f], 'n')
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	460 elif m == "m": # merge
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	461 f2, fd, flag, move = a[2:]
3257 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	462 if branchmerge:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	463 # 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	464 # so that we properly record the merger later
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	465 repo.dirstate.update([fd], 'm')
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	466 if f != f2: # copy/rename
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	467 if move:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	468 repo.dirstate.update([f], 'r')
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	469 if f != fd:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	470 repo.dirstate.copy(f, fd)
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	471 else:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	472 repo.dirstate.copy(f2, fd)
3257 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	473 else:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	474 # We've update-merged a locally modified file, so
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	475 # we set the dirstate to emulate a normal checkout
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	476 # 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	477 # merge will appear as a normal local file
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	478 # modification.
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	479 repo.dirstate.update([fd], 'n', st_size=-1, st_mtime=-1)
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	480 if move:
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	481 repo.dirstate.forget([f])
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	482 elif m == "d": # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	483 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	484 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	485 # untracked file moved
9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4815 diff changeset	486 continue
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	487 if branchmerge:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	488 repo.dirstate.update([fd], 'a')
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	489 if f:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	490 repo.dirstate.update([f], 'r')
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	491 repo.dirstate.copy(f, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	492 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	493 repo.dirstate.copy(f2, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	494 else:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	495 repo.dirstate.update([fd], 'n')
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	496 if f:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	497 repo.dirstate.forget([f])
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	498
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	499 def update(repo, node, branchmerge, force, partial, wlock):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	500 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	501 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	502
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	503 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	504 force = whether to force branch merging or file overwriting
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	505 partial = a function to filter file lists (dirstate not updated)
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	506 wlock = working dir lock, if already held
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	507 """
2829 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	508
2826 3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	509 if not wlock:
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	510 wlock = repo.wlock()
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	511
4177 ba51a8225a60 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 4118 diff changeset	512 wc = repo.workingctx()
ba51a8225a60 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 4118 diff changeset	513 if node is None:
ba51a8225a60 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 4118 diff changeset	514 # tip of current branch
4232 0d51eb296fb9 Merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4209 diff changeset	515 try:
0d51eb296fb9 Merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4209 diff changeset	516 node = repo.branchtags()[wc.branch()]
0d51eb296fb9 Merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4209 diff changeset	517 except KeyError:
0d51eb296fb9 Merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4209 diff changeset	518 raise util.Abort(_("branch %s not found") % wc.branch())
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	519 overwrite = force and not branchmerge
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	520 forcemerge = force and branchmerge
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	521 pl = wc.parents()
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	522 p1, p2 = pl[0], repo.changectx(node)
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	523 pa = p1.ancestor(p2)
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	524 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4404 diff changeset	525 fastforward = False
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	526
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	527 ### check phase
3200 e67c22bc8bba merge: use repo.parents and parent contexts in update Matt Mackall <mpm@selenic.com> parents: 3163 diff changeset	528 if not overwrite and len(pl) > 1:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	529 raise util.Abort(_("outstanding uncommitted merges"))
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	530 if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	531 if branchmerge:
4815 8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: 4681 diff changeset	532 if p1.branch() != p2.branch() and pa != p2:
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4404 diff changeset	533 fastforward = True
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4404 diff changeset	534 else:
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4404 diff changeset	535 raise util.Abort(_("there is nothing to merge, just use "
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4404 diff changeset	536 "'hg update' or look at 'hg heads'"))
3592 fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3580 diff changeset	537 elif not (overwrite or branchmerge):
fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3580 diff changeset	538 raise util.Abort(_("update spans branches, use 'hg merge' "
fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3580 diff changeset	539 "or 'hg update -C' to lose changes"))
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	540 if branchmerge and not forcemerge:
3581 be61bd32046c use workingcontext.files() to detect if the repo is unclean Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3580 diff changeset	541 if wc.files():
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	542 raise util.Abort(_("outstanding uncommitted changes"))
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	543
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	544 ### calculate phase
3101 87ea5a71f7b9 merge: convert actions to list Matt Mackall <mpm@selenic.com> parents: 3097 diff changeset	545 action = []
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	546 if not force:
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	547 checkunknown(wc, p2)
3786 6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	548 if not util.checkfolding(repo.path):
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3774 diff changeset	549 checkcollision(p2)
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	550 if not branchmerge:
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	551 action += forgetremoved(wc, p2)
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	552 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	553
2917 dd032b0f02ac merge: move forgets to the apply stage Matt Mackall <mpm@selenic.com> parents: 2916 diff changeset	554 ### apply phase
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	555 if not branchmerge: # just jump to the new rev
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	556 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
3302 20087b4bc6f9 merge: don't call hooks for revert Matt Mackall <mpm@selenic.com> parents: 3301 diff changeset	557 if not partial:
20087b4bc6f9 merge: don't call hooks for revert Matt Mackall <mpm@selenic.com> parents: 3301 diff changeset	558 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	559
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	560 stats = applyupdates(repo, action, wc, p2)
2919 8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2918 diff changeset	561
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	562 if not partial:
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	563 recordupdates(repo, action, branchmerge)
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	564 repo.dirstate.setparents(fp1, fp2)
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4404 diff changeset	565 if not branchmerge and not fastforward:
4207 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4117 diff changeset	566 repo.dirstate.setbranch(p2.branch())
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	567 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	568
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	569 return stats
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	570

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/merge.py @ 4890:931f901ab811