mercurial-scm/hg-stable: mercurial/merge.py annotate

annotate mercurial/merge.py @ 6271:01aed23355e9

merge: more simplifications to checkcopies

author	Matt Mackall <mpm@selenic.com>
date	Sat, 15 Mar 2008 10:02:31 -0500
parents	14f0fe2e2db7
children	dd9bd227ae9a

rev	line source
2775 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>
2775 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
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6003 diff changeset	8 from node import nullid, nullrev
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: 5857 diff changeset	10 import errno, util, os, heapq, filemerge
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	11
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	12 def _checkunknown(wctx, mctx):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	13 "check for collisions between unknown files and files in mctx"
3312 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	14 man = mctx.manifest()
3218 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3212 diff changeset	15 for f in wctx.unknown():
3312 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	16 if f in man:
c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	17 if mctx.filectx(f).cmp(wctx.filectx(f).data()):
5670 840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	18 raise util.Abort(_("untracked file in working directory differs"
840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	19 " from file in requested revision: '%s'")
840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	20 % f)
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	21
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	22 def _checkcollision(mctx):
3785 6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	23 "check for case folding collisions in the destination context"
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	24 folded = {}
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	25 for fn in mctx.manifest():
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	26 fold = fn.lower()
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	27 if fold in folded:
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	28 raise util.Abort(_("case-folding collision between %s and %s")
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	29 % (fn, folded[fold]))
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	30 folded[fold] = fn
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	31
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	32 def _forgetremoved(wctx, mctx, branchmerge):
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	33 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	34 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	35
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	36 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: 3106 diff changeset	37 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: 3106 diff changeset	38 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: 3106 diff changeset	39 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: 3106 diff changeset	40 manifest.
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	41
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	42 If we're merging, and the other revision has removed a file
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	43 that is not present in the working directory, we need to mark it
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	44 as removed.
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	45 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	46
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	47 action = []
3312 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	48 man = mctx.manifest()
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	49 state = branchmerge and 'r' or 'f'
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	50 for f in wctx.deleted():
3312 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	51 if f not in man:
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	52 action.append((f, state))
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	53
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	54 if not branchmerge:
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	55 for f in wctx.removed():
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	56 if f not in man:
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	57 action.append((f, "f"))
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	58
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	59 return action
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	60
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	61 def _nonoverlap(d1, d2, d3):
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	62 "Return list of elements in d1 not in d2 or d3"
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	63 l = [d for d in d1 if d not in d3 and d not in d2]
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	64 l.sort()
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	65 return l
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	66
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	67 def _dirname(f):
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	68 s = f.rfind("/")
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	69 if s == -1:
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	70 return ""
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	71 return f[:s]
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	72
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	73 def _dirs(files):
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	74 d = {}
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	75 for f in files:
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	76 f = _dirname(f)
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	77 while f not in d:
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	78 d[f] = True
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	79 f = _dirname(f)
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	80 return d
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	81
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	82 def _findoldnames(fctx, limit):
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	83 "find files that path was copied from, back to linkrev limit"
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	84 old = {}
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	85 seen = {}
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	86 orig = fctx.path()
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	87 visit = [fctx]
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	88 while visit:
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	89 fc = visit.pop()
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	90 s = str(fc)
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	91 if s in seen:
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	92 continue
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	93 seen[s] = 1
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	94 if fc.path() != orig and fc.path() not in old:
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	95 old[fc.path()] = 1
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	96 if fc.rev() < limit:
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	97 continue
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	98 visit += fc.parents()
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	99
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	100 old = old.keys()
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	101 old.sort()
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	102 return old
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	103
3371 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3316 diff changeset	104 def findcopies(repo, m1, m2, ma, limit):
3153 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	105 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	106 Find moves and copies between m1 and m2 back to limit linkrev
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	107 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	108
4416 bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	109 wctx = repo.workingctx()
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	110
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	111 def makectx(f, n):
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	112 if len(n) == 20:
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	113 return repo.filectx(f, fileid=n)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	114 return wctx.filectx(f)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	115 ctx = util.cachefunc(makectx)
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates Matt Mackall <mpm@selenic.com> parents: 4400 diff changeset	116
4400 84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4399 diff changeset	117 copy = {}
84cd52b48f94 merge: reorganize some hunks in findcopies Matt Mackall <mpm@selenic.com> parents: 4399 diff changeset	118 fullcopy = {}
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	119 diverge = {}
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	120
6270 14f0fe2e2db7 merge: simplify checkcopies Matt Mackall <mpm@selenic.com> parents: 6269 diff changeset	121 def checkcopies(f, m1, m2):
14f0fe2e2db7 merge: simplify checkcopies Matt Mackall <mpm@selenic.com> parents: 6269 diff changeset	122 '''check possible copies of f from m1 to m2'''
14f0fe2e2db7 merge: simplify checkcopies Matt Mackall <mpm@selenic.com> parents: 6269 diff changeset	123 c1 = ctx(f, m1[f])
14f0fe2e2db7 merge: simplify checkcopies Matt Mackall <mpm@selenic.com> parents: 6269 diff changeset	124 for of in _findoldnames(c1, limit):
14f0fe2e2db7 merge: simplify checkcopies Matt Mackall <mpm@selenic.com> parents: 6269 diff changeset	125 fullcopy[f] = of # remember for dir rename detection
6271 01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	126 if of in m2: # original file not in other manifest?
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	127 # if the original file is unchanged on the other branch,
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	128 # no merge needed
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	129 if m2[of] != ma.get(of):
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	130 c2 = ctx(of, m2[of])
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	131 ca = c1.ancestor(c2)
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	132 # related and named changed on only one side?
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	133 if ca and ca.path() == f or ca.path() == c2.path():
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	134 if c1 != ca or c2 != ca: # merge needed?
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	135 copy[f] = of
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	136 elif of in ma:
01aed23355e9 merge: more simplifications to checkcopies Matt Mackall <mpm@selenic.com> parents: 6270 diff changeset	137 diverge.setdefault(of, []).append(f)
3732 ffe9fef84801 merge: pull findcopies helpers inside, refactor checkpair to checkcopies Matt Mackall <mpm@selenic.com> parents: 3731 diff changeset	138
3371 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3316 diff changeset	139 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	140 return {}, {}
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	141
3160 1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3155 diff changeset	142 # 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	143 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	144 return {}, {}
3160 1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3155 diff changeset	145
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	146 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	147
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	148 u1 = _nonoverlap(m1, m2, ma)
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	149 u2 = _nonoverlap(m2, m1, ma)
3153 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	150
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	151 if u1:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	152 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	153 % "\n ".join(u1))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	154 if u2:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	155 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	156 % "\n ".join(u2))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	157
3153 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	158 for f in u1:
6270 14f0fe2e2db7 merge: simplify checkcopies Matt Mackall <mpm@selenic.com> parents: 6269 diff changeset	159 checkcopies(f, m1, m2)
3153 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	160
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	161 for f in u2:
6270 14f0fe2e2db7 merge: simplify checkcopies Matt Mackall <mpm@selenic.com> parents: 6269 diff changeset	162 checkcopies(f, m2, m1)
3153 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	163
5857 c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	164 diverge2 = {}
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	165 for of, fl in diverge.items():
5857 c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	166 if len(fl) == 1:
c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	167 del diverge[of] # not actually divergent
c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	168 else:
c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	169 diverge2.update(dict.fromkeys(fl)) # reverse map for below
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	170
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	171 if fullcopy:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	172 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	173 for f in fullcopy:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	174 note = ""
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	175 if f in copy: note += "*"
5857 c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	176 if f in diverge2: note += "!"
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	177 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	178
5857 c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	179 del diverge2
c704b03884ef merge: add a bit more sanity to divergent copy checks Matt Mackall <mpm@selenic.com> parents: 5708 diff changeset	180
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	181 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	182 return copy, diverge
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	183
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	184 repo.ui.debug(_(" checking for directory renames\n"))
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	185
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	186 # generate a directory move map
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	187 d1, d2 = _dirs(m1), _dirs(m2)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	188 invalid = {}
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	189 dirmove = {}
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	190
4396 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	191 # examine each file copy for a potential directory move, which is
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	192 # 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	193 for dst, src in fullcopy.items():
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	194 dsrc, ddst = _dirname(src), _dirname(dst)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	195 if dsrc in invalid:
4396 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	196 # already seen to be uninteresting
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	197 continue
4396 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	198 elif dsrc in d1 and ddst in d1:
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	199 # directory wasn't entirely moved locally
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	200 invalid[dsrc] = True
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	201 elif dsrc in d2 and ddst in d2:
c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	202 # directory wasn't entirely moved remotely
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	203 invalid[dsrc] = True
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	204 elif dsrc in dirmove and dirmove[dsrc] != ddst:
4396 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	205 # 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	206 invalid[dsrc] = True
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	207 else:
4396 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	208 # looks good so far
4115 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3875 diff changeset	209 dirmove[dsrc + "/"] = ddst + "/"
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	210
4398 3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	211 for i in invalid:
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	212 if i in dirmove:
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	213 del dirmove[i]
3b7e284b8f28 merge: expand and simplify the invalid handling for directory moves Matt Mackall <mpm@selenic.com> parents: 4397 diff changeset	214
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	215 del d1, d2, invalid
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	216
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	217 if not dirmove:
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	218 return copy, diverge
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	219
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	220 for d in dirmove:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	221 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	222
4396 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	223 # check unaccounted nonoverlapping files against directory moves
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	224 for f in u1 + u2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	225 if f not in fullcopy:
4115 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3875 diff changeset	226 for d in dirmove:
c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3875 diff changeset	227 if f.startswith(d):
4396 c04c96504a12 merge: clarify the findcopies code Matt Mackall <mpm@selenic.com> parents: 4350 diff changeset	228 # new file added in a directory that was moved, move it
4115 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3875 diff changeset	229 copy[f] = dirmove[d] + f[len(d):]
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	230 repo.ui.debug(_(" file %s -> %s\n") % (f, copy[f]))
4115 c95060a5391a merge: fix renaming of subdirectories under renamed directories Matt Mackall <mpm@selenic.com> parents: 3875 diff changeset	231 break
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	232
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	233 return copy, diverge
3153 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	234
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	235 def _symmetricdifference(repo, rev1, rev2):
5096 ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	236 """symmetric difference of the sets of ancestors of rev1 and rev2
5433 f9b0e4f023c4 findcopies: fix rename bug Matt Mackall <mpm@selenic.com> parents: 5096 diff changeset	237
5096 ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	238 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	239 """
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	240 # basic idea:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	241 # - 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	242 # - 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	243 # for each revision r:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	244 # - 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	245 # - 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	246 #
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	247 # 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	248 # 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	249 # 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	250 WHITE = 1
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	251 BLACK = 2
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	252 ALLCOLORS = WHITE \| BLACK
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	253 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	254
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	255 cl = repo.changelog
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	256
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	257 visit = [-rev1, -rev2]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	258 heapq.heapify(visit)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	259 n_wanted = len(visit)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	260 ret = []
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	261
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	262 while n_wanted:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	263 r = -heapq.heappop(visit)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	264 wanted = colors[r] != ALLCOLORS
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	265 n_wanted -= wanted
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	266 if wanted:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	267 ret.append(r)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	268
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	269 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	270 if p == nullrev:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	271 continue
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	272 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	273 # 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	274 n_wanted += wanted
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	275 colors[p] = colors[r]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	276 heapq.heappush(visit, -p)
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	277 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	278 # 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	279 # 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	280 n_wanted -= 1
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	281 colors[p] \|= colors[r]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	282
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	283 del colors[r]
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	284
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	285 return ret
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	286
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	287 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	288 """
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	289 Merge p1 and p2 with ancestor ma and generate merge action list
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	290
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	291 overwrite = whether we clobber working files
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	292 partial = function to filter file lists
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	293 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	294
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	295 repo.ui.note(_("resolving manifests\n"))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	296 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	297 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	298
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	299 m1 = p1.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	300 m2 = p2.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	301 ma = pa.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	302 backwards = (pa == p2)
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	303 action = []
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	304 copy = {}
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	305 diverge = {}
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	306
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	307 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	308 """merge flags"""
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	309 if not f2:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	310 f2 = f
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	311 fa = f
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	312 a, m, n = ma.flags(fa), m1.flags(f), m2.flags(f2)
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	313 if m == n: # flags agree
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	314 return m # unchanged
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	315 if m and n: # flags are set but don't agree
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	316 if not a: # both differ from parent
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	317 r = repo.ui.prompt(
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	318 _(" conflicting flags for %s\n"
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	319 "(n)one, e(x)ec or sym(l)ink?") % f, "[nxl]", "n")
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	320 return r != "n" and r or ''
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	321 if m == a:
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	322 return n # changed from m to n
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	323 return m # changed from n to m
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	324 if m and m != a: # changed from a to m
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	325 return m
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	326 if n and n != a: # changed from a to n
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	327 return n
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	328 return '' # flag was cleared
3118 5644a05a608c merge: simplify exec flag handling Matt Mackall <mpm@selenic.com> parents: 3117 diff changeset	329
3307 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3306 diff changeset	330 def act(msg, m, f, *args):
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	331 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	332 action.append((f, m) + args)
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	333
3731 b4af5f92e04b merge: move check for empty ancestor into findcopies Matt Mackall <mpm@selenic.com> parents: 3730 diff changeset	334 if not (backwards or overwrite):
5096 ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	335 rev1 = p1.rev()
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	336 if rev1 is None:
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	337 # p1 is a workingctx
ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	338 rev1 = p1.parents()[0].rev()
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	339 limit = min(_symmetricdifference(repo, rev1, p2.rev()))
5096 ad6b97132b81 merge: fix a copy detection bug (issue672) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5059 diff changeset	340 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	341
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	342 for of, fl in diverge.items():
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	343 act("divergent renames", "dr", of, fl)
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	344
3730 d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	345 copied = dict.fromkeys(copy.values())
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	346
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	347 # Compare manifests
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	348 for f, n in m1.iteritems():
3248 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	349 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	350 continue
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	351 if f in m2:
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	352 if overwrite or backwards:
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	353 rflags = m2.flags(f)
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	354 else:
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	355 rflags = fmerge(f)
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	356 # are files different?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	357 if n != m2[f]:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	358 a = ma.get(f, nullid)
5700 9cedc3fbbebb merge: simplify merge tests, fix exec flag bug Matt Mackall <mpm@selenic.com> parents: 5695 diff changeset	359 # are we clobbering?
9cedc3fbbebb merge: simplify merge tests, fix exec flag bug Matt Mackall <mpm@selenic.com> parents: 5695 diff changeset	360 if overwrite:
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	361 act("clobbering", "g", f, rflags)
5700 9cedc3fbbebb merge: simplify merge tests, fix exec flag bug Matt Mackall <mpm@selenic.com> parents: 5695 diff changeset	362 # or are we going back in time and clean?
9cedc3fbbebb merge: simplify merge tests, fix exec flag bug Matt Mackall <mpm@selenic.com> parents: 5695 diff changeset	363 elif backwards and not n[20:]:
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	364 act("reverting", "g", f, rflags)
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	365 # are both different from the ancestor?
5700 9cedc3fbbebb merge: simplify merge tests, fix exec flag bug Matt Mackall <mpm@selenic.com> parents: 5695 diff changeset	366 elif n != a and m2[f] != a:
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	367 act("versions differ", "m", f, f, f, rflags, False)
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	368 # is remote's version newer?
5700 9cedc3fbbebb merge: simplify merge tests, fix exec flag bug Matt Mackall <mpm@selenic.com> parents: 5695 diff changeset	369 elif m2[f] != a:
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	370 act("remote is newer", "g", f, rflags)
3113 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3112 diff changeset	371 # local is newer, not overwrite, check mode bits
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	372 elif m1.flags(f) != rflags:
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	373 act("update permissions", "e", f, rflags)
3113 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3112 diff changeset	374 # contents same, check mode bits
5708 f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	375 elif m1.flags(f) != rflags:
f6bf89722e29 merge: add flag merging intelligence Matt Mackall <mpm@selenic.com> parents: 5704 diff changeset	376 act("update permissions", "e", f, rflags)
3730 d377f8d25662 merge: only store one direction of copies in the copy map Matt Mackall <mpm@selenic.com> parents: 3729 diff changeset	377 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	378 continue
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	379 elif f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	380 f2 = copy[f]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	381 if f2 not in m2: # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	382 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	383 f, None, f2, m1.flags(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	384 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	385 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	386 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	387 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	388 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	389 f, f2, f, fmerge(f, f2, f2), False)
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	390 elif f in ma:
3117 7a635ef25132 merge: simplify tests for local changed/remote deleted Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	391 if n != ma[f] and not overwrite:
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	392 if repo.ui.prompt(
5670 840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	393 _(" local changed %s which remote deleted\n"
840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	394 "use (c)hanged version or (d)elete?") % f,
840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	395 _("[cd]"), _("c")) == _("d"):
3307 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3306 diff changeset	396 act("prompt delete", "r", f)
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	397 else:
3307 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3306 diff changeset	398 act("other deleted", "r", f)
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	399 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	400 # file is created on branch or in working directory
3120 1c1e59aac82a merge: simplify local created logic Matt Mackall <mpm@selenic.com> parents: 3119 diff changeset	401 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
3307 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3306 diff changeset	402 act("remote deleted", "r", f)
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	403
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	404 for f, n in m2.iteritems():
3248 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	405 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	406 continue
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	407 if f in m1:
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	408 continue
3729 581d20773326 merge: add copied hash to simplify copy logic Matt Mackall <mpm@selenic.com> parents: 3728 diff changeset	409 if f in copied:
581d20773326 merge: add copied hash to simplify copy logic Matt Mackall <mpm@selenic.com> parents: 3728 diff changeset	410 continue
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	411 if f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	412 f2 = copy[f]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	413 if f2 not in m1: # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	414 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	415 None, f, f2, m2.flags(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	416 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	417 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	418 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	419 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	420 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	421 f2, f, f, fmerge(f2, f, f2), True)
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	422 elif f in ma:
3116 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	423 if overwrite or backwards:
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	424 act("recreating", "g", f, m2.flags(f))
3116 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	425 elif n != ma[f]:
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	426 if repo.ui.prompt(
5670 840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	427 _("remote changed %s which local deleted\n"
840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	428 "use (c)hanged version or leave (d)eleted?") % f,
840e2b315c1f Fix misleading error and prompts during update/merge (issue556) Thomas Arendsen Hein <thomas@intevation.de> parents: 5489 diff changeset	429 _("[cd]"), _("c")) == _("c"):
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	430 act("prompt recreating", "g", f, m2.flags(f))
3115 bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3114 diff changeset	431 else:
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	432 act("remote created", "g", f, m2.flags(f))
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	433
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	434 return action
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	435
3297 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	436 def applyupdates(repo, action, wctx, mctx):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	437 "apply the merge action list to the working directory"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	438
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	439 updated, merged, removed, unresolved = 0, 0, 0, 0
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	440 action.sort()
5042 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	441 # prescan for copy/renames
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	442 for a in action:
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	443 f, m = a[:2]
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	444 if m == 'm': # merge
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	445 f2, fd, flags, move = a[2:]
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	446 if f != fd:
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	447 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: 4997 diff changeset	448 repo.wwrite(fd, repo.wread(f), flags)
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	449
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5060 diff changeset	450 audit_path = util.path_auditor(repo.root)
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5060 diff changeset	451
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	452 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	453 f, m = a[:2]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	454 if f and f[0] == "/":
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	455 continue
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	456 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	457 repo.ui.note(_("removing %s\n") % f)
5158 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5060 diff changeset	458 audit_path(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	459 try:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	460 util.unlink(repo.wjoin(f))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	461 except OSError, inst:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	462 if inst.errno != errno.ENOENT:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	463 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: 3110 diff changeset	464 (f, inst.strerror))
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3618 diff changeset	465 removed += 1
3308 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	466 elif m == "m": # merge
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	467 f2, fd, flags, move = a[2:]
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: 5857 diff changeset	468 r = filemerge.filemerge(repo, f, fd, f2, wctx, mctx)
3400 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	469 if r > 0:
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	470 unresolved += 1
3309 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3308 diff changeset	471 else:
3400 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	472 if r is None:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	473 updated += 1
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	474 else:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	475 merged += 1
5704 5049bbf988e1 merge: use util.set_flags Matt Mackall <mpm@selenic.com> parents: 5700 diff changeset	476 util.set_flags(repo.wjoin(fd), flags)
5059 8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636 Matt Mackall <mpm@selenic.com> parents: 5042 diff changeset	477 if f != fd and move and util.lexists(repo.wjoin(f)):
5042 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	478 repo.ui.debug(_("removing %s\n") % f)
f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	479 os.unlink(repo.wjoin(f))
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	480 elif m == "g": # get
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	481 flags = a[2]
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	482 repo.ui.note(_("getting %s\n") % f)
3303 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3299 diff changeset	483 t = mctx.filectx(f).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	484 repo.wwrite(f, t, flags)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	485 updated += 1
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	486 elif m == "d": # directory rename
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	487 f2, fd, flags = a[2:]
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	488 if f:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	489 repo.ui.note(_("moving %s to %s\n") % (f, fd))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	490 t = wctx.filectx(f).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	491 repo.wwrite(fd, t, flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	492 util.unlink(repo.wjoin(f))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	493 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	494 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	495 t = mctx.filectx(f2).data()
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	496 repo.wwrite(fd, t, flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	497 updated += 1
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	498 elif m == "dr": # divergent renames
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	499 fl = a[2]
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	500 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	501 for nf in fl:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	502 repo.ui.warn(" %s\n" % nf)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	503 elif m == "e": # exec
4007 20da40cc1c73 symlinks: minimal support for symlinks in merge/update Matt Mackall <mpm@selenic.com> parents: 4006 diff changeset	504 flags = a[2]
5704 5049bbf988e1 merge: use util.set_flags Matt Mackall <mpm@selenic.com> parents: 5700 diff changeset	505 util.set_flags(repo.wjoin(f), flags)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	506
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	507 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	508
3372 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	509 def recordupdates(repo, action, branchmerge):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	510 "record merge actions to the dirstate"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	511
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	512 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	513 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	514 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	515 if branchmerge:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	516 repo.dirstate.remove(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	517 else:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	518 repo.dirstate.forget(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	519 elif m == "f": # forget
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	520 repo.dirstate.forget(f)
4997 60c54154ec4c merge: don't forget to update the dirstate for exec bit changes Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	521 elif m in "ge": # get or exec change
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	522 if branchmerge:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	523 repo.dirstate.normaldirty(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	524 else:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	525 repo.dirstate.normal(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	526 elif m == "m": # merge
3303 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3299 diff changeset	527 f2, fd, flag, move = a[2:]
3251 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	528 if branchmerge:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	529 # We've done a branch merge, mark this file as merged
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	530 # so that we properly record the merger later
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	531 repo.dirstate.merge(fd)
3372 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	532 if f != f2: # copy/rename
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	533 if move:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	534 repo.dirstate.remove(f)
3372 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	535 if f != fd:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	536 repo.dirstate.copy(f, fd)
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	537 else:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	538 repo.dirstate.copy(f2, fd)
3251 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	539 else:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	540 # We've update-merged a locally modified file, so
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	541 # we set the dirstate to emulate a normal checkout
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	542 # of that file some time in the past. Thus our
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	543 # merge will appear as a normal local file
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	544 # 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: 5161 diff changeset	545 repo.dirstate.normallookup(fd)
3308 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	546 if move:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	547 repo.dirstate.forget(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	548 elif m == "d": # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	549 f2, fd, flag = a[2:]
4819 9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4748 diff changeset	550 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: 4748 diff changeset	551 # untracked file moved
9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4748 diff changeset	552 continue
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	553 if branchmerge:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	554 repo.dirstate.add(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	555 if f:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	556 repo.dirstate.remove(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	557 repo.dirstate.copy(f, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	558 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	559 repo.dirstate.copy(f2, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	560 else:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	561 repo.dirstate.normal(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	562 if f:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	563 repo.dirstate.forget(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	564
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	565 def update(repo, node, branchmerge, force, partial):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	566 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	567 Perform a merge between the working directory and the given node
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	568
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	569 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	570 force = whether to force branch merging or file overwriting
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	571 partial = a function to filter file lists (dirstate not updated)
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	572 """
2815 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2814 diff changeset	573
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	574 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	575 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	576 wc = repo.workingctx()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	577 if node is None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	578 # tip of current branch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	579 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	580 node = repo.branchtags()[wc.branch()]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	581 except KeyError:
5570 78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	582 if wc.branch() == "default": # no default branch!
78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	583 node = repo.lookup("tip") # update to tip
78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	584 else:
78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	585 raise util.Abort(_("branch %s not found") % wc.branch())
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	586 overwrite = force and not branchmerge
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	587 forcemerge = force and branchmerge
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	588 pl = wc.parents()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	589 p1, p2 = pl[0], repo.changectx(node)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	590 pa = p1.ancestor(p2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	591 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: 4904 diff changeset	592 fastforward = False
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	593
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	594 ### check phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	595 if not overwrite and len(pl) > 1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	596 raise util.Abort(_("outstanding uncommitted merges"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	597 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: 4904 diff changeset	598 if branchmerge:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	599 if p1.branch() != p2.branch() and pa != p2:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	600 fastforward = True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	601 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	602 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: 4904 diff changeset	603 "'hg update' or look at 'hg heads'"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	604 elif not (overwrite or branchmerge):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	605 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: 4904 diff changeset	606 "or 'hg update -C' to lose changes"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	607 if branchmerge and not forcemerge:
6256 69c75d063c7a merge: require --force when there are deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6242 diff changeset	608 if wc.files() or wc.deleted():
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	609 raise util.Abort(_("outstanding uncommitted changes"))
2814 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2813 diff changeset	610
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	611 ### calculate phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	612 action = []
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	613 if not force:
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	614 _checkunknown(wc, p2)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	615 if not util.checkfolding(repo.path):
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	616 _checkcollision(p2)
ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	617 action += _forgetremoved(wc, p2, branchmerge)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	618 action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	619
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	620 ### apply phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	621 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: 4904 diff changeset	622 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	623 if not partial:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	624 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	625
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	626 stats = applyupdates(repo, action, wc, p2)
2899 8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2898 diff changeset	627
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	628 if not partial:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	629 recordupdates(repo, action, branchmerge)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	630 repo.dirstate.setparents(fp1, fp2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	631 if not branchmerge and not fastforward:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	632 repo.dirstate.setbranch(p2.branch())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	633 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	634
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	635 return stats
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	636 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	637 del wlock

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/merge.py @ 6271:01aed23355e9